diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 073e626f77e499c7e35ed79c2928cace4effab6c..d855edbffadf7faaf60cbfb230fb43e5d96bab2d 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -99,7 +99,6 @@ #define JVET_M0464_UNI_MTS 1 #define JVET_M0068_M0171_MMVD_CLEANUP 1 // MMVD cleanup with 1) flip removal, 2) L1 zero vector fix, 3) bi-pred restriction after merge/MMVD #define JVET_M0255_FRACMMVD_SWITCH 1 // disable fractional MVD in MMVD adaptively -#define JVET_M0312_FRACMMVD_SWITCH_FOR_UHD 1 // disable fractional MVD in MMVD for UHD sequences #define JVET_M0823_MMVD_ENCOPT 1 // encoder optimization for MMVD #if JVET_M0464_UNI_MTS diff --git a/source/Lib/EncoderLib/EncSlice.cpp b/source/Lib/EncoderLib/EncSlice.cpp index 3fa94373cc81e1c3832a4ea2c85456ecb4119e12..35f64d3868e15c9e14c68fa5f0efeb3f0cab7541 100644 --- a/source/Lib/EncoderLib/EncSlice.cpp +++ b/source/Lib/EncoderLib/EncSlice.cpp @@ -1427,10 +1427,6 @@ void EncSlice::checkDisFracMmvd( Picture* pcPic, uint32_t startCtuTsAddr, uint32 { pcSlice->setDisFracMMVD( true ); } -#if JVET_M0312_FRACMMVD_SWITCH_FOR_UHD - bool useIntegerMVD = (pcPic->lwidth()*pcPic->lheight() > 1920 * 1080); - pcSlice->setDisFracMMVD(useIntegerMVD); -#endif } #endif