Repair very bad merge. Mysterious.

[dcpomatic.git] / src / lib / transcoder.cc

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 8c02b76337b258b904d478eb4b1ebaeccd4cbadf..23fb5b7880731789fdb82976fa7cc35c40e0f3bb 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -25,29 +25,52 @@
  */
 
 #include <iostream>
-#include <sigc++/signal.h>
+#include <boost/signals2.hpp>
 #include "transcoder.h"
 #include "encoder.h"
 #include "decoder_factory.h"
+#include "film.h"
+#include "matcher.h"
+#include "delay_line.h"
+#include "options.h"
+#include "gain.h"
+#include "video_decoder.h"
+#include "audio_decoder.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using boost::shared_ptr;
+using boost::dynamic_pointer_cast;
 
 /** Construct a transcoder using a Decoder that we create and a supplied Encoder.
  *  @param f Film that we are transcoding.
- *  @param o Options.
+ *  @param o Decode options.
  *  @param j Job that we are running under, or 0.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, shared_ptr<Encoder> e)
+Transcoder::Transcoder (shared_ptr<Film> f, DecodeOptions o, Job* j, shared_ptr<Encoder> e)
        : _job (j)
        , _encoder (e)
-       , _decoder (decoder_factory (f, o, j))
+       , _decoders (decoder_factory (f, o))
 {
        assert (_encoder);
+
+       shared_ptr<AudioStream> st = f->audio_stream();
+       _matcher.reset (new Matcher (f->log(), st->sample_rate(), f->source_frame_rate()));
+       _delay_line.reset (new DelayLine (f->log(), f->audio_delay() / 1000.0f));
+       _gain.reset (new Gain (f->log(), f->audio_gain()));
+
+       /* Set up the decoder to use the film's set streams */
+       _decoders.video->set_subtitle_stream (f->subtitle_stream ());
+       _decoders.audio->set_audio_stream (f->audio_stream ());
+
+       _decoders.video->connect_video (_delay_line);
+       _delay_line->connect_video (_matcher);
+       _matcher->connect_video (_encoder);
        
-       _decoder->Video.connect (sigc::mem_fun (*e, &Encoder::process_video));
-       _decoder->Audio.connect (sigc::mem_fun (*e, &Encoder::process_audio));
+       _decoders.audio->connect_audio (_delay_line);
+       _delay_line->connect_audio (_matcher);
+       _matcher->connect_audio (_gain);
+       _gain->connect_audio (_encoder);
 }
 
 /** Run the decoder, passing its output to the encoder, until the decoder
@@ -56,16 +79,36 @@ Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j,
 void
 Transcoder::go ()
 {
-       _encoder->process_begin (_decoder->audio_channel_layout());
+       _encoder->process_begin ();
        try {
-               _decoder->go ();
+               bool done[2] = { false, false };
+               
+               while (1) {
+                       if (!done[0]) {
+                               done[0] = _decoders.video->pass ();
+                               if (_job) {
+                                       _decoders.video->set_progress (_job);
+                               }
+                       }
+
+                       if (!done[1] && _decoders.audio && dynamic_pointer_cast<Decoder> (_decoders.audio) != dynamic_pointer_cast<Decoder> (_decoders.video)) {
+                               done[1] = _decoders.audio->pass ();
+                       } else {
+                               done[1] = true;
+                       }
+
+                       if (done[0] && done[1]) {
+                               break;
+                       }
+               }
+               
        } catch (...) {
-               /* process_end() is important as the decoder may have worker
-                  threads that need to be cleaned up.
-               */
                _encoder->process_end ();
                throw;
        }
-
+       
+       _delay_line->process_end ();
+       _matcher->process_end ();
+       _gain->process_end ();
        _encoder->process_end ();
 }