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

diff --git a/src/lib/imagemagick_decoder.cc b/src/lib/imagemagick_decoder.cc
index 9d11e043f..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
@@ -20,69 +20,48 @@
 #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"
 
+#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)
+ImageMagickDecoder::ImageMagickDecoder (shared_ptr<const Film> f, shared_ptr<const ImageMagickContent> c)
+	: Decoder (f)
+	, VideoDecoder (f)
+	, ImageMagick (c)
 {
-	if (boost::filesystem::is_directory (_film->content_path())) {
-		for (
-			boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (_film->content_path());
-			i != boost::filesystem::directory_iterator();
-			++i) {
-
-			if (still_image_file (i->path().string())) {
-				_files.push_back (i->path().string());
-			}
-		}
-	} else {
-		_files.push_back (_film->content_path ());
-	}
 
-	_iter = _files.begin ();
 }
 
-Size
-ImageMagickDecoder::native_size () const
+void
+ImageMagickDecoder::pass ()
 {
-	if (_files.empty ()) {
-		throw DecodeError ("no still image files found");
+	if (_video_position >= _imagemagick_content->video_length ()) {
+		return;
 	}
 
-	/* 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());
-	delete image;
-
-	return s;
-}
-
-bool
-ImageMagickDecoder::pass ()
-{
-	if (_iter == _files.end()) {
-		return true;
+	if (_image) {
+		video (_image, true, _video_position);
+		return;
 	}
-	
-	using namespace MagickCore;
 
-	Magick::Image* magick_image = new Magick::Image (_film->content_path ());
+	Magick::Image* magick_image = new Magick::Image (_imagemagick_content->file().string ());
+	_video_size = libdcp::Size (magick_image->columns(), magick_image->rows());
 	
-	Size size = native_size ();
-	shared_ptr<CompactImage> image (new CompactImage (PIX_FMT_RGB24, size));
+	_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) {
+	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;
@@ -91,17 +70,26 @@ ImageMagickDecoder::pass ()
 	}
 
 	delete magick_image;
-	
-	emit_video (image, 0);
 
-	++_iter;
-	return false;
+	video (_image, false, _video_position);
 }
 
-PixelFormat
-ImageMagickDecoder::pixel_format () const
+void
+ImageMagickDecoder::seek (VideoContent::Frame frame)
 {
-	/* XXX: always true? */
-	return PIX_FMT_RGB24;
+	_video_position = frame;
 }
 
+void
+ImageMagickDecoder::seek_back ()
+{
+	if (_video_position > 0) {
+		_video_position--;
+	}
+}
+
+bool
+ImageMagickDecoder::done () const
+{
+	return _video_position >= _imagemagick_content->video_length ();
+}