X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimagemagick_decoder.cc;h=5dc0b7b06d6ff9cfad6116ff12c7f7b6c1a4c7e0;hb=ba0a895137b630f5d308b123ef886d68090f855d;hp=3957da5ddd1df8e01be6306b6f4657d93733c146;hpb=1f2bc4d8f3601ad1e12b94f37b3889fcd003509b;p=dcpomatic.git

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 3957da5dd..5dc0b7b06 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -25,13 +25,16 @@
 #include "film.h"
 #include "exceptions.h"
 
+#include "i18n.h"
+
 using std::cout;
 using boost::shared_ptr;
+using libdcp::Size;
 
 ImageMagickDecoder::ImageMagickDecoder (
-	boost::shared_ptr<Film> f, boost::shared_ptr<const DecodeOptions> o, Job* j)
-	: Decoder (f, o, j)
-	, VideoDecoder (f, o, j)
+	boost::shared_ptr<Film> f, DecodeOptions o)
+	: Decoder (f, o)
+	, VideoDecoder (f, o)
 {
 	if (boost::filesystem::is_directory (_film->content_path())) {
 		for (
@@ -50,17 +53,17 @@ ImageMagickDecoder::ImageMagickDecoder (
 	_iter = _files.begin ();
 }
 
-Size
+libdcp::Size
 ImageMagickDecoder::native_size () const
 {
 	if (_files.empty ()) {
-		throw DecodeError ("no still image files found");
+		throw DecodeError (_("no still image files found"));
 	}
 
 	/* Look at the first file and assume its size holds for all */
 	using namespace MagickCore;
 	Magick::Image* image = new Magick::Image (_film->content_path ());
-	Size const s = Size (image->columns(), image->rows());
+	libdcp::Size const s = libdcp::Size (image->columns(), image->rows());
 	delete image;
 
 	return s;
@@ -70,16 +73,21 @@ bool
 ImageMagickDecoder::pass ()
 {
 	if (_iter == _files.end()) {
-		return true;
+		if (video_frame() >= _film->still_duration_in_frames()) {
+			return true;
+		}
+
+		repeat_last_video ();
+		return false;
 	}
 	
-	using namespace MagickCore;
-
 	Magick::Image* magick_image = new Magick::Image (_film->content_path ());
 	
-	Size size = native_size ();
-	shared_ptr<CompactImage> image (new CompactImage (PIX_FMT_RGB24, size));
+	libdcp::Size size = native_size ();
+	shared_ptr<Image> image (new SimpleImage (PIX_FMT_RGB24, size, false));
 
+	using namespace MagickCore;
+	
 	uint8_t* p = image->data()[0];
 	for (int y = 0; y < size.height; ++y) {
 		for (int x = 0; x < size.width; ++x) {
@@ -91,8 +99,10 @@ ImageMagickDecoder::pass ()
 	}
 
 	delete magick_image;
+
+	image = image->crop (_film->crop(), true);
 	
-	emit_video (image);
+	emit_video (image, 0);
 
 	++_iter;
 	return false;
@@ -105,3 +115,38 @@ ImageMagickDecoder::pixel_format () const
 	return PIX_FMT_RGB24;
 }
 
+bool
+ImageMagickDecoder::seek_to_last ()
+{
+	if (_iter == _files.end()) {
+		_iter = _files.begin();
+	} else {
+		--_iter;
+	}
+
+	return false;
+}
+
+bool
+ImageMagickDecoder::seek (double t)
+{
+	int const f = t * frames_per_second();
+	
+	_iter = _files.begin ();
+	for (int i = 0; i < f; ++i) {
+		if (_iter == _files.end()) {
+			return true;
+		}
+		++_iter;
+	}
+	
+	return false;
+}
+
+void
+ImageMagickDecoder::film_changed (Film::Property p)
+{
+	if (p == Film::CROP) {
+		OutputChanged ();
+	}
+}