integration of codec API into BMediaFile and BMediaTrack

git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5468 a95241bf-73f2-0310-859d-f6bbb57e9c96

headers/private/media/DecoderPlugin.h

@@ -1,6 +1,7 @@
 #include <MediaTrack.h>
 #include <MediaFormats.h>
 #include "MediaPlugin.h"
+#include "ReaderPlugin.h"
 
 namespace BPrivate { namespace media {
 
@@ -14,19 +15,20 @@ public:
 	virtual status_t	Setup(media_format *ioEncodedFormat, media_format *ioDecodedFormat,
 							  const void *infoBuffer, int32 infoSize) = 0;
 	
-	virtual status_t	Seek(media_seek_type seekTo,
+	virtual status_t	Seek(uint32 seekTo,
 							 int64 seekFrame, int64 *frame,
 							 bigtime_t seekTime, bigtime_t *time) = 0;
 							 
 	virtual status_t	Decode(void *buffer, int64 *frameCount,
-							   media_header *mediaHeader, media_decode_info *info) = 0;
+							   media_header *mediaHeader, media_decode_info *info = 0) = 0;
 							   
 	status_t			GetNextChunk(void **chunkBuffer, int32 *chunkSize,
 									 media_header *mediaHeader);
 
 private:
-	void				Setup(BMediaTrack *reader);
-	BMediaTrack *		fReader;
+	void				Setup(Reader *reader, void *readerCookie);
+	Reader *			fReader;
+	void *				fReaderCookie;
 };
 
 

headers/private/media/MediaExtractor.h

@@ -0,0 +1,44 @@
+#ifndef _MEDIA_EXTRACTOR_H
+#define _MEDIA_EXTRACTOR_H
+
+#include "ReaderPlugin.h"
+#include "DecoderPlugin.h"
+
+namespace BPrivate {
+namespace media {
+
+class MediaExtractor
+{
+public:
+					MediaExtractor(BDataIO * source, int32 flags);
+					~MediaExtractor();
+
+	status_t		InitCheck();
+			
+	void			GetFileFormatInfo(media_file_format *mfi) const;
+
+	int32			StreamCount();
+	
+	media_format *	EncodedFormat(int32 stream);
+	int64			CountFrames(int32 stream) const;
+	bigtime_t		Duration(int32 stream) const;
+	void *			InfoBuffer(int32 stream) const;
+	int32			InfoBufferSize(int32 stream) const;
+
+	status_t		Seek(int32 stream, uint32 seekTo,
+						 int64 *frame, bigtime_t *time);
+	
+	status_t		GetNextChunk(int32 stream,
+								 void **chunkBuffer, int32 *chunkSize,
+								 media_header *mediaHeader);
+
+	status_t		CreateDecoder(int32 stream, Decoder **decoder, media_codec_info *mci);
+	
+};
+
+}; // namespace media
+}; // namespace BPrivate
+
+using namespace BPrivate::media;
+
+#endif