Use AV_ prefixes on some FFmpeg bits.

[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 28b7299c8911d50a61c4ee830a197138fd88ade7..b6e684815b3e8cfcd346de91b60ad6b08ab28afd 100644 (file)
--- a/src/lib/j2k_image_proxy.cc
+++ b/src/lib/j2k_image_proxy.cc
@@ -22,12 +22,14 @@
 #include "image.h"
 #include "data.h"
 #include "raw_convert.h"
-#include <dcp/xyz_image.h>
+#include <dcp/openjpeg_image.h>
 #include <dcp/mono_picture_frame.h>
 #include <dcp/stereo_picture_frame.h>
 #include <dcp/colour_conversion.h>
 #include <dcp/rgb_xyz.h>
 #include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <iostream>
 
 #include "i18n.h"
 
@@ -35,6 +37,7 @@ using std::string;
 using std::cout;
 using boost::shared_ptr;
 using boost::optional;
+using boost::dynamic_pointer_cast;
 
 /** Construct a J2KImageProxy from a JPEG2000 file */
 J2KImageProxy::J2KImageProxy (boost::filesystem::path path, dcp::Size size)
@@ -80,24 +83,38 @@ J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
 shared_ptr<Image>
 J2KImageProxy::image (optional<dcp::NoteHandler> note) const
 {
-       shared_ptr<Image> image (new Image (PIX_FMT_RGB48LE, _size, true));
+       shared_ptr<Image> image (new Image (AV_PIX_FMT_RGB48LE, _size, true));
 
-       shared_ptr<dcp::XYZImage> xyz = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), 0);
+       shared_ptr<dcp::OpenJPEGImage> oj = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), 0);
 
-       if (xyz->opj_image()->comps[0].prec < 12) {
-               int const shift = 12 - xyz->opj_image()->comps[0].prec;
+       if (oj->opj_image()->comps[0].prec < 12) {
+               int const shift = 12 - oj->opj_image()->comps[0].prec;
                for (int c = 0; c < 3; ++c) {
-                       int* p = xyz->data (c);
-                       for (int y = 0; y < xyz->size().height; ++y) {
-                               for (int x = 0; x < xyz->size().width; ++x) {
+                       int* p = oj->data (c);
+                       for (int y = 0; y < oj->size().height; ++y) {
+                               for (int x = 0; x < oj->size().width; ++x) {
                                        *p++ <<= shift;
                                }
                        }
                }
        }
 
-       dcp::xyz_to_rgb (xyz, dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
-       
+       if (oj->opj_image()->color_space == CLRSPC_SRGB) {
+               /* No XYZ -> RGB conversion necessary; just copy and interleave the values */
+               int p = 0;
+               for (int y = 0; y < oj->size().height; ++y) {
+                       uint16_t* q = (uint16_t *) (image->data()[0] + y * image->stride()[0]);
+                       for (int x = 0; x < oj->size().width; ++x) {
+                               for (int c = 0; c < 3; ++c) {
+                                       *q++ = oj->data(c)[p] << 4;
+                               }
+                               ++p;
+                       }
+               }
+       } else {
+               dcp::xyz_to_rgb (oj, dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
+       }
+
        return image;
 }
 
@@ -118,3 +135,25 @@ J2KImageProxy::send_binary (shared_ptr<Socket> socket) const
 {
        socket->write (_data.data().get(), _data.size());
 }
+
+bool
+J2KImageProxy::same (shared_ptr<const ImageProxy> other) const
+{
+       shared_ptr<const J2KImageProxy> jp = dynamic_pointer_cast<const J2KImageProxy> (other);
+       if (!jp) {
+               return false;
+       }
+
+       if (_data.size() != jp->_data.size()) {
+               return false;
+       }
+
+       return memcmp (_data.data().get(), jp->_data.data().get(), _data.size()) == 0;
+}
+
+J2KImageProxy::J2KImageProxy (Data data, dcp::Size size)
+       : _data (data)
+       , _size (size)
+{
+
+}