From patchwork Tue Sep 20 22:28:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 38120 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp2237991pzh; Tue, 20 Sep 2022 15:28:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5wUl0o0e85U3vkPMVPv9uR/0Yy8qwtpVk5WjjKNd0TTpLTGIdRWzQJX6f1ctQpLsR277hz X-Received: by 2002:a17:907:a042:b0:77b:a279:fc00 with SMTP id gz2-20020a170907a04200b0077ba279fc00mr18227558ejc.616.1663712897892; Tue, 20 Sep 2022 15:28:17 -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 eb5-20020a0564020d0500b0044f32dc9cffsi1070537edb.396.2022.09.20.15.28.16; Tue, 20 Sep 2022 15:28:17 -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=GW41GhFT; 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 9041A68BABC; Wed, 21 Sep 2022 01:28:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2084.outbound.protection.outlook.com [40.92.89.84]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B4B8468B320 for ; Wed, 21 Sep 2022 01:28:06 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XBoJIXnDTekWv7Xr5Xa4jlQb51ZKLto/8foCpC43wrfe0IlIfUC/z7dkCkc4pQCsCHX/SfKejcbPqO748kN71kontJXeZgSV+ej3CYS6Q7jF0YL+0Pojz9NtYUOLvKWo5s4Bl6FXm3HqBYXYzHJFvVKThWi/DN4JWKiK05Xqj1ItRq0DPjqQhDrW3dZBj75c7HXbhMxTqOaS8HHl7OOtmTD8O9WqyMu/iN6IJOHSwgvovwNPHGcAbOWBMjTikGJ7D3S1U3nsDWTThty2eTjIab3C0DxeG5G2Fo9klmt4KGmCiB+QhMK2r9NhYY5FNq9JqTUPhfjYbL9f1Aobu3iywg== 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=/gyW7DEde8ZqXcqgUZSM021pLLUKV1pYDYg1vdvQIHY=; b=Ae7+EqCypOnw6xreT/wAQhNqtNYJkMjGO2Y3q1bW+1hQCDwI0sQAnto9O79I1PBI/Syv5RED/1y7pbUyE1VwOH/FnfTDIGWC919a8twQrVx6F2Lq5Set/mIawCtpL5+9qqVXIGax0Fq2U82sci/VrPxD9ocrn0iCR4bxk337LA4Kq0M8hoyHXnwpmMVf9kN3dLMAs71mLuZfH1/vGO/culrjhYZTV7E0MXdR7EHNtRspBSwD5AqBijacckswzeCUO+N6T1u6VAdHqVOopwAFN9VWW3n4/xnx5/JRphUWljpYs6smhKx9GEL5gbNutegMPpmdv3+5thDcs3eawjTN4Q== 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=/gyW7DEde8ZqXcqgUZSM021pLLUKV1pYDYg1vdvQIHY=; b=GW41GhFTmARtH5DWZ8wS0HNedVbxTGvodRJaZZ/lEmuqgZqCcxRJQOtA+xZZGVGQGqHGBJ3Lg/s70thORJbZustRuT+r8A9DTWVXA4wiXORgtxjv34riThW+VC6vw8mpnosl99GNX4Ud6CBQU7fA9qio7kvP7jLORFGE2HxqnGo3uHeIqJa/rv/zAasPfauEG5GUmm9cScKy1J8J6iSVdqw1/W9W1w6KtLT6nrfADP5Mdx8WETNOBH3IT1ldON8Bq1RE8is8mVIviaMzWI6DM3e2XVNllRdFlEt215Haqn491yzv7SYQed3dIG4PMXeplWFI8LKFPmSSnGCTTi7ryw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0167.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:376::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5632.19; Tue, 20 Sep 2022 22:28:04 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::f3f2:4362:56:4785%8]) with mapi id 15.20.5632.019; Tue, 20 Sep 2022 22:28:04 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Sep 2022 00:28:02 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [YFKQby/ym362Q7P5s2HalLA40FGf5AFgYJ3aKlFRFfY=] X-ClientProxiedBy: ZR0P278CA0098.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::13) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20220920222802.40209-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0167:EE_ X-MS-Office365-Filtering-Correlation-Id: f680e00c-5094-4fd1-1c46-08da9b576251 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmrSLXKEIOho5llLytxD09+Y11NCxTNWvnCtEZo4Q0z+G8wAR0sugIusvUxvkpbJPPdGspWH1907ROfsHTujyU7NlqWNgt+OxuR0ztzf5iio0oQgEEEtP4ke67WEXs3UqJy/BTxvVDQVzDaywcHjHaaPrJYrFJQQ8fgQ3JtkUrwn/QK88syUh16oRdrB96B+L1uK5EiPrAXpBk8kkih5H3YbYcgSex+tvyRtakAoKa+j0XibfpOaN/Y9T5OlBbFJAE/lF1ApsES0qhrmWq6ZlALenMzIc7nzmtbURu28isKsm41uJPI6F7kKUm7BYQvVNA1FaFdtkN2TuT4WM3MTH7VhbXqDnqlwXr8KbyxeOXdPg+Q4OWSJ3sD2jS9B3dfI3Mgyv1DvK/wFB31+iUvByxQ6MFBp1AjPjGr0QR9hdGm9EXfW+3h9N5jDJJKmGdZTUFdgv/Zyr/DX125esH8nNsVoOtLz/TiEhzSSoAhbzLcXDYwbg0GLhcJpd6I2taRKdNQIvbknr+MZOyBVxdRI1Y9rl6WPeEX/7VDhs0He4USBm+jXJN/oG4uyqEZxsh8J8MPFqtwJPM6R/nTLK1DeHCngW6w6zCD92PFiccXfWGNUGmwI3dF3pNAlvFzGsZ8xa9H86VlzNY/EAt0Oh635lIreMU98gRSPF1VJJqpXiHI7mQjwqq13vZxS/eynjmwNfWqHf3omJukFzEFGR4jlcDG+Eti43tN+jSVwgrAM2lMeNNECg5IzczNDnsrM/HCUOWw= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vQEmU9sVpWIL2sM2GS4j52C5AJ8BFE/bTnm3HC95IjPKZROleOPIk/HjWVdC2W/KgK5eTGyAQ//bHeKpoo7b6Xqocqve0ELeVaum5A7deFcxWYB2cfGL7gouzq7GcBPrtB6R4GdndqybuE2pYe0CNXe5dDdtw6Kt5mzA4nnHPOMyj4UlRoH9V+AJBGN22wpz44o8Re7gI6T+ljZthvsntxH756iJ3zmmzKe2Aiu6746LtnnoHPa223iq0nn1yzTTGvuk0FbGW5NKBZkYFvf6p2Shj/2VIiVlFv9nxb6oLdh8khFdni+FnHpHUygV1f5hpO2D0fREyf0HN12nAJ2Jtd2khJ/6SdQfVGywNVLtHij/N52ovpByd+uiT1Y6dP5gbN4Kza2mXhSNNjkCqzTHBAfoeZIex/389saz2KU1Kr9FQ//AMhg2yhScv1O34a+xoLrzEbjY0SiyfWs/Ryh26bcAYAExPJ5x6qA5YEQlNlVIwVQRyUJ5fjJFA7jNzgUxan4zpgNNDt0kWopet+h1SeNI3kuIc/ZNpC6A7aXRD1KEtcFJp6A0q3nuCHwFYYgFu4QM4hKd3pOfA0iGA2ikoSRUOPeF54HospQQiwuxW6fz/IPtANE7oeccaQhfpl911cL7uCJD919qRyYbY94arg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Mm4zt6GpndWaWLqQv1Gu7dj+5bGMToV0vfhKPS4hvDx1Uj7gagQ8n10UEw6NAbxSAeu8iFFiXpWNlV5S6LaffDiwQKhwC5ldTA1V6PSaRYQhj2v1UzD5TDlkm+IRnix0ZxLM6DM8pUh2YYhzJU2L1XX7ESKmVaWPQcBTZeYcM+vENnWJYCUdVfsAXZ12SmFgLvgFnnsFPPwSPDWfoV5XAswH2i7Gh5uTs/cyrfnPfe39sCkLbvzp4yRSJflZedJr8m3js4th1ZtpHClqriA/zz8GMUhHsopVUwWFalWG+9nSI1FMskjJh7wpZrEbLPN3W2L5ZTYdTnB1atlA9Z17Fo4GdP84Kg+niIZhJBdsuYgQbAcgic+fm5Aj8+407w4Wo9TtntQnxV1xCmDQ9oYw8z3XSHEevSUaeyAYAcXAfG86YADA/SywJEVj5tBg+IkNV7CjPTCj3orM9CHcyutFol9+ynb17+q0jI+Y9h8r8PH91YkBjFwFMmp7uQwevqRzLlaN26rv+RbXUrd0griH1UpLmKyb4Pg317JF8ZNXGVJmf277brCoYsAg7Kkm4yv2Jn5z8CscipyGy/gJHNJLZcxB7DsT8kyhPxqm+SLkHG6wcH6ZBzCaihso8nAoAwdqj+JJhKDe+drS8+O0uRFmxADtFxEYDEiNA/84C6VzMDErUV9UmabS0w1LW0BlAmnicmqeBQVfJA1vOJbibl6j8xyte5oV+432BRJMV0QNQxTbSxFkDRxJOAEc+A+JS7BlVeBmYtdMc8yCp9Clmva6w9WfY7N6iI0xgt+nNCWfw7zxcNdbRv9IX968D7/hjsjb7/WzeVV7z4b+6dKbEGX/TPWjp9YWL6yNkzw9BJctJ6UlYGoCWTj0reH4XLpuL/13gbSrVu0lHFxSZ1YI2YYv8tI1rImwIsaDvwtNbJYkh/2UD7MGnmpKfOMw9LgezrPDv3c/60Yfn23CYppAJ3DVKyYYgZ9hyYDQdE5hf6omZOmLvJpy1e0q/NOraKMUhFwaCGwu2L9OCLrPQryq7u9dXsYKrKmhkJcfN8CLIKR+FttcROrYFE0pMQIMjoJYWstIjso1/fwzzM6iOacrVGAy85kWL1cgPPmpvpZnL6j2iNzZkLzOR+d+//OVVCCFnvHEAvcUTo8Tqzr0n9YXLShhxYxzld6K5wSkCwYVftMgcLSQkkfKi689CTDJgLKIdFxkJQpEwiYgMpjrTleRGz/+O9bOWFcFNH2MQfZapGe1QI4mJgFJXUfv8ot1hv9olxqt3iLwZk8llR1uwOrPbBGw7TgeFymfocA6ls+75+xcCzqtZ/3RihzQGumSVXAEIAqU X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f680e00c-5094-4fd1-1c46-08da9b576251 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Sep 2022 22:28:04.2177 (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: AS8P250MB0167 Subject: [FFmpeg-devel] [PATCH] avcodec/h264_slice: Remove always-false check 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: jwThyANvZMfS The H.264 decoder, the only codec with which this code is ever called, does not set AVCodec.pix_fmts. Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_slice.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 6f0a7c1fb7..58fe245891 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -797,8 +797,6 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) CONFIG_H264_VIDEOTOOLBOX_HWACCEL + \ CONFIG_H264_VDPAU_HWACCEL) enum AVPixelFormat pix_fmts[HWACCEL_MAX + 2], *fmt = pix_fmts; - const enum AVPixelFormat *choices = pix_fmts; - int i; switch (h->ps.sps->bit_depth_luma) { case 9: @@ -883,9 +881,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) #if CONFIG_H264_VAAPI_HWACCEL *fmt++ = AV_PIX_FMT_VAAPI; #endif - if (h->avctx->codec->pix_fmts) - choices = h->avctx->codec->pix_fmts; - else if (h->avctx->color_range == AVCOL_RANGE_JPEG) + if (h->avctx->color_range == AVCOL_RANGE_JPEG) *fmt++ = AV_PIX_FMT_YUVJ420P; else *fmt++ = AV_PIX_FMT_YUV420P; @@ -899,10 +895,10 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback) *fmt = AV_PIX_FMT_NONE; - for (i=0; choices[i] != AV_PIX_FMT_NONE; i++) - if (choices[i] == h->avctx->pix_fmt && !force_callback) - return choices[i]; - return ff_thread_get_format(h->avctx, choices); + for (int i = 0; pix_fmts[i] != AV_PIX_FMT_NONE; i++) + if (pix_fmts[i] == h->avctx->pix_fmt && !force_callback) + return pix_fmts[i]; + return ff_thread_get_format(h->avctx, pix_fmts); } /* export coded and cropped frame dimensions to AVCodecContext */