#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 "frame_interval_checker.h"
#include <boost/filesystem.hpp>
#include <iostream>
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)
- , _video_position (0)
+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 (_video_position >= _image_content->video->length()) {
+ if (_frame_video_position >= _image_content->video->length()) {
return true;
}
if (!_image_content->still() || !_image) {
/* Either we need an image or we are using moving images, so load one */
- boost::filesystem::path path = _image_content->path (_image_content->still() ? 0 : _video_position);
+ boost::filesystem::path path = _image_content->path (_image_content->still() ? 0 : _frame_video_position);
if (valid_j2k_file (path)) {
AVPixelFormat pf;
if (_image_content->video->colour_conversion()) {
*/
_image.reset (new J2KImageProxy (path, _image_content->video->size(), pf));
} else {
- _image.reset (new MagickImageProxy (path));
+ _image.reset (new FFmpegImageProxy (path));
}
}
- _position = ContentTime::from_frames (_video_position, _image_content->active_video_frame_rate ());
- video->give (_image, _video_position);
- ++_video_position;
+ video->emit (film(), _image, _frame_video_position);
+ ++_frame_video_position;
return false;
}
void
ImageDecoder::seek (ContentTime time, bool accurate)
{
- video->seek (time, accurate);
- _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()));
}