Better fix for still (no sound) DCP crash.

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

diff --git a/src/lib/transcoder.cc b/src/lib/transcoder.cc
index a7e79b05f74d6338cd2c5debfe6d77381b905839..48cf402d77bac4f36ababbac36adff4fb880d5e9 100644 (file)
--- a/src/lib/transcoder.cc
+++ b/src/lib/transcoder.cc
@@ -36,51 +36,64 @@
 #include "gain.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
+#include "trimmer.h"
 
 using std::string;
-using std::cout;
 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)
-       , _decoders (decoder_factory (f, o, j))
+       , _decoders (decoder_factory (f, o))
 {
        assert (_encoder);
 
-       if (f->audio_stream()) {
-               shared_ptr<AudioStream> st = f->audio_stream();
-               _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()));
+       shared_ptr<AudioStream> st = f->audio_stream();
+       if (st && st->sample_rate ()) {
+               _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()));
+
+       int const sr = st ? st->sample_rate() : 0;
+       int const trim_start = f->trim_type() == Film::ENCODE ? f->trim_start() : 0;
+       int const trim_end = f->trim_type() == Film::ENCODE ? f->trim_end() : 0;
+       _trimmer.reset (new Trimmer (
+                               f->log(), trim_start, trim_end, f->length().get_value_or(0),
+                               sr, f->source_frame_rate(), f->dcp_frame_rate()
+                               ));
 
        /* Set up the decoder to use the film's set streams */
-       _decoders.first->set_subtitle_stream (f->subtitle_stream ());
-       if (_decoders.second) {
-               _decoders.second->set_audio_stream (f->audio_stream ());
+       _decoders.video->set_subtitle_stream (f->subtitle_stream ());
+       if (f->audio_stream ()) {
+           _decoders.audio->set_audio_stream (f->audio_stream ());
        }
 
+       _decoders.video->connect_video (_delay_line);
        if (_matcher) {
-               _decoders.first->connect_video (_matcher);
-               _matcher->connect_video (_encoder);
+               _delay_line->connect_video (_matcher);
+               _matcher->connect_video (_trimmer);
        } else {
-               _decoders.first->connect_video (_encoder);
+               _delay_line->connect_video (_trimmer);
        }
+       _trimmer->connect_video (_encoder);
        
-       if (_matcher && _delay_line && _decoders.second) {
-               _decoders.second->connect_audio (_delay_line);
+       _decoders.audio->connect_audio (_delay_line);
+       if (_matcher) {
                _delay_line->connect_audio (_matcher);
                _matcher->connect_audio (_gain);
-               _gain->connect_audio (_encoder);
+       } else {
+               _delay_line->connect_audio (_gain);
        }
+       _gain->connect_audio (_trimmer);
+       _trimmer->connect_audio (_encoder);
 }
 
 /** Run the decoder, passing its output to the encoder, until the decoder
@@ -90,39 +103,32 @@ void
 Transcoder::go ()
 {
        _encoder->process_begin ();
-       try {
-               bool done[2] = { false, false };
-               
-               while (1) {
-                       if (!done[0]) {
-                               done[0] = _decoders.first->pass ();
-                               _decoders.first->set_progress ();
-                       }
-
-                       if (!done[1] && _decoders.second && dynamic_pointer_cast<Decoder> (_decoders.second) != dynamic_pointer_cast<Decoder> (_decoders.first)) {
-                               done[1] = _decoders.second->pass ();
-                       } else {
-                               done[1] = true;
-                       }
 
-                       if (done[0] && done[1]) {
-                               break;
+       bool done[2] = { false, false };
+       
+       while (1) {
+               if (!done[0]) {
+                       done[0] = _decoders.video->pass ();
+                       if (_job) {
+                               _decoders.video->set_progress (_job);
                        }
                }
                
-       } catch (...) {
-               _encoder->process_end ();
-               throw;
+               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;
+               }
        }
        
-       if (_delay_line) {
-               _delay_line->process_end ();
-       }
+       _delay_line->process_end ();
        if (_matcher) {
                _matcher->process_end ();
        }
-       if (_gain) {
-               _gain->process_end ();
-       }
+       _gain->process_end ();
        _encoder->process_end ();
 }