From 012a52e3e81022c672af8672b5d1b47ca2437405 Mon Sep 17 00:00:00 2001
From: Karsten Suehring <karsten.suehring@hhi.fraunhofer.de>
Date: Sun, 26 Apr 2020 20:11:10 +0200
Subject: [PATCH] remove macro JVET_Q0353_ACT_SW_FIX
---
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 c98d85f73..fd171a057 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -120,7 +120,6 @@
-#define JVET_Q0353_ACT_SW_FIX 1 // JVET-Q0353: Bug fix of ACT
#define JVET_P0288_PIC_OUTPUT 1 // JVET-P0288: Set the value of PictureOutputFlag
diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp
index 01fbc9bb0..9b2d44f13 100644
--- a/source/Lib/CommonLib/UnitTools.cpp
+++ b/source/Lib/CommonLib/UnitTools.cpp
@@ -3966,11 +3966,7 @@ bool CU::bdpcmAllowed( const CodingUnit& cu, const ComponentID compID )
if (isLuma(compID))
bdpcmAllowed &= (cu.lwidth() <= transformSkipMaxSize && cu.lheight() <= transformSkipMaxSize);
else
-#if JVET_Q0353_ACT_SW_FIX
bdpcmAllowed &= (cu.chromaSize().width <= transformSkipMaxSize && cu.chromaSize().height <= transformSkipMaxSize) && !cu.colorTransform;
-#else
- bdpcmAllowed &= (cu.chromaSize().width <= transformSkipMaxSize && cu.chromaSize().height <= transformSkipMaxSize);
-#endif
return bdpcmAllowed;
}
--
GitLab