Tidying.

[libdcp.git] / src / mono_picture_frame.cc

diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index 79527280afd2def374d2d7b78e245e6906713da4..3e27bed7079ea6762584da3544f5f8a524b86834 100644 (file)
--- a/src/mono_picture_frame.cc
+++ b/src/mono_picture_frame.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libdcp.
 
@@ -31,10 +31,12 @@
     files in the program, then also delete it here.
 */
 
+
 /** @file  src/mono_picture_frame.cc
- *  @brief MonoPictureFrame class.
+ *  @brief MonoPictureFrame class
  */
 
+
 #include "mono_picture_frame.h"
 #include "exceptions.h"
 #include "util.h"
@@ -42,33 +44,38 @@
 #include "colour_conversion.h"
 #include "compose.hpp"
 #include "j2k.h"
-#include "decryption_context.h"
+#include "crypto_context.h"
 #include <asdcp/KM_fileio.h>
 #include <asdcp/AS_DCP.h>
 
+
+using std::make_shared;
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using namespace dcp;
 
-/** Make a picture frame from a JPEG2000 file.
- *  @param path Path to JPEG2000 file.
- */
+
 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, "rb");
+       auto const size = boost::filesystem::file_size (path);
+       _buffer.reset(new ASDCP::JP2K::FrameBuffer(size));
+       auto f = fopen_boost (path, "rb");
        if (!f) {
-               boost::throw_exception (FileError ("could not open JPEG2000 file", path, errno));
+               boost::throw_exception (FileError("could not open JPEG2000 file", path, errno));
        }
 
-       fread (j2k_data(), 1, size, f);
+       size_t n = fread (data(), 1, size, f);
        fclose (f);
 
+       if (n != size) {
+               boost::throw_exception (FileError("could not read from JPEG2000 file", path, errno));
+       }
+
        _buffer->Size (size);
 }
 
+
 /** Make a picture frame from a 2D (monoscopic) asset.
  *  @param reader Reader for the asset's MXF file.
  *  @param n Frame within the asset, not taking EntryPoint into account.
@@ -77,53 +84,47 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path)
 MonoPictureFrame::MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, shared_ptr<DecryptionContext> c)
 {
        /* XXX: unfortunate guesswork on this buffer size */
-       _buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte);
+       _buffer = make_shared<ASDCP::JP2K::FrameBuffer>(4 * Kumu::Megabyte);
 
-       if (ASDCP_FAILURE (reader->ReadFrame (n, *_buffer, c->decryption()))) {
-               boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1", n)));
+       auto const r = reader->ReadFrame (n, *_buffer, c->context(), c->hmac());
+
+       if (ASDCP_FAILURE(r)) {
+               boost::throw_exception (ReadError(String::compose ("could not read video frame %1 (%2)", n, static_cast<int>(r))));
        }
 }
 
+
 MonoPictureFrame::MonoPictureFrame (uint8_t const * data, int size)
 {
-       _buffer = new ASDCP::JP2K::FrameBuffer (size);
+       _buffer = make_shared<ASDCP::JP2K::FrameBuffer>(size);
        _buffer->Size (size);
        memcpy (_buffer->Data(), data, size);
 }
 
-/** MonoPictureFrame destructor */
-MonoPictureFrame::~MonoPictureFrame ()
-{
-       delete _buffer;
-}
 
-/** @return Pointer to JPEG2000 data */
 uint8_t const *
-MonoPictureFrame::j2k_data () const
+MonoPictureFrame::data () const
 {
        return _buffer->RoData ();
 }
 
-/** @return Pointer to JPEG2000 data */
+
 uint8_t *
-MonoPictureFrame::j2k_data ()
+MonoPictureFrame::data ()
 {
        return _buffer->Data ();
 }
 
-/** @return Size of JPEG2000 data in bytes */
+
 int
-MonoPictureFrame::j2k_size () const
+MonoPictureFrame::size () const
 {
        return _buffer->Size ();
 }
 
-/** @param reduce a factor by which to reduce the resolution
- *  of the image, expressed as a power of two (pass 0 for no
- *  reduction).
- */
+
 shared_ptr<OpenJPEGImage>
 MonoPictureFrame::xyz_image (int reduce) const
 {
-       return decompress_j2k (const_cast<uint8_t*> (_buffer->RoData()), _buffer->Size(), reduce);
+       return decompress_j2k (const_cast<uint8_t*>(_buffer->RoData()), _buffer->Size(), reduce);
 }