From 424f9d0c70ff0832da0509776da939b2f855cdc1 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 9 Jul 2014 16:41:53 +0100 Subject: Use a new ImageProxy to hold J2K data from DCP content. --- src/lib/dcp_decoder.cc | 27 ++++++++---------- src/lib/image_proxy.cc | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/lib/image_proxy.h | 23 +++++++++++++++ 3 files changed, 111 insertions(+), 15 deletions(-) (limited to 'src') diff --git a/src/lib/dcp_decoder.cc b/src/lib/dcp_decoder.cc index 1939fc1c9..e23efba3e 100644 --- a/src/lib/dcp_decoder.cc +++ b/src/lib/dcp_decoder.cc @@ -62,23 +62,20 @@ DCPDecoder::pass () shared_ptr mxf = (*_reel)->main_picture()->mxf (); shared_ptr mono = dynamic_pointer_cast (mxf); shared_ptr stereo = dynamic_pointer_cast (mxf); - int64_t const ep = (*_reel)->main_picture()->entry_point (); + int64_t const entry_point = (*_reel)->main_picture()->entry_point (); + int64_t const frame = _next.frames (vfr); if (mono) { - shared_ptr image (new Image (PIX_FMT_RGB24, mxf->size(), false)); - mono->get_frame (ep + _next.frames (vfr))->rgb_frame (image->data()[0]); - shared_ptr aligned (new Image (image, true)); - video (shared_ptr (new RawImageProxy (aligned, _log)), _next.frames (vfr)); + video (shared_ptr (new J2KImageProxy (mono->get_frame (entry_point + frame), mxf->size(), _log)), frame); } else { - - shared_ptr left (new Image (PIX_FMT_RGB24, mxf->size(), false)); - stereo->get_frame (ep + _next.frames (vfr))->rgb_frame (dcp::EYE_LEFT, left->data()[0]); - shared_ptr aligned_left (new Image (left, true)); - video (shared_ptr (new RawImageProxy (aligned_left, _log)), _next.frames (vfr)); - - shared_ptr right (new Image (PIX_FMT_RGB24, mxf->size(), false)); - stereo->get_frame (ep + _next.frames (vfr))->rgb_frame (dcp::EYE_RIGHT, right->data()[0]); - shared_ptr aligned_right (new Image (right, true)); - video (shared_ptr (new RawImageProxy (aligned_right, _log)), _next.frames (vfr)); + video ( + shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_LEFT, _log)), + frame + ); + + video ( + shared_ptr (new J2KImageProxy (stereo->get_frame (entry_point + frame), mxf->size(), dcp::EYE_RIGHT, _log)), + frame + ); } } diff --git a/src/lib/image_proxy.cc b/src/lib/image_proxy.cc index 039b11133..6215113aa 100644 --- a/src/lib/image_proxy.cc +++ b/src/lib/image_proxy.cc @@ -20,6 +20,8 @@ #include #include #include +#include +#include #include "image_proxy.h" #include "image.h" #include "exceptions.h" @@ -161,6 +163,80 @@ MagickImageProxy::send_binary (shared_ptr socket) const socket->write ((uint8_t *) _blob.data (), _blob.length ()); } +J2KImageProxy::J2KImageProxy (shared_ptr frame, dcp::Size size, shared_ptr log) + : ImageProxy (log) + , _mono (frame) + , _size (size) +{ + +} + +J2KImageProxy::J2KImageProxy (shared_ptr frame, dcp::Size size, dcp::Eye eye, shared_ptr log) + : ImageProxy (log) + , _stereo (frame) + , _size (size) + , _eye (eye) +{ + +} + +J2KImageProxy::J2KImageProxy (shared_ptr xml, shared_ptr socket, shared_ptr log) + : ImageProxy (log) +{ + _size = dcp::Size (xml->number_child ("Width"), xml->number_child ("Height")); + if (xml->optional_number_child ("Eye")) { + _eye = static_cast (xml->number_child ("Eye")); + int const left_size = xml->number_child ("LeftSize"); + int const right_size = xml->number_child ("RightSize"); + _stereo.reset (new dcp::StereoPictureFrame ()); + socket->read (_stereo->left_j2k_data(), left_size); + socket->read (_stereo->right_j2k_data(), right_size); + } else { + int const size = xml->number_child ("Size"); + _mono.reset (new dcp::MonoPictureFrame ()); + socket->read (_mono->j2k_data (), size); + } +} + +shared_ptr +J2KImageProxy::image () +{ + shared_ptr image (new Image (PIX_FMT_RGB24, _size, false)); + + if (_mono) { + _mono->rgb_frame (image->data()[0]); + } else { + _stereo->rgb_frame (image->data()[0], _eye); + } + + return shared_ptr (new Image (image, true)); +} + +void +J2KImageProxy::add_metadata (xmlpp::Node* node) const +{ + node->add_child("Width")->add_child_text (dcp::raw_convert (_size.width)); + node->add_child("Height")->add_child_text (dcp::raw_convert (_size.height)); + if (_stereo) { + node->add_child("Eye")->add_child_text (dcp::raw_convert (_eye)); + node->add_child("LeftSize")->add_child_text (dcp::raw_convert (_stereo->left_j2k_size ())); + node->add_child("RightSize")->add_child_text (dcp::raw_convert (_stereo->right_j2k_size ())); + } else { + node->add_child("Size")->add_child_text (dcp::raw_convert (_mono->j2k_size ())); + } +} + +void +J2KImageProxy::send_binary (shared_ptr socket) const +{ + if (_mono) { + socket->write (_mono->j2k_data(), size); + } else { + socket->write (_stereo->left_j2k_data(), _stereo->left_j2k_size ()); + socket->write (_stereo->right_j2k_data(), _stereo->right_j2k_size ()); + } +} + shared_ptr image_proxy_factory (shared_ptr xml, shared_ptr socket, shared_ptr log) { diff --git a/src/lib/image_proxy.h b/src/lib/image_proxy.h index f6212e54f..9807d027d 100644 --- a/src/lib/image_proxy.h +++ b/src/lib/image_proxy.h @@ -34,6 +34,11 @@ namespace cxml { class Node; } +namespace dcp { + class MonoPictureFrame; + class StereoPictureFrame; +} + /** @class ImageProxy * @brief A class which holds an Image, and can produce it on request. * @@ -88,4 +93,22 @@ private: mutable boost::shared_ptr _image; }; +class J2KImageProxy : public ImageProxy +{ +public: + J2KImageProxy (boost::shared_ptr frame, dcp::Size, boost::shared_ptr log); + J2KImageProxy (boost::shared_ptr frame, dcp::Size, dcp::Eye, boost::shared_ptr log); + J2KImageProxy (boost::shared_ptr xml, boost::shared_ptr socket, boost::shared_ptr log); + + boost::shared_ptr image () const; + void add_metadata (xmlpp::Node *) const; + void send_binary (boost::shared_ptr) const; + +private: + boost::shared_ptr _mono; + boost::shared_ptr _stereo; + dcp::Size _size; + dcp::Eye _eye; +}; + boost::shared_ptr image_proxy_factory (boost::shared_ptr xml, boost::shared_ptr socket, boost::shared_ptr log); -- cgit v1.2.3