Untested merge of master.

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 33dd433eac8e1a6d3484a6ca6be954924727850b..fd82384416b6166a461b0f9d9d43e1430ae2695b 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -26,13 +26,14 @@
 
 #include "i18n.h"
 
+using std::cout;
 using boost::shared_ptr;
 using boost::optional;
 
-VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<VideoContent> c)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
        : Decoder (f)
        , _video_frame (0)
-       , _last_source_time (0)
+       , _last_content_time (0)
 {
 
 }
@@ -43,46 +44,18 @@ VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<VideoContent> c
  *  @param t Time of the frame within the source, in seconds.
  */
 void
-VideoDecoder::emit_video (shared_ptr<Image> image, double t)
+VideoDecoder::emit_video (shared_ptr<Image> image, bool same, double t)
 {
        shared_ptr<Subtitle> sub;
        if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
                sub = _timed_subtitle->subtitle ();
        }
 
-       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(), true));
-               _last_image->make_black ();
-       }
-
-       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, bool same, shared_ptr<Subtitle> sub)
-{
        TIMING (N_("Decoder emits %1"), _video_frame);
-       Video (image, same, sub);
+       Video (image, same, sub, t);
        ++_video_frame;
 
-       _last_image = image;
-       _last_subtitle = sub;
+       _last_content_time = t;
 }
 
 /** Set up the current subtitle.  This will be put onto frames that
@@ -106,10 +79,7 @@ VideoDecoder::set_progress (Job* j) const
 {
        assert (j);
 
-#if 0
-       XXX
-       if (_film->length()) {
-               j->set_progress (float (_video_frame) / _film->length().get());
+       if (_film->video_length()) {
+               j->set_progress (float (_video_frame) / _film->video_length());
        }
-#endif 
 }