X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fvideo_decoder.cc;h=e7ddec5e6cd19df910966a66fcb9e969b5c5b6ee;hb=f87a0f16f8cee026ee33c3a46b93b43d4b3cf5ff;hp=cb74a7987fead8961b5ae283a4257e550e0ff09c;hpb=596441a4e8cf03a88113646ca6da2f90e721a38b;p=dcpomatic.git

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index cb74a7987..e7ddec5e6 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -1,5 +1,3 @@
-/* -*- c-basic-offset: 8; default-tab-width: 8; -*- */
-
 /*
     Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
 
@@ -20,59 +18,44 @@
 */
 
 #include "video_decoder.h"
-#include "subtitle.h"
-#include "film.h"
 #include "image.h"
-#include "log.h"
-#include "job.h"
 
 #include "i18n.h"
 
 using std::cout;
 using boost::shared_ptr;
-using boost::optional;
 
 VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
 	: Decoder (f)
-	, _next_video (0)
 	, _video_content (c)
+	, _video_position (0)
 {
 
 }
 
-/** 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.
- */
 void
-VideoDecoder::emit_video (shared_ptr<Image> image, bool same, Time t)
+VideoDecoder::video (shared_ptr<const Image> image, bool same, VideoContent::Frame frame)
 {
-	shared_ptr<Subtitle> sub;
-	if (_timed_subtitle && _timed_subtitle->displayed_at (t)) {
-		sub = _timed_subtitle->subtitle ();
+	switch (_video_content->video_frame_type ()) {
+	case VIDEO_FRAME_TYPE_2D:
+		Video (image, EYES_BOTH, same, frame);
+		break;
+	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+	{
+		int const half = image->size().width / 2;
+		Video (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, same, frame);
+		Video (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, same, frame);
+		break;
+	}
+	case VIDEO_FRAME_TYPE_3D_TOP_BOTTOM:
+	{
+		int const half = image->size().height / 2;
+		Video (image->crop (Crop (0, 0, 0, half), true), EYES_LEFT, same, frame);
+		Video (image->crop (Crop (0, 0, half, 0), true), EYES_RIGHT, same, frame);
+		break;
 	}
-
-	TIMING (N_("Decoder emits %1"), _video_frame);
-	Video (image, same, sub, t);
-	++_video_frame;
-
-	/* XXX: who's doing skip / repeat? */
-	_next_video = t + _film->video_frames_to_time (1);
-}
-
-/** 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) {
-		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;
 }
+