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 6205B43A60 for ; Wed, 5 Oct 2022 14:18:24 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7CB4C68BC51; Wed, 5 Oct 2022 17:18:21 +0300 (EEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2094.outbound.protection.outlook.com [40.107.223.94]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4E5B68BCA2 for ; Wed, 5 Oct 2022 17:18:14 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BYcxLvauaEKQ5ScdaUrRUI2j6sR2JtidBywWh1EzSmAvyhU/qI0JgnEz7a0slEMHD3rXqeL+on45krNI4uyLlxXV4OmtoZyXDn1fLL8fxC361+QeCNhVfcjvWAMfulH73lk77jZzdD6UOav08s9qFvxFHMkp8Ym5d+EX9SuLgQcwdpGLY6iEkd0oihJtsthW3I54R1HShuz4zcBKC33EsjQiCk0HgvCNWpfgu65hUIsPfrdpXhWkKLcmBCR29Aboqt9kjMZAzjotCp8TIvZrLBcLxBE9rFCjyrcLrisTtUVGAsZ5RfD1nfweKjomVbuQytNz7U0aUytVQFFGBu8EEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fPPaNLKZkPKskfG7JB8rOctyEIAn5W9+Nz4M0g9pz1M=; b=fCuDivkK5lMkhoArRbNtVbA+5AMyqNT1c7BZu7bInz/5i66FdcAuDv0YpYyLvwzJu0oQTdcd4U8hWZ6aXQe4Lc+3txkGCWGVuoyqUauEA4X/97PcnuFUYS8HeGDFUYNr5cVpWKX9Hyi8Qhnc/qHodEkshmg4Lm865+sSnPRSpLMNhEAQbLHVMI/8g/8ZL7j1zaqk8DfUZnA1zCIt0kIUgvTDzzyJG8diomordAnYHlTd4g8BsvdKCA/pe2exwvH/+wsuJ/76bkDb9+aFNEL53nJ8q/mDZsn9lB0bnQMl9OcIhBT7YyhcSHxPJsPAHD4UbL6JxUt4hp4T96sBk/Ufow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=bydeluxe.com; dmarc=pass action=none header.from=bydeluxe.com; dkim=pass header.d=bydeluxe.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bydeluxe.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=fPPaNLKZkPKskfG7JB8rOctyEIAn5W9+Nz4M0g9pz1M=; b=C84l/v0hFerGV4WPtraIhefVlgsHcvEJAaIi6iO0BoGAVygPTUi4xfcXKIn4NY7nwCmOKuhfewmfvWQj/pydljwJEavnIp9omgFT5GQgATRmmgSKUo87bkjiz2FI8DZ/0xNlHbVzjECA1oBi6Bz3xo0uZHNTcsjHNzq0rL+RilFbB4yI/lPfWO5O9/Oj2bUYQVZuC/uklhgozAh/pl2xhEvXCV+uQgd+ncEKsVm7jCFtkWNCikyn8KPkpbmA3IhIt14sKBEb14dnHtNcGKiwBwML5rVMbFQ6WjNfsprEoYBfnU5c0VTYHEm/rBNxcNAd/+Wk0JTC8dOG3sWJU/oECg== Received: from BN6PR08MB2834.namprd08.prod.outlook.com (2603:10b6:404:126::9) by DM5PR08MB2682.namprd08.prod.outlook.com (2603:10b6:3:cb::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5676.24; Wed, 5 Oct 2022 14:18:11 +0000 Received: from BN6PR08MB2834.namprd08.prod.outlook.com ([fe80::40f:754b:dd14:8cda]) by BN6PR08MB2834.namprd08.prod.outlook.com ([fe80::40f:754b:dd14:8cda%11]) with mapi id 15.20.5676.032; Wed, 5 Oct 2022 14:18:11 +0000 From: Richard Ayres To: FFmpeg development discussions and patches Thread-Topic: [FFmpeg-devel] [PATCH] Encrypted SMPTE DC MXF - additional UL needed to unpack EKLV packet Thread-Index: AQHY1NImGKpML/NQXUSyON6VmnQLkK34CPCAgASHmGWAAv3mgIAAUfce Date: Wed, 5 Oct 2022 14:18:10 +0000 Message-ID: References: <47fca934df0a0e347f39c304c714a7e823b78b13.camel@haerdin.se> In-Reply-To: <47fca934df0a0e347f39c304c714a7e823b78b13.camel@haerdin.se> Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=bydeluxe.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BN6PR08MB2834:EE_|DM5PR08MB2682:EE_ x-ms-office365-filtering-correlation-id: 40d51713-d10c-40f2-5bba-08daa6dc6eed x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: xIFEQVoQyIi2jrCOw87uj184QWZ0EuiSlQgdDMEsaHRyG3anB222i5dOZ35Oj/OV+WtROqoaYivdOrHNd8t7UQladFgXU0jPDTXN6RgPbpvti9fGtfMeD33/K/tycRhk0Q9DT3Wk1bdxsemucB5DpkHuBExn9eeAu0cKSsFaFyQQANnGm1vBNazSciz71wZDctxLzAkqQQOyLEtNGPo2RrK6gCqwYAGllXSpuR+siAumSzj4JEfaLWPpTacOXSdgbThTgT7X20ghs6+wiVxe/BUJuI0CSuF7bh1f7E/VJYSAhGjFufivyLkh9yqoR5/8dtdw/IhjfFpgnaTa0Egca0QnhDekJEVqBpl5z6nDA58UPLmJJ7slYjBLGXH2Dlc6ZoXPUh9gw78Di6BzCghZAOivk32BG4jd6XB1USipDTa9bQZ8e9Ip/0fkO8V9ChyYVu0Z4yoAc7WTqAl6w0bPHWw8rUP4TEVjED7QYj7iLSOoghxtbH5mJinz38PdbK2diKivgP7cD5xMwvBHBGES0jDwDBoXEBhjSH85cJ84YBKl4qCJsgRe0EXx2Z+1Mv3INwp97yq8U/9ckS3OiqJ9cN3Uz2TAnHA3Oba1cyt+UyzDmV5J0UoXkBXjWYQsCJjBp7ZbA9qYm7BNH3tqpeHmkbctomPg4PEsrhrb9gCEnspMMxtnKbYGnhdoxc2nsEiKxipcEZbaObL+TEv7Rv4zyVmnUriSNDJST+qd0JGGBOqgyXlc6SjhlLYCP8OxYRCa x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BN6PR08MB2834.namprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230022)(39860400002)(366004)(136003)(396003)(346002)(376002)(451199015)(66556008)(66946007)(66476007)(8936002)(76116006)(38070700005)(86362001)(91956017)(55016003)(64756008)(66446008)(8676002)(52536014)(316002)(6916009)(5660300002)(33656002)(71200400001)(41300700001)(478600001)(2906002)(7696005)(6506007)(38100700002)(26005)(9686003)(122000001)(186003)(66574015)(83380400001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?Q?bULzbB04a+sq8ubEu6qgNvLlruPVAOEV0tz+I+WFskEmLNwmdiR6WxB1pF?= =?iso-8859-1?Q?5xSTKdl3yP5nYRB+sIzuB2+x9y1wzklALBo+liwIOh8Jd/XfbscXP7cDxv?= =?iso-8859-1?Q?r32H3pi739Gs4E6ztdKRn6KDD+Rr7ufTbNWko0ZSbwRZyb9URmvwe5TkDS?= =?iso-8859-1?Q?6EYFGgXsCfjxE01dYk9DN79MdgjEEhKWrexpCFaQgtWx7ocBaRqHnf98W7?= =?iso-8859-1?Q?b1twn7++XuJ+LeGgAU0YwFw+1wxzc+pyUKxFxIX9mMuO9vhrLq/CdThtEU?= =?iso-8859-1?Q?u8mZGuNGrknCqlAZhTrnatYDPLxxH/ZmguWY/pH6ChB4NfdJT97Q2Y0g/u?= =?iso-8859-1?Q?mLIjGp2MbO7SLSh8uNOGlQZOBXLHUH+6TzmUuRxWjSFEdYHmC6TxAdavx3?= =?iso-8859-1?Q?ZJLBzw+STmwHmWj1tq6qtNFr/d6HBjbJXW5qFOh4GIjiMWbRaHl/K5qUn8?= =?iso-8859-1?Q?Qii+4ZmlW6mC8e7ZClL836OgjCnnhCM+ISm2fSUgB7JVLJt7DnwbmDpkcJ?= =?iso-8859-1?Q?GllN4ZllLEvEo0+JLRP49VSZG/9cSvlsiLj7435BeD7iZaQXRI510nRJoV?= =?iso-8859-1?Q?/e2x6fx7tZvEHfP2fOLn2wpkiPb6eQalKIxqNrYw4ON0NhJWRPwdoGKvEu?= =?iso-8859-1?Q?eE5GEETCWbvXb7sGpfkh2FPVDWGL4MVdRYM+5s/zTZIKQf27kiTPlGzrX6?= =?iso-8859-1?Q?cyIQGB+qJfNaLEW2niqian5KCLulMpzbD8Xay+uRY7MrYSDDhThHSHoizD?= =?iso-8859-1?Q?pOS6eM1+7jG+WrzCSJ1WIUnAbqfdiECISsVptq5X8vrsfk7xLwID7PgWpe?= =?iso-8859-1?Q?JwjZGZwPqssj9c2sePMfslDPeSarS3tue7tUq6OLA0R+bS2au5dD/Hs7qX?= =?iso-8859-1?Q?84Z0cG33qPnbkPV3nimaXZicv45wr5hA7fRffOyBBVX7C5JKYhYfDT/u1/?= =?iso-8859-1?Q?RSZNL5c6XLZ2krGkMLBYUjDlWuoD5p0Fj0hK2u7WiCkGDj4xzVF6Zl1x9W?= =?iso-8859-1?Q?zFjMAAXF4edhMnWd2uWEvbFZRoFga6eZLq9Iu2XYG1d9eT4BYQ5e0D5s6P?= =?iso-8859-1?Q?ldhp42Jjs8GyZS31+unQvFwUllPhAtq3gU7oC/Z6RAhwdzrvCmyUTXA4jU?= =?iso-8859-1?Q?/+f465G70vjYFCpPaAJBK/sDSQrdaNwv3UDi7iUrtVRI1YFVWx7EvFqho8?= =?iso-8859-1?Q?/quArqRMLz07sh4+qJZp2fSSeYG5kE0QuZRE8HonJdyudr1iys4+BO1lIT?= =?iso-8859-1?Q?KyHFhO6h2eVZhbSuQOaoPD+fyiT1nTVcwN9GGj8K+i/a+Yz+sJQJJMczD3?= =?iso-8859-1?Q?PMyiVJPyAw/FGXsWWHO+o2lsCPV6MDivVM9qz4EMwICXJLAWNt1LCQumKA?= =?iso-8859-1?Q?g1QktNgMUcVGM3Q7EVUI2xBIEuaswNZApz4TXJf/wUx6W/4HKwmMxhJy48?= =?iso-8859-1?Q?Xn8L+gN/VU1kALN6H18tvxIhNguHTGBJ0ddPozdaOvlUrl7aEcuu/nVdLu?= =?iso-8859-1?Q?Nlm3fsyi1n5lVCTDJMD3WC/5GpUwZ499LGGA/BUMK07l6HPGdwNATMNWi2?= =?iso-8859-1?Q?QQSGNuhqRvpHMnIuyxcMT+WMV7P4hBHeFPirDm6sgQ+eEABqvztPH/fIog?= =?iso-8859-1?Q?YqRRrVR7zriRVLtCmeLuIUqiaV/AfmJ4xy?= MIME-Version: 1.0 X-OriginatorOrg: bydeluxe.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN6PR08MB2834.namprd08.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 40d51713-d10c-40f2-5bba-08daa6dc6eed X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Oct 2022 14:18:10.9786 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 8688c7c4-1f2a-4115-a918-361023dde469 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: /RSgnR5Mxhj4HQsmAHxHgORTWtE8f00OCz1ra0nB3zw+7lL+2Vd4JIZxVK395o0HsrVPSZJ+p3aElbsRvFZ611yThkakPEe9O6iFYqyNfx8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR08MB2682 Subject: Re: [FFmpeg-devel] [PATCH] Encrypted SMPTE DC MXF - additional UL needed to unpack EKLV packet 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: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > > m=E5n 2022-10-03 klockan 11:47 +0000 skrev Richard Ayres: > > Thanks, Pierre-Anthony. I've updated the patch to remove the > > unnecessary UL and it's now using mxf_match_uid() to detect the EKLV > > packet. > > > > Signed-off-by: Richard Ayres > > --- > > libavformat/mxfdec.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/libavformat/mxfdec.c b/libavformat/mxfdec.c > > index badd2be224..b1ab90f25f 100644 > > --- a/libavformat/mxfdec.c > > +++ b/libavformat/mxfdec.c > > @@ -3737,7 +3737,7 @@ static int mxf_read_header(AVFormatContext *s) > > > > PRINT_KEY(s, "read header", klv.key); > > av_log(s, AV_LOG_TRACE, "size %"PRIu64" offset > > %#"PRIx64"\n", klv.length, klv.offset); > > - if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key) || > > + if (mxf_match_uid(klv.key, mxf_encrypted_triplet_key, > > sizeof(mxf_encrypted_triplet_key)) || > > IS_KLV_KEY(klv.key, mxf_essence_element_key) || > > IS_KLV_KEY(klv.key, mxf_canopus_essence_element_key) || > > IS_KLV_KEY(klv.key, mxf_avid_essence_element_key) || > > @@ -3983,7 +3983,7 @@ static int mxf_read_packet(AVFormatContext *s, > > AVPacket *pkt) > > pos =3D klv.next_klv - klv.length; > > PRINT_KEY(s, "read packet", klv.key); > > av_log(s, AV_LOG_TRACE, "size %"PRIu64" offset > > %#"PRIx64"\n", klv.length, klv.offset); > > - if (IS_KLV_KEY(klv.key, mxf_encrypted_triplet_key)) { > > + if (mxf_match_uid(klv.key, mxf_encrypted_triplet_key, > > sizeof(mxf_encrypted_triplet_key))) { > > Passes FATE. Will push later today > > /Tomas Great. Thank you. Richard Ayres This e-mail and any attachments are intended only for use by the addressee(= s) named herein and may contain confidential information. If you are not th= e intended recipient of this e-mail, you are hereby notified any disseminat= ion, distribution or copying of this email and any attachments is strictly = prohibited. If you receive this email in error, please immediately notify t= he sender by return email and permanently delete the original, any copy and= any printout thereof. The integrity and security of e-mail cannot be guara= nteed. _______________________________________________ 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".