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 458CB481E0 for ; Sun, 12 Nov 2023 17:18:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2365168CC54; Sun, 12 Nov 2023 19:18:54 +0200 (EET) Received: from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net [217.70.183.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5DB0468C933 for ; Sun, 12 Nov 2023 19:18:48 +0200 (EET) Received: by mail.gandi.net (Postfix) with ESMTPSA id 86E38240003 for ; Sun, 12 Nov 2023 17:18:47 +0000 (UTC) Date: Sun, 12 Nov 2023 18:18:46 +0100 From: Michael Niedermayer To: FFmpeg development discussions and patches Message-ID: <20231112171846.GE3543730@pb2> References: <8047ac88-e449-4e46-9527-c4ba407fb38f@guinet.me> MIME-Version: 1.0 In-Reply-To: <8047ac88-e449-4e46-9527-c4ba407fb38f@guinet.me> X-GND-Sasl: michael@niedermayer.cc 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-Type: multipart/mixed; boundary="===============5864187555159151158==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --===============5864187555159151158== Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="cje/q25Z9/p4QV3a" Content-Disposition: inline --cje/q25Z9/p4QV3a Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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=3D>key (in hex), using AV_OPT_TYPE_DICT > * add the corresponding cenc_decryption_keys option to DASH >=20 > 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 >=20 > 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 Encrypt= ion > (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 [...] --=20 Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB Awnsering whenever a program halts or runs forever is On a turing machine, in general impossible (turings halting problem). On any real computer, always possible as a real computer has a finite number of states N, and will either halt in less than N cycles or never halt. --cje/q25Z9/p4QV3a Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iF0EABEIAB0WIQSf8hKLFH72cwut8TNhHseHBAsPqwUCZVEI9gAKCRBhHseHBAsP q9pXAKCM4nHaYmIrNt8V/ehmBAU0EOul2ACfdkgmDNi7cL9w8y2ags5xwk371hI= =BjB8 -----END PGP SIGNATURE----- --cje/q25Z9/p4QV3a-- --===============5864187555159151158== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --===============5864187555159151158==--