From 91e9b782cc9ea0252ab2b211b15e8da4a3043d5f Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Sat, 2 Jul 2005 11:39:51 +0000
Subject: Added some audiocode. Moved libfame code out of mov_encoder

---
 src/mov_encoder.h | 35 +++++++++--------------------------
 1 file changed, 9 insertions(+), 26 deletions(-)

(limited to 'src/mov_encoder.h')

diff --git a/src/mov_encoder.h b/src/mov_encoder.h
index 76f0c7a..a54b145 100644
--- a/src/mov_encoder.h
+++ b/src/mov_encoder.h
@@ -36,6 +36,10 @@
 
 /*
  * $Log$
+ * Revision 1.14  2005/07/02 11:39:52  deva
+ * Added some audiocode.
+ * Moved libfame code out of mov_encoder
+ *
  * Revision 1.13  2005/06/16 21:54:22  deva
  * *** empty log message ***
  *
@@ -77,14 +81,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-
-// Use libfame
-#include <fame.h>
-
-// Use libdv
-#include <libdv/dv.h>
-#include <libdv/dv_types.h>
-
 #include <vector>
 using namespace std;
 
@@ -96,8 +92,8 @@ using namespace std;
 
 #include "info.h"
 
-// size specifies the length of the buffer. 
-#define FAME_BUFFER_SIZE	(1024*1024)	// FIXME: One size fits all...
+#include "libfame_wrapper.h"
+#include "liblame_wrapper.h"
 
 class MovEncoder : public Thread {
 public:
@@ -106,13 +102,15 @@ public:
              FramePriorityQueue *out, sem_t *out_sem, pthread_mutex_t *out_mutex,
              Info *info);
   ~MovEncoder();
-  Frame* encode(Frame *frame);
 
   void thread_main();
 
   volatile bool running;
 
 private:
+  LibFAMEWrapper *fame;
+  LibLAMEWrapper *lame;
+
   Info *info;
 
   // Input/Output queues
@@ -127,21 +125,6 @@ private:
   
   pthread_mutex_t *input_mutex;
   pthread_mutex_t *output_mutex;
-
-  Frame *encode_video(Frame *frame);
-  void encode_audio(Frame *frame);
-
-  // libFAME encoder
-  //  unsigned char *fame_buffer;
-  fame_parameters_t fame_par;
-  fame_context_t *fame_context;
-  fame_yuv_t yuv;
-  unsigned char fame_buffer[FAME_BUFFER_SIZE];
-
-  // libdv decoder
- 	dv_decoder_t *dvdecoder;
-
-  unsigned char picture[FAME_BUFFER_SIZE];
 };
 
 #endif
-- 
cgit v1.2.3