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 4c05d5fcdf335e931414e72e569125b4ef535fe2..fd82384416b6166a461b0f9d9d43e1430ae2695b 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -22,58 +22,47 @@
 #include "film.h"
 #include "image.h"
 #include "log.h"
-#include "options.h"
 #include "job.h"
 
+#include "i18n.h"
+
+using std::cout;
 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)
+       : Decoder (f)
        , _video_frame (0)
-       , _last_source_frame (0)
+       , _last_content_time (0)
 {
 
 }
 
 /** Called by subclasses to tell the world that some video data is ready.
  *  We find a subtitle then emit it for listeners.
- *  @param frame to emit.
+ *  @param image frame to emit.
+ *  @param t Time of the frame within the source, in seconds.
  */
 void
-VideoDecoder::emit_video (shared_ptr<Image> image, SourceFrame f)
+VideoDecoder::emit_video (shared_ptr<Image> image, bool same, double t)
 {
        shared_ptr<Subtitle> sub;
-       if (_timed_subtitle && _timed_subtitle->displayed_at (f / _film->frames_per_second())) {
+       if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
                sub = _timed_subtitle->subtitle ();
        }
 
-       signal_video (image, sub);
-       _last_source_frame = f;
-}
-
-void
-VideoDecoder::repeat_last_video ()
-{
-       if (!_last_image) {
-               _last_image.reset (new SimpleImage (pixel_format(), native_size(), false));
-               _last_image->make_black ();
-       }
-
-       signal_video (_last_image, _last_subtitle);
-}
-
-void
-VideoDecoder::signal_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
-{
-       TIMING ("Decoder emits %1", _video_frame);
-       Video (image, sub);
+       TIMING (N_("Decoder emits %1"), _video_frame);
+       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
+ *  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)
 {
@@ -86,15 +75,11 @@ 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 (_film->video_length()) {
+               j->set_progress (float (_video_frame) / _film->video_length());
        }
 }