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 0c8cda2944c47b7b7bdb97815e9978a69af069d5..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,51 +21,35 @@
 #include "subtitle.h"
 #include "film.h"
 #include "image.h"
-#include "log.h"
-#include "job.h"
+#include "ratio.h"
 
 #include "i18n.h"
 
 using std::cout;
 using boost::shared_ptr;
-using boost::optional;
 
-VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
        : Decoder (f)
-       , _video_content (c)
-       , _video_frame (0)
-       , _last_content_time (0)
+       , _video_position (0)
 {
 
 }
 
-/** Called by subclasses to tell the world that some video data is ready.
- *  We find a subtitle then emit it for listeners.
- *  @param image frame to emit.
- *  @param t Time of the frame within the source.
- */
 void
-VideoDecoder::emit_video (shared_ptr<Image> image, bool same, Time t)
+VideoDecoder::video (shared_ptr<const Image> image, bool same, VideoContent::Frame frame)
 {
-       shared_ptr<Subtitle> sub;
-       if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
-               sub = _timed_subtitle->subtitle ();
-       }
-
-       TIMING (N_("Decoder emits %1"), _video_frame);
-       Video (image, same, sub, t);
-       ++_video_frame;
-
-       _last_content_time = t;
+        Video (image, same, frame);
+       _video_position = frame + 1;
 }
 
-/** 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.
+#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.
  */
 void
-VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
+VideoDecoder::subtitle (shared_ptr<TimedSubtitle> s)
 {
        _timed_subtitle = s;
        
@@ -76,13 +58,5 @@ VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
                _timed_subtitle->subtitle()->set_position (Position (p.x - _video_content->crop().left, p.y - _video_content->crop().top));
        }
 }
+#endif
 
-void
-VideoDecoder::set_progress (Job* j) const
-{
-       assert (j);
-
-       if (_film->length()) {
-               j->set_progress (float (_video_frame) / _film->time_to_video_frames (_film->length()));
-       }
-}