X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=de1df727f13838563484bb9d348835c1ba248c2f;hb=715d87a4cf9e4697a2f67881776c19c4ce8af581;hp=2bd8d6f5170e0c0e824af35b1d236e674538efe6;hpb=9824173a79ce723068296b3a44499101408c24f2;p=dcpomatic.git

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 2bd8d6f51..de1df727f 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -36,8 +36,8 @@ using std::back_inserter;
 using boost::shared_ptr;
 using boost::optional;
 
-VideoDecoder::VideoDecoder (Decoder* parent, shared_ptr<const Content> c, shared_ptr<Log> log)
-	: DecoderPart (parent, log)
+VideoDecoder::VideoDecoder (Decoder* parent, shared_ptr<const Content> c)
+	: DecoderPart (parent)
 	, _content (c)
 {
 
@@ -53,52 +53,71 @@ VideoDecoder::VideoDecoder (Decoder* parent, shared_ptr<const Content> c, shared
  *  and so on.
  */
 void
-VideoDecoder::emit (shared_ptr<const ImageProxy> image, Frame frame)
+VideoDecoder::emit (shared_ptr<const Film> film, shared_ptr<const ImageProxy> image, Frame frame)
 {
 	if (ignore ()) {
 		return;
 	}
 
-	FrameRateChange const frc = _content->film()->active_frame_rate_change (_content->position());
-	for (int i = 0; i < frc.repeat; ++i) {
-		switch (_content->video->frame_type ()) {
-		case VIDEO_FRAME_TYPE_2D:
-			Data (ContentVideo (image, frame, EYES_BOTH, PART_WHOLE));
-			break;
-		case VIDEO_FRAME_TYPE_3D:
-		{
-			/* We receive the same frame index twice for 3D; hence we know which
-			   frame this one is.
+	switch (_content->video->frame_type ()) {
+	case VIDEO_FRAME_TYPE_2D:
+		Data (ContentVideo (image, frame, EYES_BOTH, PART_WHOLE));
+		break;
+	case VIDEO_FRAME_TYPE_3D:
+	{
+		/* We should receive the same frame index twice for 3D; hence we know which
+		   frame this one is.
+		*/
+		bool const same = (_last_emitted_frame && _last_emitted_frame.get() == frame);
+		if (!same && _last_emitted_eyes && *_last_emitted_eyes == EYES_LEFT) {
+			/* We just got a new frame index but the last frame was left-eye; it looks like
+			   this content is not really 3D.
 			*/
-			bool const same = (_last_emitted && _last_emitted.get() == frame);
-			Data (ContentVideo (image, frame, same ? EYES_RIGHT : EYES_LEFT, PART_WHOLE));
-			_last_emitted = frame;
-			break;
+			boost::throw_exception (
+				DecodeError(
+					String::compose(
+						_("The content file %1 is set as 3D but does not appear to contain 3D images.  Please set it to 2D.  "
+						  "You can still make a 3D DCP from this content by ticking the 3D option in the DCP video tab."),
+						_content->path(0)
+						)
+					)
+				);
 		}
-		case VIDEO_FRAME_TYPE_3D_ALTERNATE:
-			Data (ContentVideo (image, frame / 2, (frame % 2) ? EYES_RIGHT : EYES_LEFT, PART_WHOLE));
-			frame /= 2;
-			break;
-		case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
-			Data (ContentVideo (image, frame, EYES_LEFT, PART_LEFT_HALF));
-			Data (ContentVideo (image, frame, EYES_RIGHT, PART_RIGHT_HALF));
-			break;
-		case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
-			Data (ContentVideo (image, frame, EYES_LEFT, PART_TOP_HALF));
-			Data (ContentVideo (image, frame, EYES_RIGHT, PART_BOTTOM_HALF));
-			break;
-		case VIDEO_FRAME_TYPE_3D_LEFT:
-			Data (ContentVideo (image, frame, EYES_LEFT, PART_WHOLE));
-			break;
-		case VIDEO_FRAME_TYPE_3D_RIGHT:
-			Data (ContentVideo (image, frame, EYES_RIGHT, PART_WHOLE));
-			break;
-		default:
-			DCPOMATIC_ASSERT (false);
-		}
-
-		++frame;
+		Eyes const eyes = same ? EYES_RIGHT : EYES_LEFT;
+		Data (ContentVideo (image, frame, eyes, PART_WHOLE));
+		_last_emitted_frame = frame;
+		_last_emitted_eyes = eyes;
+		break;
+	}
+	case VIDEO_FRAME_TYPE_3D_ALTERNATE:
+		Data (ContentVideo (image, frame / 2, (frame % 2) ? EYES_RIGHT : EYES_LEFT, PART_WHOLE));
+		frame /= 2;
+		break;
+	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+		Data (ContentVideo (image, frame, EYES_LEFT, PART_LEFT_HALF));
+		Data (ContentVideo (image, frame, EYES_RIGHT, PART_RIGHT_HALF));
+		break;
+	case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+		Data (ContentVideo (image, frame, EYES_LEFT, PART_TOP_HALF));
+		Data (ContentVideo (image, frame, EYES_RIGHT, PART_BOTTOM_HALF));
+		break;
+	case VIDEO_FRAME_TYPE_3D_LEFT:
+		Data (ContentVideo (image, frame, EYES_LEFT, PART_WHOLE));
+		break;
+	case VIDEO_FRAME_TYPE_3D_RIGHT:
+		Data (ContentVideo (image, frame, EYES_RIGHT, PART_WHOLE));
+		break;
+	default:
+		DCPOMATIC_ASSERT (false);
 	}
 
-	_position = ContentTime::from_frames (frame, _content->active_video_frame_rate ());
+	_position = ContentTime::from_frames (frame, _content->active_video_frame_rate(film));
+}
+
+void
+VideoDecoder::seek ()
+{
+	_position = ContentTime();
+	_last_emitted_frame.reset ();
+	_last_emitted_eyes.reset ();
 }