Skip to content
Snippets Groups Projects
Commit cf210b0e authored by Karsten Suehring's avatar Karsten Suehring
Browse files

fix indentation after !1598

parent b0125f88
No related branches found
No related tags found
No related merge requests found
...@@ -899,40 +899,40 @@ void SEIReader::xParseSEIPictureTiming(SEIPictureTiming& sei, uint32_t payloadSi ...@@ -899,40 +899,40 @@ void SEIReader::xParseSEIPictureTiming(SEIPictureTiming& sei, uint32_t payloadSi
if (sei.m_numDecodingUnitsMinus1 > 0) if (sei.m_numDecodingUnitsMinus1 > 0)
{ {
#endif #endif
sei_read_flag( pDecodedMessageOutputStream, symbol, "du_common_cpb_removal_delay_flag" ); sei_read_flag( pDecodedMessageOutputStream, symbol, "du_common_cpb_removal_delay_flag" );
sei.m_duCommonCpbRemovalDelayFlag = symbol; sei.m_duCommonCpbRemovalDelayFlag = symbol;
if( sei.m_duCommonCpbRemovalDelayFlag ) if( sei.m_duCommonCpbRemovalDelayFlag )
{
for( int i = temporalId; i < bp.m_bpMaxSubLayers - 1; i ++ )
{ {
if( sei.m_ptSubLayerDelaysPresentFlag[i] ) for( int i = temporalId; i < bp.m_bpMaxSubLayers - 1; i ++ )
{ {
sei_read_code( pDecodedMessageOutputStream, bp.getDuCpbRemovalDelayIncrementLength(), symbol, "du_common_cpb_removal_delay_increment_minus1[i]" ); if( sei.m_ptSubLayerDelaysPresentFlag[i] )
sei.m_duCommonCpbRemovalDelayMinus1[i] = symbol; {
sei_read_code( pDecodedMessageOutputStream, bp.getDuCpbRemovalDelayIncrementLength(), symbol, "du_common_cpb_removal_delay_increment_minus1[i]" );
sei.m_duCommonCpbRemovalDelayMinus1[i] = symbol;
}
} }
} }
} for( int i = 0; i <= sei.m_numDecodingUnitsMinus1; i ++ )
for( int i = 0; i <= sei.m_numDecodingUnitsMinus1; i ++ )
{
sei_read_uvlc( pDecodedMessageOutputStream, symbol, "num_nalus_in_du_minus1[i]" );
sei.m_numNalusInDuMinus1[i] = symbol;
if( !sei.m_duCommonCpbRemovalDelayFlag && i < sei.m_numDecodingUnitsMinus1 )
{ {
for( int j = temporalId; j < bp.m_bpMaxSubLayers - 1; j ++ ) sei_read_uvlc( pDecodedMessageOutputStream, symbol, "num_nalus_in_du_minus1[i]" );
sei.m_numNalusInDuMinus1[i] = symbol;
if( !sei.m_duCommonCpbRemovalDelayFlag && i < sei.m_numDecodingUnitsMinus1 )
{ {
if( sei.m_ptSubLayerDelaysPresentFlag[j] ) for( int j = temporalId; j < bp.m_bpMaxSubLayers - 1; j ++ )
{ {
sei_read_code( pDecodedMessageOutputStream, bp.getDuCpbRemovalDelayIncrementLength(), symbol, "du_cpb_removal_delay_increment_minus1[i][j]" ); if( sei.m_ptSubLayerDelaysPresentFlag[j] )
sei.m_duCpbRemovalDelayMinus1[i * bp.m_bpMaxSubLayers + j] = symbol; {
sei_read_code( pDecodedMessageOutputStream, bp.getDuCpbRemovalDelayIncrementLength(), symbol, "du_cpb_removal_delay_increment_minus1[i][j]" );
sei.m_duCpbRemovalDelayMinus1[i * bp.m_bpMaxSubLayers + j] = symbol;
}
} }
} }
} }
}
#if JVET_R0103_DU_SIGNALLING #if JVET_R0103_DU_SIGNALLING
} }
else else
{ {
sei.m_duCommonCpbRemovalDelayFlag = 0; sei.m_duCommonCpbRemovalDelayFlag = 0;
} }
#endif #endif
} }
......
...@@ -439,27 +439,27 @@ void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei, const SEIBuf ...@@ -439,27 +439,27 @@ void SEIWriter::xWriteSEIPictureTiming(const SEIPictureTiming& sei, const SEIBuf
if (sei.m_numDecodingUnitsMinus1 > 0) if (sei.m_numDecodingUnitsMinus1 > 0)
{ {
#endif #endif
WRITE_FLAG( sei.m_duCommonCpbRemovalDelayFlag, "du_commmon_cpb_removal_delay_flag" ); WRITE_FLAG( sei.m_duCommonCpbRemovalDelayFlag, "du_commmon_cpb_removal_delay_flag" );
if( sei.m_duCommonCpbRemovalDelayFlag ) if( sei.m_duCommonCpbRemovalDelayFlag )
{
for( int i = temporalId; i < bp.m_bpMaxSubLayers - 1; i ++ )
{ {
if( sei.m_ptSubLayerDelaysPresentFlag[i] ) for( int i = temporalId; i < bp.m_bpMaxSubLayers - 1; i ++ )
WRITE_CODE( sei.m_duCommonCpbRemovalDelayMinus1[i], bp.m_duCpbRemovalDelayIncrementLength, "du_common_cpb_removal_delay_increment_minus1[i]" ); {
if( sei.m_ptSubLayerDelaysPresentFlag[i] )
WRITE_CODE( sei.m_duCommonCpbRemovalDelayMinus1[i], bp.m_duCpbRemovalDelayIncrementLength, "du_common_cpb_removal_delay_increment_minus1[i]" );
}
} }
} for( int i = 0; i <= sei.m_numDecodingUnitsMinus1; i ++ )
for( int i = 0; i <= sei.m_numDecodingUnitsMinus1; i ++ )
{
WRITE_UVLC( sei.m_numNalusInDuMinus1[i], "num_nalus_in_du_minus1[i]" );
if( !sei.m_duCommonCpbRemovalDelayFlag && i < sei.m_numDecodingUnitsMinus1 )
{ {
for( int j = temporalId; j < bp.m_bpMaxSubLayers - 1; j ++ ) WRITE_UVLC( sei.m_numNalusInDuMinus1[i], "num_nalus_in_du_minus1[i]" );
if( !sei.m_duCommonCpbRemovalDelayFlag && i < sei.m_numDecodingUnitsMinus1 )
{ {
if( sei.m_ptSubLayerDelaysPresentFlag[j] ) for( int j = temporalId; j < bp.m_bpMaxSubLayers - 1; j ++ )
WRITE_CODE( sei.m_duCpbRemovalDelayMinus1[i * bp.m_bpMaxSubLayers + j], bp.m_duCpbRemovalDelayIncrementLength, "du_cpb_removal_delay_increment_minus1[i][j]" ); {
if( sei.m_ptSubLayerDelaysPresentFlag[j] )
WRITE_CODE( sei.m_duCpbRemovalDelayMinus1[i * bp.m_bpMaxSubLayers + j], bp.m_duCpbRemovalDelayIncrementLength, "du_cpb_removal_delay_increment_minus1[i][j]" );
}
} }
} }
}
#if JVET_R0103_DU_SIGNALLING #if JVET_R0103_DU_SIGNALLING
} }
#endif #endif
......
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