Stub player.

[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 fb38c9e999a9d04913f14823a67a0ed581429944..9e68951e95b8e8823ab12d46346e96ac8ff1ab51 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -30,12 +30,14 @@
 #include <dcp/j2k.h>
 #include <libcxml/cxml.h>
 #include <libxml++/libxml++.h>
+#include <Magick++.h>
 #include <iostream>
 
 #include "i18n.h"
 
 using std::string;
 using std::cout;
+using std::max;
 using boost::shared_ptr;
 using boost::optional;
 using boost::dynamic_pointer_cast;
@@ -92,42 +94,58 @@ J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
 }
 
 void
-J2KImageProxy::ensure_j2k () const
+J2KImageProxy::prepare (optional<dcp::Size> target_size) const
 {
-       if (!_j2k) {
-               _j2k = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), 0);
+       boost::mutex::scoped_lock lm (_mutex);
+
+       if (_decompressed && target_size == _target_size) {
+               return;
        }
-}
 
-shared_ptr<Image>
-J2KImageProxy::image (optional<dcp::NoteHandler>) const
-{
-       ensure_j2k ();
+       int reduce = 0;
+
+       while (target_size && (_size.width / pow(2, reduce)) > target_size->width && (_size.height / pow(2, reduce)) > target_size->height) {
+               ++reduce;
+       }
+
+       --reduce;
+       reduce = max (0, reduce);
+       _decompressed = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), reduce);
 
-       if (_j2k->precision(0) < 12) {
-               int const shift = 12 - _j2k->precision (0);
+       if (_decompressed->precision(0) < 12) {
+               int const shift = 12 - _decompressed->precision (0);
                for (int c = 0; c < 3; ++c) {
-                       int* p = _j2k->data (c);
-                       for (int y = 0; y < _j2k->size().height; ++y) {
-                               for (int x = 0; x < _j2k->size().width; ++x) {
+                       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;
                                }
                        }
                }
        }
 
-       shared_ptr<Image> image (new Image (_pixel_format, _size, true));
+       _target_size = target_size;
+}
+
+shared_ptr<Image>
+J2KImageProxy::image (optional<dcp::NoteHandler>, optional<dcp::Size> target_size) const
+{
+       prepare (target_size);
+
+       shared_ptr<Image> image (new Image (_pixel_format, _decompressed->size(), true));
 
        /* 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;
-       for (int y = 0; y < _j2k->size().height; ++y) {
+       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 < _j2k->size().width; ++x) {
+               for (int x = 0; x < width; ++x) {
                        for (int c = 0; c < 3; ++c) {
-                               *q++ = _j2k->data(c)[p] << 4;
+                               *q++ = _decompressed->data(c)[p] << 4;
                        }
                        ++p;
                }