From f23f87830a49c6ca5dfc38f2c8859f8092fddc22 Mon Sep 17 00:00:00 2001
From: Shih-Ta Hsiang <shih-ta.hsiang@mediatek.com>
Date: Thu, 15 Aug 2019 20:18:31 +0800
Subject: [PATCH] Update the cfg file for class F and remove unused variables.
---
cfg/per-class/classF.cfg | 2 +-
source/App/EncoderApp/EncApp.cpp | 2 ++
source/App/EncoderApp/EncAppCfg.h | 2 ++
source/Lib/EncoderLib/EncCfg.h | 4 ++++
4 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/cfg/per-class/classF.cfg b/cfg/per-class/classF.cfg
index 0820b2133..0edc6f8c1 100644
--- a/cfg/per-class/classF.cfg
+++ b/cfg/per-class/classF.cfg
@@ -1,3 +1,3 @@
IBC : 1
HashME : 1
-RDPCM: 1
+BDPCM: 1
diff --git a/source/App/EncoderApp/EncApp.cpp b/source/App/EncoderApp/EncApp.cpp
index bf420c481..21c65e025 100644
--- a/source/App/EncoderApp/EncApp.cpp
+++ b/source/App/EncoderApp/EncApp.cpp
@@ -302,7 +302,9 @@ void EncApp::xInitLibCfg()
m_cEncLib.setDMVR ( m_DMVR );
m_cEncLib.setMMVD ( m_MMVD );
m_cEncLib.setMmvdDisNum (m_MmvdDisNum);
+#if !JVET_O1136_TS_BDPCM_SIGNALLING
m_cEncLib.setRDPCM ( m_RdpcmMode );
+#endif
#if JVET_O0119_BASE_PALETTE_444
m_cEncLib.setPLTMode ( m_PLTMode );
#endif
diff --git a/source/App/EncoderApp/EncAppCfg.h b/source/App/EncoderApp/EncAppCfg.h
index 02209e98a..bafa42150 100644
--- a/source/App/EncoderApp/EncAppCfg.h
+++ b/source/App/EncoderApp/EncAppCfg.h
@@ -297,7 +297,9 @@ protected:
bool m_DMVR;
bool m_MMVD;
int m_MmvdDisNum;
+#if !JVET_O1136_TS_BDPCM_SIGNALLING
bool m_RdpcmMode;
+#endif
#if JVET_O0119_BASE_PALETTE_444
unsigned m_PLTMode;
#endif
diff --git a/source/Lib/EncoderLib/EncCfg.h b/source/Lib/EncoderLib/EncCfg.h
index e04ef2024..b2e2501e9 100644
--- a/source/Lib/EncoderLib/EncCfg.h
+++ b/source/Lib/EncoderLib/EncCfg.h
@@ -311,7 +311,9 @@ protected:
bool m_DMVR;
bool m_MMVD;
int m_MmvdDisNum;
+#if !JVET_O1136_TS_BDPCM_SIGNALLING
bool m_RdpcmMode;
+#endif
#if JVET_O0119_BASE_PALETTE_444
unsigned m_PLTMode;
#endif
@@ -919,8 +921,10 @@ public:
bool getMMVD () const { return m_MMVD; }
void setMmvdDisNum ( int b ) { m_MmvdDisNum = b; }
int getMmvdDisNum () const { return m_MmvdDisNum; }
+ #if !JVET_O1136_TS_BDPCM_SIGNALLING
void setRDPCM ( bool b ) { m_RdpcmMode = b; }
bool getRDPCM () const { return m_RdpcmMode; }
+ #endif
#if JVET_O0119_BASE_PALETTE_444
void setPLTMode ( unsigned n) { m_PLTMode = n; }
unsigned getPLTMode () const { return m_PLTMode; }
--
GitLab