X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_decoder.cc;h=3625e074fba0460fc63729a00bc30c446f7d769b;hb=14cccb179fff7bbbf422e13f9d2e3264239c93c7;hp=a3b45716c532887473d76c17f50957bf80dba5ac;hpb=58588c485eac7c488a574fe923576f109ec0134e;p=dcpomatic.git

diff --git a/src/lib/video_decoder.cc b/src/lib/video_decoder.cc
index a3b45716c..3625e074f 100644
--- a/src/lib/video_decoder.cc
+++ b/src/lib/video_decoder.cc
@@ -1,61 +1,106 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
 #include "video_decoder.h"
 #include "image.h"
+#include "raw_image_proxy.h"
+#include "film.h"
+#include "log.h"
+#include "compose.hpp"
+#include <boost/foreach.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
 using std::cout;
+using std::list;
+using std::max;
+using std::back_inserter;
 using boost::shared_ptr;
 using boost::optional;
 
-VideoDecoder::VideoDecoder (shared_ptr<const Film> f, shared_ptr<const VideoContent> c)
-	: Decoder (f)
-	, _video_content (c)
+VideoDecoder::VideoDecoder (Decoder* parent, shared_ptr<const Content> c, shared_ptr<Log> log)
+	: DecoderPart (parent, log)
+	, _content (c)
 {
 
 }
 
-/** Called by subclasses when they have a video frame ready */
+/** Called by decoder classes when they have a video frame ready.
+ *  @param frame Frame index within the content; this does not take into account 3D
+ *  so for 3D_ALTERNATE this value goes:
+ *     0: frame 0 left
+ *     1: frame 0 right
+ *     2: frame 1 left
+ *     3: frame 1 right
+ *  and so on.
+ */
 void
-VideoDecoder::video (shared_ptr<const Image> image, bool same, VideoFrame frame)
+VideoDecoder::emit (shared_ptr<const ImageProxy> image, Frame frame)
 {
-	switch (_video_content->video_frame_type ()) {
+	if (ignore ()) {
+		return;
+	}
+
+	switch (_content->video->frame_type ()) {
 	case VIDEO_FRAME_TYPE_2D:
-		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image, EYES_BOTH, same, frame)));
+		Data (ContentVideo (image, frame, EYES_BOTH, PART_WHOLE));
 		break;
-	case VIDEO_FRAME_TYPE_3D_LEFT_RIGHT:
+	case VIDEO_FRAME_TYPE_3D:
 	{
-		int const half = image->size().width / 2;
-		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (0, half, 0, 0), true), EYES_LEFT, same, frame)));
-		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (half, 0, 0, 0), true), EYES_RIGHT, same, frame)));
+		/* We receive the same frame index twice for 3D; hence we know which
+		   frame this one is.
+		*/
+		bool const same = (_last_emitted && _last_emitted.get() == frame);
+		Data (ContentVideo (image, frame, same ? EYES_RIGHT : EYES_LEFT, PART_WHOLE));
+		_last_emitted = frame;
 		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:
-	{
-		int const half = image->size().height / 2;
-		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (0, 0, 0, half), true), EYES_LEFT, same, frame)));
-		_pending.push_back (shared_ptr<DecodedVideo> (new DecodedVideo (image->crop (Crop (0, 0, half, 0), true), EYES_RIGHT, same, frame)));
+		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:
-		assert (false);
+		DCPOMATIC_ASSERT (false);
 	}
+
+	_position = ContentTime::from_frames (frame, _content->active_video_frame_rate ());
+}
+
+void
+VideoDecoder::seek ()
+{
+	_position = ContentTime();
+	_last_emitted.reset ();
 }