diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h index a204eeae479546d8c2ca419c4f73cf580bd99bf7..e2463f6b7dc4474d71c82857eb4d255f59b466c7 100644 --- a/source/Lib/CommonLib/TypeDef.h +++ b/source/Lib/CommonLib/TypeDef.h @@ -50,6 +50,7 @@ #include <assert.h> #include <cassert> +#define JVET_Q0353_ACT_SW_FIX 1 // JVET-Q0353: Bug fix of ACT #define JVET_Q0495_NLALF_CLIP_CLEANUP 1 // JVET-Q0495: Cleanup of clipping table for NL-ALF #define JVET_Q0249_ALF_CHROMA_CLIPFLAG 1 // JVET-Q0249: Cleanup of chroma clipping flags for ALF #define JVET_Q0150 1 // fix for ALF virtual horizontal CTU boundary processing diff --git a/source/Lib/CommonLib/UnitTools.cpp b/source/Lib/CommonLib/UnitTools.cpp index b11d68861538736236a89972506bbaba0f5aa877..6090cb21bba2b0a7e517c6eae58e3b516ff9cb73 100644 --- a/source/Lib/CommonLib/UnitTools.cpp +++ b/source/Lib/CommonLib/UnitTools.cpp @@ -3613,7 +3613,11 @@ 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; }