diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index e5aca95401cc272f6ac4fd4df721b9333b7429f8..18e8a24e1b59645d168341574f80f694d5a95944 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -94,7 +94,6 @@ // Constrain that each PTL, DPB, and HRD params in VPS are referred to at least once -#define R0324_PH_SYNTAX_CONDITION_MODIFY 1 // JVET-R0324 add conditions on PH syntax to conder whether current pic is bi-predictive picture #define JVET_R0278_CONSTRAINT 1 // JVET-R0278: ph_inter_slice_allowed_flag constraint diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp index 8def00db619ec8cba1abeaa1d0655f3f25d70f71..354b0bfa5272323f16539faf286fecd3c1908be3 100644 --- a/source/Lib/DecoderLib/VLCReader.cpp +++ b/source/Lib/DecoderLib/VLCReader.cpp @@ -3144,7 +3144,6 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag if (picHeader->getEnableTMVPFlag() && pps->getRplInfoInPhFlag()) { -#if R0324_PH_SYNTAX_CONDITION_MODIFY if (picHeader->getRPL(1)->getNumRefEntries() > 0) { READ_CODE(1, uiCode, "ph_collocated_from_l0_flag"); @@ -3154,10 +3153,6 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag { picHeader->setPicColFromL0Flag(1); } -#else - READ_CODE( 1, uiCode, "ph_collocated_from_l0_flag"); - picHeader->setPicColFromL0Flag(uiCode); -#endif if ((picHeader->getPicColFromL0Flag() == 1 && picHeader->getRPL(0)->getNumRefEntries() > 1) || (picHeader->getPicColFromL0Flag() == 0 && picHeader->getRPL(1)->getNumRefEntries() > 1)) { @@ -3175,7 +3170,6 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag } // mvd L1 zero flag -#if R0324_PH_SYNTAX_CONDITION_MODIFY if (!pps->getRplInfoInPhFlag() || picHeader->getRPL(1)->getNumRefEntries() > 0) { READ_FLAG(uiCode, "pic_mvd_l1_zero_flag"); @@ -3184,9 +3178,6 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag { uiCode = 1; } -#else - READ_FLAG(uiCode, "mvd_l1_zero_flag"); -#endif picHeader->setMvdL1ZeroFlag( uiCode != 0 ); // merge candidate list size @@ -3212,17 +3203,12 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag } // picture level BDOF disable flags -#if R0324_PH_SYNTAX_CONDITION_MODIFY if (sps->getBdofControlPresentFlag() && (!pps->getRplInfoInPhFlag() || picHeader->getRPL(1)->getNumRefEntries() > 0)) -#else - if (sps->getBdofControlPresentFlag()) -#endif { READ_FLAG(uiCode, "ph_disable_bdof_flag"); picHeader->setDisBdofFlag(uiCode != 0); } else { -#if R0324_PH_SYNTAX_CONDITION_MODIFY if (sps->getBdofControlPresentFlag() == 0) { picHeader->setDisBdofFlag(1 - (int)(sps->getBDOFEnabledFlag())); @@ -3231,23 +3217,15 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag { picHeader->setDisBdofFlag(1); } -#else - picHeader->setDisBdofFlag(0); -#endif } // picture level DMVR disable flags -#if R0324_PH_SYNTAX_CONDITION_MODIFY if (sps->getDmvrControlPresentFlag() && (!pps->getRplInfoInPhFlag() || picHeader->getRPL(1)->getNumRefEntries() > 0)) -#else - if (sps->getDmvrControlPresentFlag()) -#endif { READ_FLAG(uiCode, "ph_disable_dmvr_flag"); picHeader->setDisDmvrFlag(uiCode != 0); } else { -#if R0324_PH_SYNTAX_CONDITION_MODIFY if (sps->getDmvrControlPresentFlag() == 0) { picHeader->setDisDmvrFlag(1 - (int)(sps->getUseDMVR())); @@ -3256,9 +3234,6 @@ void HLSyntaxReader::parsePictureHeader( PicHeader* picHeader, ParameterSetManag { picHeader->setDisDmvrFlag(1); } -#else - picHeader->setDisDmvrFlag(0); -#endif } // picture level PROF disable flags @@ -5198,7 +5173,6 @@ void HLSyntaxReader::parsePredWeightTable(PicHeader *picHeader, const SPS *sps) if (numRef == 0) { -#if R0324_PH_SYNTAX_CONDITION_MODIFY if (picHeader->getRPL(1)->getNumRefEntries() > 0) { READ_UVLC(numLxWeights, "num_l1_weights"); @@ -5207,9 +5181,6 @@ void HLSyntaxReader::parsePredWeightTable(PicHeader *picHeader, const SPS *sps) { numLxWeights = 0; } -#else - READ_UVLC(numLxWeights, "num_l1_weights"); -#endif moreSyntaxToBeParsed = (numLxWeights == 0) ? false : true; picHeader->setNumL1Weights(numLxWeights); } diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp index 67ff0b517540d92b1a48cf016172c5e11fe6f725..987f6511aaebc90469451145625609e62caf1a5b 100644 --- a/source/Lib/EncoderLib/VLCWriter.cpp +++ b/source/Lib/EncoderLib/VLCWriter.cpp @@ -1957,14 +1957,10 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader, bool writeRbspTrailingB WRITE_FLAG( picHeader->getEnableTMVPFlag(), "ph_temporal_mvp_enabled_flag" ); if (picHeader->getEnableTMVPFlag() && pps->getRplInfoInPhFlag()) { -#if R0324_PH_SYNTAX_CONDITION_MODIFY if (picHeader->getRPL(1)->getNumRefEntries() > 0) { WRITE_CODE(picHeader->getPicColFromL0Flag(), 1, "ph_collocated_from_l0_flag"); } -#else - WRITE_CODE(picHeader->getPicColFromL0Flag(), 1, "ph_collocated_from_l0_flag"); -#endif if ((picHeader->getPicColFromL0Flag() && picHeader->getRPL(0)->getNumRefEntries() > 1) || (!picHeader->getPicColFromL0Flag() && picHeader->getRPL(1)->getNumRefEntries() > 1)) { @@ -1978,14 +1974,10 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader, bool writeRbspTrailingB } // mvd L1 zero flag -#if R0324_PH_SYNTAX_CONDITION_MODIFY if (!pps->getRplInfoInPhFlag() || picHeader->getRPL(1)->getNumRefEntries() > 0) { WRITE_FLAG(picHeader->getMvdL1ZeroFlag(), "pic_mvd_l1_zero_flag"); } -#else - WRITE_FLAG(picHeader->getMvdL1ZeroFlag(), "mvd_l1_zero_flag"); -#endif // merge candidate list size // subblock merge candidate list size if ( sps->getUseAffine() ) @@ -2008,11 +2000,7 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader, bool writeRbspTrailingB } // picture level BDOF disable flags -#if R0324_PH_SYNTAX_CONDITION_MODIFY if (sps->getBdofControlPresentFlag() && (!pps->getRplInfoInPhFlag() || picHeader->getRPL(1)->getNumRefEntries() > 0)) -#else - if (sps->getBdofControlPresentFlag()) -#endif { WRITE_FLAG(picHeader->getDisBdofFlag(), "ph_disable_bdof_flag"); } @@ -2022,11 +2010,7 @@ void HLSWriter::codePictureHeader( PicHeader* picHeader, bool writeRbspTrailingB } // picture level DMVR disable flags -#if R0324_PH_SYNTAX_CONDITION_MODIFY if (sps->getDmvrControlPresentFlag() && (!pps->getRplInfoInPhFlag() || picHeader->getRPL(1)->getNumRefEntries() > 0)) -#else - if (sps->getDmvrControlPresentFlag()) -#endif { WRITE_FLAG(picHeader->getDisDmvrFlag(), "ph_disable_dmvr_flag"); } @@ -3010,12 +2994,10 @@ void HLSWriter::xCodePredWeightTable(PicHeader *picHeader, const SPS *sps) if (numRef == 0) { numLxWeights = picHeader->getNumL1Weights(); -#if R0324_PH_SYNTAX_CONDITION_MODIFY if (picHeader->getRPL(1)->getNumRefEntries() > 0) { WRITE_UVLC(numLxWeights, "num_l1_weights"); } -#endif moreSyntaxToBeParsed = (numLxWeights == 0) ? false : true; } }