From 9486066c29b91a8d9ac25be1c596cad62387208f Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 14 Aug 2016 23:59:16 +0100 Subject: Support reading of encrypted subtitles. --- src/asset_reader.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'src/asset_reader.cc') diff --git a/src/asset_reader.cc b/src/asset_reader.cc index 9ada75f0..73c5d010 100644 --- a/src/asset_reader.cc +++ b/src/asset_reader.cc @@ -34,22 +34,13 @@ #include "asset_reader.h" #include "mxf.h" #include "exceptions.h" +#include "decryption_context.h" #include using namespace dcp; AssetReader::AssetReader (MXF const * mxf) - : _decryption_context (0) + : _decryption_context (new DecryptionContext (mxf->key ())) { - if (mxf->key()) { - _decryption_context = new ASDCP::AESDecContext; - if (ASDCP_FAILURE (_decryption_context->InitKey (mxf->key()->value ()))) { - throw MiscError ("could not set up decryption context"); - } - } -} -AssetReader::~AssetReader () -{ - delete _decryption_context; } -- cgit v1.2.3