changeset 12572:8703bedb269f Release_3.1

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 dc2dcb53498a
children 7d72c29a7ead
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	Tue Aug 13 10:51:21 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	Tue Aug 13 10:51:21 2019 +0530
+++ b/source/test/regression-tests.txt	Mon Oct 14 14:33:16 2019 +0530
@@ -153,6 +153,7 @@ Kimono1_1920x1080_24_400.yuv,--preset pl
 big_buck_bunny_360p24.y4m, --keyint 60 --min-keyint 40 --gop-lookahead 14
 BasketballDrive_1920x1080_50.y4m, --preset medium --no-open-gop --keyint 50 --min-keyint 50 --radl 2 --vbv-maxrate 5000 --vbv-bufsize 5000
 big_buck_bunny_360p24.y4m, --bitrate 500 --fades
+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