X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=457cfe47b1e3de06671b646d7ddaf48926c2f1c8;hb=bb917533ad5beaded24ed56c7c4dc71d50e76263;hp=4c05d5fcdf335e931414e72e569125b4ef535fe2;hpb=8dd455ba867122056e2093e259a9a045aeeea451;p=dcpomatic.git

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 4c05d5fcd..457cfe47b 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -18,83 +18,24 @@
 */
 
 #include "video_decoder.h"
-#include "subtitle.h"
-#include "film.h"
 #include "image.h"
-#include "log.h"
-#include "options.h"
-#include "job.h"
 
-using boost::shared_ptr;
-using boost::optional;
-
-VideoDecoder::VideoDecoder (shared_ptr<Film> f, shared_ptr<const DecodeOptions> o, Job* j)
-	: Decoder (f, o, j)
-	, _video_frame (0)
-	, _last_source_frame (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.
- */
-void
-VideoDecoder::emit_video (shared_ptr<Image> image, SourceFrame f)
-{
-	shared_ptr<Subtitle> sub;
-	if (_timed_subtitle && _timed_subtitle->displayed_at (f / _film->frames_per_second())) {
-		sub = _timed_subtitle->subtitle ();
-	}
-
-	signal_video (image, sub);
-	_last_source_frame = f;
-}
+#include "i18n.h"
 
-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);
-}
+using std::cout;
+using boost::shared_ptr;
 
-void
-VideoDecoder::signal_video (shared_ptr<Image> image, shared_ptr<Subtitle> sub)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f)
+	: Decoder (f)
+	, _video_position (0)
 {
-	TIMING ("Decoder emits %1", _video_frame);
-	Video (image, sub);
-	++_video_frame;
 
-	_last_image = image;
-	_last_subtitle = sub;
 }
 
 void
-VideoDecoder::emit_subtitle (shared_ptr<TimedSubtitle> s)
+VideoDecoder::video (shared_ptr<const Image> image, bool same, VideoContent::Frame frame)
 {
-	_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));
-	}
+        Video (image, same, frame);
+	_video_position = frame + 1;
 }
 
-void
-VideoDecoder::set_subtitle_stream (shared_ptr<SubtitleStream> s)
-{
-	_subtitle_stream = s;
-}
-
-void
-VideoDecoder::set_progress () const
-{
-	if (_job && _film->length()) {
-		_job->set_progress (float (_video_frame) / _film->length().get());
-	}
-}