- if (_image && _image_content->still ()) {
- video (_image, true, _video_position * TIME_HZ / _video_content->video_frame_rate ());
- ++_video_position;
- return false;
- }
-
- Magick::Image* magick_image = new Magick::Image (_image_content->path (_image_content->still() ? 0 : _video_position).string ());
- libdcp::Size size (magick_image->columns(), magick_image->rows());
-
- _image.reset (new Image (PIX_FMT_RGB24, size, true));
-
- using namespace MagickCore;
-
- uint8_t* p = _image->data()[0];
- for (int y = 0; y < size.height; ++y) {
- uint8_t* q = p;
- for (int x = 0; x < size.width; ++x) {
- Magick::Color c = magick_image->pixelColor (x, y);
- *q++ = c.redQuantum() * 255 / QuantumRange;
- *q++ = c.greenQuantum() * 255 / QuantumRange;
- *q++ = c.blueQuantum() * 255 / QuantumRange;
+ 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 : _frame_video_position);
+ if (valid_j2k_file (path)) {
+ AVPixelFormat pf;
+ if (_image_content->video->colour_conversion()) {
+ /* We have a specified colour conversion: assume the image is RGB */
+ pf = AV_PIX_FMT_RGB48LE;
+ } else {
+ /* No specified colour conversion: assume the image is XYZ */
+ pf = AV_PIX_FMT_XYZ12LE;
+ }
+ /* 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(), pf));
+ } else {
+ _image.reset (new FFmpegImageProxy (path));