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 F07954CAF3 for ; Thu, 26 Jun 2025 21:18:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 8747268E5C1; Fri, 27 Jun 2025 00:18:07 +0300 (EEST) Received: from sender2-op-o10.zoho.eu (sender2-op-o10.zoho.eu [136.143.171.10]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 6911668E589 for ; Fri, 27 Jun 2025 00:18:00 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; t=1750972677; cv=none; d=zohomail.eu; s=zohoarc; b=e0HGxWBDXn3ZzvYpJp/xOd89cS4sb8FmSKN2D73/4Yg46zbXw28CQzYYrqgW2kegZkNnrCq7fDCA9wQ2EmkyoDBHgpN56t4xwtPIr4ivBQwyS/T0ouB6Nio0MpxIo/skuIaZ7qJnytCjKRhfQKm0GdbvnElVH8YDFy1Bf8omGnw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1750972677; h=Content-Type:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To:Cc; bh=uQqnJI4ZQgzTQwjUipaFmHOs8hyZNDPhFwtx9ikxfhU=; b=OZHDOKr6mLvCBoEktl0Jd+Rh1ZtZLpXIwpMGu8LZy/MuAXw5x8UUw+WJAgJVs+xA475WvUpWLDMWPhvHMJfpf7xah/4VT6zKhJOyVZBMyHfSRseF5sigmr4t0mZ1EVYV1J0IiVOZl7o6tQmo0TejSDQpAJ+6xzHoeJDbyhWa5Ao= 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=1750972676; s=zmail; d=frankplowman.com; i=post@frankplowman.com; h=Message-ID:Date:Date:MIME-Version:Subject:Subject:To:To:References:From:From:In-Reply-To:Content-Type:Message-Id:Reply-To:Cc; bh=uQqnJI4ZQgzTQwjUipaFmHOs8hyZNDPhFwtx9ikxfhU=; b=WnehjwLFlPORwGqSHpU/CkdsjLnyncc7lbjs6CFIOeUG6kdsrIE8PP4mlN6PnDci ds1yz63XG+i53bOUdtrpTX7jGCVkmCg3EEVxOzEZLrAZb78jt2xhXOGlMqC8/C/FrKq kUtaUiJrpG6Y1J9OsVdg4zIplQrkLNO6d88OIX8A= Received: by mx.zoho.eu with SMTPS id 1750972674701988.0421526632415; Thu, 26 Jun 2025 23:17:54 +0200 (CEST) Message-ID: <27b9d14b-2ee6-4d40-a0b5-0b203b0f9aac@frankplowman.com> Date: Fri, 27 Jun 2025 06:17:51 +0900 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20250621122015.80590-1-post@frankplowman.com> Content-Language: en-GB From: Frank Plowman In-Reply-To: X-Zoho-Virus-Status: 1 X-Zoho-Virus-Status: 1 X-Zoho-AV-Stamp: zmail-av-1.4.2/250.958.40 X-ZohoMailClient: External Subject: Re: [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 Content-Type: multipart/mixed; boundary="===============8424607770219741048==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============8424607770219741048== Content-Language: en-GB Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------iYjeWiQHgoi163a3HYB5OhNL" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------iYjeWiQHgoi163a3HYB5OhNL Content-Type: multipart/mixed; boundary="------------QH000jBKdZD7xXE09XIfrJmK"; protected-headers="v1" From: Frank Plowman To: ffmpeg-devel@ffmpeg.org Message-ID: <27b9d14b-2ee6-4d40-a0b5-0b203b0f9aac@frankplowman.com> Subject: Re: [FFmpeg-devel] [PATCH] lavc/vvc: Fix condition for using default scaling factor References: <20250621122015.80590-1-post@frankplowman.com> In-Reply-To: --------------QH000jBKdZD7xXE09XIfrJmK Content-Type: multipart/mixed; boundary="------------qsAySA7tYFeTyg8Mxj84yAPC" --------------qsAySA7tYFeTyg8Mxj84yAPC Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On 22/06/2025 02:27, Nuo Mi wrote: > On Sat, Jun 21, 2025 at 8:20=E2=80=AFPM Frank Plowman wrote: >=20 >> 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 =3D (id < 2) ? 1 : (id < 8) ? 2 : 3; >> uint8_t *p =3D scale_m; >> >> - >> av_assert0(!sps->r->sps_scaling_matrix_for_alternative_colour_space_di= sabled_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 =3D= =3D >> cu->act_enabled_flag)) >> return ff_vvc_default_scale_m; >> > LGTM. > Thanks. >=20 >> >> if (!sl) { >> -- >> 2.47.0 >> >> Pushed. Thank you both for your reviews. --=20 Frank --------------qsAySA7tYFeTyg8Mxj84yAPC Content-Type: application/pgp-keys; name="OpenPGP_0x03A84C6A098F2C6B.asc" Content-Disposition: attachment; filename="OpenPGP_0x03A84C6A098F2C6B.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: quoted-printable -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEaDsehBYJKwYBBAHaRw8BAQdAtPY6tq5662mjGsrl9wixeTHtvaO/qPBio/aX SmF+pjnNJUZyYW5rIFBsb3dtYW4gPHBvc3RAZnJhbmtwbG93bWFuLmNvbT7ClgQT FgoAPgIbAQIXgAUJAeEzrBYhBDTiSNa330dpcMczBAOoTGoJjyxrBQJoOyIVBQsJ CAcCBhUKCQgLAgQWAgMBAh4BAAoJEAOoTGoJjyxrMhUBAKT3f80IXiufxCSU1rve Xp5BKwvNbY6szRdR/m21m9GAAQCGhR6t64PlMspXLtwWq9o1vjKzjWH+Bgw+UybQ CG2zDM4zBGg7HsQWCSsGAQQB2kcPAQEHQPmGNV50IFIJBy9F60ZIxe5my91pL/Sl LUWq9Z5DHBsYwsA1BBgWCgAmFiEENOJI1rffR2lwxzMEA6hMagmPLGsFAmg7HsQC GwIFCQHhM4AAgQkQA6hMagmPLGt2IAQZFgoAHRYhBEh0l9eKWUIIcnmv1LvizNAX Sd6KBQJoOx7EAAoJELvizNAXSd6KtkEBAP0jS/nBlqaVJq0iNeNDk+PnKkNBmC9p i4SuwFD71nQfAP9eWO32RXbRoIwvbrdsalWxWYmqSOdIdQE51qGMsJUuAjtIAQDA 6o6O2o2pHnWWdSqKs7Zkp4BImBD+kztmzA0Du3vJeQD/TR+qrBCXaG1FCDKn9c+Q XQNtHTxI9c6dCywjkQljOAzOOARoOyM7EgorBgEEAZdVAQUBAQdAKS1xy5312Agk deedJEXplopXco5pyANBz/edWeb7zEkDAQgHwn4EGBYKACYWIQQ04kjWt99HaXDH MwQDqExqCY8sawUCaDsjOwIbDAUJAeEzgAAKCRADqExqCY8saxvgAP9zskNI1Sti DXM4RFMoJb1aQ5TPToQZSSkGhw7JyMbLpgD/VCG7BOFjKgJGtXYEb5zpmRzNzdEB QkLsgE/vAD9GXQs=3D =3DReZ+ -----END PGP PUBLIC KEY BLOCK----- --------------qsAySA7tYFeTyg8Mxj84yAPC-- --------------QH000jBKdZD7xXE09XIfrJmK-- --------------iYjeWiQHgoi163a3HYB5OhNL Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQRIdJfXillCCHJ5r9S74szQF0neigUCaF24/wUDAAAAAAAKCRC74szQF0neioUb AP9/59qwqp9YTXcCQ/QxEXqu/2IGJF6Xm+XkNChflhLBiwEA3UuFMilkVC+jpTR6GhfkSl+btp4v sgDS9U4vxtnUnwA= =QNEE -----END PGP SIGNATURE----- --------------iYjeWiQHgoi163a3HYB5OhNL-- --===============8424607770219741048== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --===============8424607770219741048==--