Commit f2f26701 authored by Frank Bossen's avatar Frank Bossen

Merge branch 'bms-tools' into 'master'

create BMS_TOOLS macro to switch all BMS only tools (including JEM_TOOLS)

See merge request !95
parents 20a68e16 927820b9
Pipeline #75 passed with stage
......@@ -29,7 +29,7 @@ target_compile_definitions( ${EXE_NAME} PUBLIC RExt__DECODER_DEBUG_BIT_STATISTIC
target_compile_definitions( ${EXE_NAME} PUBLIC RExt__DECODER_DEBUG_TOOL_STATISTICS=1 )
if( ENABLE_VTM )
target_compile_definitions( ${EXE_NAME} PUBLIC JEM_TOOLS=0 )
target_compile_definitions( ${EXE_NAME} PUBLIC BMS_TOOLS=0 )
endif()
if( SET_ENABLE_TRACING )
......
......@@ -27,7 +27,7 @@ add_executable( ${EXE_NAME} ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} ${CMAKE_CU
include_directories(${CMAKE_CURRENT_BINARY_DIR})
if( ENABLE_VTM )
target_compile_definitions( ${EXE_NAME} PUBLIC JEM_TOOLS=0 )
target_compile_definitions( ${EXE_NAME} PUBLIC BMS_TOOLS=0 )
endif()
......
......@@ -29,7 +29,7 @@ add_executable( ${EXE_NAME} ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} ${CMAKE_CU
include_directories(${CMAKE_CURRENT_BINARY_DIR})
if( ENABLE_VTM )
target_compile_definitions( ${EXE_NAME} PUBLIC JEM_TOOLS=0 )
target_compile_definitions( ${EXE_NAME} PUBLIC BMS_TOOLS=0 )
endif()
if( SET_ENABLE_TRACING )
......
......@@ -49,7 +49,7 @@ add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} )
target_compile_definitions( ${LIB_NAME} PUBLIC RExt__DECODER_DEBUG_TOOL_STATISTICS=1 )
if( ENABLE_VTM )
target_compile_definitions( ${LIB_NAME} PUBLIC JEM_TOOLS=0 )
target_compile_definitions( ${LIB_NAME} PUBLIC BMS_TOOLS=0 )
endif()
if( EXTENSION_360_VIDEO )
......
......@@ -48,7 +48,7 @@ set( INC_FILES ${BASE_INC_FILES} ${X86_INC_FILES} ${MD5_INC_FILES} )
add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} )
if( ENABLE_VTM )
target_compile_definitions( ${LIB_NAME} PUBLIC JEM_TOOLS=0 )
target_compile_definitions( ${LIB_NAME} PUBLIC BMS_TOOLS=0 )
endif()
if( EXTENSION_360_VIDEO )
......
......@@ -50,14 +50,26 @@
#include <assert.h>
#include <cassert>
#ifndef BMS_TOOLS
#define BMS_TOOLS 1 // Inclusion of BMS only tools (which include JEM tools) into compiled executable
#endif
#if BMS_TOOLS
#define JEM_TOOLS 1
#define JVET_K0076_CPR 1 // current picture referencing or intra block copy mode
#define JVET_K0248_GBI 1
#define JVET_K0485_BIO 1 // BIO simplifications
#else
#define JEM_TOOLS 0
#define JVET_K0076_CPR 0 // current picture referencing or intra block copy mode
#define JVET_K0248_GBI 0
#define JVET_K0485_BIO 0 // BIO simplifications
#endif
#if JVET_K0076_CPR
#define JVET_K0076_CPR_DT 1 // dualItree support for CPR
#endif
#define JVET_K0248_GBI 1
#define JVET_K1000_SIMPLIFIED_EMT 1 // EMT with only DCT-2, DCT-8 and DST-7
#define JVET_K0371_ALF 1
......@@ -118,15 +130,10 @@
#define JVET_K0357_AMVR 1 // Adaptive motion vector resolution separated from JEM_TOOLS macro
#define JVET_K0485_BIO 1 // BIO simplifications
#if JVET_K0485_BIO
#define JVET_K0485_BIO_EXTEND_SIZE 1
#endif
#ifndef JEM_TOOLS
#define JEM_TOOLS 1 // Defines the inclusion of JEM tools into compiled executable
#endif
#ifndef JVET_B0051_NON_MPM_MODE
#define JVET_B0051_NON_MPM_MODE ( 1 && JEM_TOOLS )
......
......@@ -18,7 +18,7 @@ target_compile_definitions( ${LIB_NAME} PUBLIC RExt__DECODER_DEBUG_BIT_STATISTIC
target_compile_definitions( ${LIB_NAME} PUBLIC RExt__DECODER_DEBUG_TOOL_STATISTICS=1 )
if( ENABLE_VTM )
target_compile_definitions( ${LIB_NAME} PUBLIC JEM_TOOLS=0 )
target_compile_definitions( ${LIB_NAME} PUBLIC BMS_TOOLS=0 )
endif()
if( EXTENSION_360_VIDEO )
......
......@@ -17,7 +17,7 @@ add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} )
target_compile_definitions( ${LIB_NAME} PUBLIC )
if( ENABLE_VTM )
target_compile_definitions( ${LIB_NAME} PUBLIC JEM_TOOLS=0 )
target_compile_definitions( ${LIB_NAME} PUBLIC BMS_TOOLS=0 )
endif()
if( EXTENSION_360_VIDEO )
......
......@@ -17,7 +17,7 @@ add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} )
target_compile_definitions( ${LIB_NAME} PUBLIC )
if( ENABLE_VTM )
target_compile_definitions( ${LIB_NAME} PUBLIC JEM_TOOLS=0 )
target_compile_definitions( ${LIB_NAME} PUBLIC BMS_TOOLS=0 )
endif()
if( EXTENSION_360_VIDEO )
......
......@@ -17,7 +17,7 @@ add_library( ${LIB_NAME} STATIC ${SRC_FILES} ${INC_FILES} ${NATVIS_FILES} )
target_compile_definitions( ${LIB_NAME} PUBLIC )
if( ENABLE_VTM )
target_compile_definitions( ${LIB_NAME} PUBLIC JEM_TOOLS=0 )
target_compile_definitions( ${LIB_NAME} PUBLIC BMS_TOOLS=0 )
endif()
if( EXTENSION_360_VIDEO )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment