commit be44e512ea4e6e204b4540ae28d08d227d6744f4
author Thomas Davies <thdavies@cisco.com> Wed Jun 07 11:41:07 2017 +0100
committer Thomas Davies <thdavies@cisco.com> Tue Jun 13 10:32:04 2017 +0100
tree 37686809c19df4c260527586e908420de3a3abf6
parent 85b66463a2ceb895c7842350f7a992082c64b523

AOM_QM: Fix bug with applying QMs to 1D and identity transforms.

Only apply quantisation matrices when the transform is 2D.

Change-Id: Iae9ac910c11199f7944a80d10d334db3b711059d

av1/common/enums.h

diff --git a/av1/common/enums.h b/av1/common/enums.h
index d105f94..0437e08 100644
--- a/av1/common/enums.h
+++ b/av1/common/enums.h
@@ -237,6 +237,12 @@
   TX_TYPES,
 } TX_TYPE;
 
+#if CONFIG_EXT_TX
+#define IS_2D_TRANSFORM(tx_type) (tx_type < IDTX)
+#else
+#define IS_2D_TRANSFORM(tx_type) 1
+#endif
+
 typedef enum {
   TILE_LEFT_BOUNDARY = 1,
   TILE_RIGHT_BOUNDARY = 2,