diff --git a/source/App/DecoderApp/DecApp.cpp b/source/App/DecoderApp/DecApp.cpp
index 474e05491ed6c8f8df38b55aa65d7ce97058c477..13f47a93283aa41889aff9fefca4f0dff7bf31d9 100644
--- a/source/App/DecoderApp/DecApp.cpp
+++ b/source/App/DecoderApp/DecApp.cpp
@@ -288,13 +288,11 @@ uint32_t DecApp::decode()
m_cDecLib.resetPictureUnitNals();
}
#endif
-#if JVET_R0066_DPB_NO_OUTPUT_PRIOR_PIC_FLAG
if (bNewAccessUnit || !bitstreamFile)
{
m_cDecLib.CheckNoOutputPriorPicFlagsInAccessUnit();
m_cDecLib.resetAccessUnitNoOutputPriorPicFlags();
}
-#endif
if(bNewAccessUnit)
{
#if JVET_R0065
diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp
index bbe82d8a748154649ad9310a7206f5b078a9397d..1f5a4582d7f09726c8444ac40c798f6c979cf3f9 100644
--- a/source/Lib/CommonLib/Slice.cpp
+++ b/source/Lib/CommonLib/Slice.cpp
@@ -2490,10 +2490,8 @@ void VPS::deriveOutputLayerSets()
m_numSubLayersInLayerInOLS.resize( m_totalNumOLSs, std::vector<int>( m_uiMaxLayers, NOT_VALID ) );
#endif
m_layerIdInOls.resize( m_totalNumOLSs, std::vector<int>( m_uiMaxLayers, NOT_VALID ) );
-#if JVET_R0066_DPB_NO_OUTPUT_PRIOR_PIC_FLAG
m_olsDpbChromaFormatIdc.resize(m_totalNumOLSs);
m_olsDpbBitDepthMinus8.resize(m_totalNumOLSs);
-#endif
std::vector<int> numRefLayers( m_uiMaxLayers );
std::vector<std::vector<int>> outputLayerIdx( m_totalNumOLSs, std::vector<int>( m_uiMaxLayers, NOT_VALID ) );
diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h
index 57cc41900a134bf60bab0c4d286c4d6923bad767..70b9f55eacae9b600f9880c7fe827f8964fea440 100644
--- a/source/Lib/CommonLib/Slice.h
+++ b/source/Lib/CommonLib/Slice.h
@@ -997,10 +997,8 @@ public:
std::vector<int> m_numOutputLayersInOls;
std::vector<int> m_numLayersInOls;
std::vector<std::vector<int>> m_layerIdInOls;
-#if JVET_R0066_DPB_NO_OUTPUT_PRIOR_PIC_FLAG
std::vector<int> m_olsDpbChromaFormatIdc;
std::vector<int> m_olsDpbBitDepthMinus8;
-#endif
public:
VPS();
@@ -1107,12 +1105,10 @@ public:
void setOlsDpbPicSize( int olsIdx, Size size ) { m_olsDpbPicSize[olsIdx] = size; }
void setOlsDpbPicWidth( int olsIdx, int width ) { m_olsDpbPicSize[olsIdx].width = width; }
void setOlsDpbPicHeight( int olsIdx, int height ) { m_olsDpbPicSize[olsIdx].height = height; }
-#if JVET_R0066_DPB_NO_OUTPUT_PRIOR_PIC_FLAG
int getOlsDpbChromaFormatIdc(int olsIdx) const { return m_olsDpbChromaFormatIdc[olsIdx]; }
int getOlsDpbBitDepthMinus8(int olsIdx) const { return m_olsDpbBitDepthMinus8[olsIdx]; }
void setOlsDpbChromaFormatIdc(int olsIdx, int chromaFormatIdc) { m_olsDpbChromaFormatIdc[olsIdx] = chromaFormatIdc; }
void setOlsDpbBitDepthMinus8(int olsIdx, int bitDepthMinus8) { m_olsDpbBitDepthMinus8[olsIdx] = bitDepthMinus8; }
-#endif
int getOlsDpbParamsIdx( int olsIdx ) const { return m_olsDpbParamsIdx[olsIdx]; }
void setOlsDpbParamsIdx( int olsIdx, int paramIdx ) { m_olsDpbParamsIdx[olsIdx] = paramIdx; }
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index e19753dfe54794c1d205e509863cd6d0541446af..d92af5cc3d7cc852c3e7a95bfcb6c5b44ee870f5 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -54,7 +54,6 @@
//########### place macros to be removed in next cycle below this line ###############
-#define JVET_R0066_DPB_NO_OUTPUT_PRIOR_PIC_FLAG 1 // JVET-R0066: Signal the maximum values of chroma_format_idc and bit_depth_minus8 for all pictures of all layers in the VPS
// The value of no_output_of_prior_pics_flag, when present, is required to be the same for all pictures in an AU
#define JVET_R0068_ASPECT1_ASPECT6 1 // JVET-R0068 aspect 1: On slice_type constraint; JVET-R0068 aspect 6: On signalling of conformance window parameters
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index fd64b7627217fc9810793e62aa51e3aeb71eee5f..3998a6909211163577293cfea7fa35bd3190ea61 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -950,7 +950,6 @@ void DecLib::checkIncludedInFirstAu()
}
#endif
-#if JVET_R0066_DPB_NO_OUTPUT_PRIOR_PIC_FLAG
void DecLib::CheckNoOutputPriorPicFlagsInAccessUnit()
{
if (m_accessUnitNoOutputPriorPicFlags.size() > 1)
@@ -960,7 +959,6 @@ void DecLib::CheckNoOutputPriorPicFlagsInAccessUnit()
CHECK(isDiffFlagsInAu, "The value of no_output_of_prior_pics_flag, when present, is required to be the same for all pictures in an AU");
}
}
-#endif
void DecLib::checkTidLayerIdInAccessUnit()
{
@@ -1736,10 +1734,8 @@ void DecLib::xCheckParameterSetConstraints(const int layerId)
{
CHECK( sps->getMaxPicWidthInLumaSamples() > vps->getOlsDpbPicSize( vps->m_targetOlsIdx ).width, "pic_width_max_in_luma_samples shall be less than or equal to the value of ols_dpb_pic_width[ i ]" );
CHECK( sps->getMaxPicHeightInLumaSamples() > vps->getOlsDpbPicSize( vps->m_targetOlsIdx ).height, "pic_height_max_in_luma_samples shall be less than or equal to the value of ols_dpb_pic_height[ i ]" );
-#if JVET_R0066_DPB_NO_OUTPUT_PRIOR_PIC_FLAG
CHECK( sps->getChromaFormatIdc() > vps->getOlsDpbChromaFormatIdc( vps->m_targetOlsIdx ), "sps_chroma_format_idc shall be less than or equal to the value of ols_dpb_chroma_format[ i ]");
CHECK((sps->getBitDepth(CHANNEL_TYPE_LUMA) - 8) > vps->getOlsDpbBitDepthMinus8( vps->m_targetOlsIdx ), "sps_bit_depth_minus8 shall be less than or equal to the value of ols_dpb_bitdepth_minus8[ i ]");
-#endif
}
static std::unordered_map<int, int> m_layerChromaFormat;
@@ -1954,12 +1950,10 @@ bool DecLib::xDecodeSlice(InputNALUnit &nalu, int &iSkipFrame, int iPOCLastDispl
m_HLSReader.parseSliceHeader( m_apcSlicePilot, &m_picHeader, &m_parameterSetManager, m_prevTid0POC );
#endif
-#if JVET_R0066_DPB_NO_OUTPUT_PRIOR_PIC_FLAG
if (m_picHeader.getGdrOrIrapPicFlag() && m_bFirstSliceInPicture)
{
m_accessUnitNoOutputPriorPicFlags.push_back(m_picHeader.getNoOutputOfPriorPicsFlag());
}
-#endif
PPS *pps = m_parameterSetManager.getPPS(m_picHeader.getPPSId());
CHECK(pps == 0, "No PPS present");
diff --git a/source/Lib/DecoderLib/DecLib.h b/source/Lib/DecoderLib/DecLib.h
index 0a43ddb472a319791911fb30b1ebafba262a8577..94c567406d92602f04d40da1763b8ba4853fab64 100644
--- a/source/Lib/DecoderLib/DecLib.h
+++ b/source/Lib/DecoderLib/DecLib.h
@@ -186,9 +186,7 @@ private:
std::vector<NalUnitInfo> m_nalUnitInfo[MAX_VPS_LAYERS];
std::vector<int> m_accessUnitApsNals;
std::vector<int> m_accessUnitSeiTids;
-#if JVET_R0066_DPB_NO_OUTPUT_PRIOR_PIC_FLAG
std::vector<bool> m_accessUnitNoOutputPriorPicFlags;
-#endif
// NAL unit type, layer ID, and SEI payloadType
std::vector<std::tuple<NalUnitType, int, SEI::PayloadType>> m_accessUnitSeiPayLoadTypes;
@@ -262,10 +260,8 @@ public:
void isCvsStart();
void checkIncludedInFirstAu();
#endif
-#if JVET_R0066_DPB_NO_OUTPUT_PRIOR_PIC_FLAG
void CheckNoOutputPriorPicFlagsInAccessUnit();
void resetAccessUnitNoOutputPriorPicFlags() { m_accessUnitNoOutputPriorPicFlags.clear(); }
-#endif
#if JVET_Q0488_SEI_REPETITION_CONSTRAINT
void checkSeiInPictureUnit();
void resetPictureSeiNalus();
diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp
index 3a928b838a9558ff791881a0d155a21665671b1e..644963e3f39b2a6e84fed9bd1c3116a1ebc7aad3 100644
--- a/source/Lib/DecoderLib/VLCReader.cpp
+++ b/source/Lib/DecoderLib/VLCReader.cpp
@@ -2651,10 +2651,8 @@ void HLSyntaxReader::parseVPS(VPS* pcVPS)
{
READ_UVLC( uiCode, "ols_dpb_pic_width[i]" ); pcVPS->setOlsDpbPicWidth( i, uiCode );
READ_UVLC( uiCode, "ols_dpb_pic_height[i]" ); pcVPS->setOlsDpbPicHeight( i, uiCode );
-#if JVET_R0066_DPB_NO_OUTPUT_PRIOR_PIC_FLAG
READ_CODE( 2, uiCode, "ols_dpb_chroma_format[i]"); pcVPS->setOlsDpbChromaFormatIdc(i, uiCode);
READ_UVLC( uiCode, "ols_dpb_bitdepth_minus8[i]"); pcVPS->setOlsDpbBitDepthMinus8(i, uiCode);
-#endif
#if JVET_R0099_DPB_HRD_PARAMETERS_SIGNALLING
if ((pcVPS->m_numDpbParams > 1) && (pcVPS->m_numDpbParams != pcVPS->m_numMultiLayeredOlss))
#else
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 7c6f71f8d3e4b6ad8623785394f0705230036e66..f2b75ac6a9845557144aa7980091c5a15cefc2a6 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -1051,10 +1051,8 @@ void EncLib::xInitVPS( const SPS& sps )
{
m_vps->setOlsDpbPicWidth( olsIdx, std::max<int>( sps.getMaxPicWidthInLumaSamples(), m_vps->getOlsDpbPicSize( olsIdx ).width ) );
m_vps->setOlsDpbPicHeight( olsIdx, std::max<int>( sps.getMaxPicHeightInLumaSamples(), m_vps->getOlsDpbPicSize( olsIdx ).height ) );
-#if JVET_R0066_DPB_NO_OUTPUT_PRIOR_PIC_FLAG
m_vps->setOlsDpbChromaFormatIdc( olsIdx, std::max<int>(sps.getChromaFormatIdc(), m_vps->getOlsDpbChromaFormatIdc( olsIdx )));
m_vps->setOlsDpbBitDepthMinus8( olsIdx, std::max<int>(sps.getBitDepth(CHANNEL_TYPE_LUMA) - 8, m_vps->getOlsDpbBitDepthMinus8( olsIdx )));
-#endif
}
m_vps->setOlsDpbParamsIdx( olsIdx, dpbIdx );
diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp
index da56449d9b5280956a79acfd72d223021c83a9da..205b8eff3583d5fae13ba592c716ecb502f8e778 100644
--- a/source/Lib/EncoderLib/VLCWriter.cpp
+++ b/source/Lib/EncoderLib/VLCWriter.cpp
@@ -1686,10 +1686,8 @@ void HLSWriter::codeVPS(const VPS* pcVPS)
{
WRITE_UVLC( pcVPS->getOlsDpbPicSize( i ).width, "ols_dpb_pic_width[i]" );
WRITE_UVLC( pcVPS->getOlsDpbPicSize( i ).height, "ols_dpb_pic_height[i]" );
-#if JVET_R0066_DPB_NO_OUTPUT_PRIOR_PIC_FLAG
WRITE_CODE( pcVPS->m_olsDpbChromaFormatIdc[i], 2, "ols_dpb_chroma_format[i]");
WRITE_UVLC( pcVPS->m_olsDpbBitDepthMinus8[i], "ols_dpb_bitdepth_minus8[i]");
-#endif
#if JVET_R0099_DPB_HRD_PARAMETERS_SIGNALLING
if( (pcVPS->m_numDpbParams > 1) && (pcVPS->m_numDpbParams != pcVPS->m_numMultiLayeredOlss) )
#else