From patchwork Mon Sep 6 12:41:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30037 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3721110iov; Mon, 6 Sep 2021 05:42:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwG9DjoDPQ30W8+qdLzWrCMcv4BOPKbY7sRnZaeXTc5Ey0QQrLNIhJaFL1kliCB12/hUkyz X-Received: by 2002:a05:6402:366:: with SMTP id s6mr13012662edw.329.1630932148927; Mon, 06 Sep 2021 05:42:28 -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 bd15si7668707edb.130.2021.09.06.05.42.27; Mon, 06 Sep 2021 05:42:28 -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=NG40kS8s; 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 6AA2D68A3AD; Mon, 6 Sep 2021 15:42:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-oln040092074048.outbound.protection.outlook.com [40.92.74.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D3906898FB for ; Mon, 6 Sep 2021 15:42:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AwBYfd/lU7Qv7QtTiWD8i7v6BvRB904AWcWpksiRSggV996fGuIWUC4TCJrgquyH9jpxNMGpTYKKdmDjNcWZsxxMqOVJPRmh/ftmCeiB/01+YWZix5Fbnq2hpYDEV8U+pT2VFOYhQY/hIb/m1PX8RUpPF1vREXrGWZyJfWGlR6C2WSf68ERky1EUti0oBfGuBOXZhOTEHLlHbg9K+IgP2mrU4SoaQxW+gwqRhdbbxNuTbK1fduN+sy8X1SY/f2Ydoc8uGGDc/fIwO6/0DRPIdU/n0D3KOmTGEewn6MU6nUMUsXycJUjWvbn8+YN4g1uS9u25UJ0lzmM6Xs6BwFTGtQ== 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; bh=aXThdD6xqUrKzodaBfaZY0t4vCH88U+Tei14B9qI5TE=; b=bPIzNw2qfEXSuwmgCYYGpAiHfucaiNyOW0WYAQeqN498vHMRO3RX/rtG1ZaqmtwUw69dh276Rsj6CBb9N/lGF1w2jlizwBtVxFHUX0fwmwODFOMELEaamR7NAKDeY2yH716foKoXoEvafAXB6ujYZcndsJjicbuOl4CP4oYdsm4FVegd5k9t9yVyMXguF6WBQoarHRwU7T4VFNSpcTCLtDcyZrILT/hLWgd4gkHqBqIXnTL6L8WSo9FLKi2yPZ8PAuqCckfsxJeD/qU5qnxgde0BPZi/5oUGzYumScq5b0wxyE5jInqgWyN/kMfH+OJ90ZDxBJU9b/PDmW64V3Q6tw== 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=aXThdD6xqUrKzodaBfaZY0t4vCH88U+Tei14B9qI5TE=; b=NG40kS8sk26EaP5Ug+zaQ/7ruLYjTGzYkk9lB3IUV5tMdBCw3XIUF3qQkd7kMzO7SWpJ+rtfa6Lj2l15bIiEDkOcEPI6Owljucdg+VmLfZLyyiwdVVGMEuO8WsIrkwwL8ceKrn8069s+4/TdIvnmh0Mt2v4A02OK315vAKg+BMIZkHqJe3LfZBpHJX6TuUM7uxoa9RBzRk9BcqGyunZiOd6aQYG7/k0yp+tJ1ibaVMQNQk/UIrfAJH1xnDXSnpiEhq1LteLSkm+IOSGw6FVGtpGkpOViR76tkMD06WgGIBmte8rkz+mIPkoXC4fjqiLjy82XiJi+5luehNATi+ZnXg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7383.eurprd03.prod.outlook.com (2603:10a6:20b:2ef::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Mon, 6 Sep 2021 12:42:15 +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 12:42:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:41:57 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 X-TMN: [JdE+oW4RXHJQ2ZiKUW6SSkn4RLZr/ejN] X-ClientProxiedBy: AM0PR04CA0074.eurprd04.prod.outlook.com (2603:10a6:208:be::15) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124207.4161421-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR04CA0074.eurprd04.prod.outlook.com (2603:10a6:208:be::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:42:14 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9ea9c287-8c8f-4b46-677a-08d97133c10b X-MS-Exchange-SLBlob-MailProps: DD4MX5oUjaLfq2xoKfc0r52VLFk0kxlBQpGYjzHARZnuvlmYh2SW8/6LlUlTK3t5cApNbYQS5i+NgOr9dIV6DSswye5oGxMUTCEigxN1u2MLs9hbhI4eFpHxjuqJ3jl4BAcHuLZ2nD8lPMum2Lnkd7g+346+kM+gHZgRZDtkHIdf+AYVyOlF/axdeBkFxaK1pZ39pzSO+ZxNlOyCb14Psf0NA5YK8JpC6XfNJVhWRxEINIDBejv+wVLR0MZBnkWqECPwpHScC8dLIrBZ7bk4L49DwPr5MErZok7u5QofRWxk2RDL74zlhRcyKwZ0WIIxVpHIl2fgoJ/KTjdWxR6SYbNAWosjHPgdhRPZX8QwFU2/uuSOsFutE9rXd1gY3LIKr4KD+zWznFMiYdeGuYGMSBeEh1nMd/9hXdtcIspTu9l7GiI1acPFNxuexRQeWlh/zOn+mlVvgwBydRIqcaCwYZrCRN5BiMVIBt4m1tEfGvo2Paii8ib+KQrr/hIuDv2tVpgabUu609951v2FNxbVSBax4G3vVrKUAko+ngMxb41MfZNkIqfeT0iKeJtWZQjP/PZED/G1FEwVJxhEUZJV8sLHLfxGsKYQaNxiUKJuuQAUhiHcf8X1xz1Lpqvu7RVf3AhNIVt9/nk9ErWbwmZbvmAjCljQmgwDb0J8w4ahHXldxDm61Lx0nw== X-MS-TrafficTypeDiagnostic: AS8PR03MB7383: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OzNJOMOxYreJXLj9wWbGEd8ofne6DRJNxzIDvNKXp+f0t78Vj27y2ufKvV2M4Nd6QC2Nrh0/U6QZEBZ+folg5IH9X8VInEqFgF5WT6lc8wO4fePjCTYgEHy0ybn2zE4mk/ZVKvrsHXsHU/QySqlMswChLIvMteBFZoxzge4j4BMuL1lJeukjYM/SuXgi0+eeR+8scZ1EVyatV9d+IMNTtnbHxDoxS7ZSDA8xWWfNtAVEqF1ppP2jPscSGA3Qiv5OxF/vA2lnD/U4b3DEIVDYFKNH7FQ2W68u6ES3DU2SDnKjoZuK0h0BlVnR7mjuqKQGkjU1Q9dYiAWl/tOdKUJPuQN2vpnScQl/1yb5o+w+Gi9zijy2KvmQ21uvJjEgl3d3R4lFYytnMYXNRbwHyoe5Wzn9/lakXRNxijgdvjDUCnlys3yHxGpZx2yTBgaS5p/Y X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: sXseAZJ7uInWr3/wusVgUkUeUaUDPpSkk5dMrbeYCldQJj93KYbzjGieOEit8M6A1VSKYeumXBedcw2hNiN8qGw2UYtQ7g0WFbc9tHH/rJIjHMyT/wPQiyji+TFxfwVndUOHxn+WqjcEdNEK7F6YJw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9ea9c287-8c8f-4b46-677a-08d97133c10b X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:42:15.2038 (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: AS8PR03MB7383 Subject: [FFmpeg-devel] [PATCH 01/11] avcodec/bsf: ff_list_bsf static 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: yyLMPFCpsb7Z It is a special BSF that is only available via the av_bsf_list-API; it is not part of the list generated from the declarations in bitstream_filters.c and therefore needn't have external linkage. Signed-off-by: Andreas Rheinhardt --- libavcodec/bsf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/bsf.c b/libavcodec/bsf.c index 57034ce646..d9c8395260 100644 --- a/libavcodec/bsf.c +++ b/libavcodec/bsf.c @@ -394,7 +394,7 @@ static const AVClass bsf_list_class = { .version = LIBAVUTIL_VERSION_INT, }; -const AVBitStreamFilter ff_list_bsf = { +static const AVBitStreamFilter list_bsf = { .name = "bsf_list", .priv_data_size = sizeof(BSFListContext), .priv_class = &bsf_list_class, @@ -490,7 +490,7 @@ int av_bsf_list_finalize(AVBSFList **lst, AVBSFContext **bsf) goto end; } - ret = av_bsf_alloc(&ff_list_bsf, bsf); + ret = av_bsf_alloc(&list_bsf, bsf); if (ret < 0) return ret; @@ -544,5 +544,5 @@ end: int av_bsf_get_null_filter(AVBSFContext **bsf) { - return av_bsf_alloc(&ff_list_bsf, bsf); + return av_bsf_alloc(&list_bsf, bsf); } From patchwork Mon Sep 6 12:42:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30040 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3721652iov; Mon, 6 Sep 2021 05:43:22 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUchyi46iMTW1hGFtuVgROIOgvWxgwMMUc2Wk8V3w+pv/K8JKEmFUb1yJ1UBSYfjj9i5J6 X-Received: by 2002:a05:6402:2792:: with SMTP id b18mr13186896ede.173.1630932202329; Mon, 06 Sep 2021 05:43:22 -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 9si7983665ejo.527.2021.09.06.05.43.21; Mon, 06 Sep 2021 05:43:22 -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=YcvHupSA; 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 94FBF687F27; Mon, 6 Sep 2021 15:43:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065075.outbound.protection.outlook.com [40.92.65.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4C0606898FB for ; Mon, 6 Sep 2021 15:43:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YfrZg/V7gHibVpjnrWEam9hrA86ItgtG5fvlI0Iv1DTHZqo9KPTst1RWVAS4IwnfBmVbxDfpwHhmCqWtHttDLj9QQUicrqZmLsjYtu3+oA+dkJC9i+I1RYG2V9ylje97aHybc1g7iLZWgROSxCezJa1bxJh53MKwRPS5KL3QYQLUqjPGqqd+xZirXaPqurNyFbDDT3qHr0/TyxBsRRdiNGLJW6NKMa4inlFDH5TJ/p/p75GjBE7Em0v1Sf/hXc/ticvPlRfuC2cFhjDBOYgtq+8KtV7kdwz74QjOnYYaIxixTqmg+KOA2DaeVBnBak5wb/sm/2yP7EeO7Km6T40uQg== 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; bh=nkTduQY8OMyboMCMa49Rn/tBLqn+xIdSPjRtL3wLUh0=; b=b90jaIXRuySNJW/uJi/DLw7mvqL6KiT/CKAlTt/ReXS+KVBd81jujyRNx9M13JKYC25jt4LLa3DaG7GMOHL02rO80rzdHrTydf1z/g8xxHtz4ngx5qTOGxhTzihof12FvIpttNJbmj6smZEEMeSxzL53oeHhErxP0Zz37r+Sz74Nd/BnCcBGvdfrHcjAXaRehGhY1u+yUtILNo4pwpL1Kytivw3cWmHRmVSEWciYIwnm9H7LbQhWCY93r3r+uEQ8UsWbRcOoknDgmXq/GapZobpJbHN89dFQbXV/R6UKvMfHUFHS+TQVnCr0PisRo9GrDxvQNHT6666Oi9uTTErA8w== 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=nkTduQY8OMyboMCMa49Rn/tBLqn+xIdSPjRtL3wLUh0=; b=YcvHupSAC03nIYB7NQ56MS6nPlMe0o64dICJVfloNY6lOLlQxkg/D81lhbeUXpAeAF3vFjZkIIpopiBe6C9e1XYINMmwe314t/ygu/hbevjXXhBdm2PHP7uxKIKEjnPzjjpmmnEFw0Qa1SmJPHBHuF9rHQG42WQA9+S1NgOAl6Nqb7s1QtNUtpf0RxnIm6BlVYvSb58zSiR0TLK+dVarYYsQOMTwfSDsNBkyd7LJN5kxwbDuZzsV6Gf5lkYFg91gl0bi2+QaQ6lkdIsrzwtiO82X8YbUWJQAIL01LYBiSs1kgRDbQfkxgq26bL8uxxF8V3RztYOuLkI+u72FmOmY2Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AS8PR03MB7143.eurprd03.prod.outlook.com (2603:10a6:20b:23e::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.17; Mon, 6 Sep 2021 12:43:10 +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 12:43:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:42:52 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [e55BNpe0V8mmf++nnlw2s4x89BxCot4b] X-ClientProxiedBy: AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124301.4161498-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:43:10 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2889e966-1243-4a20-ad29-08d97133e238 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3VUVVWLySYu7wcJ/apWCCTniyrjKvU0aCv/YmlNtkvGdQZZ/F/91+lUelkxwBWm9YhXURpJiWH44VUyeIHAdQvV8ylmNz2bVOPX2oeeKloC7lU6m2lbp4KQdGEfzF5cDWTypMDx8JabFVYl2fmQnNWbJBiMSdllzAc972+wEJqrzFqcD8O+TiY199ZP63joU3fZZWZNFYg+eXq7LCugVSnEjGV1z9uzdjxBrYRFLdePxzNTvYDJcGzrvhhtiGjWrqEW6e4NK5mypjNAp9tI4C+SMQKqC7mSCwGjUaWKkQki4HEu29S1p3abLToQSXBcmK4UVCGuR0MmPnwdRx+erj93Ja06vj9iAiWMhoKCk2C6V2Y/c13RsAN3lpymntD1yKUQEgN1u5R20F0dpzdhoGORkirDUNdwG7qy7Vab6eb1nURdPsZ/aOwngwfsANS3n+/XsFAXbs2V4aqw2Pv79UqVMl6j8iRK+Nd8O51tbkElzVazyxE6LgNvQW2zHC2g3C2qMh3TRpg/3lXSZsl7Diux/uA3wMRgGyT7In5e0nrf8JEf45T2h7NX8gNe4obslyLR4BQZ9BSnrSGkULHvGJiUtglUFekWK5d+rRJ0zIoCq2NrW8upvg/VJ0wSi7LFsVAjjo5/5q0AirrmpRR08rHeM7jLvR22R4F8Bs6CJ8FaaorRbx+Jfsf7oYbvRrd/AEYIVnBCbXrZP1KFEvbvliLYoEecNrGoDIY= X-MS-TrafficTypeDiagnostic: AS8PR03MB7143: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Tl74wZ4o2hKIGIRfFwAsV7ZrCdAd5ZYtC6QZZ928yLFFzEi71HT6guL+Fe2jiOqOUVrnFSkpmK3d8lYri4PWLkPc1+AFun9rJL7ztdyD0VUY9oO3uXrnK1zrSRIrgYcEr3tCP/aoUsxa+xZ48sSZt6M/PnkRcsHHf2o8TA4JXzDZFuOnuJ33mi0aenbq7ypWuI4Cu6dKdOuI4MpJSGxD2Pkxg/dzL28+ZumTi89bmp32ELuMrsmplY1xwQUXqLDsUv9CGTmKpfUx/dzFgg1flG0o+6cZdQ/HLayTxAVo0dg80mNo7Qdpp8bs2n78zLxCQ1hCyJBjZs9t+17IbQiBlcj84/Y/eb/Aw/pAFVTGFTWsuBglj7gNOeeA5AxB2u846FX4yQFbwS4MNdrdIOLMS5UaeL7B4Cs/ZMIOBy2tJNm3tab/OEvo6yikyZNgeHuk X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: hIst/4S0zH6s90nnt4VO1jo/guBTf6FqqszQN3LxwPSlB1TcZiC+x1zXHHb/JADEicaHbUxS2eCMsLdsgnolmYzw6hMwIvVLrGk7ZjJUSt/QZkUtV+0nMDa6JB14O0PX72VcNi/I5OAWvPKNNrfaLQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2889e966-1243-4a20-ad29-08d97133e238 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:43:10.4711 (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: AS8PR03MB7143 Subject: [FFmpeg-devel] [PATCH 02/11] avcodec/cbs: Make ff_cbs_alloc_unit_data() static 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: aJUxdve7Vqc0 Forgotten in 7c92eaace2b338e0b3acc18e1543b365610578fd. Signed-off-by: Andreas Rheinhardt --- libavcodec/cbs.c | 41 +++++++++++++++++++++++------------------ libavcodec/cbs.h | 9 --------- 2 files changed, 23 insertions(+), 27 deletions(-) diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index f6e371ddef..d7aa67c3af 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -315,6 +315,28 @@ int ff_cbs_read(CodedBitstreamContext *ctx, data, size, 0); } +/** + * Allocate a new internal data buffer of the given size in the unit. + * + * The data buffer will have input padding. + */ +static int cbs_alloc_unit_data(CodedBitstreamUnit *unit, + size_t size) +{ + av_assert0(!unit->data && !unit->data_ref); + + unit->data_ref = av_buffer_alloc(size + AV_INPUT_BUFFER_PADDING_SIZE); + if (!unit->data_ref) + return AVERROR(ENOMEM); + + unit->data = unit->data_ref->data; + unit->data_size = size; + + memset(unit->data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); + + return 0; +} + static int cbs_write_unit_data(CodedBitstreamContext *ctx, CodedBitstreamUnit *unit) { @@ -360,7 +382,7 @@ static int cbs_write_unit_data(CodedBitstreamContext *ctx, flush_put_bits(&pbc); - ret = ff_cbs_alloc_unit_data(unit, put_bytes_output(&pbc)); + ret = cbs_alloc_unit_data(unit, put_bytes_output(&pbc)); if (ret < 0) return ret; @@ -693,23 +715,6 @@ int ff_cbs_alloc_unit_content(CodedBitstreamUnit *unit, return 0; } -int ff_cbs_alloc_unit_data(CodedBitstreamUnit *unit, - size_t size) -{ - av_assert0(!unit->data && !unit->data_ref); - - unit->data_ref = av_buffer_alloc(size + AV_INPUT_BUFFER_PADDING_SIZE); - if (!unit->data_ref) - return AVERROR(ENOMEM); - - unit->data = unit->data_ref->data; - unit->data_size = size; - - memset(unit->data + size, 0, AV_INPUT_BUFFER_PADDING_SIZE); - - return 0; -} - static int cbs_insert_unit(CodedBitstreamFragment *frag, int position) { diff --git a/libavcodec/cbs.h b/libavcodec/cbs.h index bd97d163b1..87ea14cd07 100644 --- a/libavcodec/cbs.h +++ b/libavcodec/cbs.h @@ -380,15 +380,6 @@ int ff_cbs_alloc_unit_content(CodedBitstreamUnit *unit, int ff_cbs_alloc_unit_content2(CodedBitstreamContext *ctx, CodedBitstreamUnit *unit); - -/** - * Allocate a new internal data buffer of the given size in the unit. - * - * The data buffer will have input padding. - */ -int ff_cbs_alloc_unit_data(CodedBitstreamUnit *unit, - size_t size); - /** * Insert a new unit into a fragment with the given content. * From patchwork Mon Sep 6 12:42:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30038 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3721751iov; Mon, 6 Sep 2021 05:43:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuTspmE+0u/0jNeXplslEpw/h/huyibffXOuaDSBalN1CSqBUGKJqZXilUmjS09xiG11Ec X-Received: by 2002:a17:906:2bc3:: with SMTP id n3mr13353014ejg.548.1630932212052; Mon, 06 Sep 2021 05:43:32 -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 x24si7817453ejv.514.2021.09.06.05.43.31; Mon, 06 Sep 2021 05:43:32 -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=E5VB6LXa; 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 A680768A591; Mon, 6 Sep 2021 15:43:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069046.outbound.protection.outlook.com [40.92.69.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 256BF6898FB for ; Mon, 6 Sep 2021 15:43:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CxnZ/10Y0e7h9J0coHfH44fExL4W6rH1pAIQO2Y50AfWIAi58U5NqsdRQx1p3JC0jTEOtRAd/I6xksoH6MvhH97w15EhAmmH1Re7T8U5D+f5AlO79Ak/ZCBPvOBD/yCL7nlCxTVLqaiZEGWQq0Q5tVRHPeswvXXruJY2tiqfAz8bN8xzbAM3yNQclc11baCqtbJv+l00FNvo0m4OPNFmrfZDtkGY06ULcPY4yJDoE/yYqbGw3602DRU6FjAue20s7JJ3gQAIzw+ouAVjMp/2guf17Ln+Nh+cOVtJMvzNPjsjVU8RzrVa25Kns4jajbuFHl22Iu99fKOFzdmVAwVrpQ== 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; bh=D0BlApqzcRAV5ujty8Z2FWvr3oNFbAC+qpTHM+x1wsk=; b=GHyAgNr8n8uAa1rgfmOKfToyPhALfwBMd5sYjxbul7LSWU6ZUfZkTMoLCjXEOq+YPCwpaiUodZ5VbzT+LpwFOLgeZCeMhudBcvciIOrhJphTVRX5yC1xLGWbQrjc8aT7ndCl8gvWsKJ3K/deFtO1es58daOnEH49Z/TiUeyqm1odNO+U8379sHW9CJVpvxvutGkbN+ALWiFH3ng/uay4wbRk6Zf4nsOEnrDJljNLmyoNRb1+l9amZxkxYj6DAGU3NBgUKtKfv1ONU9o3AQRkwV3k8q/OlYKGY5CZYhgcYIoDyV3dtEU1NMwXF6eImvP6Vdd3NUHQghsaXIoOe3ZOgw== 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=D0BlApqzcRAV5ujty8Z2FWvr3oNFbAC+qpTHM+x1wsk=; b=E5VB6LXatXOtf1L4p07ZVng8DNqXZv4XhAj+mJTTw61a+OdvyzFwO87cLLj7iSGaO5IF/DK6ke9HhDxY1NmaQjYi/e3ucoDIzOIzD/2LTQZMHPqMN39VE68pXpH8AyMeWcK5WjwpdDPBtpHiktCi4NeaUpzeK5KVQDstqqSOp/dGpTkldP6AuEOKC5l3xqPDBJyAEdt9IPYZk+7PMY7PLvVjRTMUWONMOIk+B+zUmb9y58+a4rs8ysLomIKogyHlGDlA8oroZspwqAqHqakKBk5Idn9lhGW70WIfGub9s8fvbU7BzkO1f1ml2wjdUMvMqhNjGRe3Lzr5aGSsExcq0g== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2515.eurprd03.prod.outlook.com (2603:10a6:203:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Mon, 6 Sep 2021 12:43:11 +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 12:43:11 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:42:53 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [J3bfbsXWOVpfO9yoqmEtA9eHvm/V7jzZ] X-ClientProxiedBy: AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124301.4161498-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:43:11 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 558f9f81-fa32-4c58-5789-08d97133e303 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWfiyriVhNa5oktltvv1jUtqSGijjkk5a2Qwpgmzsg9J3k0HxZ0Q/VMaWYoHowENyiPCkmIV5a+UTUGhAUJeBbYZaWYuxNf8XgRobfQ+L44+CTxSZzCe+tNKgkvlriXwUZnfVtnJnp1k7D3+LNp/Wm1JLFYs7pm3ak+4ZWHC3Z72puG8G4wMEG+cS7NoW8tiuaF8tTacAm3ZgMO0nEKE/WT85mUfuozo97S0r3KgXcrF078ipnWDfbVlvkVe7dJQFBTDoLaW19INfRVtqToy2hMZpXC0ZtYHnJNGmUahCmubEPIQ8fKtABaWcZSZrSKUZSNFDG3nolnZRUnhbXm81VFYRcERn4I3xgYgRcmNZkGp/08TlRHn8hLyGrpiIJAJ2rVFM91xPIT0oVeesV0hmMiJuXYof3d89XgVDZjBOO1NgZdl8+U7aRZOQjjBXzN0aq3Szo7M0nBR80aPr59Kx/whgLjgzZgNaH3wrZ7A3MI3ewV2HPzLQze8UZU5HYeU93KufkwGnjQjBX2aRankBgZ1EIgAo9xpFsBtdML0A7KiQw858DqnYYa2D5WaypTPotFyfWdYW7h2TeRosANIYAtTaIV/BfZngnH9SGsLXfB3YA1KnPhp2JuNbSxqmlDvK1Z5iPK+0dpSNqJWKKGNA72xVveTdSsBAhL5tDrI5CT7vMe5Dn+30vlyH1yZ4NwkYLzzfUGpfKW4mxsF3SRLVaFSjHcJ87ZdWs= X-MS-TrafficTypeDiagnostic: AM5PR0301MB2515: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IGZ87uOt3jIAEq/R77VQ7fse/7bAklOB+/x0MrRyTit3GeNGZbINVwu+orSQ+lvTvEjRrMEZ3NIRQpBHR2sELDYflrfyXyLeqalAQ7i5aeNRWZx+8dR8S08Zp3AuzXONIzjn9MerC0nOR6ATutCKyTRWsjPRvMwN3Nh4PP8HtOyoQSLgS5IMBMZqndABWG3HwLZBUdMgDfoyIu7n4Y2Mrj4AajcpvwjYqrs4feg14Je3KAfN3H+yORLo0MJTo8BHvafc+8FZaT2pivbtdmME9UUO3xWkiZCVdU8HU8bwj3hvurA7iMsKHOG+AAILdKBeDnTFToabvnliMiNOjs1YBLSEQ9X2rllWruzCmT813w5OPtsN0ZQPXO4/7qA3DOGG7CNxVDTTAh7w7eXlXew3fzDhuOSjGGH3oBaDy+qT9sKO/30x/KkwDM+D2LeGaOOL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 274vKP4nxIUETt8FkpzPearu0BRV6thnZ+YVbsa17BENY2QFftq8ylwBUbQd0q4ELgqoQD3iGV8ssnuUSXL+g4v1IeMnRB+8Hgoj4ValpnhXB6pIEzvzc1SkYLCkkgBcw1zACjaaGbZQaVhlrUFSTA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 558f9f81-fa32-4c58-5789-08d97133e303 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:43:11.8251 (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: AM5PR0301MB2515 Subject: [FFmpeg-devel] [PATCH 03/11] avcodec/h263dec: Make ff_h263_hw_config_list static 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: lWIdLkoAyP0U Signed-off-by: Andreas Rheinhardt --- libavcodec/h263dec.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c index b4aa109601..d7ae8a0727 100644 --- a/libavcodec/h263dec.c +++ b/libavcodec/h263dec.c @@ -742,7 +742,7 @@ const enum AVPixelFormat ff_h263_hwaccel_pixfmt_list_420[] = { AV_PIX_FMT_NONE }; -const AVCodecHWConfigInternal *const ff_h263_hw_config_list[] = { +static const AVCodecHWConfigInternal *const h263_hw_config_list[] = { #if CONFIG_H263_VAAPI_HWACCEL HWACCEL_VAAPI(h263), #endif @@ -773,7 +773,7 @@ const AVCodec ff_h263_decoder = { .flush = ff_mpeg_flush, .max_lowres = 3, .pix_fmts = ff_h263_hwaccel_pixfmt_list_420, - .hw_configs = ff_h263_hw_config_list, + .hw_configs = h263_hw_config_list, }; const AVCodec ff_h263p_decoder = { @@ -791,5 +791,5 @@ const AVCodec ff_h263p_decoder = { .flush = ff_mpeg_flush, .max_lowres = 3, .pix_fmts = ff_h263_hwaccel_pixfmt_list_420, - .hw_configs = ff_h263_hw_config_list, + .hw_configs = h263_hw_config_list, }; From patchwork Mon Sep 6 12:42:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30039 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3721838iov; Mon, 6 Sep 2021 05:43:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5VhMQGOe755OIP+6aJjViEIK8JSzq9IYAkCiCxKiIMqzPU5DOziPxXh3cr+acmVCvidtf X-Received: by 2002:a05:6402:524e:: with SMTP id t14mr13204227edd.39.1630932222961; Mon, 06 Sep 2021 05:43:42 -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 dg16si8060087edb.307.2021.09.06.05.43.42; Mon, 06 Sep 2021 05:43:42 -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=QncTx7dr; 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 A823968A348; Mon, 6 Sep 2021 15:43:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069046.outbound.protection.outlook.com [40.92.69.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D6FE6898FB for ; Mon, 6 Sep 2021 15:43:18 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xcs2qma0J+qXhcfTzxyheRnpcP8njePzv1LZMqqF7iAzUpk3wW7pyMUp16Q+CzmDWbpUhHac+8UTaf/qwOgS8DwyWYtWuK+ONKS+pCK2OjYNA21ZDgaMPkkOHNj7bncXvQvqofptBbopQwPTZMNJLQn6tX7JI+/VwzMs6PhRCmHW9jLuMPPi7xCwT9QiQufaE5ZcM6gtMEq691pIPiXZzVSoAkeJXMqJLRXevqrbM015eQF71T3RREaZtt/BJVYUB3DgU7Li+Y7gfQ1jxFxmJeLaBg6b1/WPlZaKHScFyKw42Hsm8BVaL5UMUviUV379I9wj0Fkypfq6k3D0TUE1vg== 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; bh=9l8/AFqLYS4TstLOBM1IV6N/WmWLcRoQzG/ptPK3udw=; b=Rmf1zfnv3nD/Uf/dsixMQkq9bViQ5M9tFk/E4+Kv6PikAGImXIIU7nx4CeqTPh19k7VivItQcbu6qxJq9WaeoQYerCWj/wLIT9LiOE1eb4FjKfYJmEUdVubGjLn1Cj6JJTDbx9Crs5S1wV6YTETLb3+pHSPf40i0SiCM/3DcGsFX636op0Vm68zQqvTVc0vvD7oNCewk2tY9eG21A+TZYhgGmGYWN1xd7esmbLT0OIAhjgR9dSQRrsNXgLg/ZalBfqYrnv0ngGhsXvFG/B2/Ov7ijP1wwxnXslxG2EfQZJBRblAfDtqVfsXthbvtAjLPU9/Dum07RcTaKOj9Gjwe3g== 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=9l8/AFqLYS4TstLOBM1IV6N/WmWLcRoQzG/ptPK3udw=; b=QncTx7drtsnBevZjiiKJON7gEfGMKWq59JBCUjJkJRHn0hWdX0MaH+U3E9OSVT7WSmez/uHT2LoLJ7FOzJO+CiJtltfU8C9WFrkUWYQwGHLo92WoxC2G3W8GgzYPVYuFEw6Gc8OW1udr40euWJFbeK/JTV1Hnk1pwBvCSAg1xVAa/OOaNOQ8kMcwrAX5RZCA5ynO3W0S0kWk1Qu4VmiohDvX5uobZdqavhRkfl5RKu00JXWhVVJ1/t/qeGYtmEGKTR8WyOm92PcbTT9ys7EYggdVqR0iKOuoc2LMJ1yGoRegAw5d9PMsNcas4Ku+TS9faKlAaszJN6w11/8FZujCNA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2515.eurprd03.prod.outlook.com (2603:10a6:203:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Mon, 6 Sep 2021 12:43:13 +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 12:43:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:42:54 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [g5BZBFlmMJQSO9beWhQSFY1Hz0nNgTcB] X-ClientProxiedBy: AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124301.4161498-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:43:13 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3541de49-c670-49e7-4477-08d97133e3f6 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKb3QWS1fMq2gIDvxJlS4pEya5DdDAccFF434aEFkRVmFgsSAMFj2ZEbkmvsLkDG/+VrhhfgeDpE283DncPtGisETWGMZ3jzGcM8Zm/cOMEJSO9cpvdNikHH7rcpeafmUfJuHqnj1tqMeH1JG2bWeHAFVJ79oOa7bsFK3HQ4P5A7xb5prwbLzZY0eUULYlwm6Bw//Vn8+7KHbpERHTeRw+Dn6T7DjJmNSO9FHo5StOzsrPEURJxTUUMgA4YBKw8h2k5pQuxhz98VqEJnHKPukmp8rpPyDaPrqADHO6k94P1CQm/li3bbYqe7JGA8s43nT/grK2Os+85VJCDvOBV6OgaOYc6h7TSUvqg449XX3RSbZ/ppkHU0sESqbvNkCOu5iSwJ7QZP3aQxVEZiiWyJj9Bhq4YUObHQqssK9Km8u2rJTgeojuJATcYVosN/D0ypkIwRaUgJOmueL8IRdqUFq9DMX7s+DJNOQMM/crIrd3kOdiAQ4OX8AGgjhygTF66UQQYnM1tmMDFqtpg70sGMG6pXZcRoWzJtwuoxwvBSkV3kaf97LqXScZ4Aym286ku3zuFIYPSbxFr7PUUw9kSGXl6qqrgnYft16Av9/x3IW6Y1BPPuQG6AImzO0zHaRRZRRTDPhUmCnuD/2FYFwJpF26CMxB8uCbv8LHOGbSQhAKl+NHLIteDArnibdVutk8klfwMoO+RHYQLOQ== X-MS-TrafficTypeDiagnostic: AM5PR0301MB2515: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pKjDuyIDoV0vtUTNXjcEbCtl5uHrH4BM8zVw8AWA29UOxUV3hG0slRhciqu4N9O9Ar+MWCoWEzMobLkEQ3Q9wzaM4mRiSPwHV6LQNIOzwnqxeUpG+3gREHE1aGFFW3eVp4njE7ZHfSJWiK/eu7vz/aCvcfZlZPBwXElkEf+ckZqNirZlqgcGRGMqzF0g5yFefBo/5csoXY4SvnzDoRStC8IOQyqAteA6ywOsWFYNfK9nl4dwP6XY5uejPZyHHD7k0Ch1aFTtAVgoTw4cNiRVN9nqNok3Csz9XOf3s1KMeAQcUQWLLm8flUu0RPelvuEUJU4YezTgOM943u7Ib+WU1VOZ7kyUPpqmpbLb9+mL5WPOIFWO6IGOplN9YcNavuJIMNJRwCAqElZaZS8XVGFK/YsPJtcoilHbF1XRhiFAdVhhW6Pw3GwuyZ9CpwwZ8JP1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3RmiEdvUybIzbb09xSrTlsOiyNKV35R2lDOyixmCLXm9pr1w1gcKTfGiqQkOO9qzXB8XC9l/zGmyEuJiilkWEZ9JKAZsM8VXBz5PcTk8d570pofi5boLF9RViB2wT7KKPUjniZBGLlnHeKxsYHtKaQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3541de49-c670-49e7-4477-08d97133e3f6 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:43:13.3734 (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: AM5PR0301MB2515 Subject: [FFmpeg-devel] [PATCH 04/11] avcodec/qsv: Make ff_qsv_map_error() static 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: ScUY6B2hlG4V It is only an auxiliary function to ff_qsv_print_(error|warning)(). Signed-off-by: Andreas Rheinhardt --- libavcodec/qsv.c | 11 ++++++----- libavcodec/qsv_internal.h | 5 ----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c index c53e2e3b07..98e776477c 100644 --- a/libavcodec/qsv.c +++ b/libavcodec/qsv.c @@ -145,7 +145,10 @@ static const struct { { MFX_WRN_INCOMPATIBLE_AUDIO_PARAM, 0, "incompatible audio parameters" }, }; -int ff_qsv_map_error(mfxStatus mfx_err, const char **desc) +/** + * Convert a libmfx error code into an FFmpeg error code. + */ +static int qsv_map_error(mfxStatus mfx_err, const char **desc) { int i; for (i = 0; i < FF_ARRAY_ELEMS(qsv_errors); i++) { @@ -164,8 +167,7 @@ int ff_qsv_print_error(void *log_ctx, mfxStatus err, const char *error_string) { const char *desc; - int ret; - ret = ff_qsv_map_error(err, &desc); + int ret = qsv_map_error(err, &desc); av_log(log_ctx, AV_LOG_ERROR, "%s: %s (%d)\n", error_string, desc, err); return ret; } @@ -174,8 +176,7 @@ int ff_qsv_print_warning(void *log_ctx, mfxStatus err, const char *warning_string) { const char *desc; - int ret; - ret = ff_qsv_map_error(err, &desc); + int ret = qsv_map_error(err, &desc); av_log(log_ctx, AV_LOG_WARNING, "%s: %s (%d)\n", warning_string, desc, err); return ret; } diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h index 327a8d3385..b7ba02fdc7 100644 --- a/libavcodec/qsv_internal.h +++ b/libavcodec/qsv_internal.h @@ -106,11 +106,6 @@ typedef struct QSVFramesContext { int ff_qsv_print_iopattern(void *log_ctx, int mfx_iopattern, const char *extra_string); -/** - * Convert a libmfx error code into an ffmpeg error code. - */ -int ff_qsv_map_error(mfxStatus mfx_err, const char **desc); - int ff_qsv_print_error(void *log_ctx, mfxStatus err, const char *error_string); From patchwork Mon Sep 6 12:42:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30043 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3722056iov; Mon, 6 Sep 2021 05:44:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJybxpfZYESVaf/73J0g2LD7ciDZoEgdNnfnT/92x1/EBJ/C9ji9h40exP+vQiBldSzo8V/c X-Received: by 2002:aa7:d887:: with SMTP id u7mr13035000edq.366.1630932244152; Mon, 06 Sep 2021 05:44:04 -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 x8si10214149edd.9.2021.09.06.05.44.03; Mon, 06 Sep 2021 05:44:04 -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=TVq4EoZH; 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 ECE3268A605; Mon, 6 Sep 2021 15:43:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2108.outbound.protection.outlook.com [40.92.89.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5264768A5F0 for ; Mon, 6 Sep 2021 15:43:24 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CxU8ZzwFaOiiJBdR2P7m3CfNw/6fkzwiCfviOAPRaGKOiA6PxbAxxn1fgdK3b7S5MsdGQMHGaeD5qcHQdoqGKB/AV/58tpGQlzmnr2sekjJurhBXBF1cXcj24ohHAfjY8wv/jG7/zRsrwxfy2y1FLRJO8wGM9dZE3UcBXPTIfB5MKJtBdQC2KUzZwVC9eeOJwIklouwWK8auFBdf8S1ZyE2KY9CmwlCLwfoQtdWwZ0wpkkVSqi65/NkgEBvC+dmpn0tMkNPQSHo8LMjOh5Qn2rF3o9GCIon0EabwSKYUAfstLUcuE/aV4jsH+CYd2EeW3Qsl88B4CSgB/HP9qruq/w== 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; bh=5tiQED4F8IXdLXHcvhio+3D+TceI9lRo9BIYly1YsiI=; b=EaHq+MFci2ich7YZnfFD5iZkLeZQM7j2t1YR88bU/fIPr/oj34DZeRrXzKkgrOaAm1nBpJRZ8ZPqDxYDzj6RirYMaZseI67wU8I/8dzyUzOqrpowAuQsEPq3ULjFay8zA7kHCv4LXg51/YTexUJMg6swevRIDDamnWFb87SJqiTG78Y1V3n1Gngi5fo7dJS2wTR+7VxLAR78NA6XwPeYcoiVVAYb8JzDKG/PYy3hOI7btdOd8Ehv1D0fc0qDWQ9sZNwZnbSHZj/CZ1cRyrcELMB1XCBDodDvfQeeaNrtMjbUICKkEf8oaLYTURbKsvHQn00KjMB2jobxekvDHOpk1Q== 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=5tiQED4F8IXdLXHcvhio+3D+TceI9lRo9BIYly1YsiI=; b=TVq4EoZHR56nXDdaQ8QhKoqV14wsJ+Hai6sR0kU1JtMQyWpOS7ttuaDbrNddTFaes4kxyYbKGhzeTH6MPom7yEHa65TwjkIL16YFBXQ4a3iYIh2OZhfnnfAXMPg1qH2mTOzY7TPmZj4dFG7U5KmEb8P4gqQ0ASAaW6uFnVkiKyI/MgSHxY1PQ8d75YseIs2xgrGVvHsZ7khOHQxYiqYomBE+45wIGRIxR5fPK2vIXxHHbPMdgWUsfAtCXENWyd/KckR4FU9ry5ktf6q78WOCrPvdxWo9eyEObAg4p1kyTzuQHOjKGXI0lqOWC7WhjHHA+Jjuvp2Hg12tda3lkqJSLQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2515.eurprd03.prod.outlook.com (2603:10a6:203:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Mon, 6 Sep 2021 12:43:17 +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 12:43:17 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:42:55 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [byk1PZpwqhUIiGz9Hujz46Odnz3QtEWh] X-ClientProxiedBy: AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124301.4161498-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:43:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fc620c5a-8b1e-4c85-166f-08d97133e68f X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKb3QWS1fMq2gIDvxJlS4pE3u1JUOLHFawEYmObJ5HBWawUY7eZKWpVkAbIENSVoDJ89T47nKm59pilntR14DQ/Khgb0v1uYIZTXQR1O4K7K0k7F/BeOCTq2k3sbZdXH0shTzMTMgYCq5gDxF91T3ED3/4a/e3I6rQy5X2Ce+iKfwvhwUFeDasrC8gbeDumrGr8IpbBjAsAEgtf+b+cym9+OWbQf8A2eF2wyN9bsNlkmQlTH3moNjLIiKeZEuKO2is9Ry25UdGxngE0qoDTYXz6nil1AP9Bk3PwX07GxLKOXxA4NQvMnhSOtPyHxgVjSBNftwjgW4JqOV3J//9z4ROc62GT+2QGUd2mV/sQTpJxVCeNadSncYS6UgUQOzDoFhVCOPJOd4PvQVztPsmVrD6XLFM9BhH+uVRWjDIr4CIFlif7JcIl7XkNfWbTADAKK8OlbI8GJMkV3Y4t+LounOFvIkKjr75f5hCYZ+UNkx2+e1H0DAJSvANfKnSucN6mf6bnzgzwxVZIGeWp4eNXuTKsP/84cQpxheXN9PGPiT7f5tbCI1vhl3csolNavsE3OHcaOTiIqH+gAYIl0PFg7MW76A7f1MHa17tAhDFq0R6nAwfWtQfM+b/IEkzCjfC4pUQ/ozTJQDsRmZwQ52COL+s3ZQMLbfzbINcsKnr3SCGL6UlLrUR1Ow0z9XfFmPpoVSMpV67ATuI+Jg== X-MS-TrafficTypeDiagnostic: AM5PR0301MB2515: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: RD7z3Z68E/EgL2xIwrJPhM8Ym5Z5CJnRw2/BBaexSFvpmxHo+v43DdE/BHOCgEMpWJXE0ClhXTBmEIol5FvftsKJWEpfmVLSbYX02Vu6IGYOTSYENRYhomKjYBEn0Kq8cLJgEsAzbLJFkJP8iD80JNAcFBgfqdImSo3UKAVwT7i4jDah9WBW+3D43RwUQ07raIUY9dWJozJ2mFwbvqhHVNiQQjMwqdbLt7M1Wg7YXtGAC9hP+3x+AMTlBaXwhgG8VQdDCe4VqT57DBkufYxqcnoKlrSRiTiQgEwphjiUB6sPt3uvYD1KsYlV23/1PGjlJoxNAZ3mWhogH4WaOg/iFLlluvGP5scIwIwTz+tsUzoHcxWd8SrK4/tchyojEvqWJezE0lQycBiPuL0pwx6cT99H2Q5BHpqRiC8RbEfcqmYAizZPZgYc796gpEKFw+01 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: LbzrP06Y2HBILIuAiKP5WY4wZc/IhGCRF27J68JhiUt7aWVbcyR9Nc99kKMRCAeTLyo9vo29UMvBANpmWpTVy8/WXIh3VCPQKNjY1UXZiaGtaPtfT6DWSuKgjljXC/RvToXzcyLRBcgLlORjUgoROw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc620c5a-8b1e-4c85-166f-08d97133e68f X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:43:17.7054 (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: AM5PR0301MB2515 Subject: [FFmpeg-devel] [PATCH 05/11] avcodec/mqcenc: Make ff_mqc_flush() static 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: 0ZKSgaAwC92+ Only used as an auxiliary function for ff_mqc_flush_to() since 4624656797b667eb6405186682eb04e74dfd90fd. Signed-off-by: Andreas Rheinhardt --- libavcodec/mqc.h | 1 - libavcodec/mqcenc.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/mqc.h b/libavcodec/mqc.h index ad80fe9228..5e782b05f9 100644 --- a/libavcodec/mqc.h +++ b/libavcodec/mqc.h @@ -55,7 +55,6 @@ void ff_mqc_initenc(MqcState *mqc, uint8_t *bp); void ff_mqc_encode(MqcState *mqc, uint8_t *cxstate, int d); /** flush the encoder [returns number of bytes encoded] */ -int ff_mqc_flush(MqcState *mqc); int ff_mqc_flush_to(MqcState *mqc, uint8_t *dst, int *dst_len); /* decoder */ diff --git a/libavcodec/mqcenc.c b/libavcodec/mqcenc.c index c941f849d9..6d0368f827 100644 --- a/libavcodec/mqcenc.c +++ b/libavcodec/mqcenc.c @@ -102,7 +102,7 @@ void ff_mqc_encode(MqcState *mqc, uint8_t *cxstate, int d) } } -int ff_mqc_flush(MqcState *mqc) +static int mqc_flush(MqcState *mqc) { setbits(mqc); mqc->c = mqc->c << mqc->ct; @@ -120,7 +120,7 @@ int ff_mqc_flush_to(MqcState *mqc, uint8_t *dst, int *dst_len) mqc2.bpstart= mqc2.bp = dst; *mqc2.bp = *mqc->bp; - ff_mqc_flush(&mqc2); + mqc_flush(&mqc2); *dst_len = mqc2.bp - dst; if (mqc->bp < mqc->bpstart) { av_assert1(mqc->bpstart - mqc->bp == 1); From patchwork Mon Sep 6 12:42:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30036 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3721965iov; Mon, 6 Sep 2021 05:43:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy25lc+r4HCWcP+/LMO/LVLV7hnYc/SSWjmQtZQ22JA0ykGdymRWDTpT0EOlxUrKng+7Wry X-Received: by 2002:a05:6402:455:: with SMTP id p21mr13266881edw.309.1630932233718; Mon, 06 Sep 2021 05:43:53 -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 f21si7220987ejj.305.2021.09.06.05.43.53; Mon, 06 Sep 2021 05:43:53 -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=KFiIbYlw; 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 D1F4268A5FC; Mon, 6 Sep 2021 15:43:29 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069046.outbound.protection.outlook.com [40.92.69.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C70668A5F7 for ; Mon, 6 Sep 2021 15:43:23 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GzO5+VWWf8/NsudJiQkpfPRjALRcHAKTDIkRj/u16cOH1fqw2a3S5Dxg8zBV8jkxSvEG45oco/mSZH6Zb3yTjL+A1bz8JaLdKfN9ZB7geJIK9HUxTzJchFh/aixsWk4kEaMrBSG//GFkM+4QqyQV45C5/uCNsR07pYdSKHLRBW80gPgT1y8/rJlRF/a2i8XY7jty2a4hmeB1XXfUdxtSNdZ+sOaT0CNwnAuWqt1W36cOHe1tO7uA/siZx7yB21gbEOu7OhiS4lZxGJ+NKFCP4cB+Y7YBuDuzdPmP+mABU77SBGUs8cU7da8BUWUfa72w7ZslHuIR4qxxPsBH4TN5Jw== 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; bh=Q+IPwzTmfboncMLrOjcCK9sEi9FK/AXuUANoM7QlYZk=; b=KPMijhJwBLtJcgzDmACIh/ZzPwzW+mUmaA8hhNBF1o7LquPFM0yijTPaUX681D5brthUGP5GmwzyTbiesRGBUTiBEnVEUaHACknzC2FKP+kHZyVOg7FYYRdN5Bo+90rH+x7Cg2WrWVOcbTVlVkH6fZcIR2uDJ1bZhbndHDadqrL9IEtnKR2e22I00G5DW3o94nZTdAk3KG1nP5jf3IBpye1ctBS/zJ24YzQZZGKE4c3uFjd2j7VcLdSy6VOMDW/5ilx5FIodDpFLJbc4YXM+1pazgFBbaRMydiVkLPrjcsuPqCbqjjavRR357vAuFmwKJ1O4lj7oq8Xpn8z4FsjEyA== 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=Q+IPwzTmfboncMLrOjcCK9sEi9FK/AXuUANoM7QlYZk=; b=KFiIbYlwjaqdmgIWcc1g1KEnaHbKxKb36BY96Ab/vljUeORVQXEpZJbbR1ZRxXraOyMuCkP4S/UhkR6ukySQ3vUFJ79HyyZ2JqQi6yT/qx/qyASczuJM5iYy0SeUChQPonUfp43gRcZIMOZNw5nIN/Uv2MITbHdHiErxZgpSqT9SuxUivRSl901tOpOafWDSa6JOXF5tNExxmttMMfOByjAls4O2abavi98lGT8IRCW8FqX14B79Fi5PV0jDNWtOC69DUwtuf38JBvHtTnqDbfIIlGnhUOylDrrcNZMHwFfWkLwgUJV+A5pVrcxF0D7nqf8r8phPH0cJnTRahonXCQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2515.eurprd03.prod.outlook.com (2603:10a6:203:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Mon, 6 Sep 2021 12:43:18 +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 12:43:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:42:56 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [xu+eNqa4UekYmZ2c9/9hcAlNDxB8yJSZ] X-ClientProxiedBy: AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124301.4161498-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:43:17 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a5d6d35-c68c-46a5-434e-08d97133e6d0 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKb3QWS1fMq2gIDvxJlS4pEAdL39qOFKc8vHjJ+upNJ6ihbwqM6mi2dZ5hfrCulpzp6nE/59uUSx/Tv0jD4crOLafLYuMJSpsksdSU5c8kz6tPjSoS7zRI0Xx748H6/YB93oJ+i04olZ/B2jtGXNa+LpT+7+nTeRDIQ5cVXR4qT35GVRWMArKF5AkEV4O5CVl4uN1O36QxnBIskVMjtFWWAUo1DwYVymQTNUbVHXlZMxpA3pjHNZvHTMsM0Nqzu/8+qApTh0KuXY8xDRcvBib3mQRFawZ94r7RbKf7HviN8vXE5QQnKvb6FLpmY9VmjLXcNmT4EZ6/oEzUiuyzmam+eRb8sbVgKt3GKVKLxgKZgEWeevaYgT5yeoDdJoZWVJ9FP7XrVzEzYND37Y9fNmU8EDEw9YAjOP+fClGK8dj79uAL8kvG1mx30c5f1OQycmspm5f/CvyyrM2kZ5bGpOMVX4zBr1pITjT5hlKRHcJ5PXt0jnDfE0AH5E0xEx/ZhMMPQArYY1alVsEgXLNfutlz1iH0MEaaOwiXcN1XaBVXPFBvSzICSF3g+f8Y0zbpUNsLKkcstiNHS7vO6S2lv9rQc1nYMAQIThGlUkrkjCbyiGveE1/xVTEiSwKIzPGJatnK3ISAMR1Dps6xdfgVpRWw4MVUVb9dZAKtlF/EIjsAyrUX9BfWJoKWt5CSR4RWYe3QGBOyCR9Lybw== X-MS-TrafficTypeDiagnostic: AM5PR0301MB2515: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Yw3bSH2mYiLv4KyVIQyiGtxcswyOmQMO+2U39Z95Adu0wuAfdy2yXRce2rwVaBFyQIz/1/NeBWCGFVPpNqRiZCIg39Yv3FH6XgmrWovLPMVceLrUnNhlvttEmLSGgo2qKwgT35IdaZ81Ke89r/vhPr/yoYAbDRTwtxUSAlJzPe6ojlIGmpYPeuwInHfkGCWeF3KyVzo97lUVb/PMVAtL38rKwsIq4UUvaFaKLZAy9EtJUceAa5aA1HfeNSkCafziKgGZyHlo7ahlTGDcI2ijW/cvXUNrUmGFyy5gA6VfJLJmgUIwEIM0NxFzKSLgg2pGRlN91neTAui8VDeSj+dTxcp302kZEcIEb2V28s+tScIQhY7y9Qqzhv0bn9/K20AkutXxrG5obposfaI1JnSU2h/JchJfi9thjH+fZxBlXvYnorONfWp22ednDKB/W/+v X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: XkMTwowQ/ldzZqalng2B2/7nnDsVEc47C51u5HALhlFZuVMoU2Ioz9tpgYm0urKcE/5fbF7Iiv+HDGYoOVoF9PrYiL4jsyibkbHBpDENHxzbuSORgk78Zp1HUGcRbVwkNYVpxqR6GogGf+PIOgpCmw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a5d6d35-c68c-46a5-434e-08d97133e6d0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:43:18.1286 (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: AM5PR0301MB2515 Subject: [FFmpeg-devel] [PATCH 06/11] avcodec/jpeg2000: Make ff_tag_tree_size() static 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: ontJU7ncSjqf Signed-off-by: Andreas Rheinhardt --- libavcodec/jpeg2000.c | 8 ++++---- libavcodec/jpeg2000.h | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c index 324908d833..2fbdb64280 100644 --- a/libavcodec/jpeg2000.c +++ b/libavcodec/jpeg2000.c @@ -39,8 +39,7 @@ /* tag tree routines */ -/* allocate the memory for tag tree */ -int32_t ff_tag_tree_size(int w, int h) +static int32_t tag_tree_size(int w, int h) { int64_t res = 0; while (w > 1 || h > 1) { @@ -52,13 +51,14 @@ int32_t ff_tag_tree_size(int w, int h) return (int32_t)(res + 1); } +/* allocate the memory for tag tree */ static Jpeg2000TgtNode *ff_jpeg2000_tag_tree_init(int w, int h) { int pw = w, ph = h; Jpeg2000TgtNode *res, *t, *t2; int32_t tt_size; - tt_size = ff_tag_tree_size(w, h); + tt_size = tag_tree_size(w, h); t = res = av_mallocz_array(tt_size, sizeof(*t)); if (!res) @@ -85,7 +85,7 @@ static Jpeg2000TgtNode *ff_jpeg2000_tag_tree_init(int w, int h) void ff_tag_tree_zero(Jpeg2000TgtNode *t, int w, int h, int val) { - int i, siz = ff_tag_tree_size(w, h); + int i, siz = tag_tree_size(w, h); for (i = 0; i < siz; i++) { t[i].val = val; diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h index 612832c872..d06313425e 100644 --- a/libavcodec/jpeg2000.h +++ b/libavcodec/jpeg2000.h @@ -301,7 +301,6 @@ static inline int needs_termination(int style, int passno) { return 0; } -int32_t ff_tag_tree_size(int w, int h); void ff_tag_tree_zero(Jpeg2000TgtNode *t, int w, int h, int val); #endif /* AVCODEC_JPEG2000_H */ From patchwork Mon Sep 6 12:42:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30045 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3722161iov; Mon, 6 Sep 2021 05:44:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7YNmCnW0NOgceX3wFsmdvdt8n7pCqs+rfNi3yoDCA0eNTY/a9iqgcD8ovc1W9hOS8po1H X-Received: by 2002:a17:906:52d9:: with SMTP id w25mr13188076ejn.464.1630932254107; Mon, 06 Sep 2021 05:44:14 -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 gn14si7956786ejc.279.2021.09.06.05.44.13; Mon, 06 Sep 2021 05:44:14 -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=QE7xx90h; 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 2F01568A630; Mon, 6 Sep 2021 15:43:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069046.outbound.protection.outlook.com [40.92.69.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7506F68A5F7 for ; Mon, 6 Sep 2021 15:43:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LhqXeZPXjel1rEld5JAAiIUzYYUPlimfrdabhaXZQDJfV8q/E7aO09/aLd0D+/JHXcRdNUL5f6Ii6Sq3Njspf3KdK33FUyi6qNvKniOcZbB/0onFdDxv10ny3t05KIpKeWFEHg7AG8o7NT1FET+sKzXKk3BjOaCP5PdKkHvEeDndFP/mpuohUBhZ1gkfs3mgM/IYgwWECgEgNH5LJ1OrIyOrG+mmmwkCA4p6L7gDmvpY2zFOPeVRZaEXDMCHngLyUqo/VaTNy+1c13KcSewPtHv8MHlapp1SMAUTIr9k0ZBjzo15vAB7j8yfMqtd1vw4BQSJTekbDeaAgcuM4+Fs3g== 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; bh=FTsrzSfpJTq5O9TeeUGTap5lJ8BA8St8A5H3FL7A6LA=; b=I2p9dTg8knlIg9XTASvYsWfH9TvBewAp8EUbUHb7y/ZTEvc15sRfsXelgflruNY60KPzX/mzZCj1yANHUrAuGEsC3AwuQsmYg5wgXve/Nqg8Ioj3dDZUfsUT2g0HRxN2x9zw5H2F16oluJOxEL1dtz5VPllWXXy6sMSKIAn0bZbdaKLM//QCDfXY9w6Y8QLuzBSqt6K9EAUT/fLaXo6TRfsG5KWPhEN/hukLg5TaDSEJozCV4tfeaHqQJZnr1UmdjkJk2AECUfGQ1Wz4cftdxPDqMIIKBF2ahTB3hNusrppzLTdM2CsjXDqTHkY0iCnWpeZ4j5Y1fzk1IgdbyrW3gQ== 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=FTsrzSfpJTq5O9TeeUGTap5lJ8BA8St8A5H3FL7A6LA=; b=QE7xx90hLHPDjeuyhz28ssp1S9btO2GlEWuDZ5t9aRjqQlVGq4+vSxt9jH5BSYxuFmhO4s2FZOHu47nC+wc1Kdx6XK/ybYAvaVWYGkk5CNK0yXLSS82mdHBMAkk1JUiaLKgY+4X06bdDGRIYlR1AP3cSLZwCL+c1yC5DPXJw10Yw+5/8g7IoOL7sl8g9gRdLN4KWfdU49F88ThJ3JBrlISpmaezLxG1bQhNePrzR2eZLwQEgH7DBw62TxHPgf2jYswMluiweB7BMHFmqgpCvfOJW6GIOkHXMr5N7z4pqY6m+9FwTAmW7TWu8BIiaw+fJCJJoV50JzEWm36Z2i0VDvw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2515.eurprd03.prod.outlook.com (2603:10a6:203:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Mon, 6 Sep 2021 12:43:18 +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 12:43:18 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:42:57 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [SMGMk1gqBCP0xDFnP/cWhZ4wH1AFEIQe] X-ClientProxiedBy: AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124301.4161498-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:43:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2c89f2f8-5b0f-444b-e154-08d97133e70c X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWfiyriVhNa5oktltvv1jUtAGHJ3ADhdf6ctNb2AF7GKHY5t4kuzg82tmtOlgQoTFHG7kSLYh69Z6B5M7PSolGnjhJZRokm+AbxH1mjlvbDoJ0AJNYvf58afpkW1rk6oygKb+TXU2bIdnxWKJQ0Eyf6SWbS3ib30xy3iXXHl2UB/LvmObjTsoOGM52S/oosJsmKKWHzykrCeSM8AmcEnb6g+AWuh0TBn7MbQXVEyJe3KgkDRmOQxHEYMISR9VLKlbinNolNSHFYugswo6WTt59r1ziZ3fbwWHLsE4b4ydKV3V79nVtU2PieBrDLxqzdLrHtOqrrKdZUwpxF1BE0FVhhfmE9ycZ+fkdYoj9q/LLO5QxA0TV+Xmz+NAW/7jY3zkhGHXur9WW8yRNpqCIWKSviTlwrg7tSCFa74z6Ldn2Fa1wUUMG4mWDTYLEhV9GvHAx608hWS+U3jY8xyrQbjvaq1dbcYcFouGm/q64yqS/+LvLNnXwWalbbDEOp65sigwP+DmJC8cLjP2tmnkSOTTy++G9nmWCMMUDkM4jvPhQWav+FAiSia7efYQjMESnmtGQlS39vX3SbagXJ0quszY+6s7CPI1KXIvCDpKtBEn71mQ1F/lXAqwdNsQMqo0mkWpUCP7oIYMGQZmHxnKvEYX5jlMnk8J0BxEO6OXUG81Dg5dw+wwgBjPYHPTksTzEe2wXMC5dGx09LszSpQH6Ic3hbQUHN3QHsJO4= X-MS-TrafficTypeDiagnostic: AM5PR0301MB2515: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: WvHHvjQUgkHJmxVIb+fkh1NjIw5umKM5olSm2WbdfdXZaxbWOseilvMF6Rewp+qysT+LkaY6Z9sOZekg9RvIke+vUwaekeOfW6dtgmlnpkaMjyaPKtv+zUAamcEXdma05R86XlYof42TCk6I98KoqTr2R0rTsXvIA8KbCXxgH/A3sa6eAfHqE9mq0LmKEjev0B6o5tcHJESoNhJOkhNumLG+QOScjBuzTQfXLI1L6y2giyLXS6unmCgoq/qt5TDgmSDx7KLMC5gQeYU7FWq9z6R9G2/cjsKbc3td10HM5JdWdOmWAXraAHpKmhJFo5d7a5ebymFnO9/gukDlP1lD7vY5KXzbFDjsfGqPlT6P7nhXVJ83U/Wd2tFzT1e3mJqouVn+sj1vH1oYWeC78YojJtbfyGg6sA772XfP4Lj9EBfkYa2xFXzA2/j0ZI6E82PP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: OwTJd0SJRh0UkKWpHL8AeQA2X3ZUMDDBgcQcQVdX4sNFJExgnZaKeoIAjrGJ6g4nuO6ZLTMN8UrstCJ7S7Mf1inJhiu0Ul0Qv8Ibq52dTrFyX5YQn0jSOxUm/QisC06wtNpxJa/LqM4c9c8i01EIWA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2c89f2f8-5b0f-444b-e154-08d97133e70c X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:43:18.5507 (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: AM5PR0301MB2515 Subject: [FFmpeg-devel] [PATCH 07/11] avcodec/snow_dwt: Make ff_snow_(horizont|vertic)al_compose97i static 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: NOtuYzZlu3CD Signed-off-by: Andreas Rheinhardt --- libavcodec/snow_dwt.c | 16 ++++++++-------- libavcodec/snow_dwt.h | 4 ---- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/libavcodec/snow_dwt.c b/libavcodec/snow_dwt.c index 25681e7edd..3dca3c6d30 100644 --- a/libavcodec/snow_dwt.c +++ b/libavcodec/snow_dwt.c @@ -462,7 +462,7 @@ static void spatial_compose53i_dy(DWTCompose *cs, IDWTELEM *buffer, cs->y += 2; } -void ff_snow_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, int width) +static void snow_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, int width) { const int w2 = (width + 1) >> 1; int x; @@ -526,9 +526,9 @@ static void vertical_compose97iL1(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, b1[i] -= (W_DM * (b0[i] + b2[i]) + W_DO) >> W_DS; } -void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, - IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, - int width) +static void snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, + IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, + int width) { int i; @@ -625,9 +625,9 @@ static void spatial_compose97i_dy(DWTCompose *cs, IDWTELEM *buffer, vertical_compose97iH0(b0, b1, b2, width); if (y - 1 < (unsigned)height) - ff_snow_horizontal_compose97i(b0, temp, width); + snow_horizontal_compose97i(b0, temp, width); if (y + 0 < (unsigned)height) - ff_snow_horizontal_compose97i(b1, temp, width); + snow_horizontal_compose97i(b1, temp, width); cs->b0 = b2; cs->b1 = b3; @@ -849,8 +849,8 @@ av_cold void ff_dsputil_init_dwt(MECmpContext *c) av_cold void ff_dwt_init(SnowDWTContext *c) { - c->vertical_compose97i = ff_snow_vertical_compose97i; - c->horizontal_compose97i = ff_snow_horizontal_compose97i; + c->vertical_compose97i = snow_vertical_compose97i; + c->horizontal_compose97i = snow_horizontal_compose97i; c->inner_add_yblock = ff_snow_inner_add_yblock; if (HAVE_MMX) diff --git a/libavcodec/snow_dwt.h b/libavcodec/snow_dwt.h index ee699de35e..390bc57130 100644 --- a/libavcodec/snow_dwt.h +++ b/libavcodec/snow_dwt.h @@ -99,10 +99,6 @@ void ff_slice_buffer_flush(slice_buffer *buf); void ff_slice_buffer_destroy(slice_buffer *buf); IDWTELEM *ff_slice_buffer_load_line(slice_buffer *buf, int line); -void ff_snow_vertical_compose97i(IDWTELEM *b0, IDWTELEM *b1, IDWTELEM *b2, - IDWTELEM *b3, IDWTELEM *b4, IDWTELEM *b5, - int width); -void ff_snow_horizontal_compose97i(IDWTELEM *b, IDWTELEM *temp, int width); void ff_snow_inner_add_yblock(const uint8_t *obmc, const int obmc_stride, uint8_t **block, int b_w, int b_h, int src_x, int src_y, int src_stride, slice_buffer *sb, From patchwork Mon Sep 6 12:42:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30046 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3722543iov; Mon, 6 Sep 2021 05:44:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw+eDdM6hm/TM0xhdTRN1YKltuuVu/pTjuC+k3AP9t+2muVtsOX53ireY/KJLehTmqXOdR9 X-Received: by 2002:aa7:da81:: with SMTP id q1mr12828704eds.29.1630932291559; Mon, 06 Sep 2021 05:44:51 -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 z23si7721540ejl.612.2021.09.06.05.44.51; Mon, 06 Sep 2021 05:44:51 -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=k2Xt2TC5; 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 AE45768A637; Mon, 6 Sep 2021 15:43:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2108.outbound.protection.outlook.com [40.92.89.108]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7588C68A5F7 for ; Mon, 6 Sep 2021 15:43:29 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gypQq19i4fieiWqWos3OzfmvIQso1VgevxHB1Vz7K1jk+uOgEExRzs5M+tZ971O+iydb2R3UN8ivY2WWuJ2g0GjKM0m3czjNTP65nXH9C8s1rLIGicF9ytGSdzANKc/ItXf5o2SMnlqE8KHh3pd/1sk1HHT6BS3eaEDvZhRzKY6v9IIiI8Mx0lEg007+ZLMDlViHRH2rwbhxPU7FMxOBPkf08I8oX4JErCAn5vEfSwwhHVtqVPJ5snY6gXyYnDR4lFhV5IyZjJmBePwSeonQC6dzB3hfApEdOzzC2oQQQSM6X042faQw7wK24LSJ3O79ijAMNINhGKUenBDm00amLg== 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; bh=59MN/2PS/nemzIyTupeJlFihQ7sUoEi7rJrR5ETneXM=; b=nVtL+Hg3v/me1Mlq5LCrArUTLtXcfV1ml+p9JcNU8yNhE3FPZJuk1peTyDcex15EnUcRP/uK0Cv46JejnjnDnGemGIxRImn/WXefHo1GwNBcu3xjAut8bSDeqRNmO7CbeEawnnoSSmbJ2Gxj926VnPdJeLdkI+dnpEmxpONVM8G7DR5lRXwp2VFGHcec09x8bMwki66dl3a+MMi16K7xg9laZuvuX1s5Gt/uPydPrfQnA1DV8XxgHAgM8agn3JvDmZgdGtRAv96a3T5osvpXcRbiQdnk8ZONPtxHCD+HeOLX+mBd6Mdz2b93ovVUTliJluCDoqfLbwEfE+iTZyLqLw== 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=59MN/2PS/nemzIyTupeJlFihQ7sUoEi7rJrR5ETneXM=; b=k2Xt2TC5ouTPT/CFp2U+WRssvW5hdodH/St9J+GLOPUOxsd8SElzQevXFo3T/ff8XF/r8h/0sO1eEPTKBoqVhttkxhGWx8s7KV4vyZ4Ncf/Ruqr+Rs4kQwn1q8kgzFWVOr/eGabCXUcwHHUimoU2F0HkrQjhOTdzzB9uRM0spXJz+2d02pLGnA7rwK5YEKEvnDE/c18+cGac+mQn4SHWV0dHSc4NAkehV0wx99Q460AtsdbeouC5eGJ+1hiFnpuLT67lfk6hgZCjbxpEUEWKJ5rGlkxtIcgavtNmzLZItqEoyVBsYhAydqr4v0oFjQHH8+KpkcQy3roMUzPZRhs/tg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2515.eurprd03.prod.outlook.com (2603:10a6:203:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Mon, 6 Sep 2021 12:43:19 +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 12:43:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:42:58 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [rJnz5EmXpZSIaNeM1UTPKDkZ3GcLi2xN] X-ClientProxiedBy: AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124301.4161498-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:43:18 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5841054e-3ea1-424c-6f9d-08d97133e754 X-MS-Exchange-SLBlob-MailProps: dEG5jEBie8koNIbw20JU/eBv5d4Y6L0onVsvqc2iUyNHsBpq+q6L6L5Xhe+iQsUwNOhv6TIMONhiP9v1D3BojMPhO7kzEiDWiLaBqL96EpB+m9DLURQ3SlQ0lzRfXR0/DHKZZo6s1Ul+2wl/MST4axquaWtCfkmRipDOiGSnENWUDJQlkqXMP/2Mw3KoshbNPlFGqtjiYq9BcBGjVYpaptkkEHFVNixkOsPW8k2nJVyxAs073PnO2mI4vZoAWXaxKMWyD/SpS7oT5JVwYutGTVJvrOyyJ3eZXV/qXPLYIndxy5c2LUEnxxQ46aYvBZ3p8x5JZ8PjwOFDsvOIHKDpJtLr7lmyJHvZ9uSoFloHrLlcX2c9M6rggSvf3TOjHKeEpj1eihcyHETNhNVyr2NULrLfakPuTpPRrqh6hENvHEfo3uXqTQdoOs1j6eGaCV+YZBBmQcLN3EyEzrRoFgf2+ARkP7C/ttpFcj+Z+2F8TMxrgqAEYkxf407ofx91IUw0a7SehSB27xasFM/1O/96IhhQUli6R0a2LDkRINQ8gEo914V5z5LhCz8ouwsRShzT3QPlb7fk4nFhvtrU6rBWjrwVkUO3Q9HM7rMzUOd0n12XRGDWmndGYwK7j7TfI/zBqk4ZgkSGXZ820zogmq/RjJJbE+UPGwLPMx4i6aYklhhfH72WuwXAKg== X-MS-TrafficTypeDiagnostic: AM5PR0301MB2515: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7WXsbOz1SGcmLs/5tc+XGzV8k/p3GoGHlpguI/HP5tRu9qlkQN6gzm9Nct4dCHjTXYpJSHJf1AoKqcs1i2Qn+04HdjTYKEVhFu80gY0Ud9EgC/8Eu7kMFyjN3ziLvWU2pLysWdfyEZP3KJA7o4JIrveZ1+BXMnMOPAx+urN76bbjsMiOxsvOiW1giDioN8VS3Kqhz1oX6udcGjkIZ9uOXsVHaY3qfWMF87YsR3sz8h5fZUAdnZ4jbU6L78x+9IJsr7TCZFHJt/1U5DYF62vHjh+0yMKMu6hczfkyu8j7fW/AUjWCxM2DXcjdjlk2rK0Tr5Pb0/EbvHhBWdzHlOHabAQssob8QyQfj4M6Wb+C46H/dZLmpt9y136kpc1rdFCf47GQ4wV4p27nBkISJC8cVpcz/7PipSb6X9uJcnHqSwsj4IPtGNmVvGzE4a1srHZh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: pW2MVcat4p7+vLw3SEqyye7z3xMdjgkCk1P+B8F+A15v9UZicTvv5jhtTYoZc0oY1k2DNnoEzdIjrpepvqAcDJkHK/px93iZ+fLDumIsxNcSOGY62eLnuPZugMRqga30zOhg0wN8F+KFoE9PgGzzwQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5841054e-3ea1-424c-6f9d-08d97133e754 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:43:19.0406 (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: AM5PR0301MB2515 Subject: [FFmpeg-devel] [PATCH 08/11] avcodec/iirfilter: Make ff_iir_filter_flt() static 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: WAiXWGJz7HrY Signed-off-by: Andreas Rheinhardt --- libavcodec/iirfilter.c | 21 ++++++++++++++++----- libavcodec/iirfilter.h | 16 ---------------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/libavcodec/iirfilter.c b/libavcodec/iirfilter.c index cd5bbc943a..900893d2ff 100644 --- a/libavcodec/iirfilter.c +++ b/libavcodec/iirfilter.c @@ -287,10 +287,21 @@ void ff_iir_filter(const struct FFIIRFilterCoeffs *c, } } -void ff_iir_filter_flt(const struct FFIIRFilterCoeffs *c, - struct FFIIRFilterState *s, int size, - const float *src, ptrdiff_t sstep, - float *dst, ptrdiff_t dstep) +/** + * Perform IIR filtering on floating-point input samples. + * + * @param coeffs pointer to filter coefficients + * @param state pointer to filter state + * @param size input length + * @param src source samples + * @param sstep source stride + * @param dst filtered samples (destination may be the same as input) + * @param dstep destination stride + */ +static void iir_filter_flt(const struct FFIIRFilterCoeffs *c, + struct FFIIRFilterState *s, int size, + const float *src, ptrdiff_t sstep, + float *dst, ptrdiff_t dstep) { if (c->order == 2) { FILTER_O2(float, FLT) @@ -317,7 +328,7 @@ av_cold void ff_iir_filter_free_coeffsp(struct FFIIRFilterCoeffs **coeffsp) } void ff_iir_filter_init(FFIIRFilterContext *f) { - f->filter_flt = ff_iir_filter_flt; + f->filter_flt = iir_filter_flt; if (HAVE_MIPSFPU) ff_iir_filter_init_mips(f); diff --git a/libavcodec/iirfilter.h b/libavcodec/iirfilter.h index 5ffa1ce53a..d6b8fe2782 100644 --- a/libavcodec/iirfilter.h +++ b/libavcodec/iirfilter.h @@ -128,20 +128,4 @@ void ff_iir_filter_free_statep(struct FFIIRFilterState **state); void ff_iir_filter(const struct FFIIRFilterCoeffs *coeffs, struct FFIIRFilterState *state, int size, const int16_t *src, ptrdiff_t sstep, int16_t *dst, ptrdiff_t dstep); -/** - * Perform IIR filtering on floating-point input samples. - * - * @param coeffs pointer to filter coefficients - * @param state pointer to filter state - * @param size input length - * @param src source samples - * @param sstep source stride - * @param dst filtered samples (destination may be the same as input) - * @param dstep destination stride - */ -void ff_iir_filter_flt(const struct FFIIRFilterCoeffs *coeffs, - struct FFIIRFilterState *state, int size, - const float *src, ptrdiff_t sstep, - float *dst, ptrdiff_t dstep); - #endif /* AVCODEC_IIRFILTER_H */ From patchwork Mon Sep 6 12:42:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30044 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3722264iov; Mon, 6 Sep 2021 05:44:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyVfv9KEBbKeZnr8lS0H+XvjXSE+UkUBiW5p0ZKt8s2hcA2DIUv6fCj4Cc5ghpMaaRBs3Rf X-Received: by 2002:a17:906:bcd7:: with SMTP id lw23mr13605870ejb.141.1630932262984; Mon, 06 Sep 2021 05:44:22 -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 g3si8059832edw.18.2021.09.06.05.44.22; Mon, 06 Sep 2021 05:44:22 -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=jDeX9+tQ; 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 2FA0F68A60C; Mon, 6 Sep 2021 15:43:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069046.outbound.protection.outlook.com [40.92.69.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9CE4368A62A for ; Mon, 6 Sep 2021 15:43:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O6gbZGrZ8x9zpahu2hT8xFnol3kdMP+h87DHvDLvc70726LqcHoe9Kn6pUVF7JwKCECLm8T0c+Zo/RL/KXg5GsF9L09mSuUvifUBnHjrhHbQgJBS7f/M8xxtL0exzznoOXi1WLLgS0TvewKUVx1yXZfWoAOiclq5nxVYSaUbmGHYiJfI9dIFfcelKT/jNUDF0sVXuetOgq76n49fZy1ddM67ddCafCr8JYAPawJQ+G750fvokLucm/1/wPLdUg9KxnAbAgxumFmv/gMoDqMU0mamIKk7df7H0XeozyXRsgl5eBrMWIu2yk6gickocqPOoYNKPAVT8Q9aAC1bk3XraA== 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; bh=59B35eFVw3PqQ0LPDtvwO7sKqEQMpEPwuXgqgY09kyU=; b=ZVUxxwnKNl1EMkoV2osbo1fhcS8r5oigheFKKJVP64r6E2/rqjh+EH3DkLHhOLx6jHx61u3piAn/8snPm8y8BdlZYuIvjfqWwaUtMzcuEjHe7l0r+6nTaRNHVrXkR0yUYIerhIJ3J6W/G81Zet8+VBlwnkCNMTCgJEAStgcffEMyaExNLIk/+JriOqqurqhdf/NdVktoUJDh7P2zdnvzQMcnBNUCtyDZgS1NHEnYx6Uzdp2gGUCF5tmW4OQPEUhHQa6hdx2fPYNKYLPcEhHHrU+9RXqlcfvrFLJcGr+gMOAVo4RwGHbNKmihC5r8U/IQtBcOCvlrELtv3DcaGni1PA== 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=59B35eFVw3PqQ0LPDtvwO7sKqEQMpEPwuXgqgY09kyU=; b=jDeX9+tQ+PJzfB5S7olBEUWB0RRLqdldTuyyeZ1HPwExnvvvg1dpNyO1kZK34WAPKb12FH7HAFMlchOEG4ndarLI6L/CXQXwj6RdR2kr7nFQpOL69egcYGgd9zplLGkzzupokKco+5Y9l1UkZjYodvGn1TX4QlW58GgSgiNIS7rJ+axSNnE57sUEM/pK7haasjUkXzb91uxeQXp1Gq4GBXy3pHSPbPSKuI3JeUTCFD0rCvwc+1YhKOvreM1Ace+xCipYX0P+kUXcGSbWruH6ZR7MiFb3Mz01Bk+s4+R1G04pmyJ67AKnrXjEPpaox1SCdFTOZxmJeAO+7i/Etu9h0Q== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2515.eurprd03.prod.outlook.com (2603:10a6:203:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Mon, 6 Sep 2021 12:43:19 +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 12:43:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:42:59 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [eCf4ieppO8Xnlvq7WtDdmS7UeU4Y6/rC] X-ClientProxiedBy: AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124301.4161498-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:43:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a2e2dc77-dfd9-43ea-a647-08d97133e798 X-MS-Exchange-SLBlob-MailProps: q+fD6XS3/UKb3QWS1fMq2gIDvxJlS4pEvDpszNW6UIgfSe5KBkyHfpqUPk6b/HOGYV8ByhPEz7PVFGKKGEPnYHfB3oFBgtAkDOdkS7RAnjNYu8HZxCNZ/MEC5DLvywnubjgsASoe8fah3rpWCrgNaPu9c2WpweXAPnQ8cGR0fhGIroxxVXstAVvBX3Ca9PGsASU0JOyPf1/Ltaz9lhJpjkEmltSLHwzaGVYidNRHymHsmI8WS0+MB6QiIvw3BpVp2D8vhHTTpZOKllrS7fR/aPww9z/wnmNqqvI1gsNMiRDCrPTJ2TQaPq/3JN4IKIzTOAPP2JVZf/i8C3U4dQE7BFhsCUppF5FEiW5Hr/8LUOkYTLFDcpD3A+zkVynthoYXhfZ4rYvsGTuIWUqXL4lf+HXYqkYRKxAC9PyOySSXpavvp/gewT+fjycrVAiaf2+MEDrHM4bzNA/fTLO+FnuRsW2c+pF+WYoU7vEtvV1YUjNwQnoTDIFYP6yLAyUHJkr7PVlJPXh4PNCszQXZFpYqw3PL9TZiJWu7TGZgd8YP+VcB6fIQbeW58W1+qwK9xYiTixeJePnMJI+eL4fn8l/MGinDUBFHIf9elnU5/2UGYbRGnUsvNuUNlaB0FImWAcQi6fBZAS6nZuSGWL59vRCyAXQr69ESx3JWenYrJ44+2/RfUnQzI9gjVD2bW3v8N0SResW+ckbdpeOjyTJSFP5wjw== X-MS-TrafficTypeDiagnostic: AM5PR0301MB2515: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /S1y2hTmtrGF9dMcj0hoYHU7Dy7O7vKpL3FwGs9lEilK3wiOQKY5pYk8i+VAltMnZTQGrGoWfb2ZFtczFZrKXtaPzT32Imfs1jDp90OMKycg1VBIh9NDdZOu8G0hDwnsyyAKCysZKUC7C80d7ZfuUKGhAnLzxI6+mM/G0TFyuJ0K7+VoLMRvCipmja+1wkmcZrkl7ba7hN/KOHFFGwUzbHdoh1afSyXMnGEFUIoIegmNa9HwusD6JUqACIcpqOCOXYTdFF8E7b/7UH3o2irrKlHAx6PxWxiu8gWVmPDgZH1rHimaUqpnyCttQW98JK2ByoGKNv60/+J/ZjJKGdIib9xBrZPiQr0iHR38EBTO4CHWAnSJbma6feEJxBYnDYzZ4OsC2n7TGsTtALCiYwdQ/RXhbRFEx80R1LHGdNWGeWGITHDKazT1PK3F2Df5iX0Y X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: kBJWnaGXBrjlfge0xDkF/bymf3fbRAwNJRiG1cPedd3ZjTjEA0x7sHw1g1KENbcEiPpdnvabjfDXHwk/tNB5atuN5OAMXNH3ud53b42KhG6WDaceW2G60BqobziJeTFmdhFPGN53jmk7jGh7KyD9Tw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a2e2dc77-dfd9-43ea-a647-08d97133e798 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:43:19.4637 (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: AM5PR0301MB2515 Subject: [FFmpeg-devel] [PATCH 09/11] avformat/mov_chan: Make ff_mov_get_channel_layout() static 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: WggtTtWXBWhy Possible since 3bab7cd12802dc5abf2c5cc6dec49e9e249ce204. Signed-off-by: Andreas Rheinhardt --- libavformat/mov_chan.c | 11 +++++++++-- libavformat/mov_chan.h | 9 --------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index 4ec16f15c2..349634094c 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -451,7 +451,14 @@ static const struct { { AV_CODEC_ID_NONE, NULL }, }; -uint64_t ff_mov_get_channel_layout(uint32_t tag, uint32_t bitmap) +/** + * Get the channel layout for the specified channel layout tag. + * + * @param[in] tag channel layout tag + * @param[out] bitmap channel bitmap (only used if needed) + * @return channel layout + */ +static uint64_t mov_get_channel_layout(uint32_t tag, uint32_t bitmap) { int i, channels; const struct MovChannelLayoutMap *layout_map; @@ -591,7 +598,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, if (label_mask) st->codecpar->channel_layout = label_mask; } else - st->codecpar->channel_layout = ff_mov_get_channel_layout(layout_tag, bitmap); + st->codecpar->channel_layout = mov_get_channel_layout(layout_tag, bitmap); avio_skip(pb, size - 12); return 0; diff --git a/libavformat/mov_chan.h b/libavformat/mov_chan.h index 978b8a3732..f7916e9899 100644 --- a/libavformat/mov_chan.h +++ b/libavformat/mov_chan.h @@ -31,15 +31,6 @@ #include "libavcodec/codec_id.h" #include "avformat.h" -/** - * Get the channel layout for the specified channel layout tag. - * - * @param[in] tag channel layout tag - * @param[out] bitmap channel bitmap (only used if needed) - * @return channel layout - */ -uint64_t ff_mov_get_channel_layout(uint32_t tag, uint32_t bitmap); - /** * Get the channel layout tag for the specified codec id and channel layout. * If the layout tag was not found, use a channel bitmap if possible. From patchwork Mon Sep 6 12:43:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30042 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3722362iov; Mon, 6 Sep 2021 05:44:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw4pAxL2D8Gs09ONE7XUMa1dOqVmH9E3piMYhXypgrVR6WLkuKX94LA3GOq9y0YbVi43Gl2 X-Received: by 2002:a17:906:5795:: with SMTP id k21mr13772158ejq.158.1630932272955; Mon, 06 Sep 2021 05:44:32 -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 mp19si8669504ejc.630.2021.09.06.05.44.32; Mon, 06 Sep 2021 05:44:32 -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=AMhGpGRg; 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 328EA68A675; Mon, 6 Sep 2021 15:43:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069046.outbound.protection.outlook.com [40.92.69.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B696868A60C for ; Mon, 6 Sep 2021 15:43:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oWJicEggjIjhrw6nMfL1Urf+rnsoYEB/KZKmOGscg0BgoZO5rIPDY5V9yufWOwPo3BNLpcxKhjzVuOoxZQWkm1nvanAsAWHgWkBIpfpeo36GfniCiiQR2/GK+OwU+B46+ag7+tpK6wJZm9W9Zzf6w2sCXkoyBKpBFoxSlsx9cjmI0RZYQNpqj41V1IkA+4F9GXfZvUq2gwFQ0VDe/3kSMK95z+T5b8ZDOKEf2UYDWSI0MP9OEPmGbh40kU0H30RXUOYDojfbVgcqu+tfP62CZmCajGJ03aT2JGJqd6I1EVq+WLFASeHK0ZHca+MKxVY5NKDXqeiS1ieq55ckplSWrw== 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; bh=SPHIRnrLPRcznzq5r5XxL7k9UM9+8NGQfG5kNSjABVs=; b=gTtt2NwRu75OKxGhGsxz9VXZCooMDDXGSumm8s3z0pHtm3TJLVh/uFkt1MBmrl0k8ZkEib2HKmcXwl0/P+KIbkO0LgFzs1vFb9u6cjf3m/Z8S+XU8a2viCElHEEppJIgAUQR1cdafCgia+jBjWSBYoL8WO0AZFC07B3mkuImQdNSTKGeDKtXRac+lxWD1Pwu4j22BzBqU/YSu6urALjqCON/Pfa8SLZ4Aj5nGJD9VRQifbwMcPcV3f4qJgXTCK7xatEKmAW2pD8Pwhpm+wJcKrabWjocan7yMRDnbbTvFwi8V3fIA3dlXLLtl0LoeCrl3HPD814hiUTulAt1l4ePpQ== 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=SPHIRnrLPRcznzq5r5XxL7k9UM9+8NGQfG5kNSjABVs=; b=AMhGpGRg2cnUQQEi+NVhh8URED94/sg1LgDpN9O3lICrDefpOT+PXoSj6GuSKGt1LDUfcz4uk4QVVkCXqbf/gxc7K6qedKgzNj/AZy12BbPqdhN4KlcSPj+sM1C0TD14moJI15Dhr/A/SOdv2JFz3Npcc56lWHpz1bLpWTOS7MqC/E7F3y0MVt6svnittoLbIQrWd1xrG8LK7gFipaYhM3UxE12+B7/fpPhZP/6nNhoI1OROQq3NGQleE/ISG7a8FkECQ6Y7rN7hsQBp9RBrPRz4kh7CE0cJOoxkINb7jNhCAM6sDKYI9XmaWkb6deYMyI+HIOVQ3iZX57FvM/FjTA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2515.eurprd03.prod.outlook.com (2603:10a6:203:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Mon, 6 Sep 2021 12:43:20 +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 12:43:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:43:00 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [2MS2VEake59hxPJkUgiXUqTK2tSfrkKh] X-ClientProxiedBy: AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124301.4161498-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:43:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5034360b-0370-4a89-2acd-08d97133e7dd X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiRm1SWGrcVu3yZ1k8RyeU252QoGQtekXJAatY+uE9AJkHDHHbT6xORfix3UJQrlM8Izmih+oRvdQ42XyxBvWcCC3jdOYc9+HW+xGtr9APYvsa8n3cRj0xyHzD8pCb2kfnMVH4kfl1ZmEqrXGqvLHmIpY1Mm1OaUcMqVLFlOR24boWTLHWy+dn249RoTOv0t8mW3wy7KLmeFzm8cjz5wnL/830rU9md1X96CrNZyX2BWwkvAjsKgM2qQ/IveU559Yx2OpExwzI0Yp3p3C5tzUbKAu03tRVrpW/SzatmeaUWBiW1e2TKpjfwX67Xkmtnl8K6g3HEqvSl2jdDTwomdoSynxzpIvD0KNHz6Lyuyg9FoABUSfg1VU3KrkKfGCWAssCeZVwAZ6u9HEBD+vIGdpSkJTNU1/nRdtjw08SQ8h7y6uYSsi6dlDLgFImN6YN4qo+lJeioCcKB3eXfXfjohiuD9DS5UKLX3gXF1m8EJoZNs4xoUXbWekc7/B/lCtlW8YHHO8Jc1fM2B+RujSmbc4vvySuc8MWqsfMS6iFprKW9Pd02PO1GDVOsdojviZfIWkK2lGpa0IwuXKAVrh7C0Dlra0ja/UriPw3xlUE0jj1fUH6DdTjyK7mbtP7Wqc16ORVvN/6EcI69s5s589oKZAGxPivLIZh3t+7Zi5FGGCpHljUYAchZvpd2HOQBdkejR8cEAdZRFwgmMjt8ax0o89/cYYC5Dc2btlHKCxVAGeuhAwAvI7w+8ElNZFXxBC21SkGc= X-MS-TrafficTypeDiagnostic: AM5PR0301MB2515: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jL62YInRY6evlDk8gRvjHNlpjkdvdi8AvM4tQcNMHmfvP5Cpbwokrc78IPBYay8Mc1E+DaOlUpGDcDzh/LjVv/rAlNZUPAEPcKOqZI5ujbWDJcvA8keA3Ws+0ZknnY80hb4AaN2oYgqHDcM80xEbI9uBl3HrwMN+WDlJJAcTsYc3KCWWzPoCYmV4qUwvTgP9W9Ps+1RoiS6BVCAppPC38U/GxqRGNfkXB8NVhUn5kq9gHx2J7zteAIcYQ/9rW8XXANcdBYnZsYCmj5GD8rN7sgY/0AhgSZmdspzl+7dT19OSVWUV44/IzpgUwW02JdGIK44Rt9LfixMb9m9hOumbHskZmdx+x2IE0a+au2sA3dVX5fkRQMHVREpY8MqytekectspdlEdPfvhUYQafnKH+nust5Xjz2Tqpeo9uuRK7IOjERrtBlEpImdeGF01VsNF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3I9wxFE1ZpsLsiLOrz+JRSN5XBXdCroH4QkSl04uLXH8hYnMRXg92fv5idx++aNAM17F0QQNHrevR7Xc6UnZgPPdOQHzRVVUdREIJlcIBR+v4Iven7XJqzjIrmXH7SmCymEwlv1J8FC4CWmb6aI9Lg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5034360b-0370-4a89-2acd-08d97133e7dd X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:43:19.9018 (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: AM5PR0301MB2515 Subject: [FFmpeg-devel] [PATCH 10/11] avformat/rawdec: Make ff_raw_data_read_header() static 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: HowaQrqmBh4u Signed-off-by: Andreas Rheinhardt --- libavformat/rawdec.c | 4 ++-- libavformat/rawdec.h | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 06406424c8..b7e5a2d966 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -102,7 +102,7 @@ int ff_raw_subtitle_read_header(AVFormatContext *s) return 0; } -int ff_raw_data_read_header(AVFormatContext *s) +static int raw_data_read_header(AVFormatContext *s) { AVStream *st = avformat_new_stream(s, NULL); if (!st) @@ -148,7 +148,7 @@ const AVClass ff_raw_demuxer_class = { const AVInputFormat ff_data_demuxer = { .name = "data", .long_name = NULL_IF_CONFIG_SMALL("raw data"), - .read_header = ff_raw_data_read_header, + .read_header = raw_data_read_header, .read_packet = ff_raw_read_partial_packet, .raw_codec_id = AV_CODEC_ID_NONE, .flags = AVFMT_NOTIMESTAMPS, diff --git a/libavformat/rawdec.h b/libavformat/rawdec.h index 18777db290..f843fe5a2e 100644 --- a/libavformat/rawdec.h +++ b/libavformat/rawdec.h @@ -49,8 +49,6 @@ int ff_raw_video_read_header(AVFormatContext *s); int ff_raw_subtitle_read_header(AVFormatContext *s); -int ff_raw_data_read_header(AVFormatContext *s); - #define FF_DEF_RAWVIDEO_DEMUXER2(shortname, longname, probe, ext, id, flag)\ const AVInputFormat ff_ ## shortname ## _demuxer = {\ .name = #shortname,\ From patchwork Mon Sep 6 12:43:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30041 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3722445iov; Mon, 6 Sep 2021 05:44:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCiT543RCD4PiYISy128dfTFroT+OuhnbIV0/HlVph30nUi4jZHpTDoWNo92o9sk3M2j5j X-Received: by 2002:a05:6402:1b02:: with SMTP id by2mr12923391edb.365.1630932282202; Mon, 06 Sep 2021 05:44:42 -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 j7si6423673ejm.280.2021.09.06.05.44.41; Mon, 06 Sep 2021 05:44:42 -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="Zw1z/LUG"; 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 4C0F068A69A; Mon, 6 Sep 2021 15:43:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-VE1-obe.outbound.protection.outlook.com (mail-oln040092069046.outbound.protection.outlook.com [40.92.69.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF3BD68A62A for ; Mon, 6 Sep 2021 15:43:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k9fpSLxY5asMc4pBKCFjq0QIIsVaglp13Njy1N93upWOel98nSjv8NCsQo9OPEHAjw7grRFGu40hevhG0ZauT2bIt6CfGOa44cS0gGH2PHXXGPzq3VT5DzEeb5BIcUEt+02XvPEz8nTZ0cwFnn0bGjbuhh71SjObEVas4gxSwljYVwb90y7cOvU8Cf2IL89kx7O4jO4iDuPwqG06FGSQyz/fRvILZQxaUaVbWSbG9LWUqOLb7DTXGEFr7qoiDMe/E749fS3MdX50Ql2O2BsUZv46Li6W3FV7Clkh7MjPyLIcVlPJbU1Jp/woDwRNQerp6qRVFRs3daWLIWQkREt99g== 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; bh=0zRQZJ1i+QNRJQRDlIiyYvTvu9Y2kUSeSn/J4qEeYQQ=; b=HFfc8tLFrxOHiDWggKA82UBgri4qbmRABtxd1UR35OF6h5w6tyXqIRM1pFNFb5eqruRpq393QqO+ZFU74zAG94XKqsYpaxi/jjK0V4D7LLPUGt1GFxgeZhmJ7oJIIX6+Sp8GVI0LCxGyH4p75csWvo3OlqjXo4AVqXYFxLe7eXgnzG4R/DLJNhQdjdzQCFII9JTH1y5H1ysd2rgvHCMLDmxstkIQ9TfbuzT07QiOdr9fDpAFYdZtJMrb+GRCHQNxl/izY6FjbvVGijVYZAnU0a5DWjMksd2swbX813eFDAcd30TZ+xW+AB6bqG8ThqesKMWE5wqY4B7rbpgG4N7bag== 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=0zRQZJ1i+QNRJQRDlIiyYvTvu9Y2kUSeSn/J4qEeYQQ=; b=Zw1z/LUGB7FBTU1ki1/ev1VyJ41m+aMsva7/YkB+FSpuUkI0kE7BoeIgJhyyipHazhQLGADvrYnhiGcBhg3GBTTcl5gFSztymd26qs81YyoFXgS4xfIyd78JTtqfp7PTkIrI52PLelwtLr7iQ5upY84nEuS9NQg9oUoZgV8O5LJ+L6GhaY4ueKf2gWED/nH59J4GsFuNUygpB1x6TvR3Lp6X17bjwb9NhGuP9CXYSIi8yMBntvsruwlT32nGUf6YFA0yfW1LzGk5ilz2cEUIScenxsEN5EIuJh8/byXA6r9elPwCp3U8cRdOjsSNSANTbF9VmYQXP+xbJjxlRP/rfQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM5PR0301MB2515.eurprd03.prod.outlook.com (2603:10a6:203:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Mon, 6 Sep 2021 12:43:20 +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 12:43:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 14:43:01 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [dhe5kL+f4JiHdZTBYHifjToJr6FP2Vm8] X-ClientProxiedBy: AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906124301.4161498-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by AM0PR01CA0084.eurprd01.prod.exchangelabs.com (2603:10a6:208:10e::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 12:43:19 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1010f307-9796-4b5d-6e44-08d97133e81d X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNWfiyriVhNa5oktltvv1jUtk6bVD55OMjig2oqrF0lYCvEbogc4dh64RC60BrT04LD7NRmnzgwd4ESwZ+UrzL9dzZvvgHdfCd0KAuuRyLiqZ+38A/BjYmHg1zruws17nkwF/eEHOG/4S5olUATyPd7A0cG+o3JelvBieK/cxFAYjeB+PdbFVuEu19O17FStBozUmdk06TiwgOszpLDn/tENKiAsRiYGRi9PJ8lOpMyhAwOxCwsuVpSYXGbteZFdQDStTDN7a9Co2sLIBjWL4ctW+8sxTZegJZQtP8pL6x7ic5kPQKuetf/8GF8hlzhNKiXqUuoCknrkk72Ft3mIr3Zk2DmPwgA5+O4WKjnTx/QwMU7SuzUDTRrVPHlQqwcuxFNUJWM3mtDcBRBYCl0mhvL2pb608XzA77A/rmUChsRu6mGQDi+SxoPZBlHYLmh8i28UvoI2K0EGLURJhioebFaeVZmBt22MnYmz0IrVkCDFn4rbBhleJoE48691be+G8t9W4q3tywuAYPTUbOBA1lvjeWzJw//2Tg9dvhkT4XOdhxAzGkodmvI+OCPTfDXuF2AWDM2L97soj5mxORXiNuyZwIQvd8ZQf14tPFYXpvLJ8poxGuvk8A0FtdRRJTghVhatGYM6Ddh7jsYiDOt0nqaWfjSRHcY3OGNiby4Jk0bRWtyUI9nKcnmGmYHXEwyhaa2H1ld6kK7tyIIm4WFkF4dK/k/dfFDsk0M= X-MS-TrafficTypeDiagnostic: AM5PR0301MB2515: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: duvWFh2Qr2rc+c43uARAJAz6V/ljdenSonChDr4h0rq58gzUd14JuPeZa/lZRUnpEJ3D8auDs5vdgKk8CKZ8wpZ3kw5wZk2DZnCIQLdt5gK8g/u7wtiQwAYO9dpx+bVZFxGLUYv+j/lE+E7vt1+RqzpqU+0oKxV/Zs0xBl9GIXsVvvxo+kghjnNnUvDwxSmpcoR+JYNNAoO1nqEcmPOTLkN3xHPh0yNVQBBx5PXA7RhQ2jBdrRyUeTlCL/VRyHkMMnS8ejlBaBcxzhjFqFNkWZOeF25mFGdCOkZgHU+Q39pQNdrvAh5ZPmOnghwd5fusuQhSIj8Q8fA2qU6lNB2kP5T2Tw7FwjSDTQLcXcvBjjke6ZYESNMuvfQ7VVfUt2vyW68yNxcPNfouhlDAOLmj52nwXp1Y40WBVTPutjjygSO4QQUP+2PRsbNBNSUDWSGe X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: HR81KswNBR61ClTpsHZoXleUySD1gVZ1Vfxd/j2hdPiwVJe7Bhyk2kBpsYnjvcGE0+hDOc6NAMaBvohvC1f5x8ZMti56Qx5TKje1SyciagvlrzwbXU9XRWET1AXb2aAi6hf257wHThkjtgCOs1XE6g== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1010f307-9796-4b5d-6e44-08d97133e81d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 12:43:20.3081 (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: AM5PR0301MB2515 Subject: [FFmpeg-devel] [PATCH 11/11] avformat/rtpdec: Make ff_rtp_handler_iterate() static 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: ThELmQ8hiaUG Possible since 61974537610d82bd35b6e3ac91ccd270c6bdc711. Signed-off-by: Andreas Rheinhardt --- libavformat/rtpdec.c | 15 ++++++++++++--- libavformat/rtpdec.h | 10 ---------- 2 files changed, 12 insertions(+), 13 deletions(-) diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 6b0da9e636..20fe2b82d7 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -135,7 +135,16 @@ static const RTPDynamicProtocolHandler *const rtp_dynamic_protocol_handler_list[ NULL, }; -const RTPDynamicProtocolHandler *ff_rtp_handler_iterate(void **opaque) +/** + * Iterate over all registered rtp dynamic protocol handlers. + * + * @param opaque a pointer where libavformat will store the iteration state. + * Must point to NULL to start the iteration. + * + * @return the next registered rtp dynamic protocol handler + * or NULL when the iteration is finished + */ +static const RTPDynamicProtocolHandler *rtp_handler_iterate(void **opaque) { uintptr_t i = (uintptr_t)*opaque; const RTPDynamicProtocolHandler *r = rtp_dynamic_protocol_handler_list[i]; @@ -151,7 +160,7 @@ const RTPDynamicProtocolHandler *ff_rtp_handler_find_by_name(const char *name, { void *i = 0; const RTPDynamicProtocolHandler *handler; - while (handler = ff_rtp_handler_iterate(&i)) { + while (handler = rtp_handler_iterate(&i)) { if (handler->enc_name && !av_strcasecmp(name, handler->enc_name) && codec_type == handler->codec_type) @@ -165,7 +174,7 @@ const RTPDynamicProtocolHandler *ff_rtp_handler_find_by_id(int id, { void *i = 0; const RTPDynamicProtocolHandler *handler; - while (handler = ff_rtp_handler_iterate(&i)) { + while (handler = rtp_handler_iterate(&i)) { if (handler->static_payload_id && handler->static_payload_id == id && codec_type == handler->codec_type) return handler; diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h index d54a05869f..5a02e72dc2 100644 --- a/libavformat/rtpdec.h +++ b/libavformat/rtpdec.h @@ -190,16 +190,6 @@ struct RTPDemuxContext { PayloadContext *dynamic_protocol_context; }; -/** - * Iterate over all registered rtp dynamic protocol handlers. - * - * @param opaque a pointer where libavformat will store the iteration state. Must - * point to NULL to start the iteration. - * - * @return the next registered rtp dynamic protocol handler or NULL when the iteration is - * finished - */ -const RTPDynamicProtocolHandler *ff_rtp_handler_iterate(void **opaque); /** * Find a registered rtp dynamic protocol handler with the specified name. *