integrating codec API, added some MediaExtractor functionality

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

headers/private/media/DecoderPlugin.h

@@ -1,7 +1,10 @@
+#ifndef _DECODER_PLUGIN_H
+#define _DECODER_PLUGIN_H
+
 #include <MediaTrack.h>
 #include <MediaFormats.h>
 #include "MediaPlugin.h"
-#include "ReaderPlugin.h"
+#include "MediaExtractor.h"
 
 namespace BPrivate { namespace media {
 
@@ -26,9 +29,11 @@ public:
 									 media_header *mediaHeader);
 
 private:
-	void				Setup(Reader *reader, void *readerCookie);
-	Reader *			fReader;
-	void *				fReaderCookie;
+	friend class MediaExtractor;
+	
+	void				Setup(MediaExtractor *extractor, int32 stream);
+	MediaExtractor *	fExtractor;
+	int32				fStream;
 };
 
 
@@ -46,3 +51,5 @@ public:
 } } // namespace BPrivate::media
 
 using namespace BPrivate::media;
+
+#endif

headers/private/media/MediaExtractor.h

@@ -7,6 +7,15 @@
 namespace BPrivate {
 namespace media {
 
+struct stream_info
+{
+	status_t		status;
+	void *			cookie;
+	void *			infoBuffer;
+	int32			infoBufferSize;
+	media_format	encodedFormat;
+};
+
 class MediaExtractor
 {
 public:
@@ -33,7 +42,18 @@ public:
 								 media_header *mediaHeader);
 
 	status_t		CreateDecoder(int32 stream, Decoder **decoder, media_codec_info *mci);
+
+
+private:
+	status_t		fErr;
+
+	BDataIO			*fSource;
+	Reader			*fReader;
 	
+	stream_info *	fStreamInfo;
+	int32			fStreamCount;
+
+	media_file_format fMff;
 };
 
 }; // namespace media