Add LEQ(m) when analysing audio (#1382).

[dcpomatic.git] / src / lib / j2k_image_proxy.cc

diff --git a/src/lib/j2k_image_proxy.cc b/src/lib/j2k_image_proxy.cc
index 52b6f34f0c351de8acd5c42a70fff7b02ace8023..acf8bb05235e7018216824bfd484f0fa533b5d6a 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -51,6 +51,7 @@ J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size, AVPi
        : _data (path)
        , _size (size)
        , _pixel_format (pixel_format)
+       , _error (false)
 {
        /* ::image assumes 16bpp */
        DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
@@ -66,6 +67,7 @@ J2KImageProxy::J2KImageProxy (
        , _size (size)
        , _pixel_format (pixel_format)
        , _forced_reduction (forced_reduction)
+       , _error (false)
 {
        /* ::image assumes 16bpp */
        DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
@@ -83,6 +85,7 @@ J2KImageProxy::J2KImageProxy (
        , _eye (eye)
        , _pixel_format (pixel_format)
        , _forced_reduction (forced_reduction)
+       , _error (false)
 {
        /* ::image assumes 16bpp */
        DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
@@ -99,6 +102,7 @@ J2KImageProxy::J2KImageProxy (
 }
 
 J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
+       : _error (false)
 {
        _size = dcp::Size (xml->number_child<int> ("Width"), xml->number_child<int> ("Height"));
        if (xml->optional_number_child<int> ("Eye")) {
@@ -118,7 +122,7 @@ J2KImageProxy::prepare (optional<dcp::Size> target_size) const
 {
        boost::mutex::scoped_lock lm (_mutex);
 
-       if (_decompressed && target_size == _target_size) {
+       if (_image && target_size == _target_size) {
                DCPOMATIC_ASSERT (_reduce);
                return *_reduce;
        }
@@ -136,18 +140,35 @@ J2KImageProxy::prepare (optional<dcp::Size> target_size) const
                reduce = max (0, reduce);
        }
 
-       _decompressed = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), reduce);
-
-       if (_decompressed->precision(0) < 12) {
-               int const shift = 12 - _decompressed->precision (0);
-               for (int c = 0; c < 3; ++c) {
-                       int* p = _decompressed->data (c);
-                       for (int y = 0; y < _decompressed->size().height; ++y) {
-                               for (int x = 0; x < _decompressed->size().width; ++x) {
-                                       *p++ <<= shift;
-                               }
+       try {
+               shared_ptr<dcp::OpenJPEGImage> decompressed = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), reduce);
+               _image.reset (new Image (_pixel_format, decompressed->size(), true));
+
+               int const shift = 16 - decompressed->precision (0);
+
+               /* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming
+                  the data is 12-bit either way.
+                  */
+
+               int const width = decompressed->size().width;
+
+               int p = 0;
+               int* decomp_0 = decompressed->data (0);
+               int* decomp_1 = decompressed->data (1);
+               int* decomp_2 = decompressed->data (2);
+               for (int y = 0; y < decompressed->size().height; ++y) {
+                       uint16_t* q = (uint16_t *) (_image->data()[0] + y * _image->stride()[0]);
+                       for (int x = 0; x < width; ++x) {
+                               *q++ = decomp_0[p] << shift;
+                               *q++ = decomp_1[p] << shift;
+                               *q++ = decomp_2[p] << shift;
+                               ++p;
                        }
                }
+       } catch (dcp::J2KDecompressionError& e) {
+               _image.reset (new Image (_pixel_format, _size, true));
+               _image->make_black ();
+               _error = true;
        }
 
        _target_size = target_size;
@@ -156,33 +177,19 @@ J2KImageProxy::prepare (optional<dcp::Size> target_size) const
        return reduce;
 }
 
-pair<shared_ptr<Image>, int>
-J2KImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size> target_size) const
-{
-       int const reduce = prepare (target_size);
 
-       shared_ptr<Image> image (new Image (_pixel_format, _decompressed->size(), true));
+ImageProxy::Result
+J2KImageProxy::image (optional<dcp::Size> target_size) const
+{
+       int const r = prepare (target_size);
 
-       /* Copy data in whatever format (sRGB or XYZ) into our Image; I'm assuming
-          the data is 12-bit either way.
+       /* I think this is safe without a lock on mutex.  _image is guaranteed to be
+          set up when prepare() has happened.
        */
-
-       int const width = _decompressed->size().width;
-
-       int p = 0;
-       for (int y = 0; y < _decompressed->size().height; ++y) {
-               uint16_t* q = (uint16_t *) (image->data()[0] + y * image->stride()[0]);
-               for (int x = 0; x < width; ++x) {
-                       for (int c = 0; c < 3; ++c) {
-                               *q++ = _decompressed->data(c)[p] << 4;
-                       }
-                       ++p;
-               }
-       }
-
-       return make_pair (image, reduce);
+       return Result (_image, r, _error);
 }
 
+
 void
 J2KImageProxy::add_metadata (xmlpp::Node* node) const
 {
@@ -196,7 +203,7 @@ J2KImageProxy::add_metadata (xmlpp::Node* node) const
 }
 
 void
-J2KImageProxy::send_binary (shared_ptr<Socket> socket) const
+J2KImageProxy::write_to_socket (shared_ptr<Socket> socket) const
 {
        socket->write (_data.data().get(), _data.size());
 }
@@ -229,9 +236,9 @@ size_t
 J2KImageProxy::memory_used () const
 {
        size_t m = _data.size();
-       if (_decompressed) {
+       if (_image) {
                /* 3 components, 16-bits per pixel */
-               m += 3 * 2 * _decompressed->size().width * _decompressed->size().height;
+               m += 3 * 2 * _image->size().width * _image->size().height;
        }
        return m;
 }