From patchwork Thu Jan 27 17:06:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Juteau X-Patchwork-Id: 33887 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp2618233iov; Thu, 27 Jan 2022 09:06:22 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNKtt8khuR49sNZqLyd9li/syN1U22MJrgplDm5i46VJQr/eClTHJlr7NIA4aJ4NT/MdYR X-Received: by 2002:a05:6402:27c7:: with SMTP id c7mr4497959ede.276.1643303181769; Thu, 27 Jan 2022 09:06:21 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qf17si1622637ejc.159.2022.01.27.09.06.20; Thu, 27 Jan 2022 09:06:21 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=iMmbd3r4; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 661EF68B1D3; Thu, 27 Jan 2022 19:06:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11olkn2047.outbound.protection.outlook.com [40.92.20.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0DE4068B040 for ; Thu, 27 Jan 2022 19:06:11 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GofLVGb89G4CMr2fth1X+TLLS6i8whUPhbsc4V38zJmFtkgiOOJtHqNdo6u/Y90vec/yrZngPHNkqzoOzhjecp3m1/Bci5V5NZYma/urzh5g78FNnYPmhZkYY9nLhKkiyN5aGJXWkOLgDwTgaDAuKF2XOH/k3+OZvpWhB3fILCf2pxnStzyu3QImoobXrx/q+bYQ1vJvDJ3ldqDbKCdzHKNUxC+L8Rq4/UnzjJWik83bqeRi2xNWysZxVqZvK3clYKzUksCI6yt0fb1j1iCh0o4r1EgTek1mO0mra7xTzUtumeBegkEg2J1wOuxJ7bjDwOJU1BtHAoF8c80omPmsQA== 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=T4Y0KUlQ53GiJvGvj/yehTjpH0B3BioWlbqDzDg5GgA=; b=RGcPUmXlBNfskL2Vw1CNpmdlkqauq42S6NzCAkFhT35GD2Ra3zoZfYqeh65vpS45L9kqcKiQH6WLhd8H8jGa0GkWp8j79WSbgatHVuflFFr/XmESPkakIbMorY66aY2deOyXcWLlT7HrJJBLaeQ9b2Cryhwc4tL+dgNDvUr9Z8s16sFRJ80ZvN8loGEX7oOIz7Jr6JwLo86cmhDms8zjcaxlpasHh5AFi3iWnBgh05BiZC2EIRLIcMvI4jDlecRNkqbUoe7CYy5RO4b2+YQfstHDeSidBm+c58xgDrat1Rc+zfFy4tatgLhTJ/R09Ew5W5BQLH1LWFExMBozQs5A8w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=T4Y0KUlQ53GiJvGvj/yehTjpH0B3BioWlbqDzDg5GgA=; b=iMmbd3r4O4FUjTs6rbb/h4oIO9M0GVNE1+geJMZ19hNs7b0fepuOamFqxjhrUa/cVC5+9mPCZrifzl5CGEIHUZIE+wqhGw4Nm9M0mCIM69jQCnu9EFbZXyHn3Qdg3pLppfH79tw7VfZXAPS8smPNalKRlKlo2NtIyxNSl2Qpfqkm/h25v1kCLr0IpoWdp6gu/0HVzTUxsyfVbEEk6VwHUsEZs3vsV9tYMSsEd9VYdvcdCDuaM5CkeHGQlA5ZkwE0giWlaBycS7o5JiQKMTSFOCwkXagzgVHGUW5LkABfU70HaICaRItwHPF97G4ZVIdzOJYQBhsllKm6UJBmjZ+pEg== Received: from CY4PR0501MB3730.namprd05.prod.outlook.com (2603:10b6:910:8e::20) by CO1PR05MB8055.namprd05.prod.outlook.com (2603:10b6:303:f8::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.14; Thu, 27 Jan 2022 17:06:09 +0000 Received: from CY4PR0501MB3730.namprd05.prod.outlook.com ([fe80::f9c0:87e2:8821:16c3]) by CY4PR0501MB3730.namprd05.prod.outlook.com ([fe80::f9c0:87e2:8821:16c3%5]) with mapi id 15.20.4951.005; Thu, 27 Jan 2022 17:06:08 +0000 From: Eric Juteau To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/utils: Check codec whitelist Thread-Index: AdgTIPxJy79gi2dDTTiaLzCKdYJjmw== Date: Thu, 27 Jan 2022 17:06:08 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=763db800-91dd-46ef-aa01-77ed6a86b69e; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=true; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Standard; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=Internal; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2022-01-27T17:05:35Z; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [TnmgCxD98YW/7U+X0lIWyScnR04Kmg4x] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 88ff3f82-6a54-4a78-e1b2-08d9e1b75028 x-ms-traffictypediagnostic: CO1PR05MB8055:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: yPj4OjlephI90cDbA26XILzl53Rp6AoAkZyyOC/QLRX00LejPpBB7B6TkWUQHkGmGXm7KEMEZqFZiiYpUgU67UCMDAhiAkUU/JymXmqn5bhzBTzdlSLAHq5b1iJs+mxttStOuklhQPCPFf460URHOu7l1FIn17w8jCnR+g05vdb8AvFSYIfDFHIUK19inmffeZlMiMBg67rN3fMT3bJVOagZSm4hwd+pNK3jlMAO5dUAT8AAldmZ5fkICbtJlRFIKMXnY8Vngi2UEvMUCbnMgLg8TREH/ALcMMRsXUvhZpOuTXyH4V+JVOFipaBs1YmOe7Ml4Nav86YgRoKuTnO9vCKN0MrNvlwLLAM+dDQu+XKnOseAmyp8JFdqVme+weBaEWGdZscTlIczpd0WDat6tHhGTbvFD5ddzdvLdUDJ5MWThLPZLAr/3uQJeCSKanFFxMO2RHD8irgwSddxz5YViP6l+rRL46myLYQdUNWhiGZTRDW5riaJKv+9Juc/PX56sHCzKdlPXqyw+a43f1J41cyB0cZCjePOBtLhbpfcj+TWsu+lfdEKsY6YNR2BeRa/7dAyL62HdC7m3BTbr48TSg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: M374aFEfXVIVH1skleqLL4lcAlOM1v7DNzhGyi98WHb71UtGuPaYKpm3Qqu3x7uwLz0kyG7wQx0G7PTJnAMEvDnmDkCK1DGcpK2HBpjEPMw/xdOilx+2MjvSYQlixdZug9OnL3EuCfEpDZAa3rStZ85Ye5HFQyLEVU7xulvIvDCQG3Mtq1gkfw9v2A4W0MaDXyjm3Fb6i+W1/26nVKYk5SHtyiCdOtOX50cSnXp/RoVfPDOkFhT2VpWktC037nWhTPNInoFGDBlEr86mPqNX+NwSsDX4y4DJxfCQVr4zd++ROXtsL5hbpYkCvq0iJx17PeaM3j7JN/X3hE1LBIzq5R8awQtbsPnUeTWfv4fCyH5qAs5mBOqGRmTIbWBFWEbP7Iiwgw/Ly3Xl2b6J+120pUSQwmlBQMP36OjoPpzkrKGOO4TWg5dWELnFnoqPgM+GMwq4uluH9g2njUddO5k8QXzMoe+c6pgHhRr93WYvMmM2MHD7LMc16o1+sZcDnf2sXOM7zVfsTOY1vyc6h1XHc4HdBjwAfuhs2+ugaz1Z6ystksxv+2s/CGFrzn4tFN2dS6QVmXKFMtSpfxC91p+foBWhWIda/LuPMU+KihW/TpZLvrkMSRlii0VCmNH5hlzsxC6vp+5iVYMKb/VQt11jVjiL+U6gwOTBIZLqSdoj+7IB2Mw73mQY3VQONAmdA6Af+2RN3S2xr3BW7XtZBdNNp1FxNNWuWQg0cmBlmkURj6xhBCeX6eFjNndA75aR6SP8w6QBlWjaDmyMxLAL7m8SKlHcytThOCbqOGCvUzH92lsUBc8nXuBgbmQse3OVtVGBy74kIdmoDEPCgn4M+BnnV+wcNZ5VoweeWUYiZ7sxC+tcmhYJmmSGxvC6//zq99bTP3BRegLmi+KSmTHtAxUkTFmYDmzG3GsH88Dd+QGzyksz3iPkrhGpKo9jPTq0OWrk MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CY4PR0501MB3730.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 88ff3f82-6a54-4a78-e1b2-08d9e1b75028 X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Jan 2022 17:06:08.8975 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR05MB8055 Subject: [FFmpeg-devel] [PATCH] libavformat/utils: Check codec whitelist 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sbbvAJpBoDyr Modified the function av_find_best_stream() such that, when a list of allowed codecs is supplied in the format context, and when the caller is requesting a decoder be returned, the function will select the best stream that has a decoder in the allowed decoders list. Signed-off-by: Eric Juteau Signed-off-by: Eric Juteau --- libavformat/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index e643821fc9..5a96f16c0f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -529,7 +529,8 @@ int av_find_best_stream(AVFormatContext *ic, enum AVMediaType type, continue; if (decoder_ret) { decoder = ff_find_decoder(ic, st, par->codec_id); - if (!decoder) { + if ((!decoder) || + (ic->codec_whitelist && av_match_list(decoder->name, ic->codec_whitelist, ',') <= 0)) { if (ret < 0) ret = AVERROR_DECODER_NOT_FOUND; continue;