[x265] [PATCH] Fix encoder crash with zones and add test for zones

[Aruna Matheswaran]

Pushed into Release_3.1 and grafted the fix to Release_3.2 and default.

On Wed, Oct 16, 2019 at 4:43 PM <pooja at multicorewareinc.com> wrote:

> # HG changeset patch
> # User Pooja Venkatesan <pooja at multicorewareinc.com>
> # Date 1571043796 -19800
> #      Mon Oct 14 14:33:16 2019 +0530
> # Node ID 4f33ba60df5715e5bd6277eee20e4f778283a7b9
> # Parent  37648fca915b389bafe923d8443818359e80ebf2
> Fix encoder crash with zones and add test for zones
>
> diff -r 37648fca915b -r 4f33ba60df57 source/encoder/api.cpp
> --- 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 @@
>          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);
> diff -r 37648fca915b -r 4f33ba60df57 source/test/regression-tests.txt
> --- 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 @@
>  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
> _______________________________________________
> x265-devel mailing list
> x265-devel at videolan.org
> https://mailman.videolan.org/listinfo/x265-devel
>


-- 
Regards,
Aruna
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20191017/0c0fe45a/attachment.html>