X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fvideo_decoder.cc;h=5867ac9257aacc31f8c712039c093f531e636771;hb=79a871ea740509ff2fa540ca715375e0ba1c4ad9;hp=609594e7652c88d278a2c8df3f618961d85bf16d;hpb=8c6fe8e1e8c8f6d5932606f2a5b6e1b87681ae38;p=dcpomatic.git

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 609594e76..5867ac925 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -1,7 +1,5 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
-    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
@@ -20,8 +18,6 @@
 */
 
 #include "video_decoder.h"
-#include "subtitle.h"
-#include "film.h"
 #include "image.h"
 
 #include "i18n.h"
@@ -31,58 +27,38 @@ using boost::shared_ptr;
 
 VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
 	: Decoder (f)
-	, _next_video (0)
 	, _video_content (c)
-	, _frame_rate_conversion (c->video_frame_rate(), f->dcp_video_frame_rate())
-	, _odd (false)
+	, _video_position (0)
 {
 
 }
 
-/** Called by subclasses when some video is ready.
- *  @param image frame to emit.
- *  @param same true if this frame is the same as the last one passed to this call.
- *  @param t Time of the frame within the source.
- */
 void
-VideoDecoder::video (shared_ptr<Image> image, bool same, Time t)
+VideoDecoder::video (shared_ptr<const ImageProxy> image, bool same, VideoContent::Frame frame)
 {
-	if (_frame_rate_conversion.skip && _odd) {
-		_odd = !_odd;
-		return;
-	}
-
-	shared_ptr<Subtitle> sub;
-	if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
-		sub = _timed_subtitle->subtitle ();
-	}
-
-	Video (image, same, sub, t);
-
-	shared_ptr<const Film> film = _film.lock ();
-	assert (film);
-
-	if (_frame_rate_conversion.repeat) {
-		Video (image, true, sub, t + film->video_frames_to_time (1));
-		_next_video = t + film->video_frames_to_time (2);
-	} else {
-		_next_video = t + film->video_frames_to_time (1);
+	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;
 	}
-
-	_odd = !_odd;
-}
-
-/** Called by subclasses when a subtitle is ready.
- *  s may be 0 to say that there is no current subtitle.
- *  @param s New current subtitle, or 0.
- */
-void
-VideoDecoder::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 - _video_content->crop().left, p.y - _video_content->crop().top));
-	}
+	_video_position = frame + 1;
 }
+