From patchwork Wed Jun 5 09:23:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Plowman X-Patchwork-Id: 49570 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp247041vqb; Wed, 5 Jun 2024 02:24:17 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVgWG/ZSjKuALoVLxaHtG4tp3WwPMC00jBFmd0nvHWBUVM5zQhD1vKrQeKagddOTQmzXO+8Iw2VTuJGIyjQSL1Mp/SgvmyvWSnH7A== X-Google-Smtp-Source: AGHT+IHBvrULm+Skd68rWPIhty+YpIzMBxYkOGMlfFKK1EuWwTH+64UvpqfpCbntEOpv1QVPFdyK X-Received: by 2002:a05:6512:12c5:b0:516:cc2d:f6a1 with SMTP id 2adb3069b0e04-52bab4fa5bdmr1468324e87.51.1717579456861; Wed, 05 Jun 2024 02:24:16 -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 4fb4d7f45d1cf-57a31c62b0bsi6280263a12.232.2024.06.05.02.24.16; Wed, 05 Jun 2024 02:24:16 -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=@frankplowman.com header.s=zmail header.b=IRDaPTvZ; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DEA6068CED8; Wed, 5 Jun 2024 12:24:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from sender-op-o11.zoho.eu (sender-op-o11.zoho.eu [136.143.169.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9489168D3FA for ; Wed, 5 Jun 2024 12:24:07 +0300 (EEST) Delivered-To: post@frankplowman.com ARC-Seal: i=1; a=rsa-sha256; t=1717579445; cv=none; d=zohomail.eu; s=zohoarc; b=a/q4AlBrKrfRiDh1E+jukJwacZ3GD2prPURh6Bb1IEFjxQ5g3rJsKmFXUQWismaZ/lB8h71OGSm3Ncqhc7qmfPwLoiK/wS6kv0VcZvJ0Bv/wvEsGQYcXtCBbVVK7ZwnDGlrq8RDLb5bKVLko+10QbMugOXXmT3ZdSUKBol4RYbE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1717579445; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:MIME-Version:Message-ID:Subject:Subject:To:To:Message-Id:Reply-To; bh=1MqXPX55+zEnsfvJSBUlUNGnL0eqX8bSz5WUIH5Z8w4=; b=LRt9zlddznO6EQjvEQpKerBxSNkV+l6a0vnb8siuPUTPQktrAZOXZ/08FUGodsVoIGzw26MuWzNKzORcvt1w5DKyCZgP/Ok4GJwEKqENFdB2ZUb5+cs2qHETTmMHeWRLAGZMJdQlZWV+NiWUnfDBr7SPUVQK11YlfzK7yW4QDDE= 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=1717579445; 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=1MqXPX55+zEnsfvJSBUlUNGnL0eqX8bSz5WUIH5Z8w4=; b=IRDaPTvZKLBiTUm/uJGNXvyebTnpJg0W1q47/8RV8WfBuq3NC8Kn/L4ia2f0F6c7 1Vv03739dvA4H3WwDN13W66dANTT0KwDcA7w9Gk5KjgE3GVdjoU2ELSLSq6AU6So3Kc MJFgMCZLv2oiuULBs9NbKlmY6JxmgfcKf2UqFXZI= Received: by mx.zoho.eu with SMTPS id 1717579443714416.4253189838074; Wed, 5 Jun 2024 11:24:03 +0200 (CEST) From: Frank Plowman To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 10:23:43 +0100 Message-ID: <20240605092344.83464-1-post@frankplowman.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 X-ZohoMailClient: External Subject: [FFmpeg-devel] [PATCH v2 1/2] lavc/vvc: Use sps_chroma_qp_table return code 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ZugXL4yNR/iY Signed-off-by: Frank Plowman --- libavcodec/vvc/ps.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/vvc/ps.c b/libavcodec/vvc/ps.c index 1b23675c98..bfc3c121fd 100644 --- a/libavcodec/vvc/ps.c +++ b/libavcodec/vvc/ps.c @@ -186,8 +186,11 @@ static int sps_derive(VVCSPS *sps, void *log_ctx) sps_inter(sps); sps_partition_constraints(sps); sps_ladf(sps); - if (r->sps_chroma_format_idc != 0) - sps_chroma_qp_table(sps); + if (r->sps_chroma_format_idc != 0) { + ret = sps_chroma_qp_table(sps); + if (ret < 0) + return ret; + } return 0; } From patchwork Wed Jun 5 09:23:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Frank Plowman X-Patchwork-Id: 49571 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d792:0:b0:460:55fa:d5ed with SMTP id db18csp247152vqb; Wed, 5 Jun 2024 02:24:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXHFFwAZvWcqgWTA7pyj6WCqkbcZn+ArbWSHHg2liE5uLWdXGMgkbcOJTU9pew41Zhs/GZ/ewV/oO30xcTpwi0dfZrTiAhWCC92rg== X-Google-Smtp-Source: AGHT+IGGaK77vSKZCZrPy4hKj+km13XBAvtjQ1eRKCj5XL1D/awL1g31qSdUm0VVJvT0+Nco7Ir9 X-Received: by 2002:a17:906:410e:b0:a66:76f2:71bc with SMTP id a640c23a62f3a-a699fa9e0f4mr136414266b.24.1717579466367; Wed, 05 Jun 2024 02:24:26 -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 a640c23a62f3a-a68ee278bfasi338547566b.120.2024.06.05.02.24.26; Wed, 05 Jun 2024 02:24:26 -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=@frankplowman.com header.s=zmail header.b=Ea8Khwbn; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D8D668D6D5; Wed, 5 Jun 2024 12:24:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from sender-op-o11.zoho.eu (sender-op-o11.zoho.eu [136.143.169.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5B91468D6A3 for ; Wed, 5 Jun 2024 12:24:10 +0300 (EEST) Delivered-To: post@frankplowman.com ARC-Seal: i=1; a=rsa-sha256; t=1717579449; cv=none; d=zohomail.eu; s=zohoarc; b=J3koai28h+b7frdMDA+MefXn2P2Qb8i7auw2CuK196clfilr5lCNdvZ/VDSvYn0yzWEC0MKb4G1fQrAkQU5bhw9YF5EkB3QZD+VTBtkGDXkhs3baMgoW2hwAHnRu1UgZuYMbNh29zCKS3pVHsnLbuC5K60qwhnX4IYW/1Bzf2+s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.eu; s=zohoarc; t=1717579449; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=TwaOg1xKbAIC9BGXZUTQ1ehcBxRVVdQOjXxP4cswqSU=; b=VdRv8HK6+uWOKiJxM+9uO5Swy2zFjb8QPN4D/LOdo8Pm7HB3qwJcKPqXgttWn6mhjtFR/FvrU53SZCtvVt3dRGBe5v1qiDHv/KLAgItwaPcfXr6gie4qONwTrKnJ4Kalhnlt2ijZ83Owu16zo5vZvdwX0gy9STfewizHm0EgERc= 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=1717579449; s=zmail; d=frankplowman.com; i=post@frankplowman.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Type:Content-Transfer-Encoding:Message-Id:Reply-To; bh=TwaOg1xKbAIC9BGXZUTQ1ehcBxRVVdQOjXxP4cswqSU=; b=Ea8KhwbnhCJ4XqDNiWLfQYyfvkEacvIbSrAqw4O2ZFhhRABdsj4wW/LOyds0NHs3 GKhWISKZhN5N448T12/E5um4uA6QrSoolMu7DihYgbSRqSTV2kee/NkS1oTyMuVjEtL mTVdWP3ln3Um7G1jrK14LntJd5gvQ8s+iDwihw/8= Received: by mx.zoho.eu with SMTPS id 1717579447566254.34394484132508; Wed, 5 Jun 2024 11:24:07 +0200 (CEST) From: Frank Plowman To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Jun 2024 10:23:44 +0100 Message-ID: <20240605092344.83464-2-post@frankplowman.com> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240605092344.83464-1-post@frankplowman.com> References: <20240605092344.83464-1-post@frankplowman.com> MIME-Version: 1.0 X-ZohoMailClient: External Subject: [FFmpeg-devel] [PATCH v2 2/2] lavc/vvc: Prevent overflow in chroma QP derivation 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HxSzpmaV5EHg On the top of p. 112 in VVC (09/2023): It is a requirement of bitstream conformance that the values of qpInVal[ i ][ j ] and qpOutVal[ i ][ j ] shall be in the range of −QpBdOffset to 63, inclusive for i in the range of 0 to numQpTables − 1, inclusive, and j in the range of 0 to sps_num_points_in_qp_table_minus1[ i ] + 1, inclusive. Signed-off-by: Frank Plowman --- libavcodec/vvc/ps.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavcodec/vvc/ps.c b/libavcodec/vvc/ps.c index bfc3c121fd..c4f64d5da7 100644 --- a/libavcodec/vvc/ps.c +++ b/libavcodec/vvc/ps.c @@ -101,9 +101,14 @@ static int sps_chroma_qp_table(VVCSPS *sps) qp_out[0] = qp_in[0] = r->sps_qp_table_start_minus26[i] + 26; for (int j = 0; j < num_points_in_qp_table; j++ ) { + const uint8_t delta_qp_out = (r->sps_delta_qp_in_val_minus1[i][j] ^ r->sps_delta_qp_diff_val[i][j]); delta_qp_in[j] = r->sps_delta_qp_in_val_minus1[i][j] + 1; + if (qp_in[j] + delta_qp_in[j] > 63) + return AVERROR(EINVAL); qp_in[j+1] = qp_in[j] + delta_qp_in[j]; - qp_out[j+1] = qp_out[j] + (r->sps_delta_qp_in_val_minus1[i][j] ^ r->sps_delta_qp_diff_val[i][j]); + if (qp_out[j] + delta_qp_out > 63) + return AVERROR(EINVAL); + qp_out[j+1] = qp_out[j] + delta_qp_out; } sps->chroma_qp_table[i][qp_in[0] + off] = qp_out[0]; for (int k = qp_in[0] - 1 + off; k >= 0; k--)