From 3d0f0acb726757dc3a3dec99c6c44a4788f1d0d0 Mon Sep 17 00:00:00 2001
From: Li Jingya <jingya.li@sg.panasonic.com>
Date: Thu, 31 Jan 2019 11:31:50 +0800
Subject: [PATCH] M0823: Encoder optimization for MMVD
---
source/Lib/CommonLib/TypeDef.h | 1 -
source/Lib/EncoderLib/EncSlice.cpp | 4 ----
2 files changed, 5 deletions(-)
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 073e626f..d855edbf 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 3fa94373..35f64d38 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
--
GitLab