From patchwork Tue Aug 1 15:04:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43062 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp37694pzb; Tue, 1 Aug 2023 08:04:40 -0700 (PDT) X-Google-Smtp-Source: APBJJlET+6nf/JPjLqiRP3o+Yjqvit4DQQCDhCCD+43Bm1JibdVVHmt3HvTxRhfOZfZAZvqKbKRi X-Received: by 2002:a19:ca52:0:b0:4fb:8eec:ce49 with SMTP id h18-20020a19ca52000000b004fb8eecce49mr2198154lfj.31.1690902279979; Tue, 01 Aug 2023 08:04:39 -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 y12-20020a17090614cc00b0099b4222f51fsi5194300ejc.266.2023.08.01.08.04.15; Tue, 01 Aug 2023 08:04:39 -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=RhqQGhCw; 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 8439168BFF8; Tue, 1 Aug 2023 18:04:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2038.outbound.protection.outlook.com [40.92.90.38]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 90F2968BFF8 for ; Tue, 1 Aug 2023 18:03:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nyeYTLxOph8R5nnFJFKh6/J6Xea0vLWsLq02O/m6Oj75rbYMURvcJVk+4G0NayXBcvCTdT8j0GWvxcsDe7fOyLNEXyUiFpb3KUC27k920P7yl/ktUxUQ/nBfBRcIcdwXs5uCymF0mAeV+jzRLNB7emNINTsXmRyCJgMYVLGwbBWaHD3tgar42ihCxaiPBI7PthLTa0EwjwHa7WIIeMypQfiVNStHTxcKvOwX9FXIfTk3swLQCjYPHxJtYP9rL/XzD3whtF6V476Ovv2wY+saKcP1wtb5rTvp9V7bC3g0ae56m/th++fL4P4pzHB0FSYLsx26wh4A5D8ajRM001PrDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=w0Wgr/WBZbMMwokyC2dpEvpHDlD0hOfN/Vye0YVuxMA=; b=cObkqSQDitPRDM8trA7zpDbwAeNmCfDiIZWXE5U3SD6T3HB7W0CEBMvFeWo7RFa8puSGgi0aLUUYf9qz9qN1BwdER0ykJ73W/V1TRRmzYqJNzA6/26cNJpNMW8FmbGjN9KjZSqRpmuJZAWO1FpHiodF2FNCP4bsiMBmYgCngnrn0R/MBeZblElIi7GCLHfzNVzs3Tfsoc4EYpPFoY4MDG5wVwA7mRwgiaHldJGEAJZE4fIU0rnOjbFF9CHPWKxAhNxlCZ0i1VtgnkDSq2ONNelzMONLSKBf8/vRLVSUoVCNuKErHWn0pJfJ50tFdIVdSpMkJXP1RktMu15uQfvE2tg== 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=w0Wgr/WBZbMMwokyC2dpEvpHDlD0hOfN/Vye0YVuxMA=; b=RhqQGhCwt1ea4rOJom/FOXxJ6z+iwi3i+vFQ1HrgpgOwNw15qRpoiNbgW3edbV1NWNLmH3oZ0YM9yQIF0bHxB2WpmuaVGELueaFyNg7fD/nOgEocYerBQGlnFLm+MnKFznToVl2HkCYVzgHs4u77zD2+BEeOmvB8Vw/p4z7MVMJk+anpJiHr0jEBE/8NAmpIs2DFz+a5b80+O48YZpeTMsfipbJVEi7igRhfyz5LywYfq58+aN3dDwJQ0484S3XoH4cVbX27sGRu7LXr3vvIXyS0LDGzERKYFA2QARyU47H3mBH8V99udRUccocpIDv2yNq17yF6RAY+kqnJ4MJL2w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0080.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:271::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.44; Tue, 1 Aug 2023 15:03:53 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.043; Tue, 1 Aug 2023 15:03:53 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Aug 2023 17:04:52 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [IT0oYTrrg9bH3LSj/4PVtYJvsv118LL21UNCuGR7AhI=] X-ClientProxiedBy: ZR2P278CA0018.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::16) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230801150454.3755953-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0080:EE_ X-MS-Office365-Filtering-Correlation-Id: 2ebf21b9-488c-44c9-7961-08db92a0851b X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpdHtR81+IA7nbDSCnGfE51lOs0t4NLYEteLn8lkuarprkhXVctXPa/5IJZ9D0drfSD/U1YjRl9vkaO0xZRmlIi4Sc0WPXzDIMX0fQRUWJeEthX5dJ2HaJXeVhJFPkmdM34NDYlekrE6WWFM5Ii+cjLs0X4e127NIfVcTnZcEpFXEPYvMiDRC3Y9MHaJi3lvY683yMHBZ9cwYHr0dvq6rgjKomWRVtViYc9cv1G7L6sReqtj2F9Kf56Ywp8UogJu4IFUb1Ke+NvMCVYtOR1F0/6GUWD39DbAfqcCjgrAKBLAoZGzniYuxafki1pvi2XaeDK/qiaW4LQrE35nool1vRa/7/Jl6XOzTlVWVUOJlHQbQm8bbDNGf6wd/NUHVN+fKxc/rf2sU9tj6NGnNh4UY1MFVyS5gQmgP/crTVmHEWEKiurfMcN5UGS5imZ4aCGs7S/aNpXAn8ihswuMre0/9+jWgHF9oOtBoW+jtydDgnQU3+BtmZvMWWsmK77xPKxBB1ZBCcPaErPUZQ8yPkBBmtVohGrq/gpJOEomXafdYd5qOQ0fXkrnTyoImlUKmTbid/UldoZrrMHr6meLYQFOXyRJGN6xGzCxmGOcZ5B1I77rkWWu3inapHCTQoGw8RssyStD6HKbelmjlsXdE/ZLz+rTMhKgrnkORuoIvYPhBSbnJOQFFAIjUuu0C7v0ipdQCiO8/MIZe4teefyf5J/vEdnzYB8hYUVZ7F4wBXd6KeWHXA+5tOcb6Ji3oqcNGvL0R8= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +WM1/sWfiazKObpGmVcyODB3RQc5GgedUX9fQh4XrqoFXs8mI+o45xL0U3f7vNHUQOPTloVBgmrFH0xtaHExQB3RJqXisNIczL+cD8Rb7tJKxpndn7Gs3cM3OJb0JdpVN4GmF3whG5w4txzGqydZr5Tr+w0vWAqMCMlCB1akpn8f1gK6UDPOd/1U3bm4CvdEV0dk1VLCcQb75NP8vG66SZ3BDsX2Qs5TPY/SlUcoNjDwgmbSRH/AzOHtK1s3w0Sl0BLRPTBcHPN3m6NRCAmjr1PmuElwDScyUMK8Tr9zw5Plorncq+CB4xz2tT0HjpfTV6d6l2uUJ7Zgdd4kNnC4dD1ikKqkipwHCuzWC2/5zgxV0KiejU80B/B78++ti9kBLYqCe9yWzrkb2uvzJjh5XOn2SwF0HlNRt4VlIoyjlev4srUK75FZa3RLYWA615iFKYwAojE6Xmz2dXBaK2Sru4qURW67+A630oBCwu4wU4XturEE+56XtZZRx1bc/YsILACG5zQpvy7cuJCnnxQ4ELNbBf6Eewj451fBP3Wgh4FXCiH1QY2VeUDfc/XKoJUapdTAWcWYmt4qr91KxkdbwNxzXfBeHHegruEjN5x7++/uCXxHckRwTs1SIEYaODDZ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: ZM1cUVrwiwwhTZts6XmzyBVwCmectWC7pUg9pjEyBWErPzUki0UJVELHPQBzY4RwN8KeNKQM0hhvAE0M191J+UIprVuwR4Dv5gwshCoxVLo8ENWLw9V6IackNeaqNb4BmQuBciuH15GueU+Nw4cQTIl+3y6lDP4lAusyiNaKNs42+iL6J5L8evkgjiblnL9dMGh1OklS19c0A4OeJgP7uSCKUFsE+wAj0xo3RseLg1htUQ918hMGrHW7FAZXrE2XGD7znF4uQ/x4Dzqg1STcqLQiNPdVV0m1yx0yucIvGPsXqKIN8JeB6LalphBvNbL1g6LfzlJVq7mB2UooNCRwwzj7/ONFV9//ch7rUHC8MsjdapXex+sr/ZdrBRI3vwMvRvGogqdL88R2J3au7YQvQxU74pkzERVAtK+WjrYqV5t+S/Q3NxP/9OABHDApke3wlvIbkWi0y+Mq351cXW1Ii8Nms1MMZbEfbVuK3NBMxUh6x37/YXi8gZZMdZsvzlgb997YQqH149axKJOYcFnsseM8b6IXBKH4JKaPo/pgPOMiFMT4ADNVGtIlA8zXm3P8+8iUsZ6rZsCtXTxTK77mTT7lkZVed+FzzcCjBYojlPxtddLgJxcnA3zSVy+dEwtZAlZG3LWx6mqPupVmVJP2T0jchSSxj3WdnjiM8v6/q/sgZljYkPjHJ8tr442XJ9dmA5RQ3PDWVnMr2rpsjNpxGt6Oam330c+EArbl5GoQ4mK3+lpWdYeJiNLh1ShVgzIDoFVwVt0eCHoemkxrT5SmQhUX45HB31ToXXQjEgxY6I37uiCClubgS6+ccL17kf/c/Oe0zWvmAoqZPzu8k8kM9kBAqBTikhyRgepVrYvURLXexLwgWLQ7sPCyfYdX8jMezl4mQvi2oSjAJIK7703kATcoyEuNY7zYKC+lLXQ9i0QC7qoCm79xLZag4k9be1E0r1MUT8PNrdfytT35aEw1lTs27PNpu+psnx9cj6RGmdHiT6NA321GHeHZni0a4dmxbRUi7oSmaljXf5DrFm7hNySA6Lifxsm0cYCMvgWCLe0ogXXbmHWQnkOlta+vax568Ejalh4HX2+ZYn1lbqZF0jw35vb6wIml56cN1M1CPdDK1m0sWMrv4kzD0F1cLsu686zI7NXVw2xZhSMmu5jLr7S0x4Mx+NZCoD+Y2yr1KanrMtW2+HWSVqGicqaIET9x9rl4Y+eTNOyhvPEcApOqvE6aP9llxFGCykC81q0GBsK//wXXNL/yj6NuwMnN5Uq4 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2ebf21b9-488c-44c9-7961-08db92a0851b X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2023 15:03:53.2248 (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: DU2P250MB0080 Subject: [FFmpeg-devel] [PATCH 1/3] avfilter/avfilter: Also deprecate variable name 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: OdL5oLWTSyuz Otherwise the var_names and the corresponding enum will be off and e.g. the array holding the variable values will be too small. Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 04887b6ee5..b8e1523bdb 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -478,7 +478,9 @@ static int ff_request_frame_to_filter(AVFilterLink *link) static const char *const var_names[] = { "t", "n", +#if FF_API_FRAME_PKT "pos", +#endif "w", "h", NULL From patchwork Tue Aug 1 15:06:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43063 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp38425pzb; Tue, 1 Aug 2023 08:05:25 -0700 (PDT) X-Google-Smtp-Source: APBJJlHB6qlDdnGmfQ2kkMJcGyq9olvjS53o07WaiO3/Aes9RaXtphOM4WX+dB2VzImV/JF0mrSY X-Received: by 2002:a05:6512:2826:b0:4fb:9d61:db44 with SMTP id cf38-20020a056512282600b004fb9d61db44mr2661079lfb.12.1690902325203; Tue, 01 Aug 2023 08:05:25 -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 ci18-20020a170906c35200b009823816586esi8431888ejb.500.2023.08.01.08.05.20; Tue, 01 Aug 2023 08:05:25 -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=KNXhjeHt; 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 B532568C50A; Tue, 1 Aug 2023 18:05:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2100.outbound.protection.outlook.com [40.92.90.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53AD468BE7B for ; Tue, 1 Aug 2023 18:05:10 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q7d1ugue+DCgMbKDr47B2tO8r3fruZD0FhzfUMU19hg5SqSfoAwOSgBD1c2UNsxA/hQo6LsqqZvd6UHuOHDIHV40ZLIiPEZEXn2OXcrCxroSGVOgC1mMue5B7yhsg5D1qcrNRjo5m1j1sA/cEIjkTp9OWbZSgwTU5gnU0ZC0JQTQoU4k8ULkerZsWNHBpyFceGvCebXhyENgHOcrggL+vavBVHDSxvlm4rxpPAay9Pzk3InSmtl4rZNQMjh0j272Qtq/j+MG7499X+12wPanQjjISXHOllKjQeLpCNhqonGKmfZlX4bI2SrNsiazZHAc6bKDVrmLm26rYgYCBOrkbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=e3fXXdMeq66wUcwGqMyIPlvOQUXXlfPD8teh8lISWjk=; b=lvjwBZLBipnFDn1/HC6teTH9CWDRbqz1aC/HzbSUvkRqQC2hXWT8o1gb4IoifQgsPFg7c5nIV5QvFEITcTJiIocyV6qlERtB5zHrhCdKHT9T/NpZ7AZk+fpCR/s7qbtQPExZxiLeOFO+8iImVJtSOVdA6rYHTOixz0Neha15ag57U26Kd2tiED++cTZo7VXe9U96ufQKOxNZlxugKHKE9hBkkzFWzUwHfGi+xw/n3NFD5TEjCmEHebM7fCdOJ9QQwDmF8duTpUqT9GHTzEwZnKo1In+QBgIvkXLdlYqP7eE50oBcvh8Q5TRk87MNNggC5UB3UwKOpAHhV8eJ3Vx+Jg== 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=e3fXXdMeq66wUcwGqMyIPlvOQUXXlfPD8teh8lISWjk=; b=KNXhjeHthoMTOgn0gVgCIJ5dDX2NVkFGBitee2A9TqGNDKHssZjw9AWmHt1J7ItyRzXomCjhjewhGFzeC/azi9011NidlwG402H3O95VrQRBHdzqX3anj6hTKUGjbXk7SLrTKuwbkG8Tfk9iXs8xhNMTe3Pvku1hDQcjFpsVM9m+JE9/xnuqjboaiUvogafn/eQhhG0xOidpqSwztqp/aNhyieUwSZsJoAOILaV5lAo8pjEi3S1zoLoK+SQ7Klz+UHDSCxmNAFtIkISDuLOkOOGfLG7fmJcPqjYCRVi+RgNIDaqwxlw15wGoVSnGrCEgtSK9bHsstapCROii+Tc6rw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0080.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:271::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.44; Tue, 1 Aug 2023 15:05:08 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.043; Tue, 1 Aug 2023 15:05:08 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Aug 2023 17:06:07 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [XYDjQX6n6yITiozdZ3SVAhBSUBKE3J/jmYeY1asnJ1A=] X-ClientProxiedBy: FR2P281CA0092.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::16) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230801150608.3756402-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0080:EE_ X-MS-Office365-Filtering-Correlation-Id: 756f0f38-958c-4e77-fcfd-08db92a0b227 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpdHtR81+IA7nbDSCnGfE510XT/uT0At841VlnYGX5H2UGRRE/KPGlYK07KEsk1zPL6oKgtfcC7z3Clwk+gTswQh+677pLLBi1iHLC1eSQeU7XE7KR6D9OAgVeqHDtam85kuwdau9Oqk8sKBaePQMNQYfnjFvshi3hVSU5JTOjkFhnW2iOur7HKGRwFOtGMGURV6i1uLX2Wg0OpiwbWKJji2LrvkG36E0r+TQMfM5XzYB1mGlBGttMQ/F8PK+GwRRpP7OLh++eY7lXwDDrrwkEuEXK5zXiO12zKaVSaa9h+Mv3l+01zwtYjyXVU7MaHFyN2MOx7gFyHbt3z6si9T4fEt6GzyUm2WHGKWMaEwwfmJyvtGak8U25gfHtiAee0B74DZip/3wZ7OO0toL+lUH9HzhJ2HxMgA8tH/ZpsO0Gu6KwnaJ4dR2194zr2tIRaK4wyZY/RNkOLBJo6YWZqxBmU0tXwLk73nULoXSy3x95Fl+fIgeHpmv0n9xyJQ54HX3S9YVR/9grbRfdepfIuiPgk2Iu0GG3jl4cDiS6JyQ696iTIuHX/gjNP+vk528UHcwz9tTAQuVmWJuaq8nAzuhdVUtglLVkDTcW0yPPvfkBDrFfcVUGS1gg/jc+mgLYKPvX3GJJLMEOtKzRZR4lliJRP7vfNqGIYrvqCroz2rCo8VPhzoIXUN3VztjdMdXjWP2NeXnvZNmAho13eH7NPt3a1kTeQPbC1yziLksKbvqIbIclk3vUxdFhdWjHXdkj8TsY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ceEqmYfapePemmeBIfh2bgn7gsshIFsg1j2k5xqMprZLWsXKtVb1Q6QeCsZoMGm0V+BWQkdByqJh62KHA+zggOUJ0r+A+SronLqdeAPTqI52slV44LIMFhwAKLUZp7rTpb5bVvK+sKz3MgFjAGAQeFbUP3oe37SAAaBT2Gzn9VS7r5lRmbz5Srlt8uhe8DchUuVe6CuPEjAbSOEJSwqz9zI+HavvhHlCl8mUXl11cX4tLK3sYBwJG1hHz6aZqblLFUJLywCMjiCIzlfYWA3iKD3rAXPN+yulpswndw6wf/fooY/E6GUINByUa4Gj135ILF9kmrGYLm9NBvgvNNop1NVyH1NorYJAhvVVoRmwj2ZN8qhm6JVU20Iivj7Jv1I9zQsNT2VWGipjBYvX8RfVhSCvksSSn/+hu0xi8XXu93UZYXpa/ntzJCwtsfFXXGHg1gbK7s0Dgd9x+GslTD4v79RF0nCj/VSIl9z1QbuuOmpM+3qzxVrsw7FqO4QVhaEso6/fi4YOLdjSaNNw0yM5LipUUfyCTuhzggP0Cyx3uIJYpISwib9eIdFUARcilN7oGhE8CqE5nn31WeQMUbW7mGvlogUsljiGV23mmZ8bPkeUBLmmFaROQPJzvidu/BmU X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BPOfXEs0IoZf0ZzJU9pDDzdaMM7fC85BJQZlVMiy4sogocigjG0XU7AKYF0NtPwJTK5/G5qI5adCTzK7+TOLvXgg8B1iOKr9cUT/vfUv/LBOfMxV8OmQ9Zjp4UugKGY90Ias6/RSYF4VuWQ9T2uo7nfKvy5yv4Oy27wkwCmAmF8sE4VoyVcEX+A9Ne9KuqIfykHiTi4KXRme9cxyZ+8AEExwT/4boBO3djEU3cOLu48KOwesmOVQMXahjDdONxg9ip7WGZYoDOVDux4B6TeRYRNORGzfpOKlz0gi7biQHrdGGxUZZ/282m1jDhrWPySV3UpkRGqgpd05j3VlTPXVHSWaYKg4mRYancJ6eoz9FqoPPXH7ixn+S2WlSuLpaBOVLhBsNmjFGlb8/rz9ib5wgIdMaJlvipCkJqVe+2UwzDEk/3KY6TRAyXCYrlbn2OQyn6yO9RufehidqdI5h8PQaOSmbPEWMJp/9yav8nPYzTk1N19kARXJVg1YMi5ET+NpPvrvaCo2oOXYOblsSgptcHQQZm1gVRvaVsCLX6riEfVer7GgDg5MkGmtAZxefAQq4JKv6H76uOi1nibBetxzkYu1PATpdU3ovD2VQZZG4D6qhFqP9Oj+rn7jE03vaE8pdZ2VArsmIQKhmblbNQKhS9E+Kbo5JrIcWYucNYsDT0tWRYoCcHvtpDT3tC1LYey8c19FZkFlDB7e94ygzI9tEeRvuTGJHAp08Wxz748YGTtVl0YjteCMLtUXLHWUq1OMguJDhAvXP1H0KzM/0HNO6pXNmtnMUpo4e1aHA5ZaBPn5Px/RpNcYOUHEaXfbBemegR4TxAFCU1D28eAqzmcnIleO60oIiyN14SQWHfouD8qvGm4nySLHvvjhfKQRqZOOlR3ib+mcad2kEQyy7h5FgQQmMbHg4ufgVjhBbI/D0+ToWtt0U/6EV0I27jqYLkMgXQiZ9u21zZf/EOWe5YNQuq8foOo9o0N1DVObDhGLuyBekXpsjLOdBV6MDmhqZ8DTnBCRA/njqxunlmNIFLabW83R9kNkT/zLxdruVsETpL2phEHTRGMbtuUWPGyBSqu0jNJ6pObDxCT9JWZRXxmygORaGZPxD560fjqvkqOVn00yQIC71g042tihE5R42uBkjsQ2hnj6pME1VEKYhFTz2qdONqGWOrxNiVO5FGBLyK1PtuJwWHOqTcc4fTUg4ilX9fnkrGoDtadydsMXRAbzVmipQM+PdFsSU9sqBsaAvr/vicTyXvmi/1lDByWZdtwE X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 756f0f38-958c-4e77-fcfd-08db92a0b227 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2023 15:05:08.6543 (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: DU2P250MB0080 Subject: [FFmpeg-devel] [PATCH 2/3] avfilter/avfilter: Make functions only used here 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: Skp5aNbFkPQ8 Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 44 +++++++++++++++++++++++------------------- libavfilter/internal.h | 8 -------- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index b8e1523bdb..df6f1ab3de 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -201,6 +201,17 @@ void avfilter_link_free(AVFilterLink **link) av_freep(link); } +static void update_link_current_pts(AVFilterLink *link, int64_t pts) +{ + if (pts == AV_NOPTS_VALUE) + return; + link->current_pts = pts; + link->current_pts_us = av_rescale_q(pts, link->time_base, AV_TIME_BASE_Q); + /* TODO use duration */ + if (link->graph && link->age_index >= 0) + ff_avfilter_graph_update_heap(link->graph, link); +} + void ff_filter_set_ready(AVFilterContext *filter, unsigned priority) { filter->ready = FFMAX(filter->ready, priority); @@ -232,13 +243,17 @@ void ff_avfilter_link_set_in_status(AVFilterLink *link, int status, int64_t pts) ff_filter_set_ready(link->dst, 200); } -void ff_avfilter_link_set_out_status(AVFilterLink *link, int status, int64_t pts) +/** + * Set the status field of a link from the destination filter. + * The pts should probably be left unset (AV_NOPTS_VALUE). + */ +static void avfilter_link_set_out_status(AVFilterLink *link, int status, int64_t pts) { av_assert0(!link->frame_wanted_out); av_assert0(!link->status_out); link->status_out = status; if (pts != AV_NOPTS_VALUE) - ff_update_link_current_pts(link, pts); + update_link_current_pts(link, pts); filter_unblock(link->dst); ff_filter_set_ready(link->src, 200); } @@ -428,7 +443,7 @@ int ff_request_frame(AVFilterLink *link) /* Acknowledge status change. Filters using ff_request_frame() will handle the change automatically. Filters can also check the status directly but none do yet. */ - ff_avfilter_link_set_out_status(link, link->status_in, link->status_in_pts); + avfilter_link_set_out_status(link, link->status_in, link->status_in_pts); return link->status_out; } } @@ -537,17 +552,6 @@ static int set_enable_expr(AVFilterContext *ctx, const char *expr) return 0; } -void ff_update_link_current_pts(AVFilterLink *link, int64_t pts) -{ - if (pts == AV_NOPTS_VALUE) - return; - link->current_pts = pts; - link->current_pts_us = av_rescale_q(pts, link->time_base, AV_TIME_BASE_Q); - /* TODO use duration */ - if (link->graph && link->age_index >= 0) - ff_avfilter_graph_update_heap(link->graph, link); -} - int avfilter_process_command(AVFilterContext *filter, const char *cmd, const char *arg, char *res, int res_len, int flags) { if(!strcmp(cmd, "ping")){ @@ -1117,7 +1121,7 @@ static int ff_filter_frame_to_filter(AVFilterLink *link) link->frame_count_out--; ret = ff_filter_frame_framed(link, frame); if (ret < 0 && ret != link->status_out) { - ff_avfilter_link_set_out_status(link, ret, AV_NOPTS_VALUE); + avfilter_link_set_out_status(link, ret, AV_NOPTS_VALUE); } else { /* Run once again, to see if several frames were available, or if the input status has also changed, or any other reason. */ @@ -1147,7 +1151,7 @@ static int forward_status_change(AVFilterContext *filter, AVFilterLink *in) if (!progress) { /* Every output already closed: input no longer interesting (example: overlay in shortest mode, other input closed). */ - ff_avfilter_link_set_out_status(in, in->status_in, in->status_in_pts); + avfilter_link_set_out_status(in, in->status_in, in->status_in_pts); return 0; } progress = 0; @@ -1249,7 +1253,7 @@ static int ff_filter_activate_default(AVFilterContext *filter) change is considered having already happened. It is set by the destination filter using - ff_avfilter_link_set_out_status(). + avfilter_link_set_out_status(). Filters are activated according to the ready field, set using the ff_filter_set_ready(). Eventually, a priority queue will be used. @@ -1339,7 +1343,7 @@ int ff_inlink_acknowledge_status(AVFilterLink *link, int *rstatus, int64_t *rpts if (!link->status_in) return *rstatus = 0; *rstatus = link->status_out = link->status_in; - ff_update_link_current_pts(link, link->status_in_pts); + update_link_current_pts(link, link->status_in_pts); *rpts = link->current_pts; return 1; } @@ -1368,7 +1372,7 @@ int ff_inlink_check_available_samples(AVFilterLink *link, unsigned min) static void consume_update(AVFilterLink *link, const AVFrame *frame) { - ff_update_link_current_pts(link, frame->pts); + update_link_current_pts(link, frame->pts); ff_inlink_process_commands(link, frame); link->dst->is_disabled = !ff_inlink_evaluate_timeline_at_frame(link, frame); link->frame_count_out++; @@ -1512,7 +1516,7 @@ void ff_inlink_set_status(AVFilterLink *link, int status) return; link->frame_wanted_out = 0; link->frame_blocked_in = 0; - ff_avfilter_link_set_out_status(link, status, AV_NOPTS_VALUE); + avfilter_link_set_out_status(link, status, AV_NOPTS_VALUE); while (ff_framequeue_queued_frames(&link->fifo)) { AVFrame *frame = ff_framequeue_take(&link->fifo); av_frame_free(&frame); diff --git a/libavfilter/internal.h b/libavfilter/internal.h index 8b232a8d8f..58665ff086 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -243,8 +243,6 @@ av_warn_unused_result int ff_parse_channel_layout(AVChannelLayout *ret, int *nret, const char *arg, void *log_ctx); -void ff_update_link_current_pts(AVFilterLink *link, int64_t pts); - /** * Set the status field of a link from the source filter. * The pts should reflect the timestamp of the status change, @@ -254,12 +252,6 @@ void ff_update_link_current_pts(AVFilterLink *link, int64_t pts); */ void ff_avfilter_link_set_in_status(AVFilterLink *link, int status, int64_t pts); -/** - * Set the status field of a link from the destination filter. - * The pts should probably be left unset (AV_NOPTS_VALUE). - */ -void ff_avfilter_link_set_out_status(AVFilterLink *link, int status, int64_t pts); - #define D2TS(d) (isnan(d) ? AV_NOPTS_VALUE : (int64_t)(d)) #define TS2D(ts) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts)) #define TS2T(ts, tb) ((ts) == AV_NOPTS_VALUE ? NAN : (double)(ts) * av_q2d(tb)) From patchwork Tue Aug 1 15:06:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43064 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp38580pzb; Tue, 1 Aug 2023 08:05:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlECTHE045fXxJS8hKU24L5KtiVumam/1R65ivmPoweZgNq4N4D1L/S9nB9XVsjXpIegvACe X-Received: by 2002:a2e:8508:0:b0:2b6:bc30:7254 with SMTP id j8-20020a2e8508000000b002b6bc307254mr2614833lji.13.1690902335375; Tue, 01 Aug 2023 08:05:35 -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 va16-20020a17090711d000b009874842217bsi8998979ejb.441.2023.08.01.08.05.31; Tue, 01 Aug 2023 08:05:35 -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=phCJZe+q; 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 BECC068C569; Tue, 1 Aug 2023 18:05:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2100.outbound.protection.outlook.com [40.92.90.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 995DA68C551 for ; Tue, 1 Aug 2023 18:05:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GgjN/4/nfpfuzzuVh8lk/GiTvHARngBH4phAEo/1gXEn6pAdkjBChpCoqWHkUT1euMhfoZ2RdbGIpubFzV/SlL7xS35Q9KeFD+Gg1QxGAZ/ltLE6PvSAtc/LejA67bsF5ru/o0pdIdVWBO+gxCmL1gesX9oLHWGsmMdxVgLEYZHBs1CGq7QSQfFd1jOLMbKmQKM+3O4L+xjvl6CPHfPc9plenwDPdA81dC6gW2ulNwoN24ccwbXVNYRxm9XQBQrmO8nAefU3FSd2ShWbtlXioJjb2ZKSGtRd/ppCwh4GIMrYFyyq23dZKyhZskwspp00LKw5rdf9nEHuXlboba/nwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/u/Yg4CcMjt8f06YoalUkRLznFcbwtKjz7Sl3TuLdMo=; b=bqzCm9v5I9gYjIu7vFdPIyK0N+q0jstfN/SSnrMcLlKDyB+nQGvDKzfhRbC/rKoOFhTnOmyyd14syLn0vYjxWUd6O+mD9UHBc1ZTz+0+1satPNcl1vTdRZVQwcbBUIY7wOPUAw9OvUcyzoNMdfAsZSe2cA9/DSikC9LDDN8Ocj3UPm3xFhQ3005xKs3Ux/ZLaH4k4BBPTTcatExHvKwbdLHlc5w9Xs+aWF0/Iq+uq5FtJxBtrFi8HGcgjrfsDHEYb6kFfZ0ET07ToRcT4l2qDREs865k5njjT79hbVtUiFppAfmqpCj4ADdO+vUPr9Dum5JXVQ0ZWH8doCePw5PGDw== 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=/u/Yg4CcMjt8f06YoalUkRLznFcbwtKjz7Sl3TuLdMo=; b=phCJZe+q42JlqOGqCyg+A8gQ037AmZuG0NyXzqDeFiRcEp4T1s4e5rlPGZqFBDp3SqDbl4Fb6Vz7lwJrnXIDy17MvwFEfKEexGcQ+OxcQJxhW7QHGPamh1trlrko+epYKYDa8Jntm9gqYKKhikS8z1h09/CVh6hkZHUJVtSNxn60qBWjbjLlkPVDG9clNGBxFnn4cWrGOnsQAvTpLXI2EywScRkHi3CIR1ZDnZuP022thBWRrj9uIJhJZsnvGHE0YAOrWO6LUcoZ52OvgwZ4iMZYVpQAWZX4dPKCdtnlAJdkcoW+npymhhEXZnLk0B9BAWAX/EUjQbiyJeeaFeurcg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU2P250MB0080.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:271::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.44; Tue, 1 Aug 2023 15:05:12 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.043; Tue, 1 Aug 2023 15:05:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Aug 2023 17:06:08 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [H7emManVmLSh3Fi7YLjXfojinhhdplh3QOAFswWup7g=] X-ClientProxiedBy: FR2P281CA0092.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:9b::16) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230801150608.3756402-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU2P250MB0080:EE_ X-MS-Office365-Filtering-Correlation-Id: 922ded76-4863-40a9-2786-08db92a0b477 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKzQ+EiUC8SRy0T4qBvxYSEKvo8A5uDmnKbug2jTndgna1oGvPpt4QbXc5mz6zzseKTKNnredxgjZS2nwPFZySRxuq1s+dy4u/K9mAfAvrEk8B7ehgMjdbOiqsx3/Q9FzaclH1+SPy39zm5O019INIBuyUCTn6C4WTWfLsSoN80E2urY9UAE832cVEwg9TEv+E0T+qUu/RoZF3slndPIHCQ5hBy2IkqIigfmg5GdawHMDFTcUdcqJqMYXi5HgacLvwQdk9ODcdZx4oKRE9NZgxukBoHlJUPWlPQRmHYLz2EUVuVqXyxyuELvk3th1gzfxi2FWCUTlr+kHLuz4zlIAs8jggMciqqKai4FDWENASwlaXX2zcpFKLbMrM9cgRrhGQDR+WmNljGryK1TBcP+y9DROwG9iLGTCOvalpa0QbOiUj/cyFtogoIxFnsTM0qsdlOMhOZSyOs1YJODwTaZ1i0+cl8PMJuUXLPIZzadNiKIprZdAMZV3tdL8LVcFrMov1/0URs7zEVcigK6yky6/cCXWQ2tDrpOR0qT+Zfj2g1jRQpU6k56SomNdVeLf9Qaf2AUVuR7nL42GLURLAylACZWgVVlxtI6aVL0cHLgdNsm4pSZCHtbNft3VO7pdqgTMdF/eRtMDDUYRvN78WzwHlr3yRNPsn7YfaHQHA7Pc7DUai6HzWFgp1JiBJnLjFlSrs15x/2VxbZMs7phr6495tqTMiYOK9tHrHM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5foe4btUZm/hokbMPy67Cxvnoq8Y767HPItJxX10CLw0lt+HtjpgDthZCNIaBA4kxlwkPHfOPaK53tOtsSvNwyaStTecb500nA4Aggolz4BlF8LxGxehg49QieXDivTYpt2a9GZoFSCk3wxk4fSvV09LZTZP6Gp21h3p6PH4ObvBiyZ8AtPDjBeB8Ir87kM4dfa/Uqsk+tskGwgXyzKLX5g/Dio/vpqXvHI0VaA2ZA3iH+vcwOmaVUDCe8NGEFs83Vh6quzKZ480X0xKHmpfNRZWZ3S4Iv1HN7yeLA3IZrvoITJ6VatOCwdJVgpIj5RqodFmTuaxi8wlZpNo2ng2xMQfhGGiCD3ZgdEVSnvRD1zqlFZExk8WUqNHmhTXjmhgP0LkTWlrV3IBpHejgq8BDPZKAHFwkwy6ay9j/6P7s9RqK5BVV4z01cJcVeiJYk6EhMGaEghHcXZqSjWxNPCbdDnVaqTSlitHjzPYDuUxPvQn3psGPIw4IwX78sSHFl9wt8io/DrddNZUH3aWuz0fuZtaGUop8lS3Br222S1TXkg9cB8HcBa7ii8XgS0h37JUTQxwFxqd9mZs+b3xjWB8uUxmHkfmXFtZ0Szh3GgbOkxV9XvTq5q5SeORAiMCDfLz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JvwqxCCf9Cmvi8Rpn0Z+CkJcOM37cI0AFJ8A36O2gNOWLfQlsmqSxeNvDuHq/4bOWrZFIQ5XZ46YSfOBZXNdHIeUWZX0hr6KgKhNebsotrwzCIzCwZotEfIJQqvIVG8RVanzv9y2ksVrlX/iMscR4XIbPAdAjy3dieRs3I6vsmrGOd/rW44RbUtqM95+1+qJmXT2F9zMai7eoJGEBSFpxcP3kZ+wNJYuj71AxczDgnysF8f2+gguyLc7JGuXOiI29x43Xa0fjOHHY6oTyNGF+Cdu5z/x6O9GU492hBZToO4dxd55WF9taFrcfCXeNZe47hjvPL53Z8ksutOdcTJQqKdUuc/v9XZOkVuRryx1wj1CTsrvFQb9sahfJdS0v4VmDJnZIZNQi4rkK/1CT+BuVTTQ4JkK9ZM37AOX9LowVMj/xLGyHA5bE4hg+bC8cMSpMmnG85AHgNnC9nleSiMYeKiU0CsjlC+wbVFpR00n/e5lzfcJmEJEQ1u2PpFZ2Fl5RHmlqLgZuOVF4aDVLOG73ZYVlZ+gcJ0lR89e6l7GPsG366++zqQb2TJRzcFnsotF+Cpj33SOMqxxMXzDAW9NMVfQB0GzKxsxypchUe3ysLyYXinm1dZ2ko/TjHJLywdJMQcz5OMqg8qVkBeI8arql5Q0K1CQzREMrXFNfQIucqic6KB8GidxYoCj/3y6nmr1LIInYUEao7Zy1q7g7M5yqr0TniKHQYiYoEA3jm1D1rxRWADnpkNyfXtBiWAEgT+FliQ27XwbxlBZEJUVT/iiPX7RzEli4XGL391C3ke5m29TUFQy8si0WRsEpawjB6kUEeexVZ5ujWkYqOqMxp+Oim9heMSgx5pv3Zk4GuTvqHj7TSMXbLyyLJCx75Jz/iFuzcMrHd+aRWC4y/Sg/kwJzWK9t6JDX3QSV3vLMBZC2h6SGSGuz6AeRNKvxO1FMClJGPa9cIzfQ5L/OzsZvWUjeLMA36SQ/IGQgqTOFOoWnhopgppMn07vGnHXlTIKPA0LC1zt3kbkiL3p4XiM96mVeCt5UwBKRYTOKMzkLIyj5t4JcXaZc0avdK/tAAo3NdboEhAo6BFoCh7Znqg7FEZdU+jY3EgOwaqbOAJDhw4bPjl4ZmWZoofLc1nH46uHSrcL7JPFR1a1imGZuKR8plj0pSIYyW3F6HTeOsdtnINA093/uZOmQda0Ai5rnqPUYP7lNiWkGnYEFDGWFzzm2h2Wo5yVLZh4IQ1p4VFG6R7d5UfPvmXhf5TVHYdvJbRNxLHj X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 922ded76-4863-40a9-2786-08db92a0b477 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2023 15:05:12.5946 (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: DU2P250MB0080 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/nvdec_(mjpeg|vp8): Constify AVHWAccels 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: G/SqZ6p8wwKc The discrepancy between the actual definition and the declarations in hwaccels.h is actually UB. Signed-off-by: Andreas Rheinhardt --- libavcodec/nvdec_mjpeg.c | 2 +- libavcodec/nvdec_vp8.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/nvdec_mjpeg.c b/libavcodec/nvdec_mjpeg.c index fce464c1f8..daaf0072ed 100644 --- a/libavcodec/nvdec_mjpeg.c +++ b/libavcodec/nvdec_mjpeg.c @@ -69,7 +69,7 @@ static int nvdec_mjpeg_frame_params(AVCodecContext *avctx, return ff_nvdec_frame_params(avctx, hw_frames_ctx, 1, 0); } -AVHWAccel ff_mjpeg_nvdec_hwaccel = { +const AVHWAccel ff_mjpeg_nvdec_hwaccel = { .name = "mjpeg_nvdec", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_MJPEG, diff --git a/libavcodec/nvdec_vp8.c b/libavcodec/nvdec_vp8.c index f174ca430f..3812ef3e1a 100644 --- a/libavcodec/nvdec_vp8.c +++ b/libavcodec/nvdec_vp8.c @@ -90,7 +90,7 @@ static int nvdec_vp8_frame_params(AVCodecContext *avctx, return ff_nvdec_frame_params(avctx, hw_frames_ctx, 3, 0); } -AVHWAccel ff_vp8_nvdec_hwaccel = { +const AVHWAccel ff_vp8_nvdec_hwaccel = { .name = "vp8_nvdec", .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_VP8, From patchwork Tue Aug 1 15:40:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43065 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c11f:b0:130:ccc6:6c4b with SMTP id bh31csp63569pzb; Tue, 1 Aug 2023 08:40:12 -0700 (PDT) X-Google-Smtp-Source: APBJJlGaUF/c9tHizKbNOlBiZMW4VMi6LKhJMmALISmGWLt62L8K7dCTFhn1nqX7HKuEz/kxbR5r X-Received: by 2002:a05:6512:370b:b0:4fe:279b:8a02 with SMTP id z11-20020a056512370b00b004fe279b8a02mr2006537lfr.67.1690904411918; Tue, 01 Aug 2023 08:40:11 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b12-20020a170906038c00b00992abdccff6si6181270eja.576.2023.08.01.08.40.10; Tue, 01 Aug 2023 08:40:11 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=HErYjPWe; 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 6215468C551; Tue, 1 Aug 2023 18:40:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2017.outbound.protection.outlook.com [40.92.73.17]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 16AC668C16B for ; Tue, 1 Aug 2023 18:40:01 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=joby9nPdA8XndVuNfnzzGn74veBb+8pHwhWcbbceuvbLOOrn+aBMOROg8r59blA3BXe7k1Hz69UFqXPFncxcspiyoOjcMqASim5iCczb4i3fMvTW6bsSYFL68uCixWDvgoAhW7lZDfMW6O8so6dBB/XOVUQyQ5cz+l2jJff7IUgkM3u6bTCzU7Q4JNBPzxbcJXXZaO/360OqTmp1B6DmipifZY7qwUmu8Hg4uM+9j97FNyKstgdD25e3SoEkbW1urgh0iHvhDDyk1CDg62lMLcZ3ikSyS4seWOgAtBwWtCuQTzUD84uMqcWT2QqBdzLaWiC3bj8m6+0+mCbkiuzedQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rfcHZ7IqL3qOIZC1cj02J0fDvfpW59lCGjSsRx1IVHI=; b=cRgU17Vt1IrC17ESajTjYCyRSQgJG91oLmgPaw+ZOXt8aB+Zt7CdVaBc63Hv0Q045jdQvVIh8ZeRggdEhhr9vA/tFGRLRRKVi2woaO/0gIwAp0FyNAD2DN3a0+ihA4w5/6nQjRrl70W/Zv43fvbAydjD97q5vYVOR6+Q890YP+KjkNfoptCbOztPczt9MngntEI1dkmvD2rspFa46J263u1FRjbnOJ57n1snlXsZHsNj1YAM8xvsjkmmDUpjGIVi18jnYQ8DBfRZ5YngTIpRAnXPJypi20emuurMcOlpwAXwqBANdQNd7fof5Z4IZCucAX0uKtyhuhE94GJcL0udUA== 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=rfcHZ7IqL3qOIZC1cj02J0fDvfpW59lCGjSsRx1IVHI=; b=HErYjPWefFO95F2qgWHvZkZsGwtLi5KP3/3CRPXyA2cGtj2G8gMz0Fz3sm9uIWZe2P2zAFVJB9iepnEN65xgL2H76CXkqGWIP7U2+L5kBYbG2JUx2zG6J67vYoWUDinaRBjxLumrhuJBIq8uY0V3AhBbQTWggFjC7Hu0jauV0NnBRa4vbkLIG+mHhTxVYKD3Dv/BGNWdZ9Kn+jc2f8WjPJCzcKMIqk0BwqJZwjrVV/LlGoWqP+lY0xpwOTHYXYJEkh/e+TPre0W83rpfyQgX1EWVM0T4wL5Nxkb1GN+dlUpQW4LoEiapdSCpJtlTAzpgcn62rmwSeDYPlCeklJ9OpA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0299.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.42; Tue, 1 Aug 2023 15:39:56 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4d3a:7ca6:cf28:9e8c%7]) with mapi id 15.20.6631.043; Tue, 1 Aug 2023 15:39:56 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Aug 2023 17:40:57 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [gEmpF/D637xvDCfztiVlHy5kHTZsVUW/7XwdWieOwyE=] X-ClientProxiedBy: ZR0P278CA0041.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20230801154057.3914628-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0299:EE_ X-MS-Office365-Filtering-Correlation-Id: c2ff9124-e4b7-4f35-dbfd-08db92a58ec0 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmpdHtR81+IA7nbDSCnGfE51Jb7FvxmbP9kZQpmEnqwAk699NuPaXRidgWukNB/kJ7M+CbprzesuDPzJ+NTAsx8/c7Zh9ILSKQHHO25IFBCM5ZB/rF7S5o/tCZq+/58zkF7qXVYjwIrEvTgCPFKE9AZ+hbr9yBt4MvwMDM8npzTvyg7rT8cPBL2+kYvBUPYjxFnkAEjl/xwkUaNTIdHtpf8zmNl9CPq6phLZC4SLOb/9ZsqGO2K+yo7Y+A7FnD6pY9TYDfIMugL9PlcBwAFJo5+TiwIlTwYCrXjoSVY1tz3QushmycgQprPGqgUG8ttbHphAQlAcCcYM1QvE0AQKqjGTjeBZOZOsP8T9UDTPLi1I36gsmYqfH4QXjtm2oXcvyzuGx6KWijF2sfu7CSTXPN9GWJvMcJRkBUh7G0urxMqpZDo1yZ4qu+zuwC7aZeUOMxCFLa1p/QmQvWHOORYefUXq/dUEas5C4fch55APMtDf44MSq/d32GvT/hSjk0yjHC+98lhLdoBu6MFtntNAHgBprRCq70KPqMePLJGEWbf9V8o+A4BfYnIQJkbSQJc+IebwNCPTJxOsMPjIXHi7lUERgVjz+yLoOsG+uTuFYb52zIUK6EYrExHPwebotHVFlEJHMHv45x2RoejmiH6QlHMY0Qb/s3ZTxZm9GDWhoMUOCRBmTgM3i1X/xoKIS4vMnmqOURXqB0qZTabGKXx6zb/9p1Rb8YOH3/qeWj7USzijCv2pAFts0G0biVQvy0isod0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8ZM7haHhES/WEefagAkT4/Cky5+iGsAtE9uGRUGAx48NtucdJveHrmTKhemRV1Gu6XWWH3xmK/JJxtNz2p85GvrBU6e6KCqQ6lC0oYygf3Yn1H9hXM7r5hryRl4O9CMqkIQEQlhsJTgmmDGCu9jn84nFEbdKFxQWnNn8R8pa8rizKbwtTKpuvav+pcfc/KSHoLmrfP6XNgyY7Dv26EOneDPw7eBMt8BPm35grOxCkPFRiY5j7bMgktHPlHh/zyd4UteGrrBcJBLZx/04d7OAHlV6rBlJq/Oib8tMK+JAb2azc+oxEL4McOKfHGuslvusl2A6yY02aMLA/GGCBg46PpmVoMm3dWV5W53hopbtKTpc3iGqM9uYMYrbyk0mLyySbflTorNxpaMEpkMw5FpmRTo8VLfkzhnL7VN6enr/Eo8pOKN9BHm6f3BGHOGVIwBfdPUx5rckoEi1Vzei5ypl2TdlzNCvPnAlY9fgTMsidVL/3iOJUxfLC0RWqur0jt2rom6yvr2hRrIahZ16QF00bVfvBiB+M92jLFSyq6Jsm3Tk68oSfjGNeTM3dTK2jB93d1vaiWWnzQoEeISsy9B7WXRFhBfNn4ZVOCENurW1GPi/lijf+Kw3ZPmt72MoSsEE X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: b4nci93jEi7/Wxo0gQYp0IzqbgmSvVAFM2hNO5QErQFThX7bYwFiPUqiqJUPduz3bxhBbdAmD2gBvxuqnHDLYyuaeTnkj7ticgaGl9ocbt4V3E+bSi8v60zIb736vsTj0HoVNBMd1a+PZcXdLNt2/0WcTwj8OjIpVBXYxyoV3kM1AZSKdofkYkSaX8wDSIcortj6FlG7uvZROdIqF3sdwLTKvzIud7wUCu8RpLZci/0Te8xdoAwhw+vBc9hmpk3oPvs+QDpE1Mw5APRrf7qBfbd/0Q95kSekwY4aEPEEWGtG0o2W+Wm+tOlhVv9VMibk9C3xKbZKTJuUbRSJ9p2xlE4QYJbICrs3If7S7bH3Ue7wKwAhK8tCHKb68LkF0TW0/E9wfaF1/dKuamuKJ9ebP2+w9ZUHXmf+jzkcoGtPts1LIw2Wla9Yaf2XgU3RrInQzDvY+AkO2pD9yPSr1EXxTBIe5WxWlHOKAOHC/wSuMRUaBtfzm++inNsjC3MigqMGBJmE+qp1nVLf/rJ3HL/RleNvoVJfEsQnt+7k700Xf+EwCGLAJT2gi31J6qxEMDL1JMCNCjkCgh/uW2P8BezksO/D6XA9kiQTNd39Mi3HEfnpY+ytaYHN/P29QScbzz9SVXnfZZrtcsIQJ8xUBJlRfA30WbWUzaeNKSjgt4oXsktWL2GyA1K/HaF1U10WAEhuUoDrCrfphWyuTRg4aOrua8DJQ9qhRTkQ78luKkA77eFeetcgEoz/RACgPsZhZ1NC914AbgWTMQpblZXWZhBSnVdOgjtPGfsl2efFyqaRAQV+OtDN8fm6zmxBJ5PmpviQWycXhDK3YSSkoyDS6oa0iBksk7crXok7VsB1MWk4fjSOufZuJqkJk5HXRDF4o4WMnohqHz6wCH6XZ7QTrKqtz3lp8ZiWPJXgEKUb9V2kXqmpn1qkl8aNbjD8l4eNoEYnp5H3HhXSRGufhF+d8g4BszsxeZYIg7ZiZ32Hv6TiWe+GZlRMxdCcluzNCfePdNRil2FxQ4J1+ITUg6kltW5CO8SICj819z0Gbxegbb+WKurmC142gLP1fPWHQMnnib5scyshaY4Dj0fKxoDskmxCcBXPk5K6t/+g0IqjSDaghT2LbE9Q3CJxmjcZ/Ys0So9SuX0D8iKDbdTbQVZqtzHrilwMb/85woiBdc9iQnpiiY59xU9UgAo839bHAlxI9PsQZAE3nMxgnWjoaK2iRlBuvFl/ftctvqQB1SGEab8ZjLjEXF4Fh02Kxp4B44IDphHh X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: c2ff9124-e4b7-4f35-dbfd-08db92a58ec0 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2023 15:39:56.8567 (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: AS8P250MB0299 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/error_resilience: Remove always-true checks 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: l3vUWYYX68vC Having a decode_slice callback is mandatory for HWAccels; the only exception to this (and the reason why these checks were added) was XvMC, but it is no more since commit be95df12bb06b183c8d2aea3b0831fdf05466cf3. Signed-off-by: Andreas Rheinhardt --- libavcodec/error_resilience.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 2aa6f1d864..68e20925e0 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -804,7 +804,7 @@ void ff_er_frame_start(ERContext *s) static int er_supported(ERContext *s) { - if(s->avctx->hwaccel && s->avctx->hwaccel->decode_slice || + if (s->avctx->hwaccel || !s->cur_pic.f || s->cur_pic.field_picture ) @@ -828,7 +828,7 @@ void ff_er_add_slice(ERContext *s, int startx, int starty, const int end_xy = s->mb_index2xy[end_i]; int mask = -1; - if (s->avctx->hwaccel && s->avctx->hwaccel->decode_slice) + if (s->avctx->hwaccel) return; if (start_i > end_i || start_xy > end_xy) {