Merge branch 'scaling_list/jvet-o0267_ibc' into 'master'

JVET-O0267: use the inter quant matrices for IBC mode

See merge request !654

source/Lib/CommonLib/ChromaFormat.h

@@ -128,7 +128,11 @@ static inline int getScaledChromaQP(int unscaledChromaQP, const ChromaFormat chF
 
 static inline int getScalingListType(const PredMode predMode, const ComponentID compID)
 {
+#if JVET_O0267_IBC_SCALING_LIST
+  return ((predMode == MODE_INTRA) ? 0 : MAX_NUM_COMPONENT) + MAP_CHROMA(compID);
+#else
   return ((predMode != MODE_INTER) ? 0 : MAX_NUM_COMPONENT) + MAP_CHROMA(compID);
+#endif
 }
 
 #endif

source/Lib/CommonLib/TypeDef.h

@@ -65,6 +65,7 @@
 
 
 
+#define JVET_O0267_IBC_SCALING_LIST                              1