From 6bc933e8b466fc5172a930e78013583c4f31b49b Mon Sep 17 00:00:00 2001 From: Tobias Frost Date: Mon, 12 Dec 2022 14:33:40 +0100 Subject: [PATCH] [PATCH] Use the sps from the image (as e.g mc_chroma is using the sps to determine picture properties, like pic_width_in_luma_samples and pic_height_in_luma_samples, I *think* this is more correct. This PR is for discussion. (See #345.) It makes the failures go away, but that does not mean it's correct :) The following poc will be stop failing if (only) this patch is applied: - poc2 #336 - CVE-2022-43238 - poc4 #338 - CVE-2022-43241 - poc6-1, poc6-2 #340 - CVE-2022-43242 - poc7-1, poc7-2 #341 - CVE-2022-43239 - poc8-1 #342 - CVE-2022-43244 - poc9-3 #343 - CVE-2022-43236 - poc10-2, poc10-3 #344 - CVE-2022-43237 - poc16 #350 - poc19 #353 The following are still failing if only this patch is applied, but they stop failing if #365 is applied as well, but will still fail with ONLY #365 applied (IOW, both are needed) - poc1 #335 - CVE-2022-43240 - poc3 #337 - CVE-2022-43235 - poc5 #339 - CVE-2022-43423 - poc9-1,poc9-2, poc9-4 #343 - CVE-2022-43236 - poc14 #348 - CVE-2022-43253 - poc15 #349 - CVE-2022-43248 - poc17-1, poc17-2 #351 - poc18 #352 - CVE-2022-43245 Gbp-Pq: Name use_sps_from_the_image.patch --- libde265/motion.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libde265/motion.cc b/libde265/motion.cc index b7d7abc..5c47404 100644 --- a/libde265/motion.cc +++ b/libde265/motion.cc @@ -290,7 +290,7 @@ void generate_inter_prediction_samples(base_context* ctx, int stride[3]; const pic_parameter_set* pps = shdr->pps.get(); - const seq_parameter_set* sps = pps->sps.get(); + const seq_parameter_set* sps = img->get_shared_sps().get(); if (sps->BitDepth_Y != img->get_bit_depth(0) || sps->BitDepth_C != img->get_bit_depth(1)) { -- 2.30.2