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;