Merge branch 'JVET-V0131' into 'master'

JVET-V0131: Fixing the forward transform matrices for high bit depth coding

See merge request jvet/VVCSoftware_VTM!2073

source/Lib/CommonLib/RomTr.cpp

@@ -387,7 +387,11 @@ const TMatrixCoeff g_trCoreDCT2P64[TRANSFORM_NUMBER_OF_DIRECTIONS][64][64] =
 // DCT-8
 const TMatrixCoeff g_trCoreDCT8P4[TRANSFORM_NUMBER_OF_DIRECTIONS][4][4] =
 {
+#if JVET_V0131_CORRECT_TR_HBD
+  DEFINE_DCT8_P4_MATRIX(21505, 18893, 14081,  7424),
+#else
   DEFINE_DCT8_P4_MATRIX(21505, 18893, 14081,  7425),
+#endif
   DEFINE_DCT8_P4_MATRIX(84,     74,     55,     29)
 };
 const TMatrixCoeff g_trCoreDCT8P8[TRANSFORM_NUMBER_OF_DIRECTIONS][8][8] =
@@ -409,7 +413,11 @@ const TMatrixCoeff g_trCoreDCT8P32[TRANSFORM_NUMBER_OF_DIRECTIONS][32][32] =
 // DST-7
 const TMatrixCoeff g_trCoreDST7P4[TRANSFORM_NUMBER_OF_DIRECTIONS][4][4] =
 {
+#if JVET_V0131_CORRECT_TR_HBD
+  DEFINE_DST7_P4_MATRIX(7424, 14081, 18893, 21505),
+#else
   DEFINE_DST7_P4_MATRIX( 7425, 14081, 18893, 21505),
+#endif
   DEFINE_DST7_P4_MATRIX(   29,    55,    74,    84)
 };
 const TMatrixCoeff g_trCoreDST7P8[TRANSFORM_NUMBER_OF_DIRECTIONS][8][8] =

source/Lib/CommonLib/TypeDef.h

@@ -50,7 +50,7 @@
 #include <assert.h>
 #include <cassert>
 
-
+#define JVET_V0131_CORRECT_TR_HBD                          1 // correcting the 4x4 BDST7/DCT8 transform matrices for high bit-depth coding
 // clang-format off
 
 #define JVET_V0078                                        1 // JVET-V0078: QP control for very smooth blocks