From fbe7406d6099c3d0dd2b03bcf4158b285f4a87e0 Mon Sep 17 00:00:00 2001 From: Karsten Suehring Date: Fri, 18 Jan 2019 12:13:45 +0100 Subject: [PATCH] remove macro JVET_L0111 --- source/Lib/CommonLib/TypeDef.h | 1 - source/Lib/CommonLib/UnitTools.cpp | 4 ---- 2 files changed, 5 deletions(-) diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index 8aba07309..a61e62367 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -61,7 +61,6 @@ -#define JVET_L0111 1 // Max Tx size for skip #define JVET_L0209_PCM 1 // PCM mode #define JVET_L0553_FIX_INITQP 1 diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp index 1ab625a29..d2f40d0ed 100644 --- a/source/Lib/CommonLib/UnitTools.cpp +++ b/source/Lib/CommonLib/UnitTools.cpp @@ -5057,12 +5057,8 @@ bool TU::hasTransformSkipFlag(const CodingStructure& cs, const CompArea& area) { uint32_t transformSkipLog2MaxSize = cs.pps->getPpsRangeExtension().getLog2MaxTransformSkipBlockSize(); -#if JVET_L0111 SizeType transformSkipMaxSize = 1 << transformSkipLog2MaxSize; return area.width <= transformSkipMaxSize && area.height <= transformSkipMaxSize; -#else - return ( area.width * area.height <= (1 << ( transformSkipLog2MaxSize << 1 )) ); -#endif } uint32_t TU::getGolombRiceStatisticsIndex(const TransformUnit &tu, const ComponentID &compID) -- GitLab