#include "image_content.h"
#include "image_decoder.h"
#include "image.h"
-#include "image_proxy.h"
+#include "magick_image_proxy.h"
+#include "j2k_image_proxy.h"
#include "film.h"
#include "exceptions.h"
ImageDecoder::ImageDecoder (shared_ptr<const ImageContent> c)
: VideoDecoder (c)
, _image_content (c)
+ , _video_position (0)
{
}
bool
-ImageDecoder::pass ()
+ImageDecoder::pass (PassReason, bool)
{
- if (_video_position >= _image_content->video_length().frames (_image_content->video_frame_rate ())) {
+ if (_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 */
- _image.reset (new MagickImageProxy (_image_content->path (_image_content->still() ? 0 : _video_position), _image_content->film()->log ()));
+ boost::filesystem::path path = _image_content->path (_image_content->still() ? 0 : _video_position);
+ if (valid_j2k_file (path)) {
+ /* We can't extract image size from a JPEG2000 codestream without decoding it,
+ so pass in the image content's size here.
+ */
+ _image.reset (new J2KImageProxy (path, _image_content->video_size ()));
+ } else {
+ _image.reset (new MagickImageProxy (path));
+ }
}
-
+
video (_image, _video_position);
++_video_position;
return false;
ImageDecoder::seek (ContentTime time, bool accurate)
{
VideoDecoder::seek (time, accurate);
- _video_position = time.frames (_image_content->video_frame_rate ());
+ _video_position = time.frames_round (_image_content->video_frame_rate ());
}