Commit dc04b112 authored by Jiahao Li's avatar Jiahao Li

Enable merge mode if hash match is found and the fast method is activated.

parent ab03effb
......@@ -2447,11 +2447,10 @@ void EncCu::xCheckRDCostMerge2Nx2N( CodingStructure *&tempCS, CodingStructure *&
}
m_bestModeUpdated = tempCS->useDbCost = bestCS->useDbCost = false;
uint32_t iteration;
uint32_t iterationBegin = m_modeCtrl->getIsHashPerfectMatch() ? 1 : 0;
uint32_t iterationBegin = 0;
if (encTestMode.lossless)
{
iteration = 1;
iterationBegin = 0;
}
else
{
......@@ -2864,11 +2863,10 @@ void EncCu::xCheckRDCostMergeTriangle2Nx2N( CodingStructure *&tempCS, CodingStru
m_bestModeUpdated = tempCS->useDbCost = bestCS->useDbCost = false;
{
uint8_t iteration;
uint8_t iterationBegin = m_modeCtrl->getIsHashPerfectMatch() ? 1 : 0;
uint8_t iterationBegin = 0;
if (encTestMode.lossless)
{
iteration = 1;
iterationBegin = 0;
}
else
{
......@@ -3131,11 +3129,10 @@ void EncCu::xCheckRDCostAffineMerge2Nx2N( CodingStructure *&tempCS, CodingStruct
}
uint32_t iteration;
uint32_t iterationBegin = m_modeCtrl->getIsHashPerfectMatch() ? 1 : 0;
uint32_t iterationBegin = 0;
if (encTestMode.lossless)
{
iteration = 1;
iterationBegin = 0;
}
else
{
......
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