X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.cc;h=775a69eebac4779b69226f7a8f408f9ad19d43c2;hp=d6c7d0502cebffb1f0be88e7770d0bfc683d1789;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=c008066160d85b9ec9e5485375d7baaa5d27bda2

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index d6c7d0502..775a69eeb 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2015 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/>.
 
 */
 
@@ -24,8 +25,12 @@
 #include "exceptions.h"
 #include "config.h"
 #include "cross.h"
-#include <dcp/xyz_frame.h>
-#include <Magick++.h>
+#include "compose.hpp"
+#include "ffmpeg_image_proxy.h"
+#include "image.h"
+#include <dcp/openjpeg_image.h>
+#include <dcp/exceptions.h>
+#include <dcp/j2k.h>
 #include <iostream>
 
 #include "i18n.h"
@@ -40,33 +45,32 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
 	: _film (film)
 	, _image_content (content)
 {
-#ifdef DCPOMATIC_IMAGE_MAGICK	
-	using namespace MagickCore;
-#endif
 	boost::filesystem::path path = content->path(0).string ();
 	if (valid_j2k_file (path)) {
 		boost::uintmax_t size = boost::filesystem::file_size (path);
-		uint8_t* buffer = new uint8_t[size];
-		FILE* f = fopen_boost (path, "r");
+		FILE* f = fopen_boost (path, "rb");
 		if (!f) {
 			throw FileError ("Could not open file for reading", path);
 		}
-		fread (buffer, 1, size, f);
+		uint8_t* buffer = new uint8_t[size];
+		checked_fread (buffer, size, f, path);
 		fclose (f);
-		_video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
+		try {
+			_video_size = dcp::decompress_j2k (buffer, size, 0)->size ();
+		} catch (dcp::DCPReadError& e) {
+			delete[] buffer;
+			throw DecodeError (String::compose (_("Could not decode JPEG2000 file %1 (%2)"), path, e.what ()));
+		}
 		delete[] buffer;
 	} else {
-		Magick::Image* image = new Magick::Image (content->path(0).string());
-		_video_size = dcp::Size (image->columns(), image->rows());
-		delete image;
+		FFmpegImageProxy proxy(content->path(0));
+		_video_size = proxy.image().first->size();
 	}
 
 	if (content->still ()) {
-		_video_length = ContentTime::from_seconds (Config::instance()->default_still_length());
+		_video_length = Config::instance()->default_still_length() * video_frame_rate().get_value_or (film->video_frame_rate ());
 	} else {
-		_video_length = ContentTime::from_frames (
-			_image_content->number_of_paths (), video_frame_rate().get_value_or (0)
-			);
+		_video_length = _image_content->number_of_paths ();
 	}
 }
 
@@ -76,9 +80,24 @@ ImageExaminer::video_size () const
 	return _video_size.get ();
 }
 
-optional<float>
+optional<double>
 ImageExaminer::video_frame_rate () const
 {
+	if (_image_content->video_frame_rate()) {
+		/* The content already knows what frame rate it should be */
+		return _image_content->video_frame_rate().get();
+	}
+
 	/* Don't know */
-	return optional<float> ();
+	return optional<double> ();
+}
+
+bool
+ImageExaminer::yuv () const
+{
+	/* We never convert ImageSource from YUV to RGB (though maybe sometimes we should)
+	   so it makes sense to just say they are never YUV so the option of a conversion
+	   to RGB is not offered.
+	*/
+	return false;
 }