X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.cc;h=e06f6023d54a8d35b1203f81eef72e823ab9ed0d;hb=72b11d5eb036651b6ff68edf3ed270e8fc52960f;hp=d33b64cd446086a96c092bf9c9e64e6b8292ee7a;hpb=317222764debbaf1ac96d256df24c00af85c1b6a;p=dcpomatic.git

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index d33b64cd4..e06f6023d 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -1,70 +1,84 @@
 /*
-    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"
 
 using std::cout;
 using boost::shared_ptr;
-using libdcp::Size;
+using dcp::Size;
 
-ImageDecoder::ImageDecoder (shared_ptr<const Film> f, shared_ptr<const ImageContent> c)
-	: Decoder (f)
-	, VideoDecoder (f, c)
-	, _image_content (c)
+ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c, shared_ptr<Log> log)
+	: _image_content (c)
+	, _frame_video_position (0)
 {
-
+	video.reset (new VideoDecoder (this, c, log));
 }
 
-void
+bool
 ImageDecoder::pass ()
 {
-	if (_video_position >= _image_content->video_length ()) {
-		return;
+	if (_frame_video_position >= _image_content->video->length()) {
+		return true;
 	}
 
-	if (_image && _image_content->still ()) {
-		video (_image, true, _video_position);
-		return;
+	if (!_image_content->still() || !_image) {
+		/* 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 : _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));
+		}
 	}
 
-	_image.reset (new MagickImageProxy (_image_content->path (_image_content->still() ? 0 : _video_position)));
-	video (_image, false, _video_position);
+	video->emit (_image, _frame_video_position);
+	++_frame_video_position;
+	return false;
 }
 
 void
-ImageDecoder::seek (VideoContent::Frame frame, bool)
-{
-	_video_position = frame;
-}
-
-bool
-ImageDecoder::done () const
+ImageDecoder::seek (ContentTime time, bool accurate)
 {
-	return _video_position >= _image_content->video_length ();
+	Decoder::seek (time, accurate);
+	_frame_video_position = time.frames_round (_image_content->active_video_frame_rate ());
 }