Merge master and multifarious hackery.

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index c11b752ae21e201038e562ceeac62dacdc215f30..609594e7652c88d278a2c8df3f618961d85bf16d 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -1,3 +1,5 @@
+/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
+
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
@@ -21,98 +23,66 @@
 #include "subtitle.h"
 #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, DecodeOptions o, Job* j)
-       : Decoder (f, o, j)
-       , _video_frame (0)
-       , _last_source_time (0)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
+       : Decoder (f)
+       , _next_video (0)
+       , _video_content (c)
+       , _frame_rate_conversion (c->video_frame_rate(), f->dcp_video_frame_rate())
+       , _odd (false)
 {
 
 }
 
-/** Called by subclasses to tell the world that some video data is ready.
- *  We find a subtitle then emit it for listeners.
+/** Called by subclasses when some video is ready.
  *  @param image frame to emit.
- *  @param t Time of the frame within the source, in seconds.
+ *  @param same true if this frame is the same as the last one passed to this call.
+ *  @param t Time of the frame within the source.
  */
 void
-VideoDecoder::emit_video (shared_ptr<Image> image, double t)
+VideoDecoder::video (shared_ptr<Image> image, bool same, Time t)
 {
+       if (_frame_rate_conversion.skip && _odd) {
+               _odd = !_odd;
+               return;
+       }
+
        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;
-}
+       Video (image, same, sub, 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);
-}
+       shared_ptr<const Film> film = _film.lock ();
+       assert (film);
 
-/** 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 ("Decoder emits %1", _video_frame);
-       Video (image, same, sub);
-       ++_video_frame;
+       if (_frame_rate_conversion.repeat) {
+               Video (image, true, sub, t + film->video_frames_to_time (1));
+               _next_video = t + film->video_frames_to_time (2);
+       } else {
+               _next_video = t + film->video_frames_to_time (1);
+       }
 
-       _last_image = image;
-       _last_subtitle = sub;
+       _odd = !_odd;
 }
 
-/** 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.
+/** Called by subclasses when a subtitle is ready.
+ *  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)
+VideoDecoder::subtitle (shared_ptr<TimedSubtitle> s)
 {
        _timed_subtitle = s;
        
        if (_timed_subtitle) {
                Position const p = _timed_subtitle->subtitle()->position ();
-               _timed_subtitle->subtitle()->set_position (Position (p.x - _film->crop().left, p.y - _film->crop().top));
-       }
-}
-
-/** Set which stream of subtitles we should use from our source.
- *  @param s Stream to use.
- */
-void
-VideoDecoder::set_subtitle_stream (shared_ptr<SubtitleStream> s)
-{
-       _subtitle_stream = s;
-}
-
-void
-VideoDecoder::set_progress () const
-{
-       if (_job && _film->length()) {
-               _job->set_progress (float (_video_frame) / _film->length().get());
+               _timed_subtitle->subtitle()->set_position (Position (p.x - _video_content->crop().left, p.y - _video_content->crop().top));
        }
 }