From 6c7e924aeffd1a1f47584f12f07d20a8f09d557f Mon Sep 17 00:00:00 2001
From: AbeKiyo <abe.kiyo@jp.panasonic.com>
Date: Tue, 30 Oct 2018 09:55:56 +0900
Subject: [PATCH] JVET_L0118_ALIGN_MTS_INDEX : Change the table size of
g_aiTrSubsetInter[] from 4 to 2.
---
cmake/modules/GetSVN.cmake | 73 ------------------------------------
source/Lib/CommonLib/Rom.cpp | 2 +-
source/Lib/CommonLib/Rom.h | 4 ++
3 files changed, 5 insertions(+), 74 deletions(-)
delete mode 100644 cmake/modules/GetSVN.cmake
diff --git a/cmake/modules/GetSVN.cmake b/cmake/modules/GetSVN.cmake
deleted file mode 100644
index c9609a0f3..000000000
--- a/cmake/modules/GetSVN.cmake
+++ /dev/null
@@ -1,73 +0,0 @@
-if( GENERATE_DUMMY )
- file( WRITE svnrevision.h.in "\n" )
-else()
- include( FindSubversion )
-
- if( SUBVERSION_FOUND )
- # Copied from FindSubversion: need to change to fix the SEND_ERROR problem
-
- # the subversion commands should be executed with the C locale, otherwise
- # the message (which are parsed) may be translated, Alex
- set( _Subversion_SAVED_LC_ALL "$ENV{LC_ALL}" )
- set( ENV{LC_ALL} C )
-
- execute_process( COMMAND ${Subversion_SVN_EXECUTABLE} info ${SOURCE_DIR}
- OUTPUT_VARIABLE NEXT_WC_INFO
- ERROR_VARIABLE Subversion_svn_info_error
- RESULT_VARIABLE Subversion_svn_info_result
- OUTPUT_STRIP_TRAILING_WHITESPACE )
-
- if( NOT ${Subversion_svn_info_result} EQUAL 0 )
- message( "${SOURCE_DIR} is not a subversion directory" )
- file( WRITE svnrevision.h.in "\n" )
- else()
- string( REGEX REPLACE "^(.*\n)?URL: ([^\n]+).*"
- "\\2" NEXT_WC_URL "${NEXT_WC_INFO}" )
- string( REGEX REPLACE "^(.*\n)?Repository Root: ([^\n]+).*"
- "\\2" NEXT_WC_ROOT "${NEXT_WC_INFO}" )
- string( REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*"
- "\\2" NEXT_WC_REVISION "${NEXT_WC_INFO}" )
- string( REGEX REPLACE "^(.*\n)?Last Changed Author: ([^\n]+).*"
- "\\2" NEXT_WC_LAST_CHANGED_AUTHOR "${NEXT_WC_INFO}" )
- string( REGEX REPLACE "^(.*\n)?Last Changed Rev: ([^\n]+).*"
- "\\2" NEXT_WC_LAST_CHANGED_REV "${NEXT_WC_INFO}" )
- string( REGEX REPLACE "^(.*\n)?Last Changed Date: ([^\n]+).*"
- "\\2" NEXT_WC_LAST_CHANGED_DATE "${NEXT_WC_INFO}" )
-
- string( REGEX REPLACE "^(.*)?:(.*)"
- "\\2" NEXT_WC_URL_PATH "${NEXT_WC_URL}" )
- string( REGEX REPLACE "^(.*)?:(.*)"
- "\\2" NEXT_WC_ROOT_PATH "${NEXT_WC_ROOT}" )
-
- file( RELATIVE_PATH NEXT_WC_RELATIVE_URL "${NEXT_WC_ROOT_PATH}" "${NEXT_WC_URL_PATH}" )
-
- execute_process( COMMAND ${Subversion_SVN_EXECUTABLE} status ${SOURCE_DIR}
- OUTPUT_VARIABLE NEXT_WC_STATUS
- ERROR_VARIABLE Subversion_svn_status_error
- RESULT_VARIABLE Subversion_svn_status_result
- OUTPUT_STRIP_TRAILING_WHITESPACE )
-
- if( ${Subversion_svn_status_result} EQUAL 0 )
- if( NEXT_WC_STATUS )
- set( NEXT_WC_STATUS "M" )
- else()
- set( NEXT_WC_STATUS "" )
- endif()
- endif()
-
- # write a file with the SVNVERSION define
- file( WRITE svnrevision.h.in "#define SVNREVISION \"${NEXT_WC_LAST_CHANGED_REV}${NEXT_WC_STATUS}\"\n" )
- file( APPEND svnrevision.h.in "#define SVNRELATIVEURL \"${NEXT_WC_RELATIVE_URL}\"\n" )
- endif()
-
- # restore the previous LC_ALL
- set( ENV{LC_ALL} ${_Subversion_SAVED_LC_ALL} )
- else()
- message( "Subversion executable not found!" )
- file( WRITE svnrevision.h.in "\n" )
- endif()
-endif()
-
-# copy the file to the final header only if the version changes
-# reduces needless rebuilds
-execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different svnrevision.h.in svnrevision.h )
diff --git a/source/Lib/CommonLib/Rom.cpp b/source/Lib/CommonLib/Rom.cpp
index 0a6c0097f..aadd7d88d 100644
--- a/source/Lib/CommonLib/Rom.cpp
+++ b/source/Lib/CommonLib/Rom.cpp
@@ -598,7 +598,7 @@ const int g_invQuantScales[SCALING_LIST_REM_NUM] =
//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 };
+const int g_aiTrSubsetInter[2] = { DST7, DCT8 };
#else
const int g_aiTrSubsetInter[4] = { DCT8, DST7 };
#endif
diff --git a/source/Lib/CommonLib/Rom.h b/source/Lib/CommonLib/Rom.h
index ce3a6554a..ba99b1608 100644
--- a/source/Lib/CommonLib/Rom.h
+++ b/source/Lib/CommonLib/Rom.h
@@ -118,7 +118,11 @@ extern const TMatrixCoeff g_as_DST_MAT_4 [TRANSFORM_NUMBER_OF_DIRECTIONS][4][4];
#endif
extern const int g_aiTrSubsetIntra[3][2];
+#if JVET_L0118_ALIGN_MTS_INDEX
+extern const int g_aiTrSubsetInter[2];
+#else
extern const int g_aiTrSubsetInter[4];
+#endif
extern const uint8_t g_aucTrSetVert[NUM_INTRA_MODE - 1];
extern const uint8_t g_aucTrSetHorz[NUM_INTRA_MODE - 1];
--
GitLab