X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_decoder.cc;h=8aa3f6a99c2eba0369d3ee6b254e703dab0189e4;hb=c4403784febdbdd42e9c32e67fadb147f11fe566;hp=28fc9c0a51bd05fe54dea9826f80203320aa3238;hpb=f113b2aaca7a65f7b37e12a7d9f3f99e2d834e81;p=dcpomatic.git

diff --git a/src/lib/image_decoder.cc b/src/lib/image_decoder.cc
index 28fc9c0a5..8aa3f6a99 100644
--- a/src/lib/image_decoder.cc
+++ b/src/lib/image_decoder.cc
@@ -22,12 +22,11 @@
 #include "image_decoder.h"
 #include "video_decoder.h"
 #include "image.h"
-#include "magick_image_proxy.h"
+#include "ffmpeg_image_proxy.h"
 #include "j2k_image_proxy.h"
 #include "film.h"
 #include "exceptions.h"
 #include "video_content.h"
-#include <Magick++.h>
 #include <boost/filesystem.hpp>
 #include <iostream>
 
@@ -36,16 +35,18 @@
 using std::cout;
 using boost::shared_ptr;
 using dcp::Size;
+using namespace dcpomatic;
 
-ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c, shared_ptr<Log> log)
-	: _image_content (c)
+ImageDecoder::ImageDecoder (shared_ptr<const Film> film, shared_ptr<const ImageContent> c)
+	: Decoder (film)
+	, _image_content (c)
 	, _frame_video_position (0)
 {
-	video.reset (new VideoDecoder (this, c, log));
+	video.reset (new VideoDecoder (this, c));
 }
 
 bool
-ImageDecoder::pass (PassReason, bool)
+ImageDecoder::pass ()
 {
 	if (_frame_video_position >= _image_content->video->length()) {
 		return true;
@@ -68,12 +69,11 @@ ImageDecoder::pass (PassReason, bool)
 			*/
 			_image.reset (new J2KImageProxy (path, _image_content->video->size(), pf));
 		} else {
-			_image.reset (new MagickImageProxy (path));
+			_image.reset (new FFmpegImageProxy (path));
 		}
 	}
 
-	video->set_position (ContentTime::from_frames (_frame_video_position, _image_content->active_video_frame_rate ()));
-	video->give (_image, _frame_video_position);
+	video->emit (film(), _image, _frame_video_position);
 	++_frame_video_position;
 	return false;
 }
@@ -81,6 +81,6 @@ ImageDecoder::pass (PassReason, bool)
 void
 ImageDecoder::seek (ContentTime time, bool accurate)
 {
-	video->seek (time, accurate);
-	_frame_video_position = time.frames_round (_image_content->active_video_frame_rate ());
+	Decoder::seek (time, accurate);
+	_frame_video_position = time.frames_round (_image_content->active_video_frame_rate(film()));
 }