Commit 6970a203 authored by janssonfr's avatar janssonfr
Browse files

Merge branch 'main' into Ericsson/ITDCNG 

Merge with main
parents f298b1fc 30322ca2

.gitignore

+15 −5
Original line number Diff line number Diff line
@@ -3,17 +3,21 @@ 
# Compiler output Unix

IVAS_cod

IVAS_dec

IVAS_rend

IVAS_crend_unit_test

obj/

*.a

*.o

*.P



# default CMake

build/**/*

build*/**/*



# Compiler output VS2017

IVAS_cod.exe

IVAS_dec.exe

IVAS_rend.exe

IVAS_crend_unit_test.exe

*.user

.vs/

Debug_*/
@@ -31,13 +35,10 @@ scripts/ivas_pytests/tests/unit_tests/crend/Release_*/ 
scripts/td_object_renderer/object_renderer_standalone/renderer_standalone

scripts/td_object_renderer/object_renderer_standalone/renderer_standalone.exe



# Prerenderer

scripts/prerenderer/IVAS_prerenderer

scripts/prerenderer/IVAS_prerenderer.exe



# General/scripts

.DS_Store

.vscode

.cache

*.log

*.bak

scripts/c-code_instrument/
@@ -46,10 +47,19 @@ scripts/ref/ 
scripts/test/

scripts/out/

scripts/self_test_summary.txt

tests/renderer/cut

tests/renderer/ref

tests/dut

tests/ref

