Commit 02848d64 authored by Biao Wang's avatar Biao Wang
Browse files

fix naming issue of sps_independent_subpics_flag

parent 9ab618d1
......@@ -2365,7 +2365,7 @@ SPS::SPS()
, m_subPicInfoPresentFlag (false)
, m_numSubPics(1)
#if JVET_R0156_ASPECT4_SPS_CLEANUP
, m_independentSubPicFlag (false)
, m_independentSubPicsFlag (false)
#endif
, m_subPicIdMappingExplicitlySignalledFlag ( false )
, m_subPicIdMappingInSpsFlag ( false )
......
......@@ -1218,7 +1218,7 @@ private:
bool m_subPicInfoPresentFlag; // indicates the presence of sub-picture info
uint32_t m_numSubPics; //!< number of sub-pictures used
#if JVET_R0156_ASPECT4_SPS_CLEANUP
bool m_independentSubPicFlag;
bool m_independentSubPicsFlag;
#endif
std::vector<uint32_t> m_subPicCtuTopLeftX;
std::vector<uint32_t> m_subPicCtuTopLeftY;
......@@ -1406,8 +1406,8 @@ public:
m_subPicId.resize(m_numSubPics);
}
#if JVET_R0156_ASPECT4_SPS_CLEANUP
void setSubPicIndependentFlag(bool b) { m_independentSubPicFlag = b; }
bool getSubPicIndependentFlag() const { return m_independentSubPicFlag; }
void setSubPicsIndependentFlag(bool b) { m_independentSubPicsFlag = b; }
bool getSubPicsIndependentFlag() const { return m_independentSubPicsFlag; }
#endif
uint32_t getNumSubPics( ) const { return m_numSubPics; }
void setSubPicCtuTopLeftX( int i, uint32_t u ) { m_subPicCtuTopLeftX[i] = u; }
......
......@@ -61,6 +61,9 @@
#define JVET_R0208_ALF_VB_ROUNDING_FIX 1 // JVET-R0208: Rounding offset fix for ALF virtual boundary processing
#define JVET_R0232_CCALF_APS_CONSTRAINT 1 // JVET-R0232 section 3.2: APS contraint for CCALF
#define JVET_R0156_ASPECT4_SPS_CLEANUP 1 // JVET-R0071 #1, R0156 #4, R0284 #1: Condition sps_independent_subpics_flag on "sps_num_subpics_minus1 > 0"
//########### place macros to be be kept below this line ###############
......
......@@ -1286,7 +1286,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
pcSPS->setSubPicWidth( 0, ( pcSPS->getMaxPicWidthInLumaSamples() + pcSPS->getCTUSize() - 1 ) >> floorLog2( pcSPS->getCTUSize() ) );
pcSPS->setSubPicHeight( 0, ( pcSPS->getMaxPicHeightInLumaSamples() + pcSPS->getCTUSize() - 1 ) >> floorLog2( pcSPS->getCTUSize() ) );
#if JVET_R0156_ASPECT4_SPS_CLEANUP
pcSPS->setSubPicIndependentFlag(1);
pcSPS->setSubPicsIndependentFlag(1);
#endif
pcSPS->setSubPicTreatedAsPicFlag( 0, 0 );
pcSPS->setLoopFilterAcrossSubpicEnabledFlag( 0, 1 );
......@@ -1294,7 +1294,7 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS)
else
{
#if JVET_R0156_ASPECT4_SPS_CLEANUP
READ_FLAG(uiCode, "sps_independent_subpics_flag"); pcSPS->setSubPicIndependentFlag(uiCode != 0);
READ_FLAG(uiCode, "sps_independent_subpics_flag"); pcSPS->setSubPicsIndependentFlag(uiCode != 0);
#endif
for (int picIdx = 0; picIdx < pcSPS->getNumSubPics(); picIdx++)
{
......@@ -1335,7 +1335,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->getSubPicIndependentFlag())
if (!pcSPS->getSubPicsIndependentFlag())
{
#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->getSubPicIndependentFlag(), "sps_independent_subpics_flag");
WRITE_FLAG(pcSPS->getSubPicsIndependentFlag(), "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->getSubPicIndependentFlag())
if (!pcSPS->getSubPicsIndependentFlag())
{
#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