diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-03-06 01:15:43 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-03-13 22:29:01 +0000 |
| commit | 380d7af94562883cdcaa60726d0ffa36f3dab304 (patch) | |
| tree | a36f4828d8ebf54efcf0f3155f49b54b430b67f6 /src/mono_picture_frame.cc | |
| parent | 0e29e68e94daade47167ac5bc6b51362ef02b5c3 (diff) | |
Merge EncryptionContext with DecryptionContext and use HMAC when decrypting.
Diffstat (limited to 'src/mono_picture_frame.cc')
| -rw-r--r-- | src/mono_picture_frame.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mono_picture_frame.cc b/src/mono_picture_frame.cc index 23deb1e8..7ac807cb 100644 --- a/src/mono_picture_frame.cc +++ b/src/mono_picture_frame.cc @@ -42,7 +42,7 @@ #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> @@ -79,7 +79,7 @@ MonoPictureFrame::MonoPictureFrame (ASDCP::JP2K::MXFReader* reader, int n, share /* XXX: unfortunate guesswork on this buffer size */ _buffer = new ASDCP::JP2K::FrameBuffer (4 * Kumu::Megabyte); - ASDCP::Result_t const r = reader->ReadFrame (n, *_buffer, c->decryption()); + 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)))); |