Commit c5996cdc authored by Xiang Li's avatar Xiang Li

Merge branch 'merRangeCheck' into 'master'

Fix #1031: Add range check for log2_parallel_merge_level_minus2.

See merge request jvet/VVCSoftware_VTM!1552
parents 43607cea f3490409
......@@ -3411,6 +3411,7 @@ bool EncAppCfg::xCheckParameter()
}
}
xConfirmPara(m_log2ParallelMergeLevel < 2, "Log2ParallelMergeLevel should be larger than or equal to 2");
xConfirmPara(m_log2ParallelMergeLevel > m_uiCTUSize, "Log2ParallelMergeLevel should be less than or equal to CTU size");
#if U0033_ALTERNATIVE_TRANSFER_CHARACTERISTICS_SEI
xConfirmPara(m_preferredTransferCharacteristics > 255, "transfer_characteristics_idc should not be greater than 255.");
#endif
......
......@@ -1763,6 +1763,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
#endif
READ_UVLC(uiCode, "log2_parallel_merge_level_minus2");
CHECK(uiCode + 2 > ctbLog2SizeY, "The value of log2_parallel_merge_level_minus2 shall be in the range of 0 to ctbLog2SizeY - 2");
pcSPS->setLog2ParallelMergeLevelMinus2(uiCode);
READ_FLAG(uiCode, "sps_explicit_scaling_list_enabled_flag"); pcSPS->setScalingListFlag(uiCode);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment