From patchwork Fri Apr 19 12:01:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 48164 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c906:b0:1a9:af23:56c1 with SMTP id gx6csp572625pzb; Fri, 19 Apr 2024 05:06:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXSaFAJeOxW2T2BM6kokay1pC/xRI/cvIr5fKNEHXkbEYfRKJOYiEYHbz316Sv7b9KqCHMY1EmagJYxXWk0JYgPkRDtHsbZfr+CWg== X-Google-Smtp-Source: AGHT+IFuCX0pamixOCVLwOl/nLKUPfNTghJbHaq9156lEfRuDJ5eZzz21MdKIO/+Jg5jUhnlr3uF X-Received: by 2002:a17:907:7205:b0:a52:3643:4cd9 with SMTP id dr5-20020a170907720500b00a5236434cd9mr1842601ejc.0.1713528418485; Fri, 19 Apr 2024 05:06:58 -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 o11-20020a170906288b00b00a5542451c11si2007174ejd.61.2024.04.19.05.06.58; Fri, 19 Apr 2024 05:06:58 -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=kTbikT4p; 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 8938168D32E; Fri, 19 Apr 2024 15:06:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2096.outbound.protection.outlook.com [40.92.75.96]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28840689DA7 for ; Fri, 19 Apr 2024 15:06:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=i/8GZf4Mh1cJM4uJIHHe7oc9OXj+1VHqX3YxcrIPdvQzGhi52SVfwHJtGXAsds9gT07sh2Ohm3PKGJeDfoEHCK9UA3K1vKafpMgWyxYsN5oIFjGHPMtUBoXjbE9/zmcjlILGaIaLFAboEaiHDwmnuWfO0H9hO/LtnqSWnN4UCbmPLiVYagR7J6pbnwiJZhcxOOCOWCAYOaiIuCh/ZMY/x7jk3VKhNqsYmRWRot6NEKNKm8mHVQbBuJTGNpXwXkf53SHNubIXejD8VepkA2jwVHYyN0ZK6K+Iq2XSL3kG9z+g/GiVt+Niofs5gh3nDNqyH06CQLrOaUm1SO7KZMuLQQ== 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=FPbLgT7wUGQqfROf4B2Nqx7WFCtycSGe3Mt/T+d88rk=; b=j8vpM2hvi1zrfAjgZfzfVqLmlIJCRLOKixIT4jMXoEkV3c9uV98Kr/6sNOrZ9QwBJIfNMOnI1vwedRLTBkNYNV5lqgWShPc2IxFmqqpcOZ0/KThSt7q9obLJ16tzdnHHckT4VkIpyABi64kUUv5Ygq8/L7s6+6QUtFEPFFUPQjxeByW7SnTCO5CjlsmUVadzU5Gnls0YbYTwONxU/cTy0AMxiPnZHb7mVkxGHxuKeCHcVaQAcrWIZn2uaimrE1f9cesHHUSWdYITDGSoO65Yma7HC4Yt6dz+rvfzNv3h4Cff74gwUHQuBLPkbPYGBWiQnKOonseSBfHSpPB5SqI+mw== 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=FPbLgT7wUGQqfROf4B2Nqx7WFCtycSGe3Mt/T+d88rk=; b=kTbikT4pzNu+hJOUpLPKcZVZrX9K2lSceb8vvXvo+rF6K/7OWP+cJM9gg0JAzbFv0kogQUWGMppZVYZdilyqJxBkLW3qMDqNgMDXuNyRLAwYNeYtVqTeySsopMgzS++6vPSSSfJNi2UloRfdepkkX3uJhz4KKCdZ4Vak6ujknJoH3k4T4NcLIyLi4vbyHYO9ceTENm57Y/kHFtkWAGbcQ0rvqfB15gQZfhKMjyxuZQf+X1Kva+px3xhh1HHMO+TpMi4lbdq8Xlp2wVmQtL/Q6gCzSPWQAqQHYzlXa1TjIzA0apuORQzGuw85K44fRLIygOsuzDKsdJ04mGzr3MBKbA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0137.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:320::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.43; Fri, 19 Apr 2024 12:06:45 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7409.042; Fri, 19 Apr 2024 12:06:45 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 19 Apr 2024 14:01:06 +0200 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [iBHHv6qH7E8fuBjdG/5VMrXxCAtNnSO1Z/pFZYTXAgw=] X-ClientProxiedBy: ZR0P278CA0044.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::13) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20240419120106.666432-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0137:EE_ X-MS-Office365-Filtering-Correlation-Id: f856dc58-8d4f-4c04-a81c-08dc60692eb3 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A2KO/ztOh/3lnMKTj94puohNB6iiG4l4id/5KFKUwtwkU/Gqrwa4nIQU8iprhPkLY4VRxJE8S/FzXlbA1orL2B1hFMF/dNsrlYeizXxYQp/+CEoXpHcLWPcyvY7m10JYG320lIMykyErNTcg4fhiY82eR73EVmCBD+3upvd7OnjaEnboTezuAB7umbVSdWEFkVTxwy1x5mRAhzfhgJu6KdgyL0TjlsGjXN7g1xkmOSkZMKGgNkh0cxThgjJzpXacraVvNHSPCfd1HQPhF3AEBafA875Ed0gIzfylCxx1lp38yhzfCBgXbQtOJQXvBgLb9exk5fT3dFpdBupPyzbv84/7bHZEEzEGjbpl6NfETqaii9MG+bulZpCIZBj9TWye2U5arevey5ft4VHDRU7fg3t2EZQNBipgQkxgBbh0ui4GscJGMd5HgSs1oiZ06v1SdIhfnWRgwZV5kkDXaebzb5VmlnEeh+4Xpohev8fcddlCvoCNLONtO9VAeO7oZQpyujLytoImPBA70bE1mTNdoExA7g7CV4gnvZNkjUmljchhQlNxYWKEN2b4qasbAwvL3+jzw3bQVoOGUD5peMCNeKFH9WAc8EXoUw9/k68ONtRufje60jynYxgngNnvS/jF X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 3+u6AI+3CiiF85JdCMPcjuG/byfGV34QowaTGg6okXrxdJ5lUDhjUQqfEaG/niEVqXi1Y/K2g+hyR/pcd0qYRSddK5LlfMI30yEZLqlIBj0AnsdwvGbhsqVsKuYZhLojE98xpy39LtTLqFBDWwvH6GCAjHG3nNW2Q7u7YAnSeFgechAI8nqNeuYXIY+iFpIQmdfJ+/Wsh+vrlHVpDDSc4uovEb0mpgmtAkzGMMQohDOqx7MdjLtUA7a9gC/w/UMXB2Q0mW5YMY5d4625P40SP0dZIkK+iIKqmoMHlYHfi4Xy0wKniux7u5PZTprVlZkN/fIDTYFIvZAkGjTd4SQfDfUDWtiI8H5oDZegQ0Zv9vOpK5wtp+b/z5wQtFhIy5u/pYOHGU/LgLh1TFcxVCwD0YM1KQAtVmhGnlPEIfHQJ6kauf44QfCA0+01Cg4opyLrs39D/l/MxDmWszBXMoikz2m7MlPUZGHQgR2bAgR4W06twWO4k/maB1sZtBbukTsaqw/1aKYD2t65JEbqbCr6U6e0ATpXgWkazSeCQ/iYwB5eRAFMVK9XN5zB6mWiABBaJrrtk6pOEzNvKT9PAHoxj/xCwt8/37hzOgCETvtLcIU3ljc35l0mGPQ32WnlxYu6BibUaVF6+EYt0bz5Zu3RLBGWwL+3No1iXCg3jfA9C0eydya+S0Pd7cPXvqmvEdctm8xjvOecy4zXPnf+RUefTmxaDK1vX9+7XWsyUSI4IMe6FioKEg7jjobo3vUpiu8ShCApg4PYBgqMAmrqX4VbJOTyLiH2lqwEdDAviRYUUd4sL8vVm72n4uu6U17ulEh+12GjAzYwbzNlK6Wtpq7kd+SePSH1xFElAVp0iAulrW6JPzsmLnhVlfkMVSIkS/CnfElOtssfhyT5KjyO27ht51Uekwp/zgQXeAAmoL97Y1qn0teoU1zKk0VdA0s09t8inUF1jCqBPlVfBpcnDhrKui/5DSOZiYTHGSuo08bcrIzxDu4tHu2/PvQaa2znMTlGbxDmcvzFf1riwseHvbC+Z1TFeas5LBLXJ+/UxUq2SoQGqUMxX0Ws87WfDQBHPXy9Gyz+j7BtzaYDg7E/C+n2zEyR9DxVOGa+GekaFedQ3m08ugDPSRQfM/ESBer5H5+smIwxv4lfs7w6e/aA7SwCstIJ5yE4TGluEJXtLkGTpBRbvqvcme8xl04/DKD4tTek0OPaIX/Rkc0QfiixVJYQAhCzDLyw2kIaj/lzYKWmFQ+LY0n1hsAMM8xgXhb0YXQCHxYgPJsN3jVc7rAr4q5z3w== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f856dc58-8d4f-4c04-a81c-08dc60692eb3 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2024 12:06:45.4094 (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: AM8P250MB0137 Subject: [FFmpeg-devel] [PATCH] avcodec/hevcdec: Fix precedence, bogus film grain warning 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: RzYSgm9F+7Q6 Signed-off-by: Andreas Rheinhardt --- libavcodec/hevcdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index a2c967cf09..1974bf9cb3 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2898,10 +2898,10 @@ static int hevc_frame_start(HEVCContext *s) goto fail; if (s->ref->needs_fg && - ( s->sei.common.film_grain_characteristics.present && - !ff_h274_film_grain_params_supported(s->sei.common.film_grain_characteristics.model_id, - s->ref->frame->format)) - || !av_film_grain_params_select(s->ref->frame)) { + (s->sei.common.film_grain_characteristics.present && + !ff_h274_film_grain_params_supported(s->sei.common.film_grain_characteristics.model_id, + s->ref->frame->format) + || !av_film_grain_params_select(s->ref->frame))) { av_log_once(s->avctx, AV_LOG_WARNING, AV_LOG_DEBUG, &s->film_grain_warning_shown, "Unsupported film grain parameters. Ignoring film grain.\n"); s->ref->needs_fg = 0;