From 7d4d5879e7658a2e28754e5a0cac63d67c22171e Mon Sep 17 00:00:00 2001
From: AbeKiyo <abe.kiyo@jp.panasonic.com>
Date: Mon, 29 Oct 2018 19:17:29 +0900
Subject: [PATCH] JVET_L0118_ALIGN_MTS_INDEX : Align mts_index on intra and
inter
---
source/Lib/CommonLib/Rom.cpp | 4 ++++
source/Lib/CommonLib/TypeDef.h | 2 ++
2 files changed, 6 insertions(+)
diff --git a/source/Lib/CommonLib/Rom.cpp b/source/Lib/CommonLib/Rom.cpp
index 04bd24ce..0a6c0097 100644
--- a/source/Lib/CommonLib/Rom.cpp
+++ b/source/Lib/CommonLib/Rom.cpp
@@ -597,7 +597,11 @@ const int g_invQuantScales[SCALING_LIST_REM_NUM] =
//structures
//EMT transform sets
const int g_aiTrSubsetIntra[3][2] = { { DST7, DCT8 }, { DST7, DCT8 }, { DST7, DCT8 } };
+#if JVET_L0118_ALIGN_MTS_INDEX
+const int g_aiTrSubsetInter[4] = { DST7, DCT8 };
+#else
const int g_aiTrSubsetInter[4] = { DCT8, DST7 };
+#endif
const uint8_t g_aucTrSetVert[NUM_INTRA_MODE - 1] =
{//0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66
diff --git a/source/Lib/CommonLib/TypeDef.h b/source/Lib/CommonLib/TypeDef.h
index 472b3428..012145dc 100644
--- a/source/Lib/CommonLib/TypeDef.h
+++ b/source/Lib/CommonLib/TypeDef.h
@@ -50,6 +50,8 @@
#include <assert.h>
#include <cassert>
+#define JVET_L0118_ALIGN_MTS_INDEX 1 // Align mts_index on intra and inter
+
#define JVET_L0285_8BIT_TRANSFORM_CORE 1 // Primary transform using 8-bit cores
#define JVET_L0081_VPDU_SPLIT_CONSTRAINTS 1 // VPDU constraints for binary and ternary partitions
--
GitLab