Skip to content
Snippets Groups Projects
Commit 8613f38c authored by Frank Bossen's avatar Frank Bossen
Browse files

Merge branch 'bugfix_checkPredMode' into 'master'

Ticket #496 (Bugfix on DC value check for ScalingList::checkPredMode())

See merge request jvet/VVCSoftware_VTM!900
parents 7d90ce29 3adf9476
No related branches found
No related tags found
No related merge requests found
...@@ -1856,7 +1856,7 @@ void ScalingList::checkPredMode(uint32_t sizeId, uint32_t listId) ...@@ -1856,7 +1856,7 @@ void ScalingList::checkPredMode(uint32_t sizeId, uint32_t listId)
continue; continue;
if( !::memcmp(getScalingListAddress(sizeId,listId),((listId == predListIdx) ? if( !::memcmp(getScalingListAddress(sizeId,listId),((listId == predListIdx) ?
getScalingListDefaultAddress(sizeId, predListIdx): getScalingListAddress(sizeId, predListIdx)),sizeof(int)*std::min(MAX_MATRIX_COEF_NUM,(int)g_scalingListSize[sizeId])) // check value of matrix getScalingListDefaultAddress(sizeId, predListIdx): getScalingListAddress(sizeId, predListIdx)),sizeof(int)*std::min(MAX_MATRIX_COEF_NUM,(int)g_scalingListSize[sizeId])) // check value of matrix
&& ((sizeId < SCALING_LIST_16x16) || (getScalingListDC(sizeId,listId) == getScalingListDC(sizeId,predListIdx)))) // check DC value && ((sizeId < SCALING_LIST_16x16) || listId == predListIdx ? getScalingListDefaultAddress(sizeId, predListIdx)[0] == getScalingListDC(sizeId, predListIdx) : (getScalingListDC(sizeId, listId) == getScalingListDC(sizeId, predListIdx)))) // check DC value
{ {
setRefMatrixId(sizeId, listId, predListIdx); setRefMatrixId(sizeId, listId, predListIdx);
setScalingListPredModeFlag(sizeId, listId, false); setScalingListPredModeFlag(sizeId, listId, false);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment