From 8c2e5ea763265204fe62bc67c1be932538e55e38 Mon Sep 17 00:00:00 2001
From: Frank Bossen <fbossen@gmail.com>
Date: Thu, 29 Aug 2019 15:18:26 -0400
Subject: [PATCH] Clean up TrQuant::init() parameter list
Remove unused parameters and remove default parameter values
---
source/Lib/CommonLib/TrQuant.cpp | 3 +--
source/Lib/CommonLib/TrQuant.h | 9 ++++-----
source/Lib/DecoderLib/DecLib.cpp | 4 ++--
source/Lib/EncoderLib/EncLib.cpp | 3 +--
4 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/source/Lib/CommonLib/TrQuant.cpp b/source/Lib/CommonLib/TrQuant.cpp
index e2350390b..821319c8c 100644
--- a/source/Lib/CommonLib/TrQuant.cpp
+++ b/source/Lib/CommonLib/TrQuant.cpp
@@ -217,8 +217,7 @@ void TrQuant::init( const Quant* otherQuant,
#if T0196_SELECTIVE_RDOQ
const bool useSelectiveRDOQ,
#endif
- const bool bEnc,
- const bool useTransformSkipFast
+ const bool bEnc
)
{
delete m_quant;
diff --git a/source/Lib/CommonLib/TrQuant.h b/source/Lib/CommonLib/TrQuant.h
index f4da7ed64..bbcf2c806 100644
--- a/source/Lib/CommonLib/TrQuant.h
+++ b/source/Lib/CommonLib/TrQuant.h
@@ -70,13 +70,12 @@ public:
void init (
const Quant* otherQuant,
const uint32_t uiMaxTrSize,
- const bool bUseRDOQ = false,
- const bool bUseRDOQTS = false,
+ const bool bUseRDOQ,
+ const bool bUseRDOQTS,
#if T0196_SELECTIVE_RDOQ
- const bool useSelectiveRDOQ = false,
+ const bool useSelectiveRDOQ,
#endif
- const bool bEnc = false,
- const bool useTransformSkipFast = false
+ const bool bEnc
);
void getTrTypes(const TransformUnit tu, const ComponentID compID, int &trTypeHor, int &trTypeVer);
diff --git a/source/Lib/DecoderLib/DecLib.cpp b/source/Lib/DecoderLib/DecLib.cpp
index e820fbfcf..65f7c9a94 100644
--- a/source/Lib/DecoderLib/DecLib.cpp
+++ b/source/Lib/DecoderLib/DecLib.cpp
@@ -925,9 +925,9 @@ void DecLib::xActivateParameterSets()
m_cCuDecoder.initDecCuReshaper(&m_cReshaper, sps->getChromaFormatIdc());
}
#if MAX_TB_SIZE_SIGNALLING
- m_cTrQuant.init( nullptr, sps->getMaxTbSize(), false, false, false, false, false );
+ m_cTrQuant.init( nullptr, sps->getMaxTbSize(), false, false, false, false );
#else
- m_cTrQuant.init( nullptr, MAX_TB_SIZEY, false, false, false, false, false );
+ m_cTrQuant.init( nullptr, MAX_TB_SIZEY, false, false, false, false );
#endif
// RdCost
diff --git a/source/Lib/EncoderLib/EncLib.cpp b/source/Lib/EncoderLib/EncLib.cpp
index 963cd63e6..8ab0e9dd8 100644
--- a/source/Lib/EncoderLib/EncLib.cpp
+++ b/source/Lib/EncoderLib/EncLib.cpp
@@ -406,8 +406,7 @@ void EncLib::init( bool isFieldCoding, AUWriterIf* auWriterIf )
#if T0196_SELECTIVE_RDOQ
m_useSelectiveRDOQ,
#endif
- true,
- m_useTransformSkipFast
+ true
);
// initialize encoder search class
--
GitLab