Commit 848ba28b authored by Frank Bossen's avatar Frank Bossen

Merge branch 'numModes' into 'master'

fix out of bounds static_vector access in MIP

See merge request jvet/VVCSoftware_VTM!521
parents 7195e405 204b2025
Pipeline #1474 passed with stage
......@@ -1324,28 +1324,27 @@ void IntraSearch::estIntraPredLumaQT( CodingUnit &cu, Partitioner &partitioner,
#if JVET_N0217_MATRIX_INTRAPRED
m_bestCostNonMip = MAX_DOUBLE;
static_vector<ModeInfo, FAST_UDI_MAX_RDMODE_NUM> uiRdModeListTemp;
for( int i = 0; i < numModesForFullRD; i++)
for( int i = 0; i < uiRdModeList.size(); i++)
{
if( ! uiRdModeList[i].mipFlg )
{
uiRdModeListTemp.push_back( uiRdModeList[i] );
}
}
for( int i = 0; i < numModesForFullRD; i++)
for( int i = 0; i < uiRdModeList.size(); i++)
{
if( uiRdModeList[i].mipFlg )
{
uiRdModeListTemp.push_back( uiRdModeList[i] );
}
}
for( int i = 0; i < numModesForFullRD; i++)
for( int i = 0; i < uiRdModeList.size(); i++)
{
uiRdModeList[i] = uiRdModeListTemp[i];
}
#else
#endif
// just to be sure
numModesForFullRD = ( int ) uiRdModeList.size();
#endif
PartSplit intraSubPartitionsProcOrder = TU_NO_ISP;
int bestNormalIntraModeIndex = -1;
#if !JVET_N0217_MATRIX_INTRAPRED
......
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