Bv2.1 7.2.3: Check that subtitle <StartTime> exists and is 0.

[libdcp.git] / src / mono_picture_frame.cc

diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index fd095a1fdf5e8953461b1959811beda3737ca74a..7420193e47ec0f0701e48ac8d7207df5113b0c51 100644 (file)
--- a/src/mono_picture_frame.cc
+++ b/src/mono_picture_frame.cc
@@ -42,11 +42,12 @@
 #include "colour_conversion.h"
 #include "compose.hpp"
 #include "j2k.h"
+#include "crypto_context.h"
 #include <asdcp/KM_fileio.h>
 #include <asdcp/AS_DCP.h>
 
 using std::string;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using namespace dcp;
 
@@ -56,13 +57,17 @@ using namespace dcp;
 MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path)
 {
        boost::uintmax_t const size = boost::filesystem::file_size (path);
-       _buffer = new ASDCP::JP2K::FrameBuffer (size);
+       _buffer.reset(new ASDCP::JP2K::FrameBuffer(size));
        FILE* f = fopen_boost (path, "rb");
        if (!f) {
                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);
+       if (n != size) {
+               boost::throw_exception (FileError ("could not read from JPEG2000 file", path, errno));
+       }
+
        fclose (f);
 
        _buffer->Size (size);
@@ -73,46 +78,43 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path)
  *  @param n Frame within the asset, not taking EntryPoint into account.
  *  @param c Context for decryption, or 0.
  */
-MonoPictureFrame::MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, ASDCP::AESDecContext* c)
+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.reset(new ASDCP::JP2K::FrameBuffer(4 * Kumu::Megabyte));
+
+       ASDCP::Result_t const r = reader->ReadFrame (n, *_buffer, c->context(), c->hmac());
 
-       if (ASDCP_FAILURE (reader->ReadFrame (n, *_buffer, c))) {
-               boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1", n)));
+       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.reset(new 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 ();
 }