X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.cc;h=f7afbc0a153b86cbabc77d88ba0c3f4d4bf1684d;hp=c3a11ce971f3895aa3b6ccc8407105dff9757151;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index c3a11ce97..f7afbc0a1 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -1,32 +1,35 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 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 <iostream>
-#include <boost/filesystem.hpp>
-#include <Magick++.h>
 #include "image_content.h"
 #include "image_decoder.h"
+#include "video_decoder.h"
 #include "image.h"
 #include "magick_image_proxy.h"
 #include "j2k_image_proxy.h"
 #include "film.h"
 #include "exceptions.h"
+#include "video_content.h"
+#include <Magick++.h>
+#include <boost/filesystem.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -35,11 +38,10 @@ using boost::shared_ptr;
 using dcp::Size;
 
 ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c, shared_ptr<Log> log)
-	: VideoDecoder (c->video, log)
-	, _image_content (c)
+	: _image_content (c)
 	, _video_position (0)
 {
-
+	video.reset (new VideoDecoder (this, c, log));
 }
 
 bool
@@ -53,16 +55,24 @@ ImageDecoder::pass (PassReason, bool)
 		/* Either we need an image or we are using moving images, so load one */
 		boost::filesystem::path path = _image_content->path (_image_content->still() ? 0 : _video_position);
 		if (valid_j2k_file (path)) {
+			AVPixelFormat pf;
+			if (_image_content->video->colour_conversion()) {
+				/* We have a specified colour conversion: assume the image is RGB */
+				pf = AV_PIX_FMT_RGB48LE;
+			} else {
+				/* No specified colour conversion: assume the image is XYZ */
+				pf = AV_PIX_FMT_XYZ12LE;
+			}
 			/* We can't extract image size from a JPEG2000 codestream without decoding it,
 			   so pass in the image content's size here.
 			*/
-			_image.reset (new J2KImageProxy (path, _image_content->video->size ()));
+			_image.reset (new J2KImageProxy (path, _image_content->video->size(), pf));
 		} else {
 			_image.reset (new MagickImageProxy (path));
 		}
 	}
 
-	video (_image, _video_position);
+	video->give (_image, _video_position);
 	++_video_position;
 	return false;
 }
@@ -70,6 +80,6 @@ ImageDecoder::pass (PassReason, bool)
 void
 ImageDecoder::seek (ContentTime time, bool accurate)
 {
-	VideoDecoder::seek (time, accurate);
-	_video_position = time.frames_round (_image_content->video->frame_rate ());
+	video->seek (time, accurate);
+	_video_position = time.frames_round (_image_content->active_video_frame_rate ());
 }