changeset 12574:7fc1f6ef2b96

Fix encoder crash with zones and add test for zones
author Pooja Venkatesan <pooja@multicorewareinc.com>
date Mon, 14 Oct 2019 14:33:16 +0530
parents 37648fca915b
children 971180b100f8
files source/encoder/api.cpp source/test/regression-tests.txt
diffstat 2 files changed, 2 insertions(+-), 0 deletions(-) [+]
line wrap: on
line diff
--- a/source/encoder/api.cpp	Fri Oct 11 12:45:52 2019 +0530
+++ b/source/encoder/api.cpp	Mon Oct 14 14:33:16 2019 +0530
@@ -108,6 +108,7 @@ x265_encoder *x265_encoder_open(x265_par
         int zoneCount = p->rc.zonefileCount ? p->rc.zonefileCount : p->rc.zoneCount;
         param->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
         latestParam->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
+        zoneParam->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount);
     }
 
     x265_copy_params(param, p);
--- a/source/test/regression-tests.txt	Fri Oct 11 12:45:52 2019 +0530
+++ b/source/test/regression-tests.txt	Mon Oct 14 14:33:16 2019 +0530
@@ -157,6 +157,7 @@ 720p50_parkrun_ter.y4m,--preset medium -
 ducks_take_off_420_720p50.y4m,--preset medium --aq-mode 4 --crf 22 --no-cutree
 ducks_take_off_420_1_720p50.y4m,--preset medium --selective-sao 4 --sao --crf 20
 Traffic_4096x2048_30p.y4m, --preset medium --frame-dup --dup-threshold 60 --hrd --bitrate 10000 --vbv-bufsize 15000 --vbv-maxrate 12000
+Kimono1_1920x1080_24_400.yuv,--preset superfast --qp 28 --zones 0,139,q=32
 
 # Main12 intraCost overflow bug test
 720p50_parkrun_ter.y4m,--preset medium