X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.cc;h=ce8843b0d76b9c45c08d239ac1d6be4024e5bc5c;hp=d3cdbd6f1ee753b994919cd677828662c1b96a8e;hb=254b3044d72de6b033d7c584f5abd2b9aa70aad5;hpb=05654d0e1799746a9df3ccab040c92e0ed825cac

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index d3cdbd6f1..ce8843b0d 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -1,31 +1,34 @@
 /*
-    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 "image_proxy.h"
+#include "ffmpeg_image_proxy.h"
+#include "j2k_image_proxy.h"
 #include "film.h"
 #include "exceptions.h"
+#include "video_content.h"
+#include <boost/filesystem.hpp>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -34,32 +37,48 @@ using boost::shared_ptr;
 using dcp::Size;
 
 ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c)
-	: VideoDecoder (c)
-	, _image_content (c)
+	: _image_content (c)
+	, _frame_video_position (0)
 {
-
+	video.reset (new VideoDecoder (this, c));
 }
 
 bool
-ImageDecoder::pass ()
+ImageDecoder::pass (boost::shared_ptr<const Film> film)
 {
-	if (_video_position >= _image_content->video_length().frames (_image_content->video_frame_rate ())) {
+	if (_frame_video_position >= _image_content->video->length()) {
 		return true;
 	}
 
 	if (!_image_content->still() || !_image) {
 		/* Either we need an image or we are using moving images, so load one */
-		_image.reset (new MagickImageProxy (_image_content->path (_image_content->still() ? 0 : _video_position), _image_content->film()->log ()));
+		boost::filesystem::path path = _image_content->path (_image_content->still() ? 0 : _frame_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(), pf));
+		} else {
+			_image.reset (new FFmpegImageProxy (path));
+		}
 	}
-		
-	video (_image, _video_position);
-	++_video_position;
+
+	video->emit (film, _image, _frame_video_position);
+	++_frame_video_position;
 	return false;
 }
 
 void
-ImageDecoder::seek (ContentTime time, bool accurate)
+ImageDecoder::seek (shared_ptr<const Film> film, ContentTime time, bool accurate)
 {
-	VideoDecoder::seek (time, accurate);
-	_video_position = time.frames (_image_content->video_frame_rate ());
+	Decoder::seek (film, time, accurate);
+	_frame_video_position = time.frames_round (_image_content->active_video_frame_rate(film));
 }