From patchwork Thu Jan 27 02:12:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Juteau X-Patchwork-Id: 33878 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp2045895iov; Wed, 26 Jan 2022 18:12:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJw67/aJ6QunlASRzMRg8OKmCBP7O8jq4CL1+fyOjcYJTORqrFDzRgTXb1mC46jhop4eQUkV X-Received: by 2002:a05:6402:1703:: with SMTP id y3mr1642738edu.239.1643249562652; Wed, 26 Jan 2022 18:12:42 -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 s13si601355ejm.199.2022.01.26.18.12.41; Wed, 26 Jan 2022 18:12:42 -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=gbmN9nnI; 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 ABADC68B19F; Thu, 27 Jan 2022 04:12:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10olkn2092.outbound.protection.outlook.com [40.92.42.92]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B93E868AEC7 for ; Thu, 27 Jan 2022 04:12:31 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i3Ma8bXXjD3Qnr3TztyM0022K9PhUshAV0czbbth5xcZsw/ZEeKdIGTHYxnPtwgESUc8tsoDGQ8ITSIUmTKw0ukH33bdMpFs4K0OH9R3xqH5nmMqzxP+02NFA+p2Mi8Hx7jVV+/Yk8vG4RU/MulrgRLZ7/in4ZtpXShp/EYx0MJhhLCsWTdR/v2xfl9+ByNVWPnHNPWPyepqXmgm1MbM2ikilcokAhuGxmumP+FMDMWQxpYpPy7YfbE2Up4arUPi52O0P+kVN/7vyHmAdYt/7NdYsJX/EKrKCl9S5ZNxx2EnEx3C+pyI/ulsDRKlhh1hs1uoEwATjkLVxGEG8E3Ohg== 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=jI0rk+P6idmbC5VZFFvs4VtQso8N8W0pD007xXtC1f7JZ9026fSewv8tm1nvQrgqsWb5kN8xc+orjjhkEsfgIYIf3jLpu72lqVuLmm+d5jz3Qr0tBpGCxzcgYVPn91x6xfeharOAtd2MNz69zmpAeJg17P29Xl4C8J/epZiu443uGMlb3RxGQLaYSlLeYcEJwf8a4fRZSiHA7g3RI9a0807ZLtjsfSEgRVTZl1iFKlRkJUFD6Xv7SpRtGjDQIa00uNY1IXc9GJ5FYQZzOIdLb8TsDJ9doZ5Tk6EHOZHfMP6xENaVkCw8mCfOs/FG0JGU8Rci877Zxf8oGOPZZgDLEg== 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=gbmN9nnIjACp7WyUyEpcIz7xHoIjv+YsuAz74lk8RbLoyYbtZiuhoXXD70Os7vY2MyRNW76g4wuCZ1ncYi6WyHVawm4rVPE1OyVlmu1SHNxb8mGGuU/5PyWnuF8AnHYbbDRp2DsBNVzkZe8UD+y+M+A6HuQtyri1+3x3rIgUTIDuMPuiyoShi2TFU/GEMQb5cG8l7Rt/1VsfXmhdHNSyQbxv599eh9w9mLykdSexB1UlCAvq/OLvkX5Viz5/c0MHgJ7ALOiZliSPIGDXenodw2n+Y7Ff+bcCyi0DQmQt6ezf1Ms6xU2YMIFxHuZI+5CB2FX3bQhlc2oLp6Hcg4zc4w== Received: from CY4PR0501MB3730.namprd05.prod.outlook.com (2603:10b6:910:8e::20) by BN6PR05MB3489.namprd05.prod.outlook.com (2603:10b6:405:40::21) 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 02:12:28 +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.4930.015; Thu, 27 Jan 2022 02:12:28 +0000 From: Eric Juteau To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] Check codec whitelist in av_find_best_stream Thread-Index: AdgTIPxJouG/bie9S5mRZqJMOpfVwA== Date: Thu, 27 Jan 2022 02:12:28 +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=fab34f0a-3033-49cd-a4f6-26ce49aeeb10; 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-27T02:11:54Z; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [0p5tiqsesTSHwQgqCX1oR4x+JIm585U7] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 035ac97a-5c66-4af9-9476-08d9e13a77ce x-ms-traffictypediagnostic: BN6PR05MB3489:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: /QnE2NyCu5Guj51NgzmbEgRGiC6fmuD2XGemS1knrnjpnyBNle5zRBJ4jNk4RcelXbBMiSRw8IyO5SOUB9fhwFZdBQz4RRtsUMh3CotY+y9HgEVj7zeChCJTs9ELRWEY+ayVFVXyEjkxGZLxQSnGzbyFZvggw/UemR7prlvCtxrqu+AjXhtSPjUhi9pL/mcE6Nh2mQr1sAAeQWM+tDdtka3x0q8qXPd2OJUNiZcUL6zBn1QE58xnGSh7Ex4xK8Ed8JWVH1alFbV0W1hnnp+LqR+SiGItnUyj7U+jZCRysYx3zUST40nXTvwVGJuW54QvV8f4ZDTf4XQjdtVe9p1BF1cMhyP4BRXrc/0w1PDNpmYlq+aTs8fXP746QHPpivqQTMxvGrmwtrG0H0I4NxSXt4hxNQf7ORtMXAsNr7enRhUpArfDzR3bEAjel8wI5PuMd7tawMBgKnMZz9G1FcKYB9lBXYTkipCJGdX/eEBm/4+uGCphQp6fEYYLv3T4y/qsY/ofCI7eQ3d3guHeCo+J1NBgQFrbw1WbjiUIfX8+TRUVegSOLGWl86zihMCH3u16sF7wyt2YlBjZ5z+iHAmZ0A== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: L/ok1Roswwi6N089PoY3F6i9hWXc9+hBp+rKX/Dr7xRMowCz6Q8QbTUgAaANC2mqkQbj/aVUHm0RT+2jm0nWE+3fwbhU/tpJ6pXJh1Od4ZDm9DE3shzEZv7AI2RE/T4Y8vyy6ZTTJ/qO0NADKQH52rifIt5p/AoyaNOMVVSAQKSK1kZzFrme33eaHxcZMywyLc3RBe0KxfKwSQKJPWAOY9PoYtm3zeyXcSLsj/NKKSXTv3SEEpVAjy+MDCNTLbF4bsrNAlvWY4DNAnM1YHzV7I2nPp41j6XNmdZH7t6Cia1LAgfMMqYimiKQE/DQJtLmVZkV0t9rzgtljmob4HUYk/X+RFbm7HSDIi4C+zjVrUAeI4DWbQhdY9sM2OiPTNN7C7HbYpIssJw/cAAEoeKo9RrCwFz6f0nXFY3xp1VnPU0YZ6pHl5oT/1Bz6212SQ2akDT4NempRrFWh6rbOKYX7hqXwnCtrlhCTl2FQdBBgLHf9RpqoyNQ5DZORVrbkEHYtP2+tBHL7gZafBlOIA2R0ekM1y83LvbE1Wr2UTibtqJYrU3kZ2rcIheBRmylOy+hl76iyUeMCUYyIC4ORwFvbfsMXxc6DmW+u9u8reOEOfg/A34QpI9E3b8fNPO5ETIFsXtJQL7fstFooI/2yDT6RnNHAbBAMddh2WHKIG7CzFqsaNIFuoE2vEdJB01EdzEKjE23Z8cNYqmeCBOlEMV6UvWRTcdaFnjwPFY3Qp/3OPt6MV+aAYW0rHXk1oogeuiXavRLvt/sjQwC1Puy0rmJSQPpNE8ymzkxqhydEIjj9pWuAZTo5iGG/BJVPYLfEUc3U1j97APU2D8oWptn8Py0sLu2XqJLaP+erbQdrX4BBjrzeI4YKCma1wpVOJDtRHT/qu2EsGChk5BH173/EQSdnEaXsOiJVG/v3Wll/9w1QZ0nq5zQe9rPptd7GsjNWgXL 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: 035ac97a-5c66-4af9-9476-08d9e13a77ce X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Jan 2022 02:12:28.3546 (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: BN6PR05MB3489 Subject: [FFmpeg-devel] [PATCH] Check codec whitelist in av_find_best_stream 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: O9+cDzwDuEdM 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 --- 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;