From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id B09BD47C3D for ; Mon, 13 Nov 2023 08:35:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1EF4268CCA0; Mon, 13 Nov 2023 10:35:37 +0200 (EET) Received: from mail.geekou.info (62-210-192-90.rev.poneytelecom.eu [62.210.192.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0FDAA68CAB9 for ; Mon, 13 Nov 2023 10:35:31 +0200 (EET) Received: from [127.0.0.1] (localhost [127.0.0.1]) by mail.geekou.info (Postfix) with ESMTP id B46973D for ; Mon, 13 Nov 2023 08:35:29 +0000 (UTC) Message-ID: <9a521257-3f8d-429e-824c-d0a1c7f15e39@guinet.me> Date: Mon, 13 Nov 2023 09:35:29 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <8047ac88-e449-4e46-9527-c4ba407fb38f@guinet.me> <20231112171846.GE3543730@pb2> Content-Language: en-US From: Adrien Guinet In-Reply-To: <20231112171846.GE3543730@pb2> Subject: Re: [FFmpeg-devel] [PATCH] avformat/mov: add support for multiple decryption keys X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 11/12/23 18:18, Michael Niedermayer wrote: > On Sun, Nov 12, 2023 at 06:06:01PM +0100, Adrien Guinet wrote: >> This commit introduces new options to support more than one decryption >> keys: >> * add a decryption_keys option to MOV, that supports a dictionnary of >> KID=>key (in hex), using AV_OPT_TYPE_DICT >> * add the corresponding cenc_decryption_keys option to DASH >> >> Signed-off-by: Adrien Guinet >> --- >> doc/demuxers.texi | 12 +++- >> libavformat/dashdec.c | 6 +- >> libavformat/isom.h | 5 +- >> libavformat/mov.c | 80 ++++++++++++++++++---- >> tests/fate/mov.mak | 12 ++++ >> tests/ref/fate/mov-3elist-encrypted-kid | 57 +++++++++++++++ >> tests/ref/fate/mov-frag-encrypted-kid | 57 +++++++++++++++ >> tests/ref/fate/mov-tenc-only-encrypted-kid | 57 +++++++++++++++ >> 8 files changed, 269 insertions(+), 17 deletions(-) >> create mode 100644 tests/ref/fate/mov-3elist-encrypted-kid >> create mode 100644 tests/ref/fate/mov-frag-encrypted-kid >> create mode 100644 tests/ref/fate/mov-tenc-only-encrypted-kid >> >> diff --git a/doc/demuxers.texi b/doc/demuxers.texi >> index ca1563abb0..9d0ab6025c 100644 >> --- a/doc/demuxers.texi >> +++ b/doc/demuxers.texi >> @@ -281,7 +281,11 @@ This demuxer accepts the following option: >> @table @option >> @item cenc_decryption_key >> -16-byte key, in hex, to decrypt files encrypted using ISO Common Encryption >> (CENC/AES-128 CTR; ISO/IEC 23001-7). >> +Default 16-byte key, in hex, to decrypt files encrypted using ISO Common >> Encryption (CENC/AES-128 CTR; ISO/IEC 23001-7). > > error: corrupt patch at line 51 > > [...] Erf.. I think thunderbird reformatted the whole thing. That's my first patch ever sent to ffmpeg, sorry about this. Let me use git send-email directly... _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".