summaryrefslogtreecommitdiff
path: root/src/mov_encoder.h
diff options
context:
space:
mode:
authordeva <deva>2005-10-04 21:39:53 +0000
committerdeva <deva>2005-10-04 21:39:53 +0000
commit111b16802de661228ef414eb6ec7484e2fa186ed (patch)
treed6d1ce9e8b857371414f33ff460266258c462275 /src/mov_encoder.h
parent9640339f2e9dc126406f6b6f8a091b924898b4f5 (diff)
*** empty log message ***
Diffstat (limited to 'src/mov_encoder.h')
-rw-r--r--src/mov_encoder.h30
1 files changed, 11 insertions, 19 deletions
diff --git a/src/mov_encoder.h b/src/mov_encoder.h
index 8488008..ace016c 100644
--- a/src/mov_encoder.h
+++ b/src/mov_encoder.h
@@ -48,15 +48,15 @@ using namespace std;
#include "info.h"
-#include "libfame_wrapper.h"
-//#include "liblame_wrapper.h"
+#include "threadsafe_queue_priority.h"
+#include "threadsafe_queue_fifo.h"
class MovEncoder : public Thread {
public:
MovEncoder(volatile bool *r, sem_t *r_sem,
- FrameVectorQueue *in, sem_t *in_sem, pthread_mutex_t *in_mutex,
- FramePriorityQueue *v_out, pthread_mutex_t *v_out_mutex, sem_t *v_out_sem,
- FramePriorityQueue *a_out, pthread_mutex_t *a_out_mutex, sem_t *a_out_sem,
+ ThreadSafeQueueFIFO< FrameVector*> *in,
+ ThreadSafeQueuePriority *video_out,
+ ThreadSafeQueuePriority *audio_out,
Info *info);
~MovEncoder();
@@ -65,24 +65,16 @@ public:
volatile bool *running;
private:
- // LibFAMEWrapper *fame;
- // LibLAMEWrapper *lame;
-
Info *info;
- // Input/Output queues
- FrameVectorQueue *inputqueue;
- FramePriorityQueue *video_outputqueue;
- FramePriorityQueue *audio_outputqueue;
- pthread_mutex_t *input_mutex;
- pthread_mutex_t *video_output_mutex;
- pthread_mutex_t *audio_output_mutex;
+ // Input queue
+ ThreadSafeQueueFIFO< FrameVector* > *inputqueue;
- //thread stuff
- sem_t *input_sem;
- sem_t *video_output_sem;
- sem_t *audio_output_sem;
+ // Output queues
+ ThreadSafeQueuePriority *video_output_queue;
+ ThreadSafeQueuePriority *audio_output_queue;
+ // Reader (mov_encoder_thread.cc) semaphore
sem_t *read_sem;
};