diff options
author | deva <deva> | 2005-07-07 12:42:19 +0000 |
---|---|---|
committer | deva <deva> | 2005-07-07 12:42:19 +0000 |
commit | 88a21aa4560d0a1bfef3e706e3b460d6745b3977 (patch) | |
tree | 02003cd3e45bb82d96db39389dff96a49ba48076 /src/mov_encoder.cc | |
parent | 26f488caef0e88e1995b6141e17e3595a6cf34dc (diff) |
*** empty log message ***
Diffstat (limited to 'src/mov_encoder.cc')
-rw-r--r-- | src/mov_encoder.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/mov_encoder.cc b/src/mov_encoder.cc index fa83830..f21cc3a 100644 --- a/src/mov_encoder.cc +++ b/src/mov_encoder.cc @@ -39,6 +39,9 @@ /* * $Log$ + * Revision 1.35 2005/07/07 12:42:19 deva + * *** empty log message *** + * * Revision 1.34 2005/07/05 23:15:16 deva * *** empty log message *** * @@ -189,12 +192,11 @@ void MovEncoder::thread_main() Frame *out_a_frame; LibFAMEWrapper fame(info); + LibLAMEWrapper lame(info); while(running) { sem_wait(input_sem); - LibLAMEWrapper lame(info); - // Lock inout mutex pthread_mutex_lock(input_mutex); item = inputqueue->front(); @@ -211,17 +213,19 @@ void MovEncoder::thread_main() // Encode video out_v_frame = fame.encode(in_frame); - out_v_frame->number = in_frame->number+1; - + out_v_frame->number = in_frame->number; + // Encode audio out_a_frame = lame.encode(in_frame); - out_a_frame->number = in_frame->number; - + out_a_frame->number = in_frame->number + 1; + delete in_frame; // Lock output mutex pthread_mutex_lock(output_mutex); + outputqueue->push(out_v_frame); + outputqueue->push(out_a_frame); outsize = outputqueue->size(); |