X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=5867ac9257aacc31f8c712039c093f531e636771;hb=79a871ea740509ff2fa540ca715375e0ba1c4ad9;hp=3a803a86339a9fdf955bc59bdcb6c45cca8d05ca;hpb=039ac5848730d154e0b3f3dd841a55e45ba922d8;p=dcpomatic.git

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 3a803a863..5867ac925 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 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
@@ -18,84 +18,47 @@
 */
 
 #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, DecodeOptions o, Job* j)
-	: Decoder (f, o, j)
-	, _video_frame (0)
-	, _last_source_time (0)
-{
+#include "i18n.h"
 
-}
+using std::cout;
+using boost::shared_ptr;
 
-/** 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, in seconds.
- */
-void
-VideoDecoder::emit_video (shared_ptr<Image> image, double t)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
+	: Decoder (f)
+	, _video_content (c)
+	, _video_position (0)
 {
-	shared_ptr<Subtitle> sub;
-	if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
-		sub = _timed_subtitle->subtitle ();
-	}
 
-	signal_video (image, false, sub);
-	_last_source_time = t;
 }
 
 void
-VideoDecoder::repeat_last_video ()
+VideoDecoder::video (shared_ptr<const ImageProxy> image, bool same, VideoContent::Frame frame)
 {
-	if (!_last_image) {
-		_last_image.reset (new SimpleImage (pixel_format(), native_size(), false));
-		_last_image->make_black ();
+	switch (_video_content->video_frame_type ()) {
+	case VIDEO_FRAME_TYPE_2D:
+		Video (image, EYES_BOTH, PART_WHOLE, same, frame);
+		break;
+	case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+		Video (image, (frame % 2) ? EYES_RIGHT : EYES_LEFT, PART_WHOLE, same, frame / 2);
+		break;
+	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+		Video (image, EYES_LEFT, PART_LEFT_HALF, same, frame);
+		Video (image, EYES_RIGHT, PART_RIGHT_HALF, same, frame);
+		break;
+	case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+		Video (image, EYES_LEFT, PART_TOP_HALF, same, frame);
+		Video (image, EYES_RIGHT, PART_BOTTOM_HALF, same, frame);
+		break;
+	case VIDEO_FRAME_TYPE_3D_LEFT:
+		Video (image, EYES_LEFT, PART_WHOLE, same, frame);
+		break;
+	case VIDEO_FRAME_TYPE_3D_RIGHT:
+		Video (image, EYES_RIGHT, PART_WHOLE, same, frame);
+		break;
 	}
-
-	signal_video (_last_image, true, _last_subtitle);
-}
-
-void
-VideoDecoder::signal_video (shared_ptr<Image> image, bool same, shared_ptr<Subtitle> sub)
-{
-	TIMING ("Decoder emits %1", _video_frame);
-	Video (image, same, sub);
-	++_video_frame;
-
-	_last_image = image;
-	_last_subtitle = sub;
-}
-
-void
-VideoDecoder::emit_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));
-	}
+	_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());
-	}
-}