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

Merge branch 'VTM12.1_BpSEI_Fix' into 'master'

Fix #1480: indexing of initial_cpb_removal_delay arrays

See merge request jvet/VVCSoftware_VTM!2044
parents 6502ca42 71de029b
No related branches found
No related tags found
No related merge requests found
......@@ -94,10 +94,10 @@ void SEIEncoder::initSEIBufferingPeriod(SEIBufferingPeriod *bufferingPeriodSEI,
{
for(int j=0; j < bufferingPeriodSEI->m_bpCpbCnt; j++)
{
bufferingPeriodSEI->m_initialCpbRemovalDelay[j][i][0] = uiInitialCpbRemovalDelay;
bufferingPeriodSEI->m_initialCpbRemovalDelay[j][i][1] = uiInitialCpbRemovalDelay;
bufferingPeriodSEI->m_initialCpbRemovalOffset[j][i][0] = uiInitialCpbRemovalDelay;
bufferingPeriodSEI->m_initialCpbRemovalOffset[j][i][1] = uiInitialCpbRemovalDelay;
bufferingPeriodSEI->m_initialCpbRemovalDelay[i][j][0] = uiInitialCpbRemovalDelay;
bufferingPeriodSEI->m_initialCpbRemovalDelay[i][j][1] = uiInitialCpbRemovalDelay;
bufferingPeriodSEI->m_initialCpbRemovalOffset[i][j][0] = uiInitialCpbRemovalDelay;
bufferingPeriodSEI->m_initialCpbRemovalOffset[i][j][1] = uiInitialCpbRemovalDelay;
}
}
// We don't set concatenation_flag here. max_initial_removal_delay_for_concatenation depends on the usage scenario.
......
......@@ -329,8 +329,8 @@ void SEIWriter::xWriteSEIBufferingPeriod(const SEIBufferingPeriod& sei)
{
for( int j = 0; j < sei.m_bpCpbCnt; j ++ )
{
WRITE_CODE( sei.m_initialCpbRemovalDelay[j][i][nalOrVcl], sei.m_initialCpbRemovalDelayLength, "initial_cpb_removal_delay[j][i][nalOrVcl]" );
WRITE_CODE( sei.m_initialCpbRemovalOffset[j][i][nalOrVcl], sei.m_initialCpbRemovalDelayLength, "initial_cpb_removal_delay_offset[j][i][nalOrVcl]" );
WRITE_CODE( sei.m_initialCpbRemovalDelay[i][j][nalOrVcl], sei.m_initialCpbRemovalDelayLength, "initial_cpb_removal_delay[i][j][nalOrVcl]" );
WRITE_CODE( sei.m_initialCpbRemovalOffset[i][j][nalOrVcl], sei.m_initialCpbRemovalDelayLength, "initial_cpb_removal_delay_offset[i][j][nalOrVcl]" );
}
}
}
......
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