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

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index 533fdcf1a..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,68 +18,47 @@
 */
 
 #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)
+VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
 	: Decoder (f)
-	, _video_frame (0)
-	, _last_content_time (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 ImageProxy> 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, 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;
 	}
-
-	TIMING (N_("Decoder emits %1"), _video_frame);
-	Video (image, same, sub, t);
-	++_video_frame;
-
-	_last_content_time = t;
-}
-
-/** 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 - _film->crop().left, p.y - _film->crop().top));
-	}
+	_video_position = frame + 1;
 }
 
-void
-VideoDecoder::set_progress (Job* j) const
-{
-	assert (j);
-
-	if (_film->length()) {
-		j->set_progress (float (_video_frame) / _film->time_to_video_frames (_film->length()));
-	}
-}