X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=16a076698eff8c652061a693dc95960f38e0cf9e;hb=af671aa256ae0d2fa38a6740cea7fc0f6b45b5b8;hp=4c05d5fcdf335e931414e72e569125b4ef535fe2;hpb=2587f29e54bac098296dbef6557b9bf9bcdc2406;p=dcpomatic.git

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 4c05d5fcd..16a076698 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -25,55 +25,44 @@
 #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<Film> f, DecodeOptions o)
+	: Decoder (f, o)
 	, _video_frame (0)
-	, _last_source_frame (0)
+	, _last_source_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);
+	Video (image, same, sub, t);
 	++_video_frame;
-
-	_last_image = image;
-	_last_subtitle = sub;
+	
+	_last_source_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)
 {
@@ -85,6 +74,9 @@ VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
 	}
 }
 
+/** 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)
 {
@@ -92,9 +84,11 @@ VideoDecoder::set_subtitle_stream (shared_ptr<SubtitleStream> s)
 }
 
 void
-VideoDecoder::set_progress () const
+VideoDecoder::set_progress (Job* j) const
 {
-	if (_job && _film->length()) {
-		_job->set_progress (float (_video_frame) / _film->length().get());
+	assert (j);
+	
+	if (_film->length()) {
+		j->set_progress (float (_video_frame) / _film->length().get());
 	}
 }