From patchwork Mon Mar 13 13:22:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 40661 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp1750471pzb; Mon, 13 Mar 2023 06:21:56 -0700 (PDT) X-Google-Smtp-Source: AK7set8ANZOBpc9igxI4tNsO2dneeOmCQj2F3K2jGv0Zqy+bSPN7cgGdi/Aax4ESwzccB/STGKJL X-Received: by 2002:a05:6402:1009:b0:4be:3918:9217 with SMTP id c9-20020a056402100900b004be39189217mr11272398edu.8.1678713716117; Mon, 13 Mar 2023 06:21: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 op27-20020a170906bcfb00b009238a205577si980207ejb.190.2023.03.13.06.21.55; Mon, 13 Mar 2023 06:21: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=QYmENjbc; 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 9501B68BB52; Mon, 13 Mar 2023 15:21:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01olkn2040.outbound.protection.outlook.com [40.92.66.40]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 72D2C68B206 for ; Mon, 13 Mar 2023 15:21:42 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X0R4fj93r4HOVqouGiiVvjgU0UudzNH5aSwDkliHsYYr1ifDllznSH7Fy6s7F8a26xljDeQb98Q7jsKnC86SVviTtUCIJlcObWpDCJJNRLfLQgDfBXfV/RD8vcTWHQrPAlPow1Y0qLzyQjJH8Rgr7toO34HteemEyOMEBDIeniLnh67RnM7OjEkXTDZq3kT1FNrov887xvPNSoxBmNOWTo9NVMrGoOTin9SEitDcHfdLOSIDBCZeF47qmf4507WMMwt3NWSqEkyFxyvnPInUNk06ESyCcN/S5FBDSlIaOVanUxccMfwSbOfCy/Z9pwOkchrDzh9jNZQmFsUcNAgccA== 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=MYLVeSs4XqD7CLKJNiRzADmJnWEzvumjS2jiciUUZ2o=; b=RkqXMC6kEfdjAWp6Sk7jbltM5zVA0ukl2qE+wMlPpi8X+J446EaIQcfqsOj0zgz2nw+X4ukXfmc3jMoRdP/x0mXnWf1xFc0wbj1yXKSx2rTDpM0u/q+8AB312yn6/fBkiqBWgcYC8edqPfs+e2qJJAzduT7qBt2RCszd02XbAJ7l0F7g65RPZeu/b7JaTtPjkpMR7yjBxrZmQpiJg00oqVTuXSmG3ec7GU/outfXEHuiqsablwQGQj6x3g5+B9nkf0E4HRwrUCCDksh77DJtXLbPm3SodqE/0hn51biN9EVsvmXwTMz8blw8P9rL9cgJYVLkKdVv2EoLnJrVKQZWAQ== 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=MYLVeSs4XqD7CLKJNiRzADmJnWEzvumjS2jiciUUZ2o=; b=QYmENjbcxdQOvl0/KwW1AWIijgVVnupYWR9NuBjx6LiT0DbX9ABfGw/VL36esxzcTmxcpYfJWVYRsBZQioOTg1OVJDsU0bd/maNafO9icAMBRCNhoGsxrNiYfphs7yByjgZDxxQPt5pNdQFmC2RhWSnESgalQ/ReMLkvrlEZ7jOi4S4nLGo0qyuJijh/pEj2PAcb1lSWyNXFchhyJR0o8YKxJxQtVdtnI/xdSC4aNJyY4qEWl8Ox1sTjYso4bZcJBM6Xh2642Yc6w+z6JyRpty/m+xqoVGbkKsdCjj2IYhViQF6OeXfNpJbjm/whAfoxrd0o0D4Xe4JRl21YNrOo1g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS2P250MB0942.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:59e::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6178.24; Mon, 13 Mar 2023 13:21:39 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::73a:bd4b:26f3:cc2b%3]) with mapi id 15.20.6178.015; Mon, 13 Mar 2023 13:21:39 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Mar 2023 14:22:02 +0100 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [faD15ISVu2pOxrjYh2szjPvDgpylZTgkhoWTnb0SkY0=] X-ClientProxiedBy: ZR2P278CA0053.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:53::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230313132202.647554-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS2P250MB0942:EE_ X-MS-Office365-Filtering-Correlation-Id: 24c047e9-db79-4e45-0596-08db23c5e0eb X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKz0HU6CvfmlHmreE0CbozhAgG3BuJ/77poFYd7tA9vpCbWgQVYsJMN/wXk6oMPE7gRcTduEu70wifRCVaknP7cGdWN/pmG2k/W2YU6RvJ/aYJpWImZsrBqyhCQ62vzS8mv1ZxyHT7hUPAtsV7P+LmvkW7D6m6IaXKVyx4QMneRwFSwg3qLcUDZDZHyhaZrw4Z7EITWoy73Uf48LEcMtnJfmIiFPvcm1rMAYNZ8Ss3V0KbJ2ojA1LRY9XW8gty4rG8q77Dpyuc9NYxjKTcG1QW2dpJ2lqMafdYjnqrYMhqHMHe8Ue2o1A/iYYQsAR/xNa8A00SgUDbk86ugxPD25BUtPLxvDHwQpdNShEK/S87iBz60uJHfnk7oi6feWnsLzR4jS1c6Hr/8t91h+xhzEe0ioy3WZtHDdxd2Ym218m3vDXYN9dBHubWLei7iKb48kV0KlC/A0k3XJM7+SP1gZ7Lw2qCoQeuR4WpEZwQGkPRmVv0HvVLaak4I+cfZALTUV5R8V3wONbJeW77VmpNgBdrvlct5voJ/t+FUY8WKmOCpB9oK4VkGJ/Tw0aPwhHLBIBWj+7vDkJEz74eHym8lCwieZsLS25fPxjqBrxfo6pVDJyauWmh6khspzewEWEeqLhDT3QFpFIrsRfSE0B22YGIajY/mc5Q4o9Bku8TYKSEcuJ+rz2Yfrg62CUMo/z9gQhbBZNYlHQYSBDMGJJ2+sMqfnMTh1I8YVPNM= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oRSdZk33TZInwT0Cuuk38MqwWoNKYeRBWCjrRuiGlSelaGKtiuoEZzoQ81UJ8/40EZpmMfWZk6fnWpnEevLUMu1HA4RKBMAqsRv/+WVGnd5XMqcPc0HKhKDT8k/IArwgM/z/HkmZxcmD2vWWQKm/r6NyXr+4jgetO2O/RkWZghNCnYy4LFAqagGN230cHqu9h1C/tluDTDIsKs89QIYeLYaH+8aYcjoi6VdhNW3q+L7E3Q2N5G/lmQOj2saqCL7yL4PXzR5E/ThyED4cQOBU251vimgq7aMYpF9FTCZq1W74St3+pkPQapAjVPEtRv+TlQAw+my+II9bUUyWO5unuwglhEXEjdKrOAtdjeYNZdJy5bEYVph/g7orbgpiMllH/NbwZuHUmmEahn1XSoEA3YKI3L1e/3TCXUnnwVlLCkBqTk1eALhVdintiyv8MPh1cr3O9BEroE6XMaHnNSlAkYPLjeCy8VfUJoT6gthUFoxUAcvX9wIkypJW3wLtMV/E5jm0TyDQ1xuxriV/61YDPSv837UWyF6I6twXhQWD/uqpxhga69lC/X9IGH4cB6hhaXRHwGzNQSnfqrkobwsXmUs9qxeJZY2GxvA7frhEPYVnsS8quucaRxJGod7mN8ms1Cobr7WRI6e55vL+M+52+A== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: k6ygikUR3PCMbRrhj/vB0nVhJihoYkglNxuNNcOtsOmWyK3YHP5bU1ewL133qL2sVZN2zNIHx1gs0cI6Q3Xdl3Iz0uOhDeTKPobiGGb7Ux+hsEc7TgN8SNl29qPduT/o6bjcsC+6W7O03K9J3KawtCnd2avV8snvmeaTTVc/KEt90DA1e5tOX1XNyMZxeAC46St47yh0U1Do4sXp9JIai91nDRKZpBGyiSnIYdMOCWGwsRMv02NaiKGL216LSMAdUKhtliHJwuPXaNg3V8kfYZchz01E+fVplu1E7L/dVHwc/mgP2Dg+pXLPQk8FJUziL67PXb0fVwuKZ7DtInndlgpMkF4FecnuWlF/i6wg0mgNbAkNHXMFZotqhIlvg3/EEX4iKh0reQ0snQfZgeHb7q76F5NzsOE1vZY+Fp2uHszaBQ2GeOox5waLrzppgSS8bwp/UZT5u54BKCMRNY7ENw7TsSHmxUTHe1Ig0LB2UK3Xw1Rop39tcgQQYbXosK+lAjICH3xY3rO2uQt4vTxH9kbUP83dh9Qfxj6NCG2/rwPHNLDrCq1zkw+QfG6/5RWhU5i/VFyREPplJUYho9xWBLDxKDwgIHRWvDivSuTEvZ5+L0L4+692K9Rp7z+6q4XiYkrddsvCOs04Vn5Lb1uMqCMUFI4Qdk3Pq8zyo+s/6AglqEk1SBmgS24GMtZ+aZpRzj4d8VRG2b7Z9jt6ZSlpPYCqcWdW8dpxhcO+lD3WD5IXADWlau0rAmjCQ0sS3eGOULMlDd2gbK/Lk0WwyptOlnfbHGmtx1OD9MIksqfwKULGJkyOjLI9qe3AbZSa7CQPkSA1e2//+ip1Ft60bTMhZdcL1zAdiEKMRv8SbRLfGd8d+clslq3AH2b2tfsLNYzsNx+QkFc7TcleDYMDsYSfSXmFktxblzwwAVCqBYgY647VlJ6yXKrI9GXe8eHn4dXBD8yYFCCDX1CbLmzGT0Gil+0HhprELsC7YGbOlUw+jaQhX1FV1en6sodB35mIHyY+nCS/Xg7tMlfgkARXSEm6h6oFwQz8ge15IMTw52aA5PZgwMFHiRdE/x7RwngQoTZtY/5iIUKZDoUkSDsB9BkWakY6VhB602X9BPWYfCrdpbCkon8l+Jwq1jEzcWHMyv6GD0VeEwXrXGhliZAna62fI9siwOOzVCnu6GLvHHnjlRMo0UABZmuAuoYFwe4ANu3MSaV7g+Mg+zXRu8cV9BUi+eNHTouquJXbd6dCL94mD52LOxH8+Aqky1AHvAR1IkbfZFk387VTRFd6LLkrfYMrwkoobPjmkli6IeEx4NO5mZM= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 24c047e9-db79-4e45-0596-08db23c5e0eb X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2023 13:21:39.4285 (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: AS2P250MB0942 Subject: [FFmpeg-devel] [PATCH 6/6] avcodec/libx264: Use av_pix_fmt_count_planes() where appropriate 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: 1V1Z7G5oWOV4 This also fixes the number of planes for the NV formats (this seems to not have caused any problems). Signed-off-by: Andreas Rheinhardt --- libavcodec/libx264.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 94006d2b20..92828fabc3 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -189,28 +189,6 @@ static int encode_nals(AVCodecContext *ctx, AVPacket *pkt, return 1; } -static int avfmt2_num_planes(int avfmt) -{ - switch (avfmt) { - case AV_PIX_FMT_YUV420P: - case AV_PIX_FMT_YUVJ420P: - case AV_PIX_FMT_YUV420P9: - case AV_PIX_FMT_YUV420P10: - case AV_PIX_FMT_YUV444P: - return 3; - - case AV_PIX_FMT_BGR0: - case AV_PIX_FMT_BGR24: - case AV_PIX_FMT_RGB24: - case AV_PIX_FMT_GRAY8: - case AV_PIX_FMT_GRAY10: - return 1; - - default: - return 3; - } -} - static void reconfig_encoder(AVCodecContext *ctx, const AVFrame *frame) { X264Context *x4 = ctx->priv_data; @@ -440,7 +418,7 @@ static int setup_frame(AVCodecContext *ctx, const AVFrame *frame, #endif if (bit_depth > 8) pic->img.i_csp |= X264_CSP_HIGH_DEPTH; - pic->img.i_plane = avfmt2_num_planes(ctx->pix_fmt); + pic->img.i_plane = av_pix_fmt_count_planes(ctx->pix_fmt); for (int i = 0; i < pic->img.i_plane; i++) { pic->img.plane[i] = frame->data[i];