Runs.

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index e723610b320056668afc5328d59eca49b5213c5d..ca1e7ab568df884e6708a7da77d3dabcf9022211 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -25,11 +25,13 @@
 #include "options.h"
 #include "job.h"
 
+#include "i18n.h"
+
 using boost::shared_ptr;
 using boost::optional;
 
-VideoDecoder::VideoDecoder (shared_ptr<Film> f, shared_ptr<const DecodeOptions> o, Job* j)
-       : Decoder (f, o, j)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<VideoContent> c, DecodeOptions o)
+       : Decoder (f, o)
        , _video_frame (0)
        , _last_source_time (0)
 {
@@ -49,32 +51,46 @@ 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;
 }
 
+/** Called by subclasses to repeat the last video frame that we
+ *  passed to emit_video().  If emit_video hasn't yet been called,
+ *  we will generate a black frame.
+ */
 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);
 }
 
+/** Emit our signal to say that some video data is ready.
+ *  @param image Video frame.
+ *  @param same true if `image' is the same as the last one we emitted.
+ *  @param sub Subtitle for this frame, or 0.
+ */
 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);
+       TIMING (N_("Decoder emits %1"), _video_frame);
+       Video (image, same, sub);
        ++_video_frame;
 
        _last_image = image;
        _last_subtitle = sub;
 }
 
+/** Set up the current subtitle.  This will be put onto frames that
+ *  fit within its time specification.  s may be 0 to say that there
+ *  is no current subtitle.
+ *  @param s New current subtitle, or 0.
+ */
 void
 VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
 {
@@ -87,15 +103,14 @@ VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
 }
 
 void
-VideoDecoder::set_subtitle_stream (shared_ptr<SubtitleStream> s)
+VideoDecoder::set_progress (Job* j) const
 {
-       _subtitle_stream = s;
-}
+       assert (j);
 
-void
-VideoDecoder::set_progress () const
-{
-       if (_job && _film->length()) {
-               _job->set_progress (float (_video_frame) / _film->length().get());
+#if 0
+       XXX
+       if (_film->length()) {
+               j->set_progress (float (_video_frame) / _film->length().get());
        }
+#endif 
 }