diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-05-13 16:08:33 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-13 16:08:33 +0100 |
| commit | 257fce15e8b4dfa112d039e7888e3ec04e523198 (patch) | |
| tree | 3afe5047010bb71aaa3851ef3b2f438509bccad3 /src/lib/ffmpeg.cc | |
| parent | 5de2fd90b92829cea8ab297c6fce81c582332cb7 (diff) | |
swaroop: basics of encrypted MP4 playback.
Diffstat (limited to 'src/lib/ffmpeg.cc')
| -rw-r--r-- | src/lib/ffmpeg.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/ffmpeg.cc b/src/lib/ffmpeg.cc index ab5148cfa..d6a592f88 100644 --- a/src/lib/ffmpeg.cc +++ b/src/lib/ffmpeg.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2019 Carl Hetherington <cth@carlh.net> This file is part of DCP-o-matic. @@ -27,8 +27,10 @@ #include "dcpomatic_log.h" #include "ffmpeg_subtitle_stream.h" #include "ffmpeg_audio_stream.h" +#include "decrypted_ecinema_kdm.h" #include "digester.h" #include "compose.hpp" +#include "config.h" #include <dcp/raw_convert.h> extern "C" { #include <libavcodec/avcodec.h> @@ -123,8 +125,9 @@ FFmpeg::setup_general () */ av_dict_set (&options, "analyzeduration", raw_convert<string> (5 * 60 * 1000000).c_str(), 0); av_dict_set (&options, "probesize", raw_convert<string> (5 * 60 * 1000000).c_str(), 0); - if (_ffmpeg_content->decryption_key()) { - av_dict_set (&options, "decryption_key", _ffmpeg_content->decryption_key()->c_str(), 0); + if (_ffmpeg_content->kdm()) { + DecryptedECinemaKDM kdm (_ffmpeg_content->kdm().get(), Config::instance()->decryption_chain()->key().get()); + av_dict_set (&options, "decryption_key", kdm.key().hex().c_str(), 0); } int e = avformat_open_input (&_format_context, 0, 0, &options); |