X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_examiner.cc;h=6ad32f511e1971ddd8d24123e4bdf0ba2bcfe696;hb=4a4725e41bf4070969223f9c40885063c50e61d0;hp=004b89e659d47ebd24cb594bc06848d2651585d4;hpb=8d58a7c5f4320ad5c111e336c45e44d6b51ab509;p=dcpomatic.git

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 004b89e65..6ad32f511 100644
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -1,5 +1,5 @@
 /*
-    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
     it under the terms of the GNU General Public License as published by
@@ -17,14 +17,17 @@
 
 */
 
-#include <iostream>
-#include <Magick++.h>
 #include "image_content.h"
 #include "image_examiner.h"
 #include "film.h"
 #include "job.h"
 #include "exceptions.h"
 #include "config.h"
+#include "cross.h"
+#include <dcp/openjpeg_image.h>
+#include <dcp/exceptions.h>
+#include <Magick++.h>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -32,20 +35,42 @@ using std::cout;
 using std::list;
 using std::sort;
 using boost::shared_ptr;
+using boost::optional;
 
 ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const ImageContent> content, shared_ptr<Job>)
 	: _film (film)
 	, _image_content (content)
 {
+#ifdef DCPOMATIC_IMAGE_MAGICK
 	using namespace MagickCore;
-	Magick::Image* image = new Magick::Image (content->path(0).string());
-	_video_size = dcp::Size (image->columns(), image->rows());
-	delete image;
+#endif
+	boost::filesystem::path path = content->path(0).string ();
+	if (valid_j2k_file (path)) {
+		boost::uintmax_t size = boost::filesystem::file_size (path);
+		FILE* f = fopen_boost (path, "rb");
+		if (!f) {
+			throw FileError ("Could not open file for reading", path);
+		}
+		uint8_t* buffer = new uint8_t[size];
+		fread (buffer, 1, size, f);
+		fclose (f);
+		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;
+	}
 
 	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 (24);
 	} else {
-		_video_length = ContentTime::from_frames (_image_content->number_of_paths (), video_frame_rate ());
+		_video_length = _image_content->number_of_paths ();
 	}
 }
 
@@ -55,13 +80,9 @@ ImageExaminer::video_size () const
 	return _video_size.get ();
 }
 
-float
+optional<double>
 ImageExaminer::video_frame_rate () const
 {
-	boost::shared_ptr<const Film> f = _film.lock ();
-	if (!f) {
-		return 24;
-	}
-
-	return f->video_frame_rate ();
+	/* Don't know */
+	return optional<double> ();
 }