X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimagemagick_decoder.cc;h=04d3d9df7c47d166c52e7692b3977d550993b547;hb=d39bfb9a1360a83f3451b79d01fdc4f465ef21d3;hp=fd4e5b18df91aa00aeb4ea638f13c6258d5cb657;hpb=5161626c3c28ba528511a8b211286a5e81a0f02a;p=dcpomatic.git

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index fd4e5b18d..04d3d9df7 100644
--- a/src/lib/imagemagick_decoder.cc
+++ b/src/lib/imagemagick_decoder.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2013 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
@@ -18,60 +18,78 @@
 */
 
 #include <iostream>
+#include <boost/filesystem.hpp>
 #include <Magick++.h>
+#include "imagemagick_content.h"
 #include "imagemagick_decoder.h"
 #include "image.h"
 #include "film.h"
+#include "exceptions.h"
 
-using namespace std;
-using namespace boost;
+#include "i18n.h"
 
-ImageMagickDecoder::ImageMagickDecoder (
-	boost::shared_ptr<Film> f, boost::shared_ptr<const Options> o, Job* j)
-	: Decoder (f, o, j)
-	, _done (false)
-{
-	_magick_image = new Magick::Image (_film->content_path ());
-}
+using std::cout;
+using boost::shared_ptr;
+using libdcp::Size;
 
-Size
-ImageMagickDecoder::native_size () const
+ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
+	: Decoder (f)
+	, VideoDecoder (f)
+	, ImageMagick (c)
 {
-	return Size (_magick_image->columns(), _magick_image->rows());
+
 }
 
-bool
+void
 ImageMagickDecoder::pass ()
 {
-	using namespace MagickCore;
-	
-	if (_done) {
-		return true;
+	if (_video_position >= _imagemagick_content->video_length ()) {
+		return;
 	}
 
-	Size size = native_size ();
-	CompactImage image (PIX_FMT_RGB24, size);
+	if (_image) {
+		video (_image, true, _video_position);
+		return;
+	}
+
+	Magick::Image* magick_image = new Magick::Image (_imagemagick_content->file().string ());
+	_video_size = libdcp::Size (magick_image->columns(), magick_image->rows());
+	
+	_image.reset (new SimpleImage (PIX_FMT_RGB24, _video_size.get(), false));
 
-	uint8_t* p = image.data()[0];
-	for (int y = 0; y < size.height; ++y) {
-		for (int x = 0; x < size.width; ++x) {
-			Magick::Color c = _magick_image->pixelColor (x, y);
+	using namespace MagickCore;
+	
+	uint8_t* p = _image->data()[0];
+	for (int y = 0; y < _video_size->height; ++y) {
+		for (int x = 0; x < _video_size->width; ++x) {
+			Magick::Color c = magick_image->pixelColor (x, y);
 			*p++ = c.redQuantum() * 255 / QuantumRange;
 			*p++ = c.greenQuantum() * 255 / QuantumRange;
 			*p++ = c.blueQuantum() * 255 / QuantumRange;
 		}
-
 	}
-	
-	process_video ((AVFrame const *) image.picture());
 
-	_done = true;
-	return false;
+	delete magick_image;
+
+	video (_image, false, _video_position);
+}
+
+void
+ImageMagickDecoder::seek (VideoContent::Frame frame)
+{
+	_video_position = frame;
 }
 
-PixelFormat
-ImageMagickDecoder::pixel_format () const
+void
+ImageMagickDecoder::seek_back ()
 {
-	return PIX_FMT_RGB24;
+	if (_video_position > 0) {
+		_video_position--;
+	}
 }
 
+bool
+ImageMagickDecoder::done () const
+{
+	return _video_position >= _imagemagick_content->video_length ();
+}