Fix erroneous reports of unresolved assets when checking OV/VF pairs.

[libdcp.git] / src / mono_picture_frame.cc

diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc
index fd095a1fdf5e8953461b1959811beda3737ca74a..9af34c486fda5ffe0d41dd0adef825ebde2c68a6 100644 (file)
--- a/src/mono_picture_frame.cc
+++ b/src/mono_picture_frame.cc
@@ -42,6 +42,7 @@
 #include "colour_conversion.h"
 #include "compose.hpp"
 #include "j2k.h"
+#include "crypto_context.h"
 #include <asdcp/KM_fileio.h>
 #include <asdcp/AS_DCP.h>
 
@@ -62,7 +63,11 @@ MonoPictureFrame::MonoPictureFrame (boost::filesystem::path path)
                boost::throw_exception (FileError ("could not open JPEG2000 file", path, errno));
        }
 
-       fread (j2k_data(), 1, size, f);
+       size_t n = fread (j2k_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,13 +78,15 @@ 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);
 
-       if (ASDCP_FAILURE (reader->ReadFrame (n, *_buffer, c))) {
-               boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1", n)));
+       ASDCP::Result_t const r = reader->ReadFrame (n, *_buffer, c->context(), c->hmac());
+
+       if (ASDCP_FAILURE (r)) {
+               boost::throw_exception (DCPReadError (String::compose ("could not read video frame %1 (%2)", n, static_cast<int>(r))));
        }
 }