Merge branch 'master' into 'master'

JVET-P0329: simplify planar prediction by comparison removal

See merge request jvet/VVCSoftware_VTM!1019

source/Lib/CommonLib/IntraPrediction.cpp

@@ -336,8 +336,14 @@ void IntraPrediction::xPredIntraPlanar( const CPelBuf &pSrc, PelBuf &pDst )
 {
   const uint32_t width  = pDst.width;
   const uint32_t height = pDst.height;
+
+#if JVET_P0329_PLANAR_SIMPLIFICATION
+  const uint32_t log2W = floorLog2( width );
+  const uint32_t log2H = floorLog2( height );
+#else
   const uint32_t log2W  = floorLog2(width  < 2 ? 2 : width);
   const uint32_t log2H  = floorLog2(height < 2 ? 2 : height);
+#endif
 
   int leftColumn[MAX_CU_SIZE + 1], topRow[MAX_CU_SIZE + 1], bottomRow[MAX_CU_SIZE], rightColumn[MAX_CU_SIZE];
   const uint32_t offset = 1 << (log2W + log2H);

source/Lib/CommonLib/TypeDef.h

@@ -56,6 +56,8 @@
 
 #define JVET_P0111_CHROMA_422_FIX                         1 // JVET-P0422: Bug fix of chroma 422 intra mode mapping
 
+#define JVET_P0329_PLANAR_SIMPLIFICATION                  1 // JVET-P0329: simplify planar prediction by comparison removal
+
 #define JVET_P0516_PLT_BINARIZATION                       1 // JVET-P0516: PLT is always signaled when pred mode is euqal to 1 (intra mode) 
 
 #define JVET_P0562_TS_RESIDUAL_CODING_SIMP                1 // JVET-P0562: Fix the Rice parameter equal to 1 for the remainder of TS residual coding