Add compress_j2k method and simple benchmark.

[libdcp.git] / src / mono_picture_frame.cc

diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index 4fe9356cfa6833af345346ffd24af178585c0640..0a7d7a11bd2a5ff4c3207bf2436ad73735d2678c 100644 (file)
--- a/src/mono_picture_frame.cc
+++ b/src/mono_picture_frame.cc
@@ -23,18 +23,19 @@
 
 #include "mono_picture_frame.h"
 #include "exceptions.h"
-#include "argb_frame.h"
 #include "util.h"
 #include "rgb_xyz.h"
 #include "colour_conversion.h"
 #include "KM_fileio.h"
 #include "AS_DCP.h"
+#include "compose.hpp"
 #include <openjpeg.h>
 
 #define DCI_GAMMA 2.6
 
 using std::string;
 using boost::shared_ptr;
+using boost::optional;
 using namespace dcp;
 
 /** Make a picture frame from a JPEG2000 file.
@@ -44,7 +45,7 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path)
 {
        boost::uintmax_t const size = boost::filesystem::file_size (path);
        _buffer = new ASDCP::JP2K::FrameBuffer (size);
-       FILE* f = fopen_boost (path, "r");
+       FILE* f = fopen_boost (path, "rb");
        if (!f) {
                boost::throw_exception (FileError ("could not open JPEG2000 file", path, errno));
        }
@@ -56,23 +57,23 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path)
 }
 
 /** Make a picture frame from a 2D (monoscopic) asset.
- *  @param mxf_path Path to the asset's MXF file.
+ *  @param path Path to the asset's MXF file.
  *  @param n Frame within the asset, not taking EntryPoint into account.
  *  @param c Context for decryption, or 0.
  */
-MonoPictureFrame::MonoPictureFrame (boost::filesystem::path mxf_path, int n, ASDCP::AESDecContext* c)
+MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path, int n, ASDCP::AESDecContext* c)
 {
        ASDCP::JP2K::MXFReader reader;
-       Kumu::Result_t r = reader.OpenRead (mxf_path.string().c_str());
+       Kumu::Result_t r = reader.OpenRead (path.string().c_str());
        if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (FileError ("could not open MXF file for reading", mxf_path, r));
+               boost::throw_exception (FileError ("could not open MXF file for reading", path, r));
        }
 
        /* XXX: unfortunate guesswork on this buffer size */
        _buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte);
 
        if (ASDCP_FAILURE (reader.ReadFrame (n, *_buffer, c))) {
-               boost::throw_exception (DCPReadError ("could not read video frame"));
+               boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1 of %2", n, path.string())));
        }
 }
 
@@ -111,28 +112,9 @@ MonoPictureFrame::j2k_size () const
 /** @param reduce a factor by which to reduce the resolution
  *  of the image, expressed as a power of two (pass 0 for no
  *  reduction).
- *  @param srgb_gamma Reciprocal of output gamma to use after
- *  the conversion from XYZ to RGB.
- *
- *  @return An ARGB representation of this frame.  This is ARGB in the
- *  Cairo sense, so that each pixel takes up 4 bytes; the first byte
- *  is blue, second green, third red and fourth alpha (always 255).
  */
-shared_ptr<ARGBFrame>
-MonoPictureFrame::argb_frame (int reduce, float srgb_gamma) const
+shared_ptr<OpenJPEGImage>
+MonoPictureFrame::xyz_image (int reduce) const
 {
-       return xyz_to_rgba (
-               decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce),
-               ColourConversion::xyz_to_srgb
-               );
-}
-
-void
-MonoPictureFrame::rgb_frame (uint16_t* buffer) const
-{
-       xyz_to_rgb (
-               decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), 0),
-               ColourConversion::xyz_to_srgb,
-               buffer
-               );
+       return decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce);
 }