From patchwork Tue May 28 02:47:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49304 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:142:b0:460:55fa:d5ed with SMTP id h2csp140987vqi; Mon, 27 May 2024 19:48:24 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUmdJGU3neRQlgAlYq1avKuGkhO3hp8sWQ4uWgBOiFU/vhQkbssJpOJExsWc+Uq+fHOEhx7A363V/xtJ59C3YwOFAa5yz7s8hLjeg== X-Google-Smtp-Source: AGHT+IHuYpWQ1qY5usCHpE4DtQ7yAvPOPdsnuHC+dAng1Ej6MpKKdgGTiPjbZasAOB2wFbHN861N X-Received: by 2002:a50:8d51:0:b0:578:61c6:b779 with SMTP id 4fb4d7f45d1cf-57861c6bb27mr5912819a12.38.1716864504376; Mon, 27 May 2024 19:48:24 -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 4fb4d7f45d1cf-579c393841csi2683533a12.63.2024.05.27.19.48.23; Mon, 27 May 2024 19:48:24 -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=M8pW4pRq; 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 E133068CFAB; Tue, 28 May 2024 05:48:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2045.outbound.protection.outlook.com [40.92.64.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1AF2A68CFAB for ; Tue, 28 May 2024 05:48:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hNCWOAPqXojTEnYaLnSHPaB+rbK0H+rURQDRn27nU8HATtzmqMZzPS+ZKbRJj5sGDlPlnbq8i0AXDCY+AGKGPru9M/JiYWCMtV9dZLhq2Lwc2d63Zjfm8KO1YTGPP+wojNKx60X700sXMfaMx/Gfw8+ijhHK7uAQwJ02GbYZyR85hVAzAbzV2sWsaGxAYEZ0LCGdgo1IFlmYQvEeWxUGpCATniQZw9PiVu3s4/jDBtf/xp10XEBAH5dpM0Qwhgf5cIS4psKQU0y6/2PlVHkTrI3v/q1hOSeaLpHdUi6L5S2uU5sg0lTJwXbjJPlhjhnhfUZytTP75S/Tb6eyzl5f2Q== 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=mGcadIrGjinU2DPYnPWNsqnG7MLbbuBkdroJveK7eVQ=; b=ZuaW2XRTD/7l60nbc4pummJAphF08gc7dWZeG3I5+zo96wOPdcgWFcri3dDUAQTgoeFodC1/1+kAWcZ77skTQ92bOOlMjHNj8pW0UE38ei/CqPg8fCHTrfNJKVg7eM0NJAsJtqQXZ5Ev3rckzFuI+oxEg9LVIRj+H0odLNK0ihUEtMbYjT+Fpuf1R/6Dxt+/Y5ZbCGt/Xlq/aOsntWUUdwPFLJYDaHnw6OyweOIsoeDOymbPQZyruINe1rSGLq7mad+0eFLH3oZouWtAZDzAL+eqkBjWK5LVoahzhAeqNPO6uxITuodjxMME/atfZU09tqBYt8Q3WjnzBHzC8bzHjA== 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=mGcadIrGjinU2DPYnPWNsqnG7MLbbuBkdroJveK7eVQ=; b=M8pW4pRqVfxCQ2hQKQoKzwSlyIuUgUm557T7iKIWoqCcr49cxuuwnJfg09iQY6eQao/9KlqW6tXOeEubd69ZNQaMPfFZrU+R2Ig22k9ak3F9jH1HqglyU0pALrNhRxJqxDPN38IjXaiA2VcQmTmzNQUcFxD5+iOKuYhTW0HdJWhgP33DLcgXA324C0IGGIBKfvUglaAJvZRHM814FBu1k9s0sMcs1LU21KhBLcZ2SVKBgk0RGa5v2AUR+PIVTk2JUAE91SOuuge5yFss8n0FzaIhwb22+pxnYiDEfE4iMtG4uIlmMPbqT4Ig2DMqKjUYnwdicxnkQMUBoB+IeUcpPw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0183.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.30; Tue, 28 May 2024 02:48:10 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.025; Tue, 28 May 2024 02:48:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 May 2024 04:47:57 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [u/yvGqkLrclWFADrbSNjdXbt8BVtitfzMZYYoBbCkzc=] X-ClientProxiedBy: ZR2P278CA0016.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::10) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240528024803.3310191-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0183:EE_ X-MS-Office365-Filtering-Correlation-Id: 993bac54-0af1-4cc3-570e-08dc7ec09c8c X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: Q7SRty3Q9pj3bW/AwK02GkF8FBuRu0qB5TxAcTd3EcCmEHLyOgciEEXuQXoykV7LP4n4IrLlWOpdSZghXXFy/irz+T+tXATf02iHrPet+mmBMMuGilthavf75HOmYZYRZU0V44XL4aib91Yp6u57P6kC1AgaqzBk3gLQikGhu4+cPG2xUExfUAcHAgE3TX9sYwM8C16VLlBWvbUAOGUPOJOp0n/2cekN28E16PJ02dD9iAKm4Y8DRsdA6tu23grqm4JjM8l3yhVHPrk2Jr2hg9MSI8tFMy6Dl44MYTrlz8QT6/gw8OVIES+ZhjT7Cuj/PSBDPt1hfI41iK/ojl90me8j8AJxR/1NuOKnngdMNR9298m0JrqCv45x/0BG/FE1jiU98nUSQbep9P1P6/gB5fTBswVGhKVs67P6tlsXpjSOcHZDQI7Te33jv8DN5G4jfSP/RUCHDRwCrBhL0Dzjw5rYk+6eX62nBadHmXQk6ZfLatSYASImtjq4BOq7cVg2UAi1WCvXxMm8uzAm6b6pJ5WeMrofdt3ccQPUL6leTS971pZtme11qrI4ZCaCn01rCEygQm36M/EhIiMA0DqgySe0JEarg3ii0Nm18ZNZSO4JfreB4QPvn7jsqr5OR/65 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FGFcQH/hjq1vs0qLgUTFhPHWEuRY+gVYha/lL0WPVQui3MUfbzODchEwpyQSV56HwohJzXb3BrAUUXI6/zbp2tF2nlJ7X+kLXSTjgvwPAs054BuekJMfv7WkmkVmW62snmbMlcJLIIsomgfBBJNHXkibyOG75qekHiQkfleFM74xdgMq6/hfAy+he2Ht/zX5If+aA+s6FbHk6jNpkSX3RqJbYqGZAKq1tmd+Gb1tu2bZYmKGo/lBY9T6PaLyOuUBDKiX2Aaf05KZr2PbqvU/VdAWVUnirudkkvGkNpSrXA4I8iGo48YUtamJr1mIwPO5pK7JzUHGCDZp8AVSU1xLCeh6tHFvMpA+Fyno7TAhsv1AncU64lpzVj8P3qgvR2nSPp7L9diurQ6XunLlSV9f0PiM2DvZdgNSTI4lte+5jXS+kfv9rqv36e0/jHdEJa1wfJQgcQG3fEy/CdTgoZzbtTP5s27kXrAhvRIVa9m3dtWhXvskxuNlVFOepXYsuBKV/bmecFY/SB62M5TlzVESluDow3vhCivSn0OCHGIiCihdgAMNcn8q7xKBDqjEG+D13NuY2ZcqUJX943POkjME7VkhcnWdeNO+qFJ6RF/dkBxeWoaTi2aETz1QghfrSpuXQ1luRUxOLJP+5MfMto+m2rVp2kHQIr/pp4hmy3DGqdpx80iASvZRAK03Q0PG0khvpkNEK1N5gUwB62Np3XTPREcO+0UFX8aadGcBIm9cP1hLtr0UCtEJBpTbNZv6/HD6s3ug+YqBNKt8Hy7ch0bRntoMHGiP06yIFv/1CMNhsfV+CD1hS//77sWl3pNGj1BA02aWst/OCHCZNxfi8/4avb5KK4REBOpUnnCQklCgwQXSyeDMqxHTtfUEvYpPw1K1YmOed1dWhswSDU/Pq+juf1ioIt2VpPFZGIZ9epEgmHuNIduAPeq2IVrsgK2/M/q/mY2THE6OnlHazPIMDtbSwPW9LDom6+xuxDNOrfBxnPS9F45wJyDXOW+zO2jO1EFxguzKuh6R601MPvKavfrFstVbDKR+P7u4Xoq9RNJRYlFCv73LYurxQ4FAZ4A+xmpJhLNVF7qnmE8i7pbc84jSGTI0GPlGMbyjfR1EW5H1i26ksvi4X/eU+OVTBIRiv42x2M1gyDPPTDuYh8TPNfoe6OZjA2QnVpmHAt698qsM4XAmQ1DVtrM7Ba6Zk2HRf4q9Oj6v0Zrv1+f4iRHC0ClWRZJQmHzqBT/wy0XkqOafvEg1ReYGw/rGVKb4l0zGXYlVYvjyCtsres8sNeOi3uVQjg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 993bac54-0af1-4cc3-570e-08dc7ec09c8c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 02:48:10.7367 (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: AM8P250MB0183 Subject: [FFmpeg-devel] [PATCH 1/7] avcodec/vc2enc: Avoid void* where possible 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: dPEBYHNONSSm Signed-off-by: Andreas Rheinhardt --- libavcodec/vc2enc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 365d43146d..b496f67d3a 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -106,7 +106,7 @@ typedef struct Plane { typedef struct SliceArgs { PutBitContext pb; int cache[DIRAC_MAX_QUANT_INDEX]; - void *ctx; + struct VC2EncContext *ctx; int x; int y; int quant_idx; @@ -116,7 +116,7 @@ typedef struct SliceArgs { } SliceArgs; typedef struct TransformArgs { - void *ctx; + struct VC2EncContext *ctx; Plane *plane; const void *idata; ptrdiff_t istride; From patchwork Tue May 28 02:49:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49306 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:142:b0:460:55fa:d5ed with SMTP id h2csp141224vqi; Mon, 27 May 2024 19:49:29 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWFqb5K3QNqLAlwyDqskY6DRregEZMWTTJDSqqWFLsIx/pqcJ8OK+QPT1DkdqWMw5ntNK8zi5mFc1Xu9nU170varw/rWezI0M49SQ== X-Google-Smtp-Source: AGHT+IGecuEu0u4ZNDg52JRc73jBC4yvOJNZWseJXEvDK7rDhohc9u5lGRkiVsOtwvp3GrCF5rDV X-Received: by 2002:a17:906:13c4:b0:a59:c39b:6bc3 with SMTP id a640c23a62f3a-a6264f0e4d6mr727751966b.49.1716864569611; Mon, 27 May 2024 19:49:29 -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 a640c23a62f3a-a633c397c9asi34224066b.543.2024.05.27.19.49.29; Mon, 27 May 2024 19:49:29 -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=aVfJeowE; 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 3615168D4A3; Tue, 28 May 2024 05:49:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2070.outbound.protection.outlook.com [40.92.64.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A843468CFAB for ; Tue, 28 May 2024 05:49:20 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GhlqlQOo/EeWkkYrYGRn+txd4FZxJchY5sghjB5X6JfGm3eedafif7O+nfse2X5FLCf/el2o+nw7KRKkCB6xu068GgOtpdlvT7K+7rAHGTLvIxV48C7tD+QPhKEgIHHCTKF5H/khqxweNPlvlxEOJBPSzgYDyZQbT5V1cqbz87gHpL4Bjysg2bXl00w5iUNr3KE97FzCpW4ldLn4y4yCzAldv4OR36am9Ep/qYFiUkOZxC+4A9e2+uR85i4TmfLKKFavfmj3Otz0CQ5s69ggxGbSDLp0hGWKkZEOr1qWjTzTh+EfD+rNKiwG7BF5S80kHLXdY42pfvvIAKziY5Hnag== 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=LnWI9cyz5bxIUfKOzuRftWlcW7h7ghIcAE1pLlEgAAs=; b=bSBDiv73hjzYFNXrrq8beGiTRtn1zDmlv84Fs/pF8sb9G53ah6NX/YFuC2WeQIMBirpiBVp3PxbxFEB59e1Vk85a7lMEN6e+fEvpkJ1rZIDbWrXbj7bLmqcc1qRQ31lcocHhdP9Ng2Sj3ZG/pdadMY19En32xHZWtz2yNGDJFiuQZxbSB01VrsUt1SR5J3BGsjyKpvjuX/mlMoEUU3R15Co5C4YUx2t67eyWzmXNZ0zUKPLVpqdpP19QPif3ttzrStipdUNtdEv7REHmQRNEKxacIxWq3Q5l0qYd8kbDAyC2Z5ix5VigbHOQh+QQjG6l1rgxtcnhd1UX41ytfxk39Q== 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=LnWI9cyz5bxIUfKOzuRftWlcW7h7ghIcAE1pLlEgAAs=; b=aVfJeowEVvJFZOXxZZGhFzxLm0ajdB6HF1NvNznv7eLQ+8VyiHC5dRqFSHu6P8ZGGTLfZtRptkXRfaZndFaigcxpP2HMY3P5vw/GyLzcGWtk9El+bOvQwvd2UAsUvNdS2mRcvgO5cqTOPlKmQ3JZbGTtrriI7KtjP7Vu5S11V7IriItpUEf5nVx+aAr0MbJOS/Pn5/wbCYAN4F+elB7alIH1QvH9VK1GQ2UsCf5NwIkSRZvP4T0+ux75delMOBC+EOcZ580r4VvPekG54Ud2HTzubviypXVlXV1B6IlBkcerbX8AmOUmQYPB2LRAx/EbYcn17i10nFUaXkose82P7w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0183.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.30; Tue, 28 May 2024 02:49:19 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.025; Tue, 28 May 2024 02:49:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 May 2024 04:49:07 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [dgGe39zRuL7rfayUP6iRBdRSINCrmfW6xlYEizk4/+s=] X-ClientProxiedBy: ZR0P278CA0161.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240528024912.3310372-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0183:EE_ X-MS-Office365-Filtering-Correlation-Id: d6a965c0-c683-49c3-826b-08dc7ec0c545 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: OLBWAdM7zY7XzKbQB8an0NwvtSTVKctPSmz0dkyHnaiU6o/abJYsiaduc7gTcCJ31DHSx4FXqj7DK/jEACrWyja84wYRfNnpJWwMO2w0VmZdK7CgXMTd0DncxEIYM92/f+E/yMag9K3f1rcO7qUujNpwEB+Uv+03f74ouq4yd76ZKRZqV5QruyAXoakTCWxl0KNTYYiAi/YG0jYpjeH3uCZE3lLBJe7OYqbXuYL2BRw/ANpkGj2luxx9rJ9rvgXvyQRmWoRGQ1H3lJj+m1vQ0JKaZ78irI0weVo+arhYwc70asEbDaIRsNlrCizKhErpE/jaRfdWcPW5fRGrLO5l06IIMCUYThuwhCp6KLCsctEVWZDdWD69Pmw2YWKE9+Y9nN7vSVGTDJDMSPioIOdSytwFPrc8lguGqcVQlbVwZtbGuYEojY3giZJ/+tAmw8zzdfP1VzhSMoeieEDQ8YhBa/Hw/N7KPUyfvbyU+CUqkgivlBQfmHgEMCLz1wxQavXjk7leqHCvQPSEZ3LIwTD6H29VQTPcZ+wbmpLHc2I8RCgQGMhnljaijD4VeoNV4c/mmHI/R2w2a96o9+84KUGZlJqFmnXnH5dqZ59injdHLSQhbgBFSWnuAZC9oc0UKfAj X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: /8lKzRypNFY9NSCCUt7xmw61oKPW9BDPvob1sP4/q4wIrqc4Fdo9As+AQtOV3A3n/tnct0EPQlrYvWYZz5iUxLIrjkqUmquUj44cMXlKJsDrlAGd9VJeAf6NGFf5xtYpJ4E1htQspm6kYDUlNFsuSbSOZzi4zV2LZoNrRoylGUkX/BO8r1hk7DUCkUnCNdWQ+ga1DvIfw3lVPMcQlqz2a2IuA65rvATI098hNDQayg1P8Pj6K7GU10byBoLj3sbJWStlxZiQZaBaDR+cKIzEk3IvYi7J8jxZO4QWg/u+sZDRr6/hIo/jw8ffGe2zoxMT+RqrkPL4eo/bL6/cLBR32qwnX+6vprQk2bZrQ4Bnp5rCNgG0nHi59K5QoCNXJcntgT6LniKSOCg21eTXJGmDM5EMq/7iYNNQeLy/q+uOP7GyfBKYeaMtPDaJIMHEKTpq/1E7xpzUs2eiLpqC0oX5XpX/AvTAvtKg94C9enyYt5GW5CRODf31y5LyJiOoI36IRA3PWIPgliXTQ+b8I2p++31ChkIBcMj/x7V/wEkBEuNFyjZQvEmjLsKB6a0DwGBKEjQCJrFplS/l6OBbo95lBP3LJTh7xGhkCc0dZLUkC7Je+vrmZbuBATPlKITNRX5j8w/AztK7jkiyJzNbPQqC3HSeIPrhH5opW5Tjhq6I51lc+LEf43YN3yDgPD5GSUZKaomj0MgUwrAIsxyXisBRuwEejl+ZQWpqTopiSygnpDDhDfpeJVJk7r2JxKFARay/sDTiGOp7al99YwS6TNCNfXmT2L/M6R3C9SBhUQxGckzagMggq1gWhZDg+TPRMvKowNRE4Ba+r4ZH23haRvM1zxgcaAAo3vaZ/HMTmlMV8Xs/01TmxWO6BPOcwrvf9Pe8BVuyNitBYZJYb6+xNPXaN7uDcdShpgK404A2kb8KYEUtREyNCBwJj5MBW7CQkexS2hF+eQPkTO8xRY92YYI3CxeQOze8pES5alWES8r6NbUq2dlrj1xMt1xzfhokYVd6zAzQ73aiSobMkJAvVL3G31O7EFq0sbycLUhNXj5n7RKvIx8EbP2VLWCcH/HqhvpbcQM9MLvCpnivbi+NYqtv8y9M593gB4A5/BYVRiS1He8s/xbGY/wsOmPF4gWkMCl6vPMMi9iuGRJ9eNqJYMbf50KvpqHePmfWpGCj3H+OdsOBXQBQbfiLK3J8Av0duhLU/W5tgzdOdq8Otk0+kCau/3NU9i65eSpHDxvmPsM994/qOkhZIFMymldHYfLLmT5eXOQKZ5tNdUhD2pp5OhWTcg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d6a965c0-c683-49c3-826b-08dc7ec0c545 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 02:49:18.9687 (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: AM8P250MB0183 Subject: [FFmpeg-devel] [PATCH 2/7] avcodec/vc2enc: Constify slices->main context pointers 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: 0mBhs/8Mi6QK Signed-off-by: Andreas Rheinhardt --- libavcodec/vc2enc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index b496f67d3a..4dcf423ef1 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -106,7 +106,7 @@ typedef struct Plane { typedef struct SliceArgs { PutBitContext pb; int cache[DIRAC_MAX_QUANT_INDEX]; - struct VC2EncContext *ctx; + const struct VC2EncContext *ctx; int x; int y; int quant_idx; @@ -116,7 +116,7 @@ typedef struct SliceArgs { } SliceArgs; typedef struct TransformArgs { - struct VC2EncContext *ctx; + const struct VC2EncContext *ctx; Plane *plane; const void *idata; ptrdiff_t istride; @@ -527,8 +527,8 @@ static void encode_picture_start(VC2EncContext *s) #define QUANT(c, mul, add, shift) (((mul) * (c) + (add)) >> (shift)) /* VC-2 13.5.5.2 - slice_band() */ -static void encode_subband(VC2EncContext *s, PutBitContext *pb, int sx, int sy, - SubBand *b, int quant) +static void encode_subband(const VC2EncContext *s, PutBitContext *pb, + int sx, int sy, const SubBand *b, int quant) { int x, y; @@ -558,7 +558,7 @@ static int count_hq_slice(SliceArgs *slice, int quant_idx) int x, y; uint8_t quants[MAX_DWT_LEVELS][4]; int bits = 0, p, level, orientation; - VC2EncContext *s = slice->ctx; + const VC2EncContext *s = slice->ctx; if (slice->cache[quant_idx]) return slice->cache[quant_idx]; @@ -576,7 +576,7 @@ static int count_hq_slice(SliceArgs *slice, int quant_idx) bits += 8; for (level = 0; level < s->wavelet_depth; level++) { for (orientation = !!level; orientation < 4; orientation++) { - SubBand *b = &s->plane[p].band[level][orientation]; + const SubBand *b = &s->plane[p].band[level][orientation]; const int q_idx = quants[level][orientation]; const uint64_t q_m = ((uint64_t)s->qmagic_lut[q_idx][0]) << 2; @@ -618,7 +618,7 @@ static int count_hq_slice(SliceArgs *slice, int quant_idx) static int rate_control(AVCodecContext *avctx, void *arg) { SliceArgs *slice_dat = arg; - VC2EncContext *s = slice_dat->ctx; + const VC2EncContext *s = slice_dat->ctx; const int top = slice_dat->bits_ceil; const int bottom = slice_dat->bits_floor; int quant_buf[2] = {-1, -1}; @@ -724,7 +724,7 @@ static int calc_slice_sizes(VC2EncContext *s) static int encode_hq_slice(AVCodecContext *avctx, void *arg) { SliceArgs *slice_dat = arg; - VC2EncContext *s = slice_dat->ctx; + const VC2EncContext *s = slice_dat->ctx; PutBitContext *pb = &slice_dat->pb; const int slice_x = slice_dat->x; const int slice_y = slice_dat->y; @@ -839,7 +839,7 @@ static int encode_slices(VC2EncContext *s) static int dwt_plane(AVCodecContext *avctx, void *arg) { TransformArgs *transform_dat = arg; - VC2EncContext *s = transform_dat->ctx; + const VC2EncContext *s = transform_dat->ctx; const void *frame_data = transform_dat->idata; const ptrdiff_t linesize = transform_dat->istride; const int field = transform_dat->field; From patchwork Tue May 28 02:49:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49308 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:142:b0:460:55fa:d5ed with SMTP id h2csp141256vqi; Mon, 27 May 2024 19:49:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUSHzNqt5O3sItIS/2rHqMfmsJUPqaihgg8XesthfMqAHVhwksxeHLPd8cqRNwLeGfx32UstZAzda1PYMnQqd5b/blQLQLVpGy/Ew== X-Google-Smtp-Source: AGHT+IHYvKTBQppzJ9MCN9TX6rhXF794g5Zs9dXdeiZ/9ldWBEEyNFc1GlsWdHbuWujciSI74vbT X-Received: by 2002:a5d:5989:0:b0:357:3e5a:6c90 with SMTP id ffacd0b85a97d-3573e5a7b42mr6028586f8f.57.1716864578072; Mon, 27 May 2024 19:49:38 -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 a640c23a62f3a-a626c8019dcsi457348566b.121.2024.05.27.19.49.37; Mon, 27 May 2024 19:49:38 -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="LnDL/9oR"; 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 90A5468D4F2; Tue, 28 May 2024 05:49:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2070.outbound.protection.outlook.com [40.92.64.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC0BA68D4E5 for ; Tue, 28 May 2024 05:49:25 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QFiO8Ycy8iHv/7IrBp1rLQxEyQk52zTmXV7biCQoXnbtqiDX5S0wlg08qjg5YMALypCPmjk+LDyUzH3UE5jLmo2GeWdRSsH1PMvyswMVaNu/PHnekoT1KrOvXWxdBQFljrbVn/8ibTB6wG8gvN9fHDZpqEWZMsZRfpQNtRHG9PrKfYrGXnb44BqYBB6y9++phaEGxUJwv548TDVdpn0Rx+P+9p1QOMYehn6P5tHoXV5Nbng6o1sKUfYDyNnx9UGGTrP6NMBFzZmSrQ4OLAzsYOhSu9uqOlXI2gQVDxnuSvm9UjBoXD2f+MAD/MpqzsKOekzoocskiKHPrt7TFLY8pA== 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=ffmxjmslxHB7qiyzbErJ8KfNZ8RcXwxFpBauuBKoodk=; b=UISiGLAcInRBY0XT4BGcJAe2C8LGz9A711LK3h63UI7ed/p25guYVDa2b5gu9uk2JB60XJvhqB2k4PJ8hHmCZaR2HY4yp712wHn+DxUDC6ltFgQoxcvY5allQ8QR2tOMw32NgYe0GGGov34v1x97yrGEZft4+TOfQcK/q+KRnrzhxhhCHT7Mua+YrDf+/v9IH5ItCjpsCl3X0gnZ5VHdlUtpuJM7XRweMDtOXE6+EOAT3U/rwfSaFIjq54lGuZKnppO7MMOwRZBERcvZaMrHsl0gH6dXybLwF+cCm+x3/rTQTn5SflcVGXYgKS/Pj0hO6BpaXa4whfe8VV/29uX+dg== 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=ffmxjmslxHB7qiyzbErJ8KfNZ8RcXwxFpBauuBKoodk=; b=LnDL/9oRhk5zERjQRdS9nUFwiTMynceDy1WuRypBYjYt2nN797UYkFhWHCxaVesR7LN+xNofJA/jg+IJzmXvw+lNXX9XcD79tclQKRMdmlwxfqtWWLyLIaz1/J+ALL1Dd22E7QyiQWFIqrU0uzAmwaHmdRD4WqWbn+XaLNJZlir6X5aymH4IWhZelVPal/lnaht1JXSIiSCb+7L8oPkECAGMbhSpH154xjP3dzY96HJdeABNkYpXYgPJkQ/ROzyYWdVyH8gXBhj2fXLbQ2+y9Pnz5tJ0YreKt8ItRFN+hDAq358MaqyYB5gHbrS++aJL74Q/8PjsyCynQxoReWIuAg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0183.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.30; Tue, 28 May 2024 02:49:21 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.025; Tue, 28 May 2024 02:49:21 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 May 2024 04:49:08 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [jmvmXWCLzxORL5WlNSdb82H2ebkOs7JWLEEQejMVHls=] X-ClientProxiedBy: ZR0P278CA0161.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240528024912.3310372-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0183:EE_ X-MS-Office365-Filtering-Correlation-Id: e6b96c97-430f-4291-fc4f-08dc7ec0c6ae X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: 44HKyopUVcscOwjX9W3gc816vAzGIKI4AE8IRf1x4f2vITLMX/4oRdt6vvSmr0oPVRzTdX3XnaV5hK9In1TjWPsYE35rZMiEhjufJIdapQLEzqT4iH1beYC4B/BduPHxIqIK+fHyxuPDBade8f6nZEjVH+G4KnLiwObSN0VH79tx1I4w4mDSlMMcYaiFkFE0DRb7iSoL8a3V4EhmYDkMOgglAnkIn7eKfdCzsCDyOfsgYpaGRAWOt1pXmxOrZobYZDbgMDon5rjzGLgLitcGbl4IH+TC0OMvvBPSpxC/itDTjj4XSgHQjNcfnS8YR3vnysAWCJ/TyBXUeKQwoa6iARGyPV3dtxGZ6ja0x7JOSGaExmw6arHBizkGmTV7tpUGIqrO+HSvJH+0U+hTH9gEf9B3kXrBymEXBuCWggUnEioBYeLjihIg/SxLtz91NOUGtdqvwVjwrS4P8sqIkOelZUrqQz4YNk9lPtKYtpdbv0rWRAuXbRJluHIpb/FE8kIA2K8TF4RywoEG1Dvi5EzKCqtqQeKLFjozWS+usPht/LBj6dS0NPklz2+xxK5B/Z+8Nxk2j28yvD3SGuxkVRrKSxSw7wsR7Ah0fCWew8UM21cwfw361vQWCcYRhQaEQT0B X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qodGt2QMq2YV91Bc1HiEgvPupKGehxlNAZLcc7u4ynGyJkK5lK82vu7+ndPBFUA+W1htZeuegnRhQa06w1L/XVU4YMK1kDdXn9hLcaQvOWp81MAy1qAD7VAvzHQfLq+kIhqMnY6BuOipeWpm8unelVFqXXV4EjnEiFZps4YkXa7GPDRlUr8RedmndlPdjxv3mUcTXZk4LVIcso8yXzLYVfEVuhRDoFhGQEKwvRCxcZVJdT+T7SNGCFFkY8HjTRb0t5Cf1F3miL7RBPERTWZ1VLj6Sxjh6Zbdmizs1r3rfqiBreCHDr2BGytKaEqeAG5WsMffMR1PJdTNOu8Djp/B808SaSVzsLoTzk12Hz4cSPoWiH/F0HuG3Q5ClStwMGyPpSb/R68ehNxVUQcveOBAWFmv0y3Gf7i/IBCzGpPTU97Ax361aA+AubEfmXDHRh/j/c2ECripkVjN3YzeJ71eMiICEi9vxpV9tIBn+ZUVBPtsDdg1Ce911nE6plRT2nEKu0RvA4zccPfmf/X0s+lWfI9oaBKCyCHrmPW8QD+3NX7S7+fq3oyTeH7tqAUaZeFhiTqJvPTsQf7LF7h6abqgbPsF+sByqDbQ+g3FHYTfVK5PjekpMhj/4l2bj359pCLx6nwZ8skDWAgZIcLVL/ZbmD62x23udURIaPYSUdLhRmQVsN2+XzLf+C2UrKaJEPnJafdGK8bFvjJ6yssieHPLpGexhGyDsVldMYPOz25ipgIFy56EIPx/IlxEjFsfBfo5nF+FboUztuxUp/mbmXoWKf92C8S8OC15uBN0nXafzACWpm/4yDo4SFugLD5SHok0UcNT96ll+8uQa57Q8NVnjZz9FvNCtL8m9rUdBP9d4iXMJIvIVZ+pdSAQmShLNtN5wgGNOyvJxJCDXS9+4V6ArV0WyKWRcL1LxnyC4TqWEBvZOS8zYMlE6yl6OsKI3v+N1k/2UEaA6adnV1QHbnEx+wyLvnZ5XAXrOcl6b2xvgOQ8lmXrpLyovv0mL22j8XrVfMxFLmi2MzhepLCtUAvBzsONNNdgfFJrTDJ41mp3MStCqg0YW+2ozm824XnNSjIDRY9tP8LEESiB7GX5jtKFnNNGk87G4IQ+2ezyU7wbrDnrPnQEiE9xPflqHDTEBZfWSkVUoG0HZRXH+lpUwj+u3JJItHg4qcygE+CoYCL2bUDULw4x6Ln/iti1gupJW+7Tj7TpYrxh0qM9bYzbYdu7W3cyNsDWLmQrH8vw0tHc0IztUFRldIAR90BUAVBPAK0ootkvimQn9KHS7iLlaZ80xw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e6b96c97-430f-4291-fc4f-08dc7ec0c6ae X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 02:49:21.3961 (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: AM8P250MB0183 Subject: [FFmpeg-devel] [PATCH 3/7] avcodec/vc2enc: Remove superfluous error message 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: ZB3XaI9VcaDH ff_get_encode_buffer() already emits an error message of its own. While just at it, also check for ret < 0 instead of just ret != 0. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc2enc.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 4dcf423ef1..f39f368181 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -918,10 +918,8 @@ static int encode_frame(VC2EncContext *s, AVPacket *avpkt, const AVFrame *frame, if (field < 2) { ret = ff_get_encode_buffer(s->avctx, avpkt, max_frame_bytes << s->interlaced, 0); - if (ret) { - av_log(s->avctx, AV_LOG_ERROR, "Error getting output packet.\n"); + if (ret < 0) return ret; - } init_put_bits(&s->pb, avpkt->data, avpkt->size); } From patchwork Tue May 28 02:49:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49305 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:142:b0:460:55fa:d5ed with SMTP id h2csp141292vqi; Mon, 27 May 2024 19:49:47 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXM5f3DE5t2p0CmqRL+L5/zmNGYgwnnAR8l+gB7KX17n6VRa7dIytMxjyWayDQ1vmKiWD4Rar3ZXrfbhhTfJUXIWjfZfQiGxCnTvA== X-Google-Smtp-Source: AGHT+IHk/V8G/2yTivhSunS6BxzqHIIi3mThWeXICnSLMy3EBOcmt+Nf8KGgwQaeFHfJIU0wxshs X-Received: by 2002:a50:d5d5:0:b0:578:5ec5:7693 with SMTP id 4fb4d7f45d1cf-5785ec5791emr5900347a12.3.1716864587729; Mon, 27 May 2024 19:49:47 -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 4fb4d7f45d1cf-57852495ee0si4354455a12.382.2024.05.27.19.49.47; Mon, 27 May 2024 19:49:47 -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=esgx8A0N; 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 8DDF968D50D; Tue, 28 May 2024 05:49:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2070.outbound.protection.outlook.com [40.92.64.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 05C6768D504 for ; Tue, 28 May 2024 05:49:31 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JlLjNGzMb/TVRQAqabCEucRiSf0nKCYf1Of6tyJD/GcgVEsNEwv8t7fWl4MHkfu8p5zY1E9Y56Az0DwPNnkkvWEshW32/k91VDMpQwd8cEfimvaZ2qOiGnu0LJ7sovLX8eHQ5jQybTM5+OPITOKZvdM4eaAQgvIamRePN27Yt8KlukJU4d0rIhSHLXGvS4nKIxHfMKPiPARM4w0R+Y3DC6cH0HTyx3I7G7sdsPGWAJwXaj2LCsOGewlS1M2wcrxN61OUJLWO2gCniKk2NVpdmTzWLfBXkyV2ld251YARjSLJVKNoDXmS4AD3zZ3De2ldaj9el8oCO2xbzYx8SZumSQ== 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=mRok1aytjA2KhNJl62tkb1UyfHB1Toy96pqU7apM/Rk=; b=k62l7ZDwk3IrzDAgXWRx7BnVfzIOi3GW+hv4YbXRQeohvad0LtAv+vDtU9h9j2yie2Y0ObnrOXnItkZ4H8/ixvFhJrprDGQuH8HhK5v/JGpRDr3kjDMWu1d7nwotf8amSUci4GDvOycFQKac8lZx/phjZ6F+znXIXNTQ/9XHZwno7JuZ0Hg0PDHZHNAggwI5Po/Mc5RLE3uyRCRa2m74taU+WEoqlqrpiPNrFQaRCWnfQz+kAr2z4uQS0j0kQ39+tLTnj+hgambEo2/6SmphOWjPyR0wGhAIUiBAQbtSYp6XdtsL+iLQlV/KB/TzDSkt0ExRiG+ZYlcR6VRPjGUgtg== 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=mRok1aytjA2KhNJl62tkb1UyfHB1Toy96pqU7apM/Rk=; b=esgx8A0NxalCyFicLd/VRz+ig4zaIH3rlkbZSmPjZqzyF81zKGsQc7HQhXg04blDdQtEXny9LKHZn7UufXREtVlR/F9HJKmWDgBgDZxhnCI9Lmzs8SU7p3rUHM9ggvVGxGG3w6F9TUa6xNgK3f2rXUN8nxKf0YWklfQ8vkb3AdinlHqK3V0T/ZyxOBmxiaKn8vIMBYDjm/chdqDuv4y2fBQVviaOa2gwzSwEozHmFuLGvtSNFR8tfReseb0brNHr72lp3FywRrjheLsmfJgxcCFSmclrEw8oWgnP+AnMltOmtJVN/lppgNrOpzxtw30rEkYkIKxDNs/Lgs9CfEUGFQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0183.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.30; Tue, 28 May 2024 02:49:23 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.025; Tue, 28 May 2024 02:49:23 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 May 2024 04:49:09 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [HPDgVtoh7KYiWHEDdiL00zv6pzPS9rM/ajpgASWYEhA=] X-ClientProxiedBy: ZR0P278CA0161.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240528024912.3310372-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0183:EE_ X-MS-Office365-Filtering-Correlation-Id: 6331e537-0da0-488d-7ac3-08dc7ec0c807 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: SA/Zh5H179TJv+fcqUYGanrm7G/K5jv6pC5exSMZbTqozEic4cb8uHlYZSy8GeZRhUlAl806ozm50LFPHpw+8CxnTYrQSFAJVn3ZmuSA3V5FwE/lz1GFhPF98lMJENuq8qhV9T5+wsx95N3CRxZViyCgiRljPN21R1qWoNM/hRXnQGB7hL7r9+WQjY0OydEgeIQr5qWJBcPFx/qAVpyLFoOwwph4zVPtNV9MsIU+iX6ZGni/snIjA667/KMOp99xmR6a14PKJdwUybYE5d3MjeHExPV/BeyOwvZZNNiyHJsyEZRfEGZEyWOie5B7ttg1/LJaI0niTJZmVSPZzC5qEsec4XeffQbnwQH6wipAS6hT3gx9n0T5fN234FGmY8RHrtGAr/eEofqsAiOH8APqTX1ipXLE2WxzFfyNBCSVllAzImV6xPaPeOH9aOz00Kd7HsJ1UvnKaw525/amY9dsjnivDxrw9+LW/yRthoMIcBfGtUbXlmtKVz3fvpsF0HmKHwdf2ThYqe3ZHsUt6oL9W5CMVYkMvzQdhDnlKyIsLmgTnUDPerBcXZVpQNCw7pUERdneIaX+10igrH+NjX6C20P68ATnXc8lVc1IXOQLVRpkX2vSRgYMD4VR4kBd23rN X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Keb+tGmjqpol480BqbxneMffs+tMUuVmcPf3BpnCrtHz38Jc98FTGvbJkHlsJqTkYYuCOEfFNeFcFLEgNwnhAKD5NKjfdvjCbnMAKhtI+zz7pfpjTeMEoCDULI4ZPE4YIBZwIVtVw9Y6wyL0H03mKCwr+JPOsiEhI420Nps3/CdOC7Wke7u7OzonMSAop91aKBHrxvXsAUGWO0rXp1wkc0loPwMYMNHJuiZwnNw+BeojCXX6klk27YGbxSyZkmPQ5Bmm55owfDWQfUewze9EihAeiZTE787Ud1dAztCn2pC6AXr2BPjdVl3mWN3DCTFx74gL11hhDuBnPXR8Szk3CPo1ewD3zqBjBTF3IEy3pmIvky/tag2sb68iTGtVqSrdILAANEMVQf68cpE8U7RgUTgsqFilXyjau9vF95VbpwzcQJ3jDTg6DNzDlpOug3sUQWw2xFbT7dSrTzqhPLQKPdCe7joewk4oMasnyA1KpfNzePCkfm1DRMh6Np6SPAqdOt/jpiKBHH/Vt+U2imkhAQNLh+h8bWUbnPpaFWN9kbM6t21xPKKP0HrcS6IQ3SihEgtXVqNMcpyXCcUA4aCXnDyMdItBlaYreVZVqD9BuwSAb5qibVCn887+WGswHksxyuT3VlyEKcsrRLuc6tuDEDr185gbyg7G/l6gKV0zoXM5Ab4VcaBxeKzAb6OAAD/CW5ubOrXrQ+++Cg08ATwOfveZJaYYOsTK2EBOMRxDZxOWxsQ7YQBnB8UcRpuqwIyyoDGlx999M1bLegSVTGZTZSE/hHRdx05tu2ZBAqafJnQJpESDCMw0XK+O/ivETwznmireYP07JkY28HimUAN55GzQmomMQq0JA2ggYSxwkrqfidrX5Uo+Z9yayHsN2L5YZP+s6+TWPmQtPJLqdDLN7xOIKg26F4zU26a1Fe7TlufphYrEVy6G8Ty0eIHvxy7bDLbLbGgCz14uiJmvl1k2Xp3meAG93RH7u1UAfM2N11up5GG0YhnBFDas0bBOMuHZa9uiHakVJGAQCpkkRVIUvvNfiXyz3caqbJL9j5vjgW2FoDbY0xeVDaoEfPeD6WuC1ADqHjtCLu6/FdsHs7tEyPwC2/UXvKQCdRw14ORId5B/YDzPP+Wx70h8/J8UiVdF/lJYbHMdZzzvses+3OX5IZMzSNwCapMVzLT5PEq4UTwUrpTio6R8RE5LyvMPjgs+4Ps0K9QIoCI59m4/bo9ArX6Y68tViGRn+n+Gcr3MSHb7vPguV2+LCs64V/b6MF/g5GqAt+itewy2hz59RRhLqQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6331e537-0da0-488d-7ac3-08dc7ec0c807 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 02:49:23.6441 (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: AM8P250MB0183 Subject: [FFmpeg-devel] [PATCH 4/7] avcodec/vc2enc: Fix slice length 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: jjMJFKRPLHe8 args->bytes here already includes prefix_bytes (see SSIZE_ROUND macro), so including it here again and forgetting it when offsetting skip seems wrong. This only works because prefix_bytes is currently always zero in this encoder. (This has been added in b88be742fac7a77a8095e8155ba8790db4b77568 without any reason.) Signed-off-by: Andreas Rheinhardt --- libavcodec/vc2enc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index f39f368181..3285218724 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -788,7 +788,7 @@ static int encode_slices(VC2EncContext *s) for (slice_y = 0; slice_y < s->num_y; slice_y++) { for (slice_x = 0; slice_x < s->num_x; slice_x++) { SliceArgs *args = &enc_args[s->num_x*slice_y + slice_x]; - init_put_bits(&args->pb, buf + skip, args->bytes+s->prefix_bytes); + init_put_bits(&args->pb, buf + skip, args->bytes); skip += args->bytes; } } From patchwork Tue May 28 02:49:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49307 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:142:b0:460:55fa:d5ed with SMTP id h2csp141339vqi; Mon, 27 May 2024 19:49:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUFvth0brommTzWTNL4CSgkcB+7xIWaMGed6kiMMtFEZK0nEFTr60RXovbB+TE1eZKQYq6Qov3bPxm0N4vkFsZ66FdeJYUnV2VzIg== X-Google-Smtp-Source: AGHT+IEBfJp3xrF7xrnMBvbtYx2txke8WIi62SYyt1Jz8QSsSqtqfL1fRYv3NB4DYiEM/e2NBIHW X-Received: by 2002:a17:907:a19f:b0:a5c:dcd4:351b with SMTP id a640c23a62f3a-a626511457dmr668514866b.58.1716864596798; Mon, 27 May 2024 19:49:56 -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 a640c23a62f3a-a626cc3805csi449735966b.444.2024.05.27.19.49.56; Mon, 27 May 2024 19:49:56 -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=DtJwv1E1; 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 06E4668D545; Tue, 28 May 2024 05:49:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2070.outbound.protection.outlook.com [40.92.64.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CF3868D420 for ; Tue, 28 May 2024 05:49:36 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QkM0w+54r6S2gE2+72d0kLZ1GcC/qI21GZw7pKdpGHDVJsWwZDEhj43cdN5MZ+B+bxe4TTi9tp+q4wxNuzjFJ65CR5ZeumoTsetT69urSH5SSjNpcJeIMF3GX71/V7rXy41muBe25w1j1dctJfN259yt/2CQajYr8LTLNDOYDa7Ry9RzK2hqRFLCfOg8LNgQBwDizdLeOsB+s/PnK6ZnvU9T3s65Otmb8qDcWfTl1imMGvDpvePNNYcbpsiP3pRYO8+Yj5ZVMi3KfByLsNRlIEfU6+SXYLY0uaXbc2YfP/b6XaSNi92N/NHcEubFz+o7UURMrYI6L1xtC7PPJbQRwA== 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=oncwcrgJ7rvNr7eco6+L8uYLMB+foT8jQl5WOFbOhfk=; b=lN0QNQXjckF6kTQGn9Uo+69B0WZS1WfjuauGFfsqo6g+dR32r8NIB/WPILmN5dXXXBtv/b9z4z4aXhjde4gHEhM4ECIaX/QUlcneqwRhvcv2GI/5V+mhko14GK9map4bqTiaJ6be3sXlAEcp5alWGQZb97wjvrHcGrx5sc6tci3zoNIsJEjAzIrjNPZWnrs72PRXC0PaHaFfdGtdP2ZeC/CWXyoOyIrG78Z6rF/tZjJnErRg48eW2vaYuPxiAb5PTTCpiPJp1lE1aU4RI/HVZaeLx5RqLd7dpAevPTgcc6HBJn/dQPBJWCm8H8vLhwwQ+jRf4tLHJVkG+ccu3mE1XQ== 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=oncwcrgJ7rvNr7eco6+L8uYLMB+foT8jQl5WOFbOhfk=; b=DtJwv1E1KLrzA9EKLvPabwXm4TqraxUuP2tITPeUdKOh8uk7melrRME/NItsoJo0+yG0JIItiA3oBOJI2X5H9vlOijpB/W3QlqHYxUX9C+EQks6pHY4+HlgacxU2dwOqCtx+WxEiKABLN28qch+jePMduOW7bPMjB6C4nBMBWlxkT+0Wo/Et5hwu2p8DvpZ8sDAYsX2wfwvpx12HBFM+LjMXRWe0auxymQoolb+lBX3Vu9YzqQEsMkMz/zd12BYuqJwCqTvMHWKtOMmcodXKvso+6cjUlW4riC6OmJDbzsPLAiDE/KWoTA+ww5B/A+CSivWVOX07JjvFQm8fNkfGBQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0183.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.30; Tue, 28 May 2024 02:49:25 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.025; Tue, 28 May 2024 02:49:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 May 2024 04:49:10 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [L1Ot8g2rD1S3RSwUz+Gq5HMYU7+ZWlaWnV9/afi4WL4=] X-ClientProxiedBy: ZR0P278CA0161.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240528024912.3310372-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0183:EE_ X-MS-Office365-Filtering-Correlation-Id: 37873fe4-554f-4c66-d95d-08dc7ec0c8de X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: ETZDXiKRKbA0On9o0lCOHouXDs7a+Jy40cDsxzX4kZ0B1lozH0JrBz3VZTrcaPdTdinG42WmiMqqqS3HKUqhDq1OAc6tv2l78OTKL1+A0iF8sYc8JVhEYcll6I64YDayLo8+U7Ymht2uH81/1SiLrrG/M4YoWD4Y6RtTQ+ayJhsEzpClLH1H8iNwSiRWKe2eHrmustlAJGx9suOBQYO/FQp4q+EETUMhbel92np/E9t9pK0mCF4bmN3dUti0dhDm8AIv79Yjd3QrxzMuqNNaT3zUIU7/51abzsHUEXbRNFt5eNymfMWJISup3T4ADfWow57nhmWrLf+cDKqg4no5qjd18ASC2hrzSGFYxXZjwJawuYDaNfs1YnqEXpVu3jtVfR0Ig0TvASVLn0B41VFhbgtralvLuZmh18mmvAnvZfy6QzcFnaTVLeu9e0XdugNwM25kFII8KLB8UjyWeHUaAMtexS/7qNm3WK+5L6qt6mveM5oSffpBBQG54/4g8+KrW39Y2XnHCSC3TNZp3Nwec+vtyJxafBqnjOgJYTCZQPQkEZfkdI9aleJqLeCSnyJjlqZwWjD6JXhB2YA9k4uJ3Ex8vELxRCmQaJjp6OeRaie7JQ9d6Q8Ny+09O0GVHxfr X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: dwfKzDU7Lo8qjU3hja6zIe+NJZ88UG4BhuLIAjpl77zRiybUz00mSV9MU70r79kejfgDdbVANYtkNdgU3eNycHquTRL63pZ7yWdoyVAucIERvP+6CZjXJqmQd+aj9C+mq0Iw2fs3GFGtoAWlKG0zDKuUawUf7ZpsGGmkplCWIpzYI8oEyOp5NoBVnmBv7Z7EcJaRdImc5LhRq0V4enMrMHhUKq+AO5bttJGVals9EIQ1DICJhhhkWt12Je5k7KdmhZ64cXdJN7jos6x1BSYIYNg4t2LZkaYUnDPAUxeslxNPD0ArHrvQ0XJgZNGUMTzuR5NWsLoZgIXKR0C/Sw5BP7qBoOiPoS33cMgH0VE5VsaYmsDlZhJnyIx7CcBCRPAGEUOluzgcgo+wm4aVEQvQdTfrIGt/gsxOCIde99Afs10cIfH9/Vgt40/ZdS/WGtMP0dHzOQqw5tmxRjdnoN8ARmviUsmEcbQNat22312i/uuBJW9PpHD+QzQQOfqcTmsyeWn6R46q2dZxTLBTj7bRcCYn4CPfjsT9F954iO6W+zOg+3Aoa7U16gD8vdcfPaSq4tV+1teI3ySWYf5DBfk+9USGCZ9OS07Jg/msar8S2Bf9YS5GHUtbbW7/7cfHKTDiiIk0pmduXkLHl2aDmo0osH7vcIZm7hxNoc4dJu6sbbBs7aC0NoR6iUqxFCtdmrdFCWj8u88bAW5f0aTfXnHg19jH+v+Cx2bctwA8J/QT1AxvoSFYORis7gj03zu2VUNaKrCCzA0x02VJl4fOjPxxr66Vx/qBwnYej58KZ93NN1ZtcKHUgM4LpGY4XZ9+Zle+e/FICRhQ9j5AR2w7Yc6MSVJpo4eazpHfDa/r6W3fNxOBq5nYVyBFIT1R/TAh4OHeeTSW/tb4a/3s4lgqD0Z9xESGCrkkWdTGWCLp5UUkv8f+ToaHJc4B46zRTK7pLkUH8YNl84QGB5+bw0/0FfOdZWZXHJOXt8djrKNcUgcD27sTUQZF5ZOqoiq06MvkOJsxZleCylJrP6I+AKM4fjwqs8LsxFtRtFlXV2nlEwTLSA7IHbwHu/PNVYS/7FSUTrGx9kLOP2nZ7GXkQcvbTwSFt3AgQSry0IxxknR4EptIbp7sMPVyPFqG6n6HaK6ttO9WgqDYG04owkN6rr8PU02I6fc+89a8M5hchIE88TePIF3MhHN8Dydx7m5N4nIS6hZtzFoczraeveCMmQcm+G6xIwlNizBKVD1RIpE5Gb/SUCbDGk0EgBZu8xt0l5zJJcBIGR7TD2tFv8OkzNqtZJqJuw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 37873fe4-554f-4c66-d95d-08dc7ec0c8de X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 02:49:25.0751 (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: AM8P250MB0183 Subject: [FFmpeg-devel] [PATCH 5/7] avcodec/vc2enc: Avoid relocations for short strings 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: /pEjv8VbEE3p These strings are so short that they can be put directly into the containing structure, avoiding the pointer and putting it into .rodata. Also use chars for interlaced and level while at it, as these are so small. Signed-off-by: Andreas Rheinhardt --- libavcodec/vc2enc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 3285218724..8b9641916a 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -41,8 +41,9 @@ typedef struct VC2BaseVideoFormat { enum AVPixelFormat pix_fmt; AVRational time_base; - int width, height, interlaced, level; - const char *name; + int width, height; + char interlaced, level; + char name[13]; } VC2BaseVideoFormat; static const VC2BaseVideoFormat base_video_fmts[] = { From patchwork Tue May 28 02:49:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49309 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:142:b0:460:55fa:d5ed with SMTP id h2csp141381vqi; Mon, 27 May 2024 19:50:07 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCW1JiNGos0mhB31Q+QLzwdjkcGOL9r/WCSvrQZOxyaML6pSjlJBA8N8tx8JqC+aL/9P7Y2miPM+RDgVyUGTcNej+oGc2sgBacxgVw== X-Google-Smtp-Source: AGHT+IGzVCzO1tIyZeRsDT7K5h7f9oi04qoiFeZajRBMydMMXu3eooP2RSavg9+m70R+3/+DVCB+ X-Received: by 2002:a19:5f07:0:b0:51f:3cb3:48a4 with SMTP id 2adb3069b0e04-529646e3b70mr6099432e87.1.1716864607064; Mon, 27 May 2024 19:50:07 -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 2adb3069b0e04-5296ea7401esi2674086e87.172.2024.05.27.19.50.06; Mon, 27 May 2024 19:50:07 -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=PLEeAB6o; 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 1A55B68D557; Tue, 28 May 2024 05:49:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2070.outbound.protection.outlook.com [40.92.64.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77E8C68D420 for ; Tue, 28 May 2024 05:49:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nYoUc0djBQ2O4zNWPNBn5Ox2QylNcB0OJ35Fy/Y0OGnLghm5QW63bOuImQkEENR/yStkjDDMMsKKM3F4ooBZAjls5zsiSFp49PQAqzi3vKDhla2LWRmvyZ5mc0IRpU8WsEQJ/Vgntem2LtQUsLudWVU5Y3bY+CjFfeiXgr0tnhIeJobdjyopO+t2UY62bLxqfB5rvqpJF4H/Z8dq9KjZJB7NXyEsgz6bN5rw7z5VzdsPx4XpoWlkBLbM3srPOj7XoPhe6beTMeSDv7AyxZpVnizQiFXHTyDeq4NCxyWKjW9yvX5lRzhx+G/GDDLEE1heglskEbu4xKW+gtFe04XI7w== 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=d+ejOo1x/b88NliRTvOjrDSKviei1DThy+WPoE3ZvBg=; b=B4aUhkjbHKB8MnMDuj+0zQnn+1fn4qm297BIhFdgkHOb452fMSo0wfuOIGLS0wzOvKQ2VVdB7TblLxtH+T+fdJ/uNBu5eTJGhsYYD0wN3l3EeKuqH8gYPCoKVfmED/hmJ7SqktqHFHbpN3xAz9ZavNSWfQeS8mEir6BqraQ/+WmppfPdfwDydejjTwC1LLF7qzhqo/k4nhR3zJEuirQE8+PWFcMC0T52HPg6N7lM/9pj2Ymea1w6pqQZv2AMkCRelcnJsr60B8E3iUpX2uI49HERpMXvD2LeIt0/DsNk8WrSOVn0Vt6vASKjHRqcY4ltHCMH7NjlCt1TDtU38AmCDw== 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=d+ejOo1x/b88NliRTvOjrDSKviei1DThy+WPoE3ZvBg=; b=PLEeAB6oTAwtTJS5EhvkM5Y/SBw3HsDXaf/xXUCxtMspcSwgWValB+J0/ryTF6zmKOsL73i/eoTImfCjkbxi3S2bwXfZ2rJ2uox3mBaDsiOgKbFX95QGQSVVCX9gZMTXvgwqGuTZcmETXE0RdHzhD4TddQKSpbO1QvZLVBYjUaHTug7i3dE0hf8u093Z1AUgSPeP3SYJLLD794AVxOYZF7gvUbxCaMNVTZ3xL+LWW6sAqCF75H0UPDNJNGmfBJ7AVpYEoEo4lo/aq+SkQI8JllAuh7L9fmhfnY6hXNDdu2XFlde43SO2+wru0fP5sk5Tbj8S5AgvnffMvw090Kytew== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0183.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.30; Tue, 28 May 2024 02:49:26 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.025; Tue, 28 May 2024 02:49:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 May 2024 04:49:11 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [ZTQrPLKwj5M0V+ApCuZC6+0U/bJfQ6oRG7GpmFk5/sw=] X-ClientProxiedBy: ZR0P278CA0161.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240528024912.3310372-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0183:EE_ X-MS-Office365-Filtering-Correlation-Id: 4331847c-70c3-4c06-92a5-08dc7ec0c9c5 X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: Ulgvbuib1Tl0uN3WmaQg+1X8ZMFwGRZAyZQP4So7jPl7Q/XhTBGQw2wiS7Q9U1787phBo2X4xA5XYUm+a9LzEdGYh/fu14b4dFLjdFWkFGg8GVqEHCbOPwwPnqeS5MVcJOjIkU1iHyfK8501CHS3mrYaqA2v+bTz/6v/AyjPh2dYngRFJw4jdZ42C0d7iVB3GHxl3cwKRpAk3WygumjFDaPX9u7o4u0VfWQiTEJxY47R+hIjPCSqKtBo2/STGaS1Xduyb8Rnr8Uh1H6wZwRjKmIpx/4dHm41ayH6dyzKQdmexqo/aESb5cc7Px35iAN+S2oo18/5fO8qrJTVm17Hk/RSdAriN+lestnEoTsqNoqj47YPEYubEc1rhoEcPPldH/nuiqItSW4HXVUGh1rY8d1uUQpnh93UPNZkk7dmvo5HZM+V6WIp3OxZ9s8PMd6ETOww9dewToa5/wCs1sGvxJHn3rNehGXu2k1qhNeVU7Mlp71IoC0ayegNyVkjEKHXx8cRYcNvIl7YfdGM+xDRynx0VhVbsdHRBtFg+GmRiAp0BQHAxL4BPo+ih+Yx74HSgkvltYPhpGFR5eBo6SbgDgnFJTG+TYANWsO/W0o9gx40PRSbyzZW6XbeP4+Z2y2T X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: vYLBHim8m9xdGYBjEFq2DPjvfQseBvhDZ1IyoaNhRcr9aKdgO8VQ+2/AXgCrC4+s2Jpi8/WztIr6NLgdPNDjSK4ypSeF74HpKk/r+x9Zl/yetEwkhhQIrfo0JoQbeauZAw791evfqyTPE177nzNexaIYdes3yU7lWECiNvAC4J8ylyjH2914w3pGCX6oW1YO3gCtZxmQYdzV0vJUL3voyij96uDAecg3c6wCHg/eIXP5T2F4uUWnLmLiTF1VD9nMcyybORDstfPpnoaLsgpfogUOZJGfesXUFmNyD25bdFWNJmoqaBhy9rgfJ1tLi7zhOS+JEO4ukZbvH0UI/4cfYvHHE5opKibEJzzVBzabWAOf+/pVNfNPYgdFqPu/nQK3WkcWvn1tQZfLUvh+/vuCl4yC2Avyn2QCbLq++/Q7iCKG6/WdVXQ7xC6Y6XrX04Q5i4WiVKs5Df2O0A/KVeKMo8cGOPNblGN0RAjhUBVN98MkhdESgl564F8pvBikiNjB2JMAlorbDpTccf/zNkwvkA3yN24h6XN0BTx8wyr+GdQT+xCRdDYax/3dsaWEySl04TYFTaYA0lGGX8vm3h8xz1APEc1rqD7roG+1WQtMXtf21p+D7XxFWhgoewAV2HWoyUTEGm4Uz32/0Jlp/p1ox3TCr7JkPHPnK6Q2ul0bbSytVBRaiufPDiYBzhNBCRb7u0LvAYqDFnb8Ikjzjeio4cz2SUOkHGdVaxegHkWwDA5HE2uGDM3qXZmcE1cfbaQSR+CQJlhNkrKoGIUdcJerLh6GgjVnLlUGEeNQC9j5HU2Ib3dWpgVQT2BayY9pQdfU7ina9NX6sucWWgzF2Ng0F6U2/P3fXOt7dA1QNxEnhqsD55J9ZOwRwvPiYFja4K5CR/sAdGeCELw3Xf0X5fW6gzPF9qnAus7hzErqqT9laMgKQ1x23tegRRxAiAV2pxpfb870VksDfoHvEPK9mZg6Exv5zRmvd9AEYD5FXFKqN+HSNMSZt+1yd/DanXm4Pxl1ZBMO0EYXVlkD3owwD3nf6SRIwYi/17c31B/qLAyHUrxDZ5WwMpiJlqhy8rixGCxGMzQzTN+K9vmiw7vKwqLUT4po5rbPNK4hmP6FMqylmvoSwkuntZt/+PPtbddMj1LyoXM0Pjp3JmUFwYgKGA7NGfwiNxhvDYnp2jXjRANpPu2z4yFDcZlSVIFG4HCpmrOjdMJqqMK5oiHRMLapTd80AOUjl4gaOeyXTVRUCvohUdO24Vj9n3N8sEgV7cE+gELsRn12YoVBJK4W3tDgE9G1XA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4331847c-70c3-4c06-92a5-08dc7ec0c9c5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 02:49:26.5185 (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: AM8P250MB0183 Subject: [FFmpeg-devel] [PATCH 6/7] avcodec/vc2enc: Move transient PutBitContext from ctx to stack 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: ZbhmjuY4JBjA Signed-off-by: Andreas Rheinhardt --- libavcodec/vc2enc.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index 8b9641916a..e72c15e6f2 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -105,9 +105,11 @@ typedef struct Plane { } Plane; typedef struct SliceArgs { - PutBitContext pb; - int cache[DIRAC_MAX_QUANT_INDEX]; const struct VC2EncContext *ctx; + union { + int cache[DIRAC_MAX_QUANT_INDEX]; + uint8_t *buf; + }; int x; int y; int quant_idx; @@ -724,9 +726,9 @@ static int calc_slice_sizes(VC2EncContext *s) /* VC-2 13.5.3 - hq_slice */ static int encode_hq_slice(AVCodecContext *avctx, void *arg) { - SliceArgs *slice_dat = arg; + const SliceArgs *slice_dat = arg; const VC2EncContext *s = slice_dat->ctx; - PutBitContext *pb = &slice_dat->pb; + PutBitContext pb0, *const pb = &pb0; const int slice_x = slice_dat->x; const int slice_y = slice_dat->y; const int quant_idx = slice_dat->quant_idx; @@ -735,8 +737,9 @@ static int encode_hq_slice(AVCodecContext *avctx, void *arg) int p, level, orientation; /* The reference decoder ignores it, and its typical length is 0 */ - memset(put_bits_ptr(pb), 0, s->prefix_bytes); - skip_put_bytes(pb, s->prefix_bytes); + memset(slice_dat->buf, 0, s->prefix_bytes); + + init_put_bits(pb, slice_dat->buf + s->prefix_bytes, slice_dat->bytes - s->prefix_bytes); put_bits(pb, 8, quant_idx); @@ -789,7 +792,7 @@ static int encode_slices(VC2EncContext *s) for (slice_y = 0; slice_y < s->num_y; slice_y++) { for (slice_x = 0; slice_x < s->num_x; slice_x++) { SliceArgs *args = &enc_args[s->num_x*slice_y + slice_x]; - init_put_bits(&args->pb, buf + skip, args->bytes); + args->buf = buf + skip; skip += args->bytes; } } From patchwork Tue May 28 02:49:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 49310 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:612c:142:b0:460:55fa:d5ed with SMTP id h2csp141430vqi; Mon, 27 May 2024 19:50:15 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVbEsn4QevRtfQ+KJliWG9/jJVGpc5L1OHp+bRXuoIgiWImef8L0Tb2bqfM5uSIcv7EilyQy9qH66jjtBN4dwnK2HPjZt8mfIedOg== X-Google-Smtp-Source: AGHT+IGsH0dzscujDaMTIbWYu2w0HP2SimNUeFTi393trHmMNjEgiltAgF8df7I9Jy+t6KanvvQT X-Received: by 2002:a17:906:6b0b:b0:a59:bae0:b12a with SMTP id a640c23a62f3a-a626536a08bmr706225566b.63.1716864615441; Mon, 27 May 2024 19:50:15 -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 a640c23a62f3a-a626c7ff0e4si449747066b.111.2024.05.27.19.50.15; Mon, 27 May 2024 19:50:15 -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=BDZXhMFo; 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 DC27268D565; Tue, 28 May 2024 05:49:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2070.outbound.protection.outlook.com [40.92.64.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C6B468D515 for ; Tue, 28 May 2024 05:49:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OV3lZO+ZmTGaURbYCWks8QpoV/wwFjChVgF0unVO053UttMpHbjE2ZSi7I6MVzJ/EtJ1mkHDNPZVHXCpv67bOq3nAPmX3n9Z0W6FkHjWsYX+oNaTwZ/tkJqiqfkr64gPGlL711VmFH8HUxJPFIi2DL72n4p47v1kghgoPvWUCUgMQgBCyaCZt6SSCH2kvhROzTVbBLKLjZ/azHiq+hqjLwB/zOUxND6GU3m2F1MXWTR5sW02yrKTpNC6og037clg6vTRMQylq/Ar3xM6pkQDjY1tQ6Sff0tECi5hQnaSvu8S/5nn6TbmsP0EICEoO4agc4fQYHclfYJ+KZy6Y5trMg== 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=WY5//F2F8xYGzJToQ/1Sg2TfwKtI3JBB0/Fa/CEfxEI=; b=Ehyols6w+O9+uS9xJNYzWGhzZEkNHp7jHD4+r6531Xm1WXGY/sZtXiOyhiIOQdqYdwHPIYNNp69yu/xq3GflOCfi2h2R3f/3RKYKLsHy+TY7jGgBIWWzJqzW467whilePluTsWX/IllQD0qZGRtoW/vI+gN0hbXwn6Ynki7dQzPXsWQI0SNe1zLl9NFJPEtDG9N9yEMN7CUbaKg4jPei1/TFIp3lg7o3vZEYxiebJMRzIsoNqsEa+Tfoe5qFWXx6xKk8yiDoTV5/461Gp2AkOoUVOb0QdkYkUu41I94iQt6d4w2TNs4/Yn8H//HwmmD8eTxMe1D2QzPLQ1zWA8sKdg== 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=WY5//F2F8xYGzJToQ/1Sg2TfwKtI3JBB0/Fa/CEfxEI=; b=BDZXhMFoCCmhVC4Vop80JQjxsUs65UIOT8hr0DIWeprSkbyOKOdK1SG5ZxmwwVfDw1nfp7FHBqa195GnyDcY22u165Q9Soq/UttjZ4jFaCZxAFrIAlkI/63pxorCI0wnlIM3U9szXJyu6EoATP8qlnAbdVpBY/FdkRoBcTjKYp3CkfPBIt2mZOc27iBkNmWsK6VBUw1Lk/SYLqwahWlBUD1omLXma6qccFGrS39ffWKB2pK9+2q08dCFanrdqa/b9F88eqLpdohao0xtyIAZ/ViP7o6ApoIRpyhaEGg8QJHyfVnsWWOJHIQX7ze+2zDOYbtDAHMLK2uAxlaH4+GBHg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0183.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:326::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7611.30; Tue, 28 May 2024 02:49:28 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.7611.025; Tue, 28 May 2024 02:49:28 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 May 2024 04:49:12 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: X-TMN: [1XX4zOncP/CKHoei5wFL42s1KgbON9ElC7BSwFFq5Ug=] X-ClientProxiedBy: ZR0P278CA0161.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:41::19) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240528024912.3310372-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0183:EE_ X-MS-Office365-Filtering-Correlation-Id: 51ac457d-6f40-482d-ae27-08dc7ec0caca X-Microsoft-Antispam: BCL:0; ARA:14566002|461199019|440099019|3412199016|1710799017; X-Microsoft-Antispam-Message-Info: N7Tq+jPxzZLY5Vi0ViyZ7QZ5l+ZNbkT7PlIWcIOjEyz4GNjw6ilSMdeLQANzRfO1o7cQ+PCx9Zh1wjBHANiDjBqtTcFAvTW50Gb6idD8XsZKqyuhh4BaTiZK8kc3o+EvcAeABaR42UWVILmiH/qRZozrjcnVSioU5+K6ikmrP7sV+ZtNNyCbzS2W5+t8NmXKJum+d5w4DbmKPBurO+XuhGBjRAizZpbg/X2vyGA57AHQlfocFyCDsgDizukJPqodloEUrR1UBDx+bRqRl0dJdHzYv6vw8r7ekSoAimXH4R135GUo6r72r2yAekcXjfzkqPqLSKnlk76B5eoClECdADauHM4mJjW9Y3yh8fhuYC74VtfDoNQsvgvdokxsHkJuiTWTfcMC53HAQfUQTNayAAVre/quvAQv2HY6i93KwPNt+dyMAqDhGwOYjjBItw7pqVL4vblqtgTzzfizMo0xcItYem/JsF23/69pzTrGBQNNthbC6C7gfjkcjO/e73wHMkNjgLAjLwsisKx+V36cvlYJeP9AXenqA5ZyvClLsRbTKCCFQWa9R+nbRa1qUWgbGCXg04oL2dLqy1uFKEZzgFzRHP+4Y3h7Q3GBiQ/+kaK4NS9dMcj4zTEl/Y38cnF9 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: JkB3CfTWm41oIyozwEc8v10JE83l+lJOqDWE3aP5425bOuPi4ubfj87BuZmr8DsdUUCpHIhEjFRzTbP8EaME9Ma8J3DFFwgRgta2jFbPBOMZGW1NGDtKbJyumgP4ArC3ZoWmtzX6NLqg3UiB1k+mTHparOSFSaoiYGrfsJ2kPU7x3OMerfW+gUi1btkMNpwFgUSgsvQOTmguz31ob7KRPq0Sd3h3H/HazifDCfjk34YEWJ0OaSC4OdUxrkkjXFloDq50gEEV4I7YxTyQlSj93ltOxCZYIEpR4Pl+e7a6O3g4+p6wPzznti2WwVzNQLrEg7ONGsWfRZx5BKRavUWZmU/YHhiycJjBhFTfGdReaYgFDFXS6bZpfBeFJK6MVQgRCwIKDyNDLQ0KhPgtvlyJEChHyE5y+EzDGj4JRbd5aNnAppY9CuqL70kTaHWZPcU1BzgJbhtTZRpUQUp8CL9aFJ0Jpgoei0DLKpUmI9K2yozj+TjDmdOHfb3lkK+ulPCxT6RMTuuPxOS9jVv9NwvY0+Pb4JEAF5bDmGSvAe/1fZDatwikn2M05L32nPlMWP/pYOOiL/xrFNJqNmXxBjDu7a+UHOvTD7uwbISycnwWRhEFxQ/f/Zrfg/sCedTSsoCIRjEv0LQ27ux9TpEnb+iu8Bzvp5se3CKjO5a5KclbM3oMR4HhqUt1E9BjUfG9mQIIR66IZc9B25JZOvgMfupXR3Z8lmG0CUEIK2ViWZhb2TOB15rgnDo9bAwYdsuMBb92OnIvoE+TmVx3/ewzLq7ARMu+7zko5FKC9Fl4CUaCo9VMdQ+hEbhE1ZWUzc5quq0s3V+0u/n/fWtk09gZ1SXx+7HP2STdH7rYLGy57B+cIOM89yeOTuqzdEIkhwExegUhjDKKQqATu2ght0HWFxYkTnyC0FUj0CbB/oImoqrK2V5MYA6xlFzmQrz7jvTj5e3zVigU/ovNm39+WBDKzBHQvpgZYU73pckc9AccxKfMN3OMiEhUaex+/c6GX4gh1UbjYIPm6rvrCvoVvUoulYoMKxbqP0adZr5+tojUMfu4rznDKSqDpDc8jHD4oqIAMy7Sou249xnh1FR1ZztDLU65hDSWgHenalcXG8QvZMbP5yizcBi5zmQqSj8OC07RHIMymMRVWPREYyrK0cIMwAiYYf8cXPt0JilvwS8eCWdAzWY74sCeeYVRC2S1ljcOKHgG4NcVqaYlUoIW1LZM9jPzWs92+LzDEqGskAKr7bwShny8l9sRACUhL0yfXsOosC2gqfFj1OPgHm2Smx4+fqGv4Q== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 51ac457d-6f40-482d-ae27-08dc7ec0caca X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 May 2024 02:49:28.2389 (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: AM8P250MB0183 Subject: [FFmpeg-devel] [PATCH 7/7] avcodec/vc2enc: Use already available AVPixFmtDescriptor 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: SjTam2hO4eLb Signed-off-by: Andreas Rheinhardt --- libavcodec/vc2enc.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c index e72c15e6f2..1d0754c09b 100644 --- a/libavcodec/vc2enc.c +++ b/libavcodec/vc2enc.c @@ -1026,9 +1026,9 @@ static av_cold int vc2_encode_init(AVCodecContext *avctx) { Plane *p; SubBand *b; - int i, level, o, shift, ret; - const AVPixFmtDescriptor *fmt = av_pix_fmt_desc_get(avctx->pix_fmt); - const int depth = fmt->comp[0].depth; + int i, level, o, shift; + const AVPixFmtDescriptor *pixdesc; + int depth; VC2EncContext *s = avctx->priv_data; s->picture_number = 0; @@ -1100,12 +1100,13 @@ static av_cold int vc2_encode_init(AVCodecContext *avctx) s->base_vf, base_video_fmts[s->base_vf].name); } + pixdesc = av_pix_fmt_desc_get(avctx->pix_fmt); /* Chroma subsampling */ - ret = av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &s->chroma_x_shift, &s->chroma_y_shift); - if (ret) - return ret; + s->chroma_x_shift = pixdesc->log2_chroma_w; + s->chroma_y_shift = pixdesc->log2_chroma_h; /* Bit depth and color range index */ + depth = pixdesc->comp[0].depth; if (depth == 8 && avctx->color_range == AVCOL_RANGE_JPEG) { s->bpp = 1; s->bpp_idx = 1;