diff --git a/source/Lib/CommonLib/Slice.cpp b/source/Lib/CommonLib/Slice.cpp index 07843886baf0b7867a833252cd63144abea5f4f7..dfdd7feb87b28840b0fe0d6fa8d415e83f32fcdb 100644 --- a/source/Lib/CommonLib/Slice.cpp +++ b/source/Lib/CommonLib/Slice.cpp @@ -1814,7 +1814,7 @@ SPS::SPS() , m_bPCMFilterDisableFlag (false) , m_sbtmvpEnabledFlag (false) , m_bdofEnabledFlag (false) -, m_disFracMmvdEnabledFlag ( false ) +, m_fpelMmvdEnabledFlag ( false ) , m_uiBitsForPOC ( 8) , m_numLongTermRefPicSPS ( 0) #if MAX_TB_SIZE_SIGNALLING diff --git a/source/Lib/CommonLib/Slice.h b/source/Lib/CommonLib/Slice.h index f57782775eddda621587310826bc4e207e27a197..2d6e84a6c9c7dd33fdba750b69decb4d673a0995 100644 --- a/source/Lib/CommonLib/Slice.h +++ b/source/Lib/CommonLib/Slice.h @@ -1058,7 +1058,7 @@ private: bool m_sbtmvpEnabledFlag; bool m_bdofEnabledFlag; - bool m_disFracMmvdEnabledFlag; + bool m_fpelMmvdEnabledFlag; uint32_t m_uiBitsForPOC; uint32_t m_numLongTermRefPicSPS; uint32_t m_ltRefPicPocLsbSps[MAX_NUM_LONG_TERM_REF_PICS]; @@ -1298,8 +1298,8 @@ public: void setBDOFEnabledFlag(bool b) { m_bdofEnabledFlag = b; } bool getBDOFEnabledFlag() const { return m_bdofEnabledFlag; } - bool getDisFracMmvdEnabledFlag() const { return m_disFracMmvdEnabledFlag; } - void setDisFracMmvdEnabledFlag( bool b ) { m_disFracMmvdEnabledFlag = b; } + bool getFpelMmvdEnabledFlag() const { return m_fpelMmvdEnabledFlag; } + void setFpelMmvdEnabledFlag( bool b ) { m_fpelMmvdEnabledFlag = b; } bool getUseDMVR()const { return m_DMVR; } void setUseDMVR(bool b) { m_DMVR = b; } uint32_t getMaxTLayers() const { return m_uiMaxTLayers; } diff --git a/source/Lib/DecoderLib/VLCReader.cpp b/source/Lib/DecoderLib/VLCReader.cpp index b453a5fef1dc059b5b05530603d06ddc7a33e77e..463e93473d2d20f212822cf2f37b4d7761aecd8b 100644 --- a/source/Lib/DecoderLib/VLCReader.cpp +++ b/source/Lib/DecoderLib/VLCReader.cpp @@ -1131,10 +1131,10 @@ void HLSyntaxReader::parseSPS(SPS* pcSPS) // KJS: sps_ciip_enabled_flag READ_FLAG( uiCode, "mhintra_flag" ); pcSPS->setUseMHIntra ( uiCode != 0 ); + READ_FLAG( uiCode, "sps_fpel_mmvd_enabled_flag" ); pcSPS->setFpelMmvdEnabledFlag ( uiCode != 0 ); + READ_FLAG( uiCode, "triangle_flag" ); pcSPS->setUseTriangle ( uiCode != 0 ); - // KJS: not in draft yet - READ_FLAG( uiCode, "sps_fracmmvd_disabled_flag" ); pcSPS->setDisFracMmvdEnabledFlag ( uiCode != 0 ); // KJS: not in draft yet READ_FLAG(uiCode, "sbt_enable_flag"); pcSPS->setUseSBT(uiCode != 0); if( pcSPS->getUseSBT() ) @@ -1898,7 +1898,7 @@ void HLSyntaxReader::parseSliceHeader (Slice* pcSlice, ParameterSetManager *para READ_UVLC( uiCode, "five_minus_max_num_affine_merge_cand" ); pcSlice->setMaxNumAffineMergeCand( AFFINE_MRG_MAX_NUM_CANDS - uiCode ); } - if ( sps->getDisFracMmvdEnabledFlag() ) + if ( sps->getFpelMmvdEnabledFlag() ) { READ_FLAG( uiCode, "tile_group_fracmmvd_disabled_flag" ); pcSlice->setDisFracMMVD( uiCode ? true : false ); diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp index e95de641b6b3af1f0aa9d57dca935fcf001bbd10..97d0d66e3cfa966286acaabf92a79ad478ee1134 100644 --- a/source/Lib/EncoderLib/EncLib.cpp +++ b/source/Lib/EncoderLib/EncLib.cpp @@ -979,7 +979,7 @@ void EncLib::xInitSPS(SPS &sps) sps.setUseMHIntra ( m_MHIntra ); sps.setUseTriangle ( m_Triangle ); - sps.setDisFracMmvdEnabledFlag ( m_allowDisFracMMVD ); + sps.setFpelMmvdEnabledFlag ( m_allowDisFracMMVD ); sps.setAffineAmvrEnabledFlag ( m_AffineAmvr ); sps.setUseDMVR ( m_DMVR ); diff --git a/source/Lib/EncoderLib/EncSlice.cpp b/source/Lib/EncoderLib/EncSlice.cpp index ff2f057ba62ae660d9e6c9e9c1cf6f507a5b541e..c842c6d8f35c817701c4bf1f838613158af44873 100644 --- a/source/Lib/EncoderLib/EncSlice.cpp +++ b/source/Lib/EncoderLib/EncSlice.cpp @@ -1515,7 +1515,7 @@ void EncSlice::checkDisFracMmvd( Picture* pcPic, uint32_t startCtuTsAddr, uint32 uint32_t totalCtu = 0; uint32_t hashRatio = 0; - if ( !pcSlice->getSPS()->getDisFracMmvdEnabledFlag() ) + if ( !pcSlice->getSPS()->getFpelMmvdEnabledFlag() ) { return; } @@ -1590,7 +1590,7 @@ void EncSlice::encodeCtus( Picture* pcPic, const bool bCompressEntireSlice, cons #if HEVC_DEPENDENT_SLICES } #endif - if ( pcSlice->getSPS()->getDisFracMmvdEnabledFlag() || + if ( pcSlice->getSPS()->getFpelMmvdEnabledFlag() || (pcSlice->getSPS()->getIBCFlag() && m_pcCuEncoder->getEncCfg()->getIBCHashSearch())) { #if JVET_N0329_IBC_SEARCH_IMP diff --git a/source/Lib/EncoderLib/VLCWriter.cpp b/source/Lib/EncoderLib/VLCWriter.cpp index 568e50422c86c64b41ef7a0b84ef83010cea76a9..b88af1ea55adfb4d8cd6ef50d8a7489faff52551 100644 --- a/source/Lib/EncoderLib/VLCWriter.cpp +++ b/source/Lib/EncoderLib/VLCWriter.cpp @@ -782,10 +782,10 @@ void HLSWriter::codeSPS( const SPS* pcSPS ) // KJS: sps_ciip_enabled_flag WRITE_FLAG( pcSPS->getUseMHIntra() ? 1 : 0, "mhintra_flag" ); + WRITE_FLAG( pcSPS->getFpelMmvdEnabledFlag() ? 1 : 0, "sps_fpel_mmvd_enabled_flag" ); + WRITE_FLAG( pcSPS->getUseTriangle() ? 1: 0, "triangle_flag" ); - // KJS: not in draft yet - WRITE_FLAG( pcSPS->getDisFracMmvdEnabledFlag() ? 1 : 0, "sps_fracmmvd_disabled_flag" ); // KJS: not in draft yet WRITE_FLAG( pcSPS->getUseSBT() ? 1 : 0, "sbt_enable_flag"); if( pcSPS->getUseSBT() ) @@ -1370,7 +1370,7 @@ void HLSWriter::codeSliceHeader ( Slice* pcSlice ) CHECK( pcSlice->getMaxNumAffineMergeCand() > AFFINE_MRG_MAX_NUM_CANDS, "More affine merge candidates signalled than supported" ); WRITE_UVLC( AFFINE_MRG_MAX_NUM_CANDS - pcSlice->getMaxNumAffineMergeCand(), "five_minus_max_num_affine_merge_cand" ); } - if ( pcSlice->getSPS()->getDisFracMmvdEnabledFlag() ) + if ( pcSlice->getSPS()->getFpelMmvdEnabledFlag() ) { WRITE_FLAG( pcSlice->getDisFracMMVD(), "tile_group_fracmmvd_disabled_flag" ); }