From patchwork Mon Sep 6 20:29:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30051 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4064218iov; Mon, 6 Sep 2021 13:30:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzPJuq+TFyfon7Lq1sWcE1DEZ6fxj29y/FXjUe5Ym2L9koxGGvGqkovXi30vOG/b5mkjj4k X-Received: by 2002:a05:6402:2909:: with SMTP id ee9mr15114315edb.377.1630960211214; Mon, 06 Sep 2021 13:30:11 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u3si9643683eju.666.2021.09.06.13.30.10; Mon, 06 Sep 2021 13:30:11 -0700 (PDT) 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="EAgGQEt/"; 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 0A4D068A60C; Mon, 6 Sep 2021 23:30:05 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073014.outbound.protection.outlook.com [40.92.73.14]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 31FA168A704 for ; Mon, 6 Sep 2021 23:29:58 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Kn4E5YdYgzjubCwUxPxFvUQ/DFCC8c15yAEKjcczTI367ItZ6jgtseILTocMb6BnDZgoeM+G4DCqFDa+5/EZ6AtIitCyNZNMU8+/MV0vy2RnP0xUoXUGphXIE7VplBldztrue9MNLAbpADZSgcmmGhSQjxpPm0AxjGzj3nf9tJCAMDohxDdK6U3Cyj2SYbJ+M56Q4AqoHlxKiEP/Wv7iMRiybLw2fJs/EvBrW+RV7TTLkq1HoI4rIl4O0RPsPIP79Qk6RxZLm60JW3uKQgc1sfnkp+wLSQaLfMx4h7MQ1yYvohrn8/yWaCFe/2EdX7AL4OInYyGL1bkjXGjl6cN4yw== 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-SenderADCheck; bh=jURbwzCGGbZO5fJ0bIZUACSBzwmd6oLVnYhlLq00Tmw=; b=Ewoe+/K/Tg9Z2GfK82BdgqpGbfd+Z9edUeFBS7j+g+W1X1gsuf1FL7Doof94g0TxgwHRRkq7C5zEBfPRzx7z+mjvZ9Zj06/rTxuriG2FBKACLuaMwoSh0/4h2vvLGr4Op87DVvxE68C0yeQZ1RT+zixoOeCJPSh2XMiih72m1iDn5HbRJmWmZCaZgGinZpUibFVQyietvVkdAycI7s4SbppnKYj71f0ed9fkQXcnEE3UQ2INBzDndr/itUKwqw9a9hbpPdfRimgKQHaYNdrBbbaJp1spPmNoiwYEPQJJqS9vWgZvECbnUVqughN6+zwHTRqp+gRDoafOVlOSq80OZg== 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=jURbwzCGGbZO5fJ0bIZUACSBzwmd6oLVnYhlLq00Tmw=; b=EAgGQEt/pPPhWdtnW52mFAyDTW0D60FNvihbd818dKvUpjfC/Jd/nQt2lVlDAZrpQS7NTJu7YYgA5xbIeaQ4fDe4ruAsH7V2cQl96OnqzGp0ncnvKia1f4vwwEfUda3HDRm1ZXoY19CXqucSZImtZQSGdWe4Klf2Z//zkskhPpfO8brDt8wALBtljC/5h30mhS/OyEx46MQXxBugIJRtt0H94Ri7bwHs00YPCY2dwqFo9glnEkyyhPUZCEhaBrwezQY1pO1jXqQ5iR8FgtnCDrkRgsuO6RNrsZqwHKQnO6ioDdH8rJ4h3Adk8NbhnmZ49Ne8cLV++mMAIQayjpDhjA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4950.eurprd03.prod.outlook.com (2603:10a6:20b:87::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4457.24; Mon, 6 Sep 2021 20:29:57 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4478.025; Mon, 6 Sep 2021 20:29:57 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 22:29:40 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [T5Z1X05dKvp+UKbAlIcw3UWJ4zn4o7Q2] X-ClientProxiedBy: PR3P195CA0014.EURP195.PROD.OUTLOOK.COM (2603:10a6:102:b6::19) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906202942.306993-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR3P195CA0014.EURP195.PROD.OUTLOOK.COM (2603:10a6:102:b6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17 via Frontend Transport; Mon, 6 Sep 2021 20:29:56 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d68eea98-aba0-4153-ac6e-08d971751774 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWfiyriVhNa5k3709UAIysHSKNg9IPnkkF1HQWm5CeIgAKcjA1Yh2VB8cr+9pVjYRi96oWzW+JnetgClkVMDX+ymsHN/xlbLZqCd1lKyXFiriF3YuP5Y+IHEDaLgDL8vAQwZcdmh8UeLTXVwWyVlIgrQMWgGJAO3yAyqMGethID1jmLCxgjyIDTqc7nAFBpF2XG67oqczNbjM2J9J72z9P6iciAla48tgPOIbFgMjdzmTQK1klnSnRLCIwGhjqTQhI8AzDduS0X3y1y/XBO2V6eXp9h6/yV0fo21m+PAoGsJXPuUukw5NSAUY+B8UrothYJFr6+IQPdFLJ4gVvY3PeTW+XYGY+w4hEycdf9oBjtJMKjWbdCA6AIaXuslXveXJ9td5Gl4W+WMNzbSuK9Iftsa70Wro2pdMFpayeRrxLqmDNdYXmVjKyClZLpAckAnZ4e88/fZlMxooZCAXKrdLBWhR448hNE0w1B3VPN03sEObGE64QjW8i9dtz5g/Ze9geiVmf4I9SWMvJdcMEWbJug6bVtmPXsdJLLNhshWVdzSPm1o5N/+8IzvXFOrMOlHMQkzd+9bDkLG8GcQRsqgLGlOzX8tRGOujQzGpUaLWXSFd5gJHmDip7OxBC5VIquzJK14BHowdBwyoODEmJD+BxnThDNfiZRhiSpyQa5Ar6L6cQuO8x0PSB42xSgrY4ncLL2YoCUZoBFY6WyUlSnK4CXV7fOqaB+fiY= X-MS-TrafficTypeDiagnostic: AM6PR03MB4950: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JDlmFkMatAknJmhi1ZI7ZOoO1PPQZpZ12N3rKQ+Ta1d24mOu5Kkp6PGc5NGynJ7wtPxWaUKaN3SQcB7yjfStGsQ3nGQC9OK8XDB0MMTkIBoKZHYDSIka9WSVBTAFEZUyu0fWKmqSCquK/qfq20o/z8nIr8bK1Vca0+RfjjSuTT7SUSrMD2X/ZS+/ythsRG1nNDV64DoizteaX0nBmFOiQs/EmiANxIRNm7pOLU24SHnXSq6C1Nu7Z5hRqn5EWOT7yhw3V0sQACf9GfpH3/D4XY9SgrfRclWMHKVXCLzKekFDOzwfcsgzVvtdw1RrJ54dqNfgUlZ1d4irfTx7Uw3jHMrNGGkGgsdkUjU2avzo3sr4OIJOk96Ac0VPe4/j2avszD4APpO2VW3SjiEiwLzvZGBd1I/+V1OUD9cQShOfYAI3bD+kD60Lc2rW2DgQFyrD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dgpD7jWpYrguMifjE9W2zM9KXasnkdKpekyphNz9OapaIG9zgdUeLfWsTnPMTCe0bA2SBoeLI+lv3mPJI7R2ERPQnEmp+NTe7ma+rkD2MpZ/dTL/RxVxH0eIMwFS5NSmbk6HYGf9Oxi1Ex2f3aVMOw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d68eea98-aba0-4153-ac6e-08d971751774 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 20:29:57.0560 (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: AM6PR03MB4950 Subject: [FFmpeg-devel] [PATCH 3/5] avcodec/bsf: Use null-bsf for passthrough when available 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: L4omh1CPekAG When an empty list bsf is used for passthrough, there is a check for every packet in bsf_list_filter() before ff_bsf_get_packet_ref() is called. Directly using the null bsf avoids that. Signed-off-by: Andreas Rheinhardt --- libavcodec/bsf.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index 57034ce646..3420885e5f 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -18,6 +18,8 @@ #include +#include "config.h" + #include "libavutil/avassert.h" #include "libavutil/log.h" #include "libavutil/mem.h" @@ -544,5 +546,10 @@ end: int av_bsf_get_null_filter(AVBSFContext **bsf) { +#if CONFIG_NULL_BSF + extern const AVBitStreamFilter ff_null_bsf; + return av_bsf_alloc(&ff_null_bsf, bsf); +#else return av_bsf_alloc(&ff_list_bsf, bsf); +#endif }