Commit 8ebd637b authored by Biao Wang's avatar Biao Wang

fix naming issue of functions

parent 7fae6fa7
......@@ -1406,8 +1406,8 @@ public:
m_subPicId.resize(m_numSubPics);
}
#if JVET_R0156_ASPECT4_SPS_CLEANUP
void setSubPicsIndependentFlag(bool b) { m_independentSubPicsFlag = b; }
bool getSubPicsIndependentFlag() const { return m_independentSubPicsFlag; }
void setIndependentSubPicsFlag(bool b) { m_independentSubPicsFlag = b; }
bool getIndependentSubPicsFlag() const { return m_independentSubPicsFlag; }
#endif
uint32_t getNumSubPics( ) const { return m_numSubPics; }
void setSubPicCtuTopLeftX( int i, uint32_t u ) { m_subPicCtuTopLeftX[i] = u; }
......
......@@ -1293,7 +1293,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
pcSPS->setSubPicHeight( 0, ( pcSPS->getMaxPicHeightInLumaSamples() + pcSPS->getCTUSize() - 1 ) >> floorLog2( pcSPS->getCTUSize() ) );
#if JVET_R0156_ASPECT4_SPS_CLEANUP
pcSPS->setSubPicsIndependentFlag(1);
pcSPS->setIndependentSubPicsFlag(1);
#endif
#if JVET_R0071_SPS_PPS_CELANUP
......@@ -1307,7 +1307,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
else
{
#if JVET_R0156_ASPECT4_SPS_CLEANUP
READ_FLAG(uiCode, "sps_independent_subpics_flag"); pcSPS->setSubPicsIndependentFlag(uiCode != 0);
READ_FLAG(uiCode, "sps_independent_subpics_flag"); pcSPS->setIndependentSubPicsFlag(uiCode != 0);
#endif
for (int picIdx = 0; picIdx < pcSPS->getNumSubPics(); picIdx++)
{
......@@ -1348,7 +1348,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
pcSPS->setSubPicHeight(picIdx, (pcSPS->getMaxPicHeightInLumaSamples() + pcSPS->getCTUSize() - 1) /pcSPS->getCTUSize() - pcSPS->getSubPicCtuTopLeftY(picIdx));
}
#if JVET_R0156_ASPECT4_SPS_CLEANUP
if (!pcSPS->getSubPicsIndependentFlag())
if (!pcSPS->getIndependentSubPicsFlag())
{
#endif
READ_FLAG(uiCode, "subpic_treated_as_pic_flag[ i ]");
......
......@@ -793,7 +793,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
if( pcSPS->getNumSubPics() > 1 )
{
#if JVET_R0156_ASPECT4_SPS_CLEANUP
WRITE_FLAG(pcSPS->getSubPicsIndependentFlag(), "sps_independent_subpics_flag");
WRITE_FLAG(pcSPS->getIndependentSubPicsFlag(), "sps_independent_subpics_flag");
#endif
for (int picIdx = 0; picIdx < pcSPS->getNumSubPics(); picIdx++)
{
......@@ -814,7 +814,7 @@ void HLSWriter::codeSPS( const SPS* pcSPS )
WRITE_CODE( pcSPS->getSubPicHeight(picIdx) - 1, ceilLog2(( pcSPS->getMaxPicHeightInLumaSamples() + pcSPS->getCTUSize() - 1) / pcSPS->getCTUSize()), "subpic_height_minus1[ i ]" );
}
#if JVET_R0156_ASPECT4_SPS_CLEANUP
if (!pcSPS->getSubPicsIndependentFlag())
if (!pcSPS->getIndependentSubPicsFlag())
{
#endif
WRITE_FLAG( pcSPS->getSubPicTreatedAsPicFlag(picIdx), "subpic_treated_as_pic_flag[ i ]" );
......
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