Another try at sorting out the thorny question of timing.

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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 609594e7652c88d278a2c8df3f618961d85bf16d..f61e63d4d1a4c312c99054c436bfee462f2afdab 100644 (file)
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
@@ -23,55 +21,29 @@
 #include "subtitle.h"
 #include "film.h"
 #include "image.h"
+#include "ratio.h"
 
 #include "i18n.h"
 
 using std::cout;
 using boost::shared_ptr;
 
-VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
        : Decoder (f)
-       , _next_video (0)
-       , _video_content (c)
-       , _frame_rate_conversion (c->video_frame_rate(), f->dcp_video_frame_rate())
-       , _odd (false)
+       , _video_position (0)
 {
 
 }
 
-/** Called by subclasses when some video is ready.
- *  @param image frame to emit.
- *  @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::video (shared_ptr<Image> image, bool same, Time t)
+VideoDecoder::video (shared_ptr<const Image> image, bool same, VideoContent::Frame frame)
 {
-       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 ();
-       }
-
-       Video (image, same, sub, t);
-
-       shared_ptr<const Film> film = _film.lock ();
-       assert (film);
-
-       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);
-       }
-
-       _odd = !_odd;
+        Video (image, same, frame);
+       _video_position = frame + 1;
 }
 
+#if 0
+
 /** 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.
@@ -86,3 +58,5 @@ VideoDecoder::subtitle (shared_ptr<TimedSubtitle> s)
                _timed_subtitle->subtitle()->set_position (Position (p.x - _video_content->crop().left, p.y - _video_content->crop().top));
        }
 }
+#endif
+