X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=fd82384416b6166a461b0f9d9d43e1430ae2695b;hb=47f25009bcbc765e397bcb471dd361a511c99daf;hp=906f92ef1637b3c6fd57ec460c92cbe7f8f32574;hpb=4fbd1901fdabc829cfa7e7d4d0c1272bba87033c;p=dcpomatic.git

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 906f92ef1..fd8238441 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -1,79 +1,85 @@
+/*
+    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include "video_decoder.h"
 #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, shared_ptr<const Options> o, Job* j)
-	: Decoder (f, o, j)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
+	: Decoder (f)
 	, _video_frame (0)
+	, _last_content_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 decode; caller manages memory.
+ *  @param image frame to emit.
+ *  @param t Time of the frame within the source, in seconds.
  */
 void
-VideoDecoder::emit_video (shared_ptr<Image> image)
+VideoDecoder::emit_video (shared_ptr<Image> image, bool same, double t)
 {
 	shared_ptr<Subtitle> sub;
-	if (_timed_subtitle && _timed_subtitle->displayed_at (double (video_frame()) / _film->frames_per_second())) {
+	if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
 		sub = _timed_subtitle->subtitle ();
 	}
 
-	signal_video (image, sub);
-}
-
-void
-VideoDecoder::repeat_last_video ()
-{
-	if (!_last_image) {
-		_last_image.reset (new CompactImage (pixel_format(), native_size()));
-		_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);
+	TIMING (N_("Decoder emits %1"), _video_frame);
+	Video (image, same, sub, t);
 	++_video_frame;
 
-	_last_image = image;
-	_last_subtitle = sub;
+	_last_content_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)
 {
 	_timed_subtitle = s;
 	
-	if (_timed_subtitle && _opt->apply_crop) {
+	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_subtitle_stream (optional<SubtitleStream> s)
+VideoDecoder::set_progress (Job* j) const
 {
-	_subtitle_stream = s;
-}
+	assert (j);
 
-void
-VideoDecoder::set_progress () const
-{
-	if (_job && _film->dcp_length()) {
-		_job->set_progress (float (_video_frame) / _film->length().get());
+	if (_film->video_length()) {
+		j->set_progress (float (_video_frame) / _film->video_length());
 	}
 }