From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 1780E4BCB9 for ; Sat, 21 Jun 2025 12:20:43 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id DA84A687D57; Sat, 21 Jun 2025 15:20:38 +0300 (EEST) Received: from sender2-op-o11.zoho.eu (sender2-op-o11.zoho.eu [136.143.171.11]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 4D5AA687AC9 for ; Sat, 21 Jun 2025 15:20:32 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; t=1750508426; cv=none; d=zohomail.eu; s=zohoarc; b=kOTaUN7g6rFHEx6VBIfKV6YpiXeLYJPG1q+q12gmrxN8pLG+svqV+WtvjjP3ZtAOIbtF1nMiJ2pPEltocKyB5XOqMYPnkTGDiEfDhO95cFeDUFSMTXJsq9NukFExLw9PoCFsAtMFPZstcOcaMiHAmrSbVOPruIVEiIy7qrxa1ss= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1750508426; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=ZorWz9ZZEpk1lnA3Lr+PnDsZ6bgPYxKSBcl6/rUBL9Y=; b=kUHMIUnb5/eQGtkD42qUYynhgCB7q4Cv39eheJmhcRTgac4P4CDoCsYvN/QhZkCEpTwuntMtRjly1LTSDTOfu6IdYQs09A6zq775SmR7tNMPEVeC+/MrThXOFscXOgRo+NZsRT8Q26nk+SxsMEhYTM3zek+MGxEwHJxuTVRBhIg= ARC-Authentication-Results: i=1; mx.zohomail.eu; dkim=pass header.i=frankplowman.com; spf=pass smtp.mailfrom=post@frankplowman.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1750508426; s=zmail; d=frankplowman.com; i=post@frankplowman.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=ZorWz9ZZEpk1lnA3Lr+PnDsZ6bgPYxKSBcl6/rUBL9Y=; b=AX5R/HQzf7MXJZtTSTk3RjBFnycOyJUVdO37IiVOEkVBjbgGsimIOujjaH/CIifk nUMXEgJx3l5L21wcNoVym5IziZItS3/pAFc1ODRRpM6owpU7pNOYJwDzkiKITST4o8P oOFs/3AzDzMGmgHWyJZsHtE5Vq8NFZQLTfZRkd/A= Received: by mx.zoho.eu with SMTPS id 1750508424568747.3304584145417; Sat, 21 Jun 2025 14:20:24 +0200 (CEST) From: Frank Plowman To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Jun 2025 13:05:14 +0100 Message-ID: <20250621122015.80590-1-post@frankplowman.com> X-Mailer: git-send-email 2.47.0 MIME-Version: 1.0 X-ZohoMailClient: External Subject: [FFmpeg-devel] [PATCH] lavc/vvc: Fix condition for using default scaling factor 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: Frank Plowman , nuomi2021@gmail.com, Michael Niedermayer Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Add handling here for sps_scaling_matrix_for_alternative_colour_space_disabled_flag. Also add parentheses to make behaviour a little more explicit, where &&'s precedence over || was used implicitly previously. Reported-by: Michael Niedermayer Signed-off-by: Frank Plowman --- libavcodec/vvc/intra.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/vvc/intra.c b/libavcodec/vvc/intra.c index f56b43be66..45fafdb117 100644 --- a/libavcodec/vvc/intra.c +++ b/libavcodec/vvc/intra.c @@ -367,10 +367,10 @@ static const uint8_t* derive_scale_m(const VVCLocalContext *lc, const TransformB const int log2_matrix_size = (id < 2) ? 1 : (id < 8) ? 2 : 3; uint8_t *p = scale_m; - av_assert0(!sps->r->sps_scaling_matrix_for_alternative_colour_space_disabled_flag); - if (!rsh->sh_explicit_scaling_list_used_flag || tb->ts || - sps->r->sps_scaling_matrix_for_lfnst_disabled_flag && cu->apply_lfnst_flag[tb->c_idx]) + (sps->r->sps_scaling_matrix_for_lfnst_disabled_flag && cu->apply_lfnst_flag[tb->c_idx]) || + (sps->r->sps_scaling_matrix_for_alternative_colour_space_disabled_flag && + sps->r->sps_scaling_matrix_designated_colour_space_flag == cu->act_enabled_flag)) return ff_vvc_default_scale_m; if (!sl) { -- 2.47.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".