Untested external audio support; AB transcodes still broken.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index b74d09174ee1a53f6d77dab2e7864691559ef605..32725f77caaca32e5d07b47fe066de4c639f6b50 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -18,37 +18,66 @@
 */
 
 /** @file  src/transcoder.cc
- *  @brief A class which takes a FilmState and some Options, then uses those to transcode a Film.
+ *  @brief A class which takes a Film and some Options, then uses those to transcode the film.
  *
  *  A decoder is selected according to the content type, and the encoder can be specified
  *  as a parameter to the constructor.
  */
 
 #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 s FilmState of Film that we are transcoding.
+ *  @param f Film that we are transcoding.
  *  @param o Options.
  *  @param j Job that we are running under, or 0.
- *  @param l Log that we can write to.
  *  @param e Encoder to use.
  */
-Transcoder::Transcoder (shared_ptr<const FilmState> s, shared_ptr<const Options> o, Job* j, Log* l, shared_ptr<Encoder> e)
+Transcoder::Transcoder (shared_ptr<Film> f, shared_ptr<const Options> o, Job* j, shared_ptr<Encoder> e)
        : _job (j)
        , _encoder (e)
-       , _decoder (decoder_factory (s, o, j, l))
+       , _decoders (decoder_factory (f, o, j))
 {
        assert (_encoder);
+
+       if (f->audio_stream()) {
+               AudioStream st = f->audio_stream().get();
+               _matcher.reset (new Matcher (f->log(), st.sample_rate(), f->frames_per_second()));
+               _delay_line.reset (new DelayLine (f->log(), st.channels(), f->audio_delay() * st.sample_rate() / 1000));
+               _gain.reset (new Gain (f->log(), f->audio_gain()));
+       }
+
+       /* Set up the decoder to use the film's set streams */
+       _decoders.first->set_subtitle_stream (f->subtitle_stream ());
+       _decoders.second->set_audio_stream (f->audio_stream ());
+
+       if (_matcher) {
+               _decoders.first->connect_video (_matcher);
+               _matcher->connect_video (_encoder);
+       } else {
+               _decoders.first->connect_video (_encoder);
+       }
        
-       _decoder->Video.connect (sigc::mem_fun (*e, &Encoder::process_video));
-       _decoder->Audio.connect (sigc::mem_fun (*e, &Encoder::process_audio));
+       if (_matcher && _delay_line) {
+               _decoders.second->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
@@ -57,9 +86,21 @@ Transcoder::Transcoder (shared_ptr<const FilmState> s, shared_ptr<const Options>
 void
 Transcoder::go ()
 {
-       _encoder->process_begin (_decoder->audio_channel_layout(), _decoder->audio_sample_format());
+       _encoder->process_begin ();
        try {
-               _decoder->go ();
+               while (1) {
+                       bool const v = _decoders.first->pass ();
+
+                       bool a = false;
+                       if (dynamic_pointer_cast<Decoder> (_decoders.second) != dynamic_pointer_cast<Decoder> (_decoders.first)) {
+                               a = _decoders.second->pass ();
+                       }
+
+                       if (v && a) {
+                               break;
+                       }
+               }
+               
        } catch (...) {
                /* process_end() is important as the decoder may have worker
                   threads that need to be cleaned up.