Removed the last pieces of ffmpeg... replaced it with libfame...

Not quite working yet, but all the major code is in place!

1 files changed, 23 insertions, 11 deletions

diff --git a/src/mov_encoder.h b/src/mov_encoder.h
index 2e3eca3..17412a2 100644
--- a/src/mov_encoder.h
+++ b/src/mov_encoder.h
@@ -36,6 +36,11 @@
 
 /*
  * $Log$
+ * Revision 1.6  2005/05/05 20:41:38  deva
+ *
+ * Removed the last pieces of ffmpeg... replaced it with libfame...
+ * Not quite working yet, but all the major code is in place!
+ *
  * Revision 1.5  2005/05/03 08:31:59  deva
  * Removed the error object, and replaced it with a more generic info object.
  *
@@ -49,13 +54,20 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <avformat.h>
+
+// Use libfame
+#include <fame.h>
+
+// Use libdv
+#include <libdv/dv.h>
+#include <libdv/dv_types.h>
 
 #include "frame.h"
 
 #include "util.h"
 
-#define VIDEO_BUFFER_SIZE	(1024*1024)	// FIXME: One size fits all...
+// size specifies the length of the buffer. 
+#define FAME_BUFFER_SIZE	(2*1024*1024)	// FIXME: One size fits all...
 
 class MovEncoder {
  public:
@@ -67,16 +79,16 @@ class MovEncoder {
   void encode_video(Frame *frame);
   void encode_audio(Frame *frame);
 
-  // Decoder
-  AVFormatContext *dfc;
-  AVCodecContext *dcc;
+  // buffer is the buffer where encoded data will be written to. It must be large 
+  // enough to contain a few frames.
+  unsigned char *fame_buffer;
+  fame_parameters_t fame_par;
+  fame_context_t *fame_context;
+  fame_yuv_t yuv;
+  FILE *f;
 
-  // Encoder
-  AVFormatContext *efc;
-  AVCodecContext *ecc;
-  AVPacket epkt;
-  unsigned char *video_buffer;
-  //  AVPacket pkt;
+  // libdv decoder
+ 	dv_decoder_t *dvdecoder;
 };
 
 #endif