scripts/testv/*_cut*.pcm

# default reference binary name

IVAS_cod_ref

IVAS_dec_ref



# Python files that pop up when running scripts

__pycache__/

*.py[cod]

*$py.class



#history

.history/

.gitlab-ci.yml

+623 −158

File changed.

Preview size limit exceeded, changes collapsed.

CMakeLists.txt

+29 −8
Original line number Diff line number Diff line
@@ -108,6 +108,9 @@ if(WMOPS) 
  add_definitions("-DWMOPS=1")

endif()



if(DEC_TO_REND_FLOAT_DUMP)

  add_compile_definitions(DEC_TO_REND_FLOAT_DUMP)

endif()



project(stereo-evs)

set_property(GLOBAL PROPERTY USE_FOLDERS ON) # make Visual Studio projects look nicer
@@ -118,6 +121,7 @@ include_directories( 
  lib_debug

  lib_dec

  lib_enc

  lib_rend

  lib_util

)
@@ -131,21 +135,35 @@ endif() 
file(GLOB libDebugSrcs "lib_debug/*.c")

file(GLOB libDebugHeaders "lib_debug/*.h")

add_library(lib_debug ${libDebugSrcs} ${libDebugHeaders})

target_link_libraries(lib_debug lib_com)



file(GLOB libEncSrcs "lib_enc/*.c")

file(GLOB libEncHeaders "lib_enc/*.h")

add_library(lib_enc ${libEncSrcs} ${libEncHeaders})

target_link_libraries(lib_enc lib_com lib_debug)



file(GLOB libRendSrcs "lib_rend/*.c")

file(GLOB libRendHeaders "lib_rend/*.h")

add_library(lib_rend ${libRendSrcs} ${libRendHeaders})

target_link_libraries(lib_rend lib_dec lib_com lib_debug) # Todo refactor: This dependency on lib_dec should be removed.



file(GLOB libDecSrcs "lib_dec/*.c")

file(GLOB libDecHeaders "lib_dec/*.h")

add_library(lib_dec ${libDecSrcs} ${libDecHeaders})

target_link_libraries(lib_dec lib_com lib_debug)

target_link_libraries(lib_dec lib_com lib_rend lib_debug)



file(GLOB libUtilSrcs "lib_util/*.c")

file(GLOB libUtilHeaders "lib_util/*.h")

add_library(lib_util ${libUtilSrcs} ${libUtilHeaders})



file(GLOB unitTestCRendSrcs "scripts/ivas_pytests/tests/unit_tests/crend/*.c")

file(GLOB unitTestCRendHeaders "scripts/ivas_pytests/tests/unit_tests/crend/*.h")

add_executable(IVAS_crend_unit_test ${unitTestCRendSrcs} ${unitTestCRendHeaders})

target_link_libraries(IVAS_crend_unit_test lib_rend lib_dec lib_util lib_com lib_debug)



add_executable(renderer_standalone "scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone/renderer_standalone.c")

target_link_libraries(renderer_standalone lib_rend lib_dec lib_util lib_com lib_debug)



add_executable(IVAS_cod apps/encoder.c)

target_link_libraries(IVAS_cod lib_enc lib_util)

if(WIN32)
@@ -158,11 +176,14 @@ if(WIN32) 
  target_link_libraries(IVAS_dec Ws2_32)

endif()



if(${IVAS_BUILD_PRERENDERER})

  add_executable(IVAS_prerenderer

    scripts/prerenderer/prerenderer.c

    ${libEncSrcs}

    ${libDecSrcs}

  )

  target_link_libraries(IVAS_prerenderer lib_com lib_dec lib_debug lib_util)

add_executable(IVAS_rend apps/renderer.c)

target_link_libraries(IVAS_rend lib_rend lib_util)



if(COPY_EXECUTABLES_FROM_BUILD_DIR)

  # Optionally copy executables to the same place where Make puts them (useful for tests that expect executables in specific places)

  add_custom_command(TARGET IVAS_cod POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_cod>" "${CMAKE_CURRENT_SOURCE_DIR}/")

  add_custom_command(TARGET IVAS_dec POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_dec>" "${CMAKE_CURRENT_SOURCE_DIR}/")

  add_custom_command(TARGET IVAS_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_rend>" "${CMAKE_CURRENT_SOURCE_DIR}/")

  add_custom_command(TARGET IVAS_crend_unit_test POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_crend_unit_test>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/ivas_pytests/tests/unit_tests/crend/")

  add_custom_command(TARGET renderer_standalone POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:renderer_standalone>" "${CMAKE_CURRENT_SOURCE_DIR}/scripts/td_object_renderer/object_renderer_standalone/")

endif()

Makefile

+23 −11
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ SRC_LIBCOM = lib_com 
SRC_LIBDEBUG = lib_debug

SRC_LIBDEC   = lib_dec

SRC_LIBENC   = lib_enc

SRC_LIBREND  = lib_rend

SRC_LIBUTIL  = lib_util

SRC_APP      = apps

BUILD        = build
@@ -19,15 +20,17 @@ UTESTS_CREND_DIR = $(UTESTS_DIR)/crend 
SRC_UTESTS = $(UTESTS_CREND_DIR)





SRC_DIRS  = $(sort -u $(SRC_LIBCOM) $(SRC_LIBDEBUG) $(SRC_LIBDEC) $(SRC_LIBENC) $(SRC_LIBUTIL) $(SRC_APP) $(SRC_UTESTS)) 

SRC_DIRS  = $(sort -u $(SRC_LIBCOM) $(SRC_LIBDEBUG) $(SRC_LIBDEC) $(SRC_LIBENC) $(SRC_LIBREND) $(SRC_LIBUTIL) $(SRC_APP) $(SRC_UTESTS)) 



# Name of CLI binaries

CLI_APIDEC   ?= IVAS_dec

CLI_APIENC   ?= IVAS_cod

CLI_APIREND  ?= IVAS_rend

LIB_LIBCOM   ?= libivascom.a

LIB_LIBDEBUG ?= libivasdebug.a

LIB_LIBDEC   ?= libivasdec.a

LIB_LIBENC   ?= libivasenc.a

LIB_LIBREND  ?= libivasrend.a

LIB_LIBUTIL  ?= libivasutil.a



CLI_UTESTS_CREND ?= IVAS_crend_unit_test
@@ -125,6 +128,7 @@ SRCS_LIBCOM = $(foreach DIR,$(SRC_LIBCOM),$(patsubst $(DIR)/%,%,$(wildcard $(D 
SRCS_LIBDEBUG = $(foreach DIR,$(SRC_LIBDEBUG),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

SRCS_LIBDEC   = $(foreach DIR,$(SRC_LIBDEC),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

SRCS_LIBENC   = $(foreach DIR,$(SRC_LIBENC),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

SRCS_LIBREND  = $(foreach DIR,$(SRC_LIBREND),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))

SRCS_LIBUTIL  = $(foreach DIR,$(SRC_LIBUTIL),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))



SRCS_UTESTS_CREND  = $(foreach DIR,$(UTESTS_CREND_DIR),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
@@ -133,9 +137,11 @@ OBJS_LIBCOM = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.o)) 
OBJS_LIBDEBUG    = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEBUG:.c=.o))

OBJS_LIBDEC      = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEC:.c=.o))

OBJS_LIBENC      = $(addprefix $(OBJDIR)/,$(SRCS_LIBENC:.c=.o))

OBJS_LIBREND     = $(addprefix $(OBJDIR)/,$(SRCS_LIBREND:.c=.o))

OBJS_LIBUTIL     = $(addprefix $(OBJDIR)/,$(SRCS_LIBUTIL:.c=.o))

OBJS_CLI_APIDEC  = $(OBJDIR)/decoder.o

OBJS_CLI_APIENC  = $(OBJDIR)/encoder.o

OBJS_CLI_APPREND = $(OBJDIR)/renderer.o



OBJS_CLI_UTESTS_CREND = $(addprefix $(OBJDIR)/,$(SRCS_UTESTS_CREND:.c=.o))
@@ -149,7 +155,7 @@ DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.P) $(SRCS_LIBDEBUG:.c=.P) $(SRCS 


.PHONY: all clean clean_unittests clean_all



all: $(CLI_APIENC) $(CLI_APIDEC)

all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND)



$(OBJDIR):

	$(QUIET)mkdir -p $(OBJDIR)
@@ -157,7 +163,7 @@ $(OBJDIR): 
$(LIB_LIBCOM): $(OBJS_LIBCOM)

	$(QUIET_AR)$(AR) rcs $@ $^



$(LIB_LIBDEC): $(OBJS_LIBDEC)

$(LIB_LIBDEC): $(OBJS_LIBDEC) $(OBJS_LIBREND)

	$(QUIET_AR)$(AR) rcs $@ $^



$(LIB_LIBDEBUG): $(OBJS_LIBDEBUG)
@@ -166,27 +172,33 @@ $(LIB_LIBDEBUG): $(OBJS_LIBDEBUG) 
$(LIB_LIBENC): $(OBJS_LIBENC)

	$(QUIET_AR)$(AR) rcs $@ $^



$(LIB_LIBREND): $(OBJS_LIBREND)

	$(QUIET_AR)$(AR) rcs $@ $^



$(LIB_LIBUTIL): $(OBJS_LIBUTIL)

	$(QUIET_AR)$(AR) rcs $@ $^



$(CLI_APIENC): $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(OBJS_CLI_APIENC)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC) -L. -livasutil -livasenc -livascom -livasdebug $(LDLIBS) -o $(CLI_APIENC)

$(CLI_APIENC): $(OBJS_CLI_APIENC) $(LIB_LIBENC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC) -L. -livasenc -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC)



$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIDEC)



$(CLI_APIDEC): $(LIB_LIBDEC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(OBJS_CLI_APIDEC)

	$(QUIET_LINK)$(CC) $(OBJS_CLI_APIDEC) $(LDFLAGS) -L. -livasutil -livasdec -livascom -livasdebug $(LDLIBS) -o $(CLI_APIDEC)

$(CLI_APIREND): $(OBJS_CLI_APPREND) $(LIB_LIBREND) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LIBDEC)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -livasdec -livasutil -livasdebug -livascom $(LDLIBS) -o $(CLI_APIREND)



$(CLI_UTESTS_CREND): $(LIB_LIBDEC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBENC) $(LIB_LIBUTIL) $(OBJS_CLI_UTESTS_CREND)

	$(QUIET_LINK)$(CC) $(OBJS_CLI_UTESTS_CREND) $(LDFLAGS) -L. -livasutil -livasdec -livascom -livasdebug $(LDLIBS) -o $(UTESTS_CREND_DIR)/$(CLI_UTESTS_CREND)

$(CLI_UTESTS_CREND): $(OBJS_CLI_UTESTS_CREND) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_UTESTS_CREND) -L. -livasdec -livascom -livasutil -livasdebug $(LDLIBS) -o $(UTESTS_CREND_DIR)/$(CLI_UTESTS_CREND)



unittests: $(CLI_UTESTS_CREND)



libs: $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBUTIL)

libs: $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBREND) $(LIB_LIBUTIL)



clean: clean_unittests

	$(QUIET)$(RM) $(OBJS_LIBENC) $(OBJS_LIBDEC) $(DEPS)

	$(QUIET)$(RM) $(DEPS:.P=.d)

	$(QUIET)test ! -d $(OBJDIR) || rm -rf $(OBJDIR)

	$(QUIET)$(RM) $(CLI_APIENC) $(CLI_APIDEC) $(CLI_PRD) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBUTIL)

	$(QUIET)$(RM) $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBUTIL) $(LIB_LIBREND)



clean_unittests:

	$(QUIET)$(RM) $(OBJS_UTESTS)

Workspace_msvc/Workspace_msvc.sln

+22 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_enc", "lib_enc.vcxproj" 
EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_com", "lib_com.vcxproj", "{39EC200D-7795-4FF8-B214-B24EDA5526AE}"

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_rend", "lib_rend.vcxproj", "{718DE063-A18B-BB72-9150-62B892E6FFA6}"

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_util", "lib_util.vcxproj", "{2FA8F384-0775-F3B7-F8C3-85209222FC70}"

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_debug", "lib_debug.vcxproj", "{54509728-928B-44D9-A118-A6F92F08B34F}"
@@ -16,6 +18,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decoder", "decoder.vcxproj" 
EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encoder", "encoder.vcxproj", "{B3FC9DFC-7268-8660-7C0D-B60BAF02C554}"

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer.vcxproj", "{12B4C8A5-1E06-4E30-B443-D1F916F52B47}"

EndProject

Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{51160D4C-55C9-4C16-A792-D94507225746}"

	ProjectSection(SolutionItems) = preProject

		..\.clang-format = ..\.clang-format
@@ -60,6 +64,15 @@ Global 
		{39EC200D-7795-4FF8-B214-B24EDA5526AE}.Unittests|Win32.ActiveCfg = Unittests|Win32

		{39EC200D-7795-4FF8-B214-B24EDA5526AE}.Unittests|Win32.Build.0 = Unittests|Win32

		{39EC200D-7795-4FF8-B214-B24EDA5526AE}.Unittests|x64.ActiveCfg = Unittests|Win32

		{718DE063-A18B-BB72-9150-62B892E6FFA6}.Debug|Win32.ActiveCfg = Debug|Win32

		{718DE063-A18B-BB72-9150-62B892E6FFA6}.Debug|Win32.Build.0 = Debug|Win32

		{718DE063-A18B-BB72-9150-62B892E6FFA6}.Debug|x64.ActiveCfg = Debug|Win32

		{718DE063-A18B-BB72-9150-62B892E6FFA6}.Release|Win32.ActiveCfg = Release|Win32

		{718DE063-A18B-BB72-9150-62B892E6FFA6}.Release|Win32.Build.0 = Release|Win32

		{718DE063-A18B-BB72-9150-62B892E6FFA6}.Release|x64.ActiveCfg = Release|Win32

		{718DE063-A18B-BB72-9150-62B892E6FFA6}.Unittests|Win32.ActiveCfg = Unittests|Win32

		{718DE063-A18B-BB72-9150-62B892E6FFA6}.Unittests|Win32.Build.0 = Unittests|Win32

		{718DE063-A18B-BB72-9150-62B892E6FFA6}.Unittests|x64.ActiveCfg = Release|Win32

		{2FA8F384-0775-F3B7-F8C3-85209222FC70}.Debug|Win32.ActiveCfg = Debug|Win32

		{2FA8F384-0775-F3B7-F8C3-85209222FC70}.Debug|Win32.Build.0 = Debug|Win32

		{2FA8F384-0775-F3B7-F8C3-85209222FC70}.Debug|x64.ActiveCfg = Debug|Win32
@@ -96,6 +109,15 @@ Global 
		{B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Unittests|Win32.ActiveCfg = Unittests|Win32

		{B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Unittests|Win32.Build.0 = Unittests|Win32

		{B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Unittests|x64.ActiveCfg = Unittests|Win32

		{12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Debug|Win32.ActiveCfg = Debug|Win32

		{12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Debug|Win32.Build.0 = Debug|Win32

		{12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Debug|x64.ActiveCfg = Debug|Win32

		{12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Release|Win32.ActiveCfg = Release|Win32

		{12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Release|Win32.Build.0 = Release|Win32

		{12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Release|x64.ActiveCfg = Release|Win32

		{12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Unittests|Win32.ActiveCfg = Unittests|Win32

		{12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Unittests|Win32.Build.0 = Unittests|Win32

		{12B4C8A5-1E06-4E30-B443-D1F916F52B47}.Unittests|x64.ActiveCfg = Release|Win32

		{32354377-ACA7-40F9-9A0E-87FC956F0B78}.Debug|Win32.ActiveCfg = Debug|Win32

		{32354377-ACA7-40F9-9A0E-87FC956F0B78}.Debug|x64.ActiveCfg = Debug|Win32

		{32354377-ACA7-40F9-9A0E-87FC956F0B78}.Release|Win32.ActiveCfg = Release|Win32