Commit b6d2e11e authored by Remy Foray's avatar Remy Foray

Remove num_extra_slice_header_bits from PPS

num_extra_slice_header_bits is not present in the spec, and is not used any more in the slice header
parent 2e5d6d8b
Pipeline #3458 passed with stage
in 5 minutes and 33 seconds
......@@ -2280,7 +2280,6 @@ PPS::PPS()
, m_sliceHeaderExtensionPresentFlag (false)
, m_loopFilterAcrossSlicesEnabledFlag(false)
, m_listsModificationPresentFlag (0)
, m_numExtraSliceHeaderBits (0)
#if !JVET_P1006_PICTURE_HEADER
, m_loopFilterAcrossVirtualBoundariesDisabledFlag(false)
, m_numVerVirtualBoundaries (0)
......
......@@ -1484,7 +1484,6 @@ private:
int m_deblockingFilterTcOffsetDiv2; //< tc offset for deblocking filter
bool m_listsModificationPresentFlag;
uint32_t m_log2ParallelMergeLevelMinus2;
int m_numExtraSliceHeaderBits;
#if !JVET_P1006_PICTURE_HEADER
bool m_loopFilterAcrossVirtualBoundariesDisabledFlag;
......@@ -1718,8 +1717,6 @@ public:
void setListsModificationPresentFlag( bool b ) { m_listsModificationPresentFlag = b; }
uint32_t getLog2ParallelMergeLevelMinus2() const { return m_log2ParallelMergeLevelMinus2; }
void setLog2ParallelMergeLevelMinus2(uint32_t mrgLevel) { m_log2ParallelMergeLevelMinus2 = mrgLevel; }
int getNumExtraSliceHeaderBits() const { return m_numExtraSliceHeaderBits; }
void setNumExtraSliceHeaderBits(int i) { m_numExtraSliceHeaderBits = i; }
void setLoopFilterAcrossSlicesEnabledFlag( bool bValue ) { m_loopFilterAcrossSlicesEnabledFlag = bValue; }
bool getLoopFilterAcrossSlicesEnabledFlag() const { return m_loopFilterAcrossSlicesEnabledFlag; }
#if JVET_P1006_PICTURE_HEADER
......
......@@ -412,8 +412,6 @@ void HLSyntaxReader::parsePPS( PPS* pcPPS, ParameterSetManager *parameterSetMana
}
#endif
READ_CODE(3, uiCode, "num_extra_slice_header_bits"); pcPPS->setNumExtraSliceHeaderBits(uiCode);
READ_FLAG( uiCode, "cabac_init_present_flag" ); pcPPS->setCabacInitPresentFlag( uiCode ? true : false );
......@@ -2677,11 +2675,6 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para
#if !JVET_P1006_PICTURE_HEADER
READ_FLAG(uiCode, "non_reference_picture_flag"); pcSlice->setNonRefPictFlag(uiCode);
for (int i = 0; i < pps->getNumExtraSliceHeaderBits(); i++)
{
READ_FLAG(uiCode, "slice_reserved_flag[]"); // ignored
}
#endif
READ_UVLC ( uiCode, "slice_type" ); pcSlice->setSliceType((SliceType)uiCode);
......
......@@ -243,7 +243,6 @@ void HLSWriter::codePPS( const PPS* pcPPS, const SPS* pcSPS )
}
}
#endif
WRITE_CODE( pcPPS->getNumExtraSliceHeaderBits(), 3, "num_extra_slice_header_bits");
WRITE_FLAG( pcPPS->getCabacInitPresentFlag() ? 1 : 0, "cabac_init_present_flag" );
WRITE_UVLC( pcPPS->getNumRefIdxL0DefaultActive()-1, "num_ref_idx_l0_default_active_minus1");
WRITE_UVLC( pcPPS->getNumRefIdxL1DefaultActive()-1, "num_ref_idx_l1_default_active_minus1");
......@@ -1846,11 +1845,6 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice )
#if !JVET_P1006_PICTURE_HEADER
WRITE_FLAG(pcSlice->getNonRefPictFlag() ? 1 : 0, "non_reference_picture_flag");
for( int i = 0; i < pcSlice->getPPS()->getNumExtraSliceHeaderBits(); i++ )
{
WRITE_FLAG( 0, "slice_reserved_flag[]" );
}
#endif
WRITE_UVLC( pcSlice->getSliceType(), "slice_type" );
......
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