#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>
}
bool
-ImageDecoder::pass (PassReason, bool)
+ImageDecoder::pass ()
{
if (_frame_video_position >= _image_content->video->length()) {
return true;
*/
_image.reset (new J2KImageProxy (path, _image_content->video->size(), pf));
} else {
- _image.reset (new MagickImageProxy (path));
+ _image.reset (new FFmpegImageProxy (path));
}
}
- video->give (_image, _frame_video_position);
+ video->emit (_image, _frame_video_position);
++_frame_video_position;
return false;
}
void
ImageDecoder::seek (ContentTime time, bool accurate)
{
- video->seek (time, accurate);
+ Decoder::seek (time, accurate);
_frame_video_position = time.frames_round (_image_content->active_video_frame_rate ());
}