X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=8bb7f3700ec6a54c51f54ff02e5a13b16ee5606c;hb=e8819ad7580f25eea7ca3c59cf0a3979d76a6b44;hp=a24059da2d9138d9c1b155ed13bb009f4867769c;hpb=21ce34c2cd04a2e7e133ff693b84c054182f4f91;p=dcpomatic.git

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index a24059da2..8bb7f3700 100644
--- 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,65 +23,63 @@
 #include "subtitle.h"
 #include "film.h"
 #include "image.h"
-#include "log.h"
-#include "job.h"
 
 #include "i18n.h"
 
 using std::cout;
 using boost::shared_ptr;
-using boost::optional;
 
-VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
 	: Decoder (f)
-	, _video_frame (0)
-	, _last_content_time (0)
+	, _next_video (0)
+	, _video_content (c)
+	, _frame_rate_conversion (c->video_frame_rate(), f->dcp_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, bool same, 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 ();
 	}
 
-	TIMING (N_("Decoder emits %1"), _video_frame);
 	Video (image, same, sub, t);
-	++_video_frame;
 
-	_last_content_time = t;
+	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;
 }
 
-/** 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));
-	}
-}
-
-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()));
+		_timed_subtitle->subtitle()->set_position (Position (p.x - _video_content->crop().left, p.y - _video_content->crop().top));
 	}
 }