Numerous fixes to A/B mode so that at least it doesn't crash (#72).

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index 32725f77caaca32e5d07b47fe066de4c639f6b50..e0f3a03a2319c02de63918a6201647c48fe478cc 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -43,37 +43,39 @@ 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)
-       , _decoders (decoder_factory (f, o, j))
+       , _decoders (decoder_factory (f, o))
 {
        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));
+               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(), 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 ());
+       _decoders.video->set_subtitle_stream (f->subtitle_stream ());
+       if (_decoders.audio) {
+               _decoders.audio->set_audio_stream (f->audio_stream ());
+       }
 
        if (_matcher) {
-               _decoders.first->connect_video (_matcher);
+               _decoders.video->connect_video (_matcher);
                _matcher->connect_video (_encoder);
        } else {
-               _decoders.first->connect_video (_encoder);
+               _decoders.video->connect_video (_encoder);
        }
        
-       if (_matcher && _delay_line) {
-               _decoders.second->connect_audio (_delay_line);
+       if (_matcher && _delay_line && _decoders.audio) {
+               _decoders.audio->connect_audio (_delay_line);
                _delay_line->connect_audio (_matcher);
                _matcher->connect_audio (_gain);
                _gain->connect_audio (_encoder);
@@ -88,26 +90,40 @@ Transcoder::go ()
 {
        _encoder->process_begin ();
        try {
+               bool done[2] = { false, false };
+               
                while (1) {
-                       bool const v = _decoders.first->pass ();
+                       if (!done[0]) {
+                               done[0] = _decoders.video->pass ();
+                               if (_job) {
+                                       _decoders.video->set_progress (_job);
+                               }
+                       }
 
-                       bool a = false;
-                       if (dynamic_pointer_cast<Decoder> (_decoders.second) != dynamic_pointer_cast<Decoder> (_decoders.first)) {
-                               a = _decoders.second->pass ();
+                       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 (v && a) {
+                       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;
        }
-
+       
+       if (_delay_line) {
+               _delay_line->process_end ();
+       }
+       if (_matcher) {
+               _matcher->process_end ();
+       }
+       if (_gain) {
+               _gain->process_end ();
+       }
        _encoder->process_end ();
 }