#include <dcp/mono_picture_frame.h>
#include <dcp/stereo_picture_frame.h>
#include "j2k_image_proxy.h"
-#include "util.h"
+#include "dcpomatic_socket.h"
#include "image.h"
#include "encoded_data.h"
using std::string;
using boost::shared_ptr;
+using boost::optional;
/** Construct a J2KImageProxy from a JPEG2000 file */
J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size)
}
shared_ptr<Image>
-J2KImageProxy::image () const
+J2KImageProxy::image (optional<dcp::NoteHandler> note) const
{
- shared_ptr<Image> image (new Image (PIX_FMT_RGB24, _size, false));
+ shared_ptr<Image> image (new Image (PIX_FMT_RGB48LE, _size, true));
if (_mono) {
- _mono->rgb_frame (image->data()[0]);
+ _mono->rgb_frame (image, note);
} else {
- _stereo->rgb_frame (_eye, image->data()[0]);
+ _stereo->rgb_frame (_eye, image);
}
- return shared_ptr<Image> (new Image (image, true));
+ return image;
}
void