From 37a354aa909796c0ef089a80a912c7ecffb84e9c Mon Sep 17 00:00:00 2001 From: sc29wg11 <zhangkai.video@bytedance.com> Date: Thu, 28 May 2020 10:35:02 -0700 Subject: [PATCH] Fix a bug when ENABLE_SPLIT_PARALLELISM is set to be 1 --- source/Lib/EncoderLib/EncLib.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp index 0abebdbae..861b2158c 100644 --- a/source/Lib/EncoderLib/EncLib.cpp +++ b/source/Lib/EncoderLib/EncLib.cpp @@ -515,7 +515,11 @@ void EncLib::xInitScalingLists( SPS &sps, APS &aps ) { getTrQuant( jId )->getQuant()->setUseScalingList( true ); } +#if JVET_R0064 + sps.setDisableScalingMatrixForLfnstBlks(getDisableScalingMatrixForLfnstBlks()); +#else aps.getScalingList().setDisableScalingMatrixForLfnstBlks(getDisableScalingMatrixForLfnstBlks()); +#endif #endif } else if(getUseScalingListId() == SCALING_LIST_FILE_READ) -- GitLab