Merge master into direct-mxf.

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index e723610b320056668afc5328d59eca49b5213c5d..0fa16bc325b8b6ee8a309098c54a066359d99e1a 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -28,7 +28,7 @@
 using boost::shared_ptr;
 using boost::optional;
 
-VideoDecoder::VideoDecoder (shared_ptr<Film> f, shared_ptr<const DecodeOptions> o, Job* j)
+VideoDecoder::VideoDecoder (shared_ptr<Film> f, DecodeOptions o, Job* j)
        : Decoder (f, o, j)
        , _video_frame (0)
        , _last_source_time (0)
@@ -49,7 +49,7 @@ VideoDecoder::emit_video (shared_ptr<Image> image, double t)
                sub = _timed_subtitle->subtitle ();
        }
 
-       signal_video (image, sub);
+       signal_video (image, false, sub);
        _last_source_time = t;
 }
 
@@ -57,18 +57,18 @@ void
 VideoDecoder::repeat_last_video ()
 {
        if (!_last_image) {
-               _last_image.reset (new SimpleImage (pixel_format(), native_size(), false));
+               _last_image.reset (new SimpleImage (pixel_format(), native_size(), true));
                _last_image->make_black ();
        }
 
-       signal_video (_last_image, _last_subtitle);
+       signal_video (_last_image, true, _last_subtitle);
 }
 
 void
-VideoDecoder::signal_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
+VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub)
 {
        TIMING ("Decoder emits %1", _video_frame);
-       Video (image, sub);
+       Video (image, same, sub);
        ++_video_frame;
 
        _last_image = image;