[x265] [PATCH] tests: modify the delimiter of multi-pass commandlines

[Pradeep Ramachandran]

On Mon, Jul 24, 2017 at 10:21 AM, <aruna at multicorewareinc.com> wrote:

> # HG changeset patch
> # User Aruna Matheswaran <aruna at multicorewareinc.com>
> # Date 1500641534 -19800
> #      Fri Jul 21 18:22:14 2017 +0530
> # Node ID 53042e0c3f6691d56492b5dc1b822bc71d8c624d
> # Parent  01a981f509eaf98461b719dcc9fdd5a9bed05b6e
> tests: modify the delimiter of multi-pass commandlines
>

Pushed into stable branch


>
> diff -r 01a981f509ea -r 53042e0c3f66 source/test/rate-control-tests.txt
> --- a/source/test/rate-control-tests.txt        Thu Jul 13 19:37:37 2017
> +0530
> +++ b/source/test/rate-control-tests.txt        Fri Jul 21 18:22:14 2017
> +0530
> @@ -2,7 +2,7 @@
>
>  #These tests should yeild deterministic results
>  # This test is listed first since it currently reproduces bugs
> -big_buck_bunny_360p24.y4m,--preset medium --bitrate 1000 --pass 1
> -F4,--preset medium --bitrate 1000 --pass 2 -F4
> +big_buck_bunny_360p24.y4m,--preset medium --bitrate 1000 --pass 1
> -F4::--preset medium --bitrate 1000 --pass 2 -F4
>  fire_1920x1080_30.yuv, --preset slow --bitrate 2000 --tune zero-latency
>
>
> @@ -29,23 +29,23 @@
>
>
>  # multi-pass rate control tests
> -sita_1920x1080_30.yuv, --preset ultrafast --crf 20 --no-cutree
> --no-scenecut --keyint 50 --no-open-gop --pass 1 --vbv-bufsize 7000
> --vbv-maxrate 5000, --preset ultrafast --crf 20 --no-cutree --no-scenecut
> --keyint 50 --no-open-gop --pass 2 --vbv-bufsize 7000 --vbv-maxrate 5000
> -sita_1920x1080_30.yuv, --preset medium --crf 20 --no-cutree --no-scenecut
> --keyint 50 --no-open-gop --pass 1 --vbv-bufsize 7000 --vbv-maxrate 5000,
> --preset medium --crf 20 --no-cutree --no-scenecut --keyint 50
> --no-open-gop --pass 2 --vbv-bufsize 7000 --vbv-maxrate 5000
> -sintel_trailer_2k_480p24.y4m, --preset medium --crf 18 --no-cutree
> --no-scenecut --no-open-gop --keyint 50 --vbv-bufsize 1200 --vbv-maxrate
> 1000 --pass 1, --preset medium --crf 18 --no-cutree --no-scenecut
> --no-open-gop --keyint 50 --vbv-bufsize 1200 --vbv-maxrate 1000 --pass 2
> -sintel_trailer_2k_480p24.y4m, --preset veryslow --crf 18 --no-cutree
> --no-scenecut --no-open-gop --keyint 50 --vbv-bufsize 1200 --vbv-maxrate
> 1000 --pass 1, --preset veryslow --crf 18 --no-cutree --no-scenecut
> --no-open-gop --keyint 50 --vbv-bufsize 1200 --vbv-maxrate 1000 --pass 2
> -ten_teaser_3840x2160_50_10bit.yuv, --preset medium --crf 25 --no-cutree
> --no-open-gop --no-scenecut --keyint 50 --vbv-maxrate 10000 --vbv-bufsize
> 12000 --pass 1, --preset medium --crf 25 --no-cutree --no-open-gop
> --no-scenecut --keyint 50 --vbv-maxrate 10000 --vbv-bufsize 12000 --pass 2
> -big_buck_bunny_360p24.y4m,--preset slow --crf 40 --pass 1 -f
> 5000,--preset slow --bitrate 200 --pass 2 -f 5000
> -big_buck_bunny_360p24.y4m,--preset medium --bitrate 700 --pass 1 -F4
> --slow-firstpass -f 5000 ,--preset medium --bitrate 700 --vbv-bufsize 900
> --vbv-maxrate 700 --pass 2 -F4 -f 5000
> -112_1920x1080_25.yuv,--preset fast --bitrate 1000 --vbv-maxrate 1000
> --vbv-bufsize 1000 --strict-cbr --pass 1 -F4,--preset fast --bitrate 1000
> --vbv-maxrate 3000 --vbv-bufsize 3000 --pass 2 -F4
> -pine_tree_1920x1080_30.yuv,--preset veryfast --crf 12 --pass 1
> -F4,--preset faster --bitrate 4000 --pass 2 -F4
> -SteamLocomotiveTrain_2560x1600_60_10bit_crop.yuv, --tune grain --preset
> ultrafast --bitrate 5000 --vbv-maxrate 5000 --vbv-bufsize 8000 --strict-cbr
> -F4 --pass 1, --tune grain --preset ultrafast --bitrate 8000 --vbv-maxrate
> 8000 --vbv-bufsize 8000 -F4 --pass 2
> -RaceHorses_416x240_30_10bit.yuv,--preset medium --crf 40 --pass 1,
> --preset faster --bitrate 200 --pass 2 -F4
> -CrowdRun_1920x1080_50_10bit_422.yuv,--preset superfast --bitrate 2500
> --pass 1 -F4 --slow-firstpass,--preset superfast --bitrate 2500 --pass 2 -F4
> -RaceHorses_416x240_30_10bit.yuv,--preset medium --crf 26 --vbv-maxrate
> 1000 --vbv-bufsize 1000 --pass 1,--preset fast --bitrate 1000
> --vbv-maxrate 1000 --vbv-bufsize 700 --pass 3 -F4,--preset slow --bitrate
> 500 --vbv-maxrate 500  --vbv-bufsize 700 --pass 2 -F4
> -sita_1920x1080_30.yuv, --preset ultrafast --crf 20 --no-cutree --keyint
> 50 --min-keyint 50 --no-open-gop --pass 1 --vbv-bufsize 7000 --vbv-maxrate
> 5000, --preset ultrafast --crf 20 --no-cutree --keyint 50 --min-keyint 50
> --no-open-gop --pass 2 --vbv-bufsize 7000 --vbv-maxrate 5000
> --repeat-headers
> -sita_1920x1080_30.yuv, --preset medium --crf 20 --no-cutree --keyint 50
> --min-keyint 50 --no-open-gop --pass 1 --vbv-bufsize 7000 --vbv-maxrate
> 5000 --repeat-headers --multi-pass-opt-rps, --preset medium --crf 20
> --no-cutree --keyint 50 --min-keyint 50 --no-open-gop --pass 2
> --vbv-bufsize 7000 --vbv-maxrate 5000 --repeat-headers --multi-pass-opt-rps
> +sita_1920x1080_30.yuv, --preset ultrafast --crf 20 --no-cutree
> --no-scenecut --keyint 50 --no-open-gop --pass 1 --vbv-bufsize 7000
> --vbv-maxrate 5000:: --preset ultrafast --crf 20 --no-cutree --no-scenecut
> --keyint 50 --no-open-gop --pass 2 --vbv-bufsize 7000 --vbv-maxrate 5000
> +sita_1920x1080_30.yuv, --preset medium --crf 20 --no-cutree --no-scenecut
> --keyint 50 --no-open-gop --pass 1 --vbv-bufsize 7000 --vbv-maxrate 5000::
> --preset medium --crf 20 --no-cutree --no-scenecut --keyint 50
> --no-open-gop --pass 2 --vbv-bufsize 7000 --vbv-maxrate 5000
> +sintel_trailer_2k_480p24.y4m, --preset medium --crf 18 --no-cutree
> --no-scenecut --no-open-gop --keyint 50 --vbv-bufsize 1200 --vbv-maxrate
> 1000 --pass 1:: --preset medium --crf 18 --no-cutree --no-scenecut
> --no-open-gop --keyint 50 --vbv-bufsize 1200 --vbv-maxrate 1000 --pass 2
> +sintel_trailer_2k_480p24.y4m, --preset veryslow --crf 18 --no-cutree
> --no-scenecut --no-open-gop --keyint 50 --vbv-bufsize 1200 --vbv-maxrate
> 1000 --pass 1:: --preset veryslow --crf 18 --no-cutree --no-scenecut
> --no-open-gop --keyint 50 --vbv-bufsize 1200 --vbv-maxrate 1000 --pass 2
> +ten_teaser_3840x2160_50_10bit.yuv, --preset medium --crf 25 --no-cutree
> --no-open-gop --no-scenecut --keyint 50 --vbv-maxrate 10000 --vbv-bufsize
> 12000 --pass 1:: --preset medium --crf 25 --no-cutree --no-open-gop
> --no-scenecut --keyint 50 --vbv-maxrate 10000 --vbv-bufsize 12000 --pass 2
> +big_buck_bunny_360p24.y4m,--preset slow --crf 40 --pass 1 -f
> 5000::--preset slow --bitrate 200 --pass 2 -f 5000
> +big_buck_bunny_360p24.y4m,--preset medium --bitrate 700 --pass 1 -F4
> --slow-firstpass -f 5000 ::--preset medium --bitrate 700 --vbv-bufsize 900
> --vbv-maxrate 700 --pass 2 -F4 -f 5000
> +112_1920x1080_25.yuv,--preset fast --bitrate 1000 --vbv-maxrate 1000
> --vbv-bufsize 1000 --strict-cbr --pass 1 -F4::--preset fast --bitrate 1000
> --vbv-maxrate 3000 --vbv-bufsize 3000 --pass 2 -F4
> +pine_tree_1920x1080_30.yuv,--preset veryfast --crf 12 --pass 1
> -F4::--preset faster --bitrate 4000 --pass 2 -F4
> +SteamLocomotiveTrain_2560x1600_60_10bit_crop.yuv, --tune grain --preset
> ultrafast --bitrate 5000 --vbv-maxrate 5000 --vbv-bufsize 8000 --strict-cbr
> -F4 --pass 1:: --tune grain --preset ultrafast --bitrate 8000 --vbv-maxrate
> 8000 --vbv-bufsize 8000 -F4 --pass 2
> +RaceHorses_416x240_30_10bit.yuv,--preset medium --crf 40 --pass 1::
> --preset faster --bitrate 200 --pass 2 -F4
> +CrowdRun_1920x1080_50_10bit_422.yuv,--preset superfast --bitrate 2500
> --pass 1 -F4 --slow-firstpass::--preset superfast --bitrate 2500 --pass 2
> -F4
> +RaceHorses_416x240_30_10bit.yuv,--preset medium --crf 26 --vbv-maxrate
> 1000 --vbv-bufsize 1000 --pass 1::--preset fast --bitrate 1000
> --vbv-maxrate 1000 --vbv-bufsize 700 --pass 3 -F4::--preset slow --bitrate
> 500 --vbv-maxrate 500  --vbv-bufsize 700 --pass 2 -F4
> +sita_1920x1080_30.yuv, --preset ultrafast --crf 20 --no-cutree --keyint
> 50 --min-keyint 50 --no-open-gop --pass 1 --vbv-bufsize 7000 --vbv-maxrate
> 5000:: --preset ultrafast --crf 20 --no-cutree --keyint 50 --min-keyint 50
> --no-open-gop --pass 2 --vbv-bufsize 7000 --vbv-maxrate 5000
> --repeat-headers
> +sita_1920x1080_30.yuv, --preset medium --crf 20 --no-cutree --keyint 50
> --min-keyint 50 --no-open-gop --pass 1 --vbv-bufsize 7000 --vbv-maxrate
> 5000 --repeat-headers --multi-pass-opt-rps:: --preset medium --crf 20
> --no-cutree --keyint 50 --min-keyint 50 --no-open-gop --pass 2
> --vbv-bufsize 7000 --vbv-maxrate 5000 --repeat-headers --multi-pass-opt-rps
>
>  # multi-pass rate control and analysis
> -ducks_take_off_1080p50.y4m,--bitrate 6000 --pass 1
> --multi-pass-opt-analysis  --hash 1 --ssim --psnr, --bitrate 6000 --pass 2
> --multi-pass-opt-analysis  --hash 1 --ssim --psnr
> -big_buck_bunny_360p24.y4m,--preset veryslow --bitrate 600 --pass 1
> --multi-pass-opt-analysis  --multi-pass-opt-distortion --hash 1 --ssim
> --psnr, --preset veryslow --bitrate 600 --pass 2
> --multi-pass-opt-analysis  --multi-pass-opt-distortion --hash 1 --ssim
> --psnr
> -parkrun_ter_720p50.y4m, --bitrate 3500 --pass 1
> --multi-pass-opt-distortion --hash 1 --ssim --psnr, --bitrate 3500 --pass 3
> --multi-pass-opt-distortion --hash 1 --ssim --psnr, --bitrate 3500 --pass 2
> --multi-pass-opt-distortion --hash 1 --ssim --psnr
> +ducks_take_off_1080p50.y4m,--bitrate 6000 --pass 1
> --multi-pass-opt-analysis  --hash 1 --ssim --psnr:: --bitrate 6000 --pass
> 2  --multi-pass-opt-analysis  --hash 1 --ssim --psnr
> +big_buck_bunny_360p24.y4m,--preset veryslow --bitrate 600 --pass 1
> --multi-pass-opt-analysis  --multi-pass-opt-distortion --hash 1 --ssim
> --psnr:: --preset veryslow --bitrate 600 --pass 2
> --multi-pass-opt-analysis  --multi-pass-opt-distortion --hash 1 --ssim
> --psnr
> +parkrun_ter_720p50.y4m, --bitrate 3500 --pass 1
> --multi-pass-opt-distortion --hash 1 --ssim --psnr:: --bitrate 3500 --pass
> 3 --multi-pass-opt-distortion --hash 1 --ssim --psnr:: --bitrate 3500
> --pass 2 --multi-pass-opt-distortion --hash 1 --ssim --psnr
> diff -r 01a981f509ea -r 53042e0c3f66 source/test/regression-tests.txt
> --- a/source/test/regression-tests.txt  Thu Jul 13 19:37:37 2017 +0530
> +++ b/source/test/regression-tests.txt  Fri Jul 21 18:22:14 2017 +0530
> @@ -17,17 +17,17 @@
>  BasketballDrive_1920x1080_50.y4m,--preset faster --aq-strength 2
> --merange 190 --slices 3
>  BasketballDrive_1920x1080_50.y4m,--preset medium --ctu 16 --max-tu-size
> 8 --subme 7 --qg-size 16 --cu-lossless --tu-inter-depth 3 --limit-tu 1
>  BasketballDrive_1920x1080_50.y4m,--preset medium --keyint -1 --nr-inter
> 100 -F4 --no-sao
> -BasketballDrive_1920x1080_50.y4m,--preset medium --no-cutree
> --analysis-reuse-mode=save --analysis-reuse-level 2 --bitrate 7000
> --limit-modes,--preset medium --no-cutree --analysis-reuse-mode=load
> --analysis-reuse-level 2 --bitrate 7000 --limit-modes
> +BasketballDrive_1920x1080_50.y4m,--preset medium --no-cutree
> --analysis-reuse-mode=save --analysis-reuse-level 2 --bitrate 7000
> --limit-modes::--preset medium --no-cutree --analysis-reuse-mode=load
> --analysis-reuse-level 2 --bitrate 7000 --limit-modes
>  BasketballDrive_1920x1080_50.y4m,--preset slow --nr-intra 100 -F4
> --aq-strength 3 --qg-size 16 --limit-refs 1
>  BasketballDrive_1920x1080_50.y4m,--preset slower --lossless --chromaloc
> 3 --subme 0 --limit-tu 4
> -BasketballDrive_1920x1080_50.y4m,--preset slower --no-cutree
> --analysis-reuse-mode=save --analysis-reuse-level 10 --bitrate 7000
> --limit-tu 0,--preset slower --no-cutree --analysis-reuse-mode=load
> --analysis-reuse-level 10 --bitrate 7000 --limit-tu 0
> +BasketballDrive_1920x1080_50.y4m,--preset slower --no-cutree
> --analysis-reuse-mode=save --analysis-reuse-level 10 --bitrate 7000
> --limit-tu 0::--preset slower --no-cutree --analysis-reuse-mode=load
> --analysis-reuse-level 10 --bitrate 7000 --limit-tu 0
>  BasketballDrive_1920x1080_50.y4m,--preset veryslow --crf 4 --cu-lossless
> --pmode --limit-refs 1 --aq-mode 3 --limit-tu 3
> -BasketballDrive_1920x1080_50.y4m,--preset veryslow --no-cutree
> --analysis-reuse-mode=save --bitrate 7000 --tskip-fast --limit-tu
> 4,--preset veryslow --no-cutree --analysis-reuse-mode=load --bitrate 7000
> --tskip-fast --limit-tu 4
> +BasketballDrive_1920x1080_50.y4m,--preset veryslow --no-cutree
> --analysis-reuse-mode=save --bitrate 7000 --tskip-fast --limit-tu
> 4::--preset veryslow --no-cutree --analysis-reuse-mode=load --bitrate 7000
> --tskip-fast --limit-tu 4
>  BasketballDrive_1920x1080_50.y4m,--preset veryslow --recon-y4m-exec
> "ffplay -i pipe:0 -autoexit"
>  Coastguard-4k.y4m,--preset ultrafast --recon-y4m-exec "ffplay -i pipe:0
> -autoexit"
>  Coastguard-4k.y4m,--preset superfast --tune grain --overscan=crop
>  Coastguard-4k.y4m,--preset superfast --tune grain --pme --aq-strength 2
> --merange 190
> -Coastguard-4k.y4m,--preset veryfast --no-cutree
> --analysis-reuse-mode=save --analysis-reuse-level 1 --bitrate
> 15000,--preset veryfast --no-cutree --analysis-reuse-mode=load
> --analysis-reuse-level 1 --bitrate 15000
> +Coastguard-4k.y4m,--preset veryfast --no-cutree
> --analysis-reuse-mode=save --analysis-reuse-level 1 --bitrate
> 15000::--preset veryfast --no-cutree --analysis-reuse-mode=load
> --analysis-reuse-level 1 --bitrate 15000
>  Coastguard-4k.y4m,--preset medium --rdoq-level 1 --tune ssim
> --no-signhide --me umh --slices 2
>  Coastguard-4k.y4m,--preset slow --tune psnr --cbqpoffs -1 --crqpoffs 1
> --limit-refs 1
>  CrowdRun_1920x1080_50_10bit_422.yuv,--preset ultrafast --weightp --tune
> zerolatency --qg-size 16
> @@ -51,7 +51,7 @@
>  DucksAndLegs_1920x1080_60_10bit_444.yuv,--preset veryfast --weightp
> --nr-intra 1000 -F4
>  DucksAndLegs_1920x1080_60_10bit_444.yuv,--preset medium --nr-inter 500
> -F4 --no-psy-rdoq
>  DucksAndLegs_1920x1080_60_10bit_444.yuv,--preset slower --no-weightp
> --rdoq-level 0 --limit-refs 3 --tu-inter-depth 4 --limit-tu 3
> -DucksAndLegs_1920x1080_60_10bit_422.yuv,--preset fast --no-cutree
> --analysis-reuse-mode=save --bitrate 3000 --early-skip --tu-inter-depth 3
> --limit-tu 1,--preset fast --no-cutree --analysis-reuse-mode=load --bitrate
> 3000 --early-skip --tu-inter-depth 3 --limit-tu 1
> +DucksAndLegs_1920x1080_60_10bit_422.yuv,--preset fast --no-cutree
> --analysis-reuse-mode=save --bitrate 3000 --early-skip --tu-inter-depth 3
> --limit-tu 1::--preset fast --no-cutree --analysis-reuse-mode=load
> --bitrate 3000 --early-skip --tu-inter-depth 3 --limit-tu 1
>  FourPeople_1280x720_60.y4m,--preset superfast --no-wpp
> --lookahead-slices 2
>  FourPeople_1280x720_60.y4m,--preset veryfast --aq-mode 2 --aq-strength
> 1.5 --qg-size 8
>  FourPeople_1280x720_60.y4m,--preset medium --qp 38 --no-psy-rd
> @@ -68,8 +68,8 @@
>  KristenAndSara_1280x720_60.y4m,--preset slower --pmode --max-tu-size 8
> --limit-refs 0 --limit-modes --limit-tu 1
>  NebutaFestival_2560x1600_60_10bit_crop.yuv,--preset superfast --tune psnr
>  NebutaFestival_2560x1600_60_10bit_crop.yuv,--preset medium --tune grain
> --limit-refs 2
> -NebutaFestival_2560x1600_60_10bit_crop.yuv,--preset slow --no-cutree
> --analysis-reuse-mode=save --rd 5 --analysis-reuse-level 10 --bitrate
> 9000,--preset slow --no-cutree --analysis-reuse-mode=load --rd 5
> --analysis-reuse-level 10 --bitrate 9000
> -News-4k.y4m,--preset ultrafast --no-cutree --analysis-reuse-mode=save
> --analysis-reuse-level 2 --bitrate 15000,--preset ultrafast --no-cutree
> --analysis-reuse-mode=load --analysis-reuse-level 2 --bitrate 15000
> +NebutaFestival_2560x1600_60_10bit_crop.yuv,--preset slow --no-cutree
> --analysis-reuse-mode=save --rd 5 --analysis-reuse-level 10 --bitrate
> 9000::--preset slow --no-cutree --analysis-reuse-mode=load --rd 5
> --analysis-reuse-level 10 --bitrate 9000
> +News-4k.y4m,--preset ultrafast --no-cutree --analysis-reuse-mode=save
> --analysis-reuse-level 2 --bitrate 15000::--preset ultrafast --no-cutree
> --analysis-reuse-mode=load --analysis-reuse-level 2 --bitrate 15000
>  News-4k.y4m,--preset superfast --lookahead-slices 6 --aq-mode 0
>  News-4k.y4m,--preset superfast --slices 4 --aq-mode 0
>  News-4k.y4m,--preset medium --tune ssim --no-sao --qg-size 16
> @@ -123,7 +123,7 @@
>  old_town_cross_444_720p50.y4m,--preset superfast --weightp --min-cu 16
> --limit-modes
>  old_town_cross_444_720p50.y4m,--preset veryfast --qp 1 --tune ssim
>  old_town_cross_444_720p50.y4m,--preset faster --rd 1 --tune zero-latency
> -old_town_cross_444_720p50.y4m,--preset fast --no-cutree
> --analysis-reuse-mode=save --analysis-reuse-level 1 --bitrate 3000
> --early-skip,--preset fast --no-cutree --analysis-reuse-mode=load
> --analysis-reuse-level 1 --bitrate 3000 --early-skip
> +old_town_cross_444_720p50.y4m,--preset fast --no-cutree
> --analysis-reuse-mode=save --analysis-reuse-level 1 --bitrate 3000
> --early-skip::--preset fast --no-cutree --analysis-reuse-mode=load
> --analysis-reuse-level 1 --bitrate 3000 --early-skip
>  old_town_cross_444_720p50.y4m,--preset medium --keyint -1 --no-weightp
> --ref 6
>  old_town_cross_444_720p50.y4m,--preset slow --rdoq-level 1 --early-skip
> --ref 7 --no-b-pyramid
>  old_town_cross_444_720p50.y4m,--preset slower --crf 4 --cu-lossless
>
> _______________________________________________
> x265-devel mailing list
> x265-devel at videolan.org
> https://mailman.videolan.org/listinfo/x265-devel
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20170724/c8021249/attachment-0001.html>