From ed80103970b93b14fe968a442ebee47a3400a2cf Mon Sep 17 00:00:00 2001 From: Kirithika Date: Thu, 22 Feb 2024 11:39:30 +0530 Subject: [PATCH] Fix test CLI for temporal layer feature --- source/encoder/encoder.cpp | 7 ++++--- source/test/rate-control-tests.txt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp index 17bc4046f..34b9adede 100644 --- a/source/encoder/encoder.cpp +++ b/source/encoder/encoder.cpp @@ -3930,10 +3930,11 @@ void Encoder::configure(x265_param *p) if (p->bEnableTemporalSubLayers > 2) { - if (!p->bFrameAdaptive) + if (p->bFrameAdaptive) + { x265_log(p, X265_LOG_WARNING, "Disabling adaptive B-frame placement to support temporal sub-layers\n"); - - p->bFrameAdaptive = 0; + p->bFrameAdaptive = 0; + } } m_bframeDelay = p->bframes ? (p->bBPyramid ? 2 : 1) : 0; diff --git a/source/test/rate-control-tests.txt b/source/test/rate-control-tests.txt index e3dd2507d..31c97d65f 100644 --- a/source/test/rate-control-tests.txt +++ b/source/test/rate-control-tests.txt @@ -15,7 +15,7 @@ fire_1920x1080_30.yuv,--preset medium --bitrate 1000 --vbv-maxrate 1500 --vbv-bu 112_1920x1080_25.yuv,--preset ultrafast --bitrate 10000 --vbv-maxrate 10000 --vbv-bufsize 15000 --hrd --strict-cbr Traffic_4096x2048_30.yuv,--preset superfast --bitrate 20000 --vbv-maxrate 20000 --vbv-bufsize 20000 --repeat-headers --strict-cbr Traffic_4096x2048_30.yuv,--preset faster --bitrate 8000 --vbv-maxrate 8000 --vbv-bufsize 6000 --aud --repeat-headers --no-open-gop --hrd --pmode --pme -News-4k.y4m,--preset veryfast --bitrate 3000 --vbv-maxrate 5000 --vbv-bufsize 5000 --repeat-headers --temporal-layers +News-4k.y4m,--preset veryfast --bitrate 3000 --vbv-maxrate 5000 --vbv-bufsize 5000 --repeat-headers --temporal-layers 3 NebutaFestival_2560x1600_60_10bit_crop.yuv,--preset medium --bitrate 18000 --vbv-bufsize 20000 --vbv-maxrate 18000 --strict-cbr NebutaFestival_2560x1600_60_10bit_crop.yuv,--preset medium --bitrate 8000 --vbv-bufsize 12000 --vbv-maxrate 10000 --tune grain big_buck_bunny_360p24.y4m,--preset medium --bitrate 400 --vbv-bufsize 600 --vbv-maxrate 600 --aud --hrd --tune fast-decode -- 2.28.0.windows.1