Skip to content
Commits on Source (725)
625 additional commits have been omitted to prevent performance issues.
Expand all Show whitespace changes
Inline Side-by-side
.gitignore
View file @ e8e1bfb6
......@@ -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,8 +47,15 @@ scripts/ref/
scripts/test/
scripts/out/
scripts/self_test_summary.txt
tests/renderer/cut
tests/renderer/ref
tests/dut
tests/ref
# Python files that pop up when running scripts
__pycache__/
*.py[cod]
*$py.class
#history
.history/
.gitlab-ci.yml
View file @ e8e1bfb6
This diff is collapsed.
CMakeLists.txt
View file @ e8e1bfb6
......@@ -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_com lib_debug)
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
View file @ e8e1bfb6
......@@ -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)
$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -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
View file @ e8e1bfb6
......@@ -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
......
Workspace_msvc/lib_com.vcxproj
View file @ e8e1bfb6
......@@ -78,7 +78,7 @@
</CustomBuildStep>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling />
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
......@@ -109,7 +109,7 @@
</CustomBuildStep>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
......@@ -147,7 +147,7 @@
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling />
......
Workspace_msvc/lib_debug.vcxproj
View file @ e8e1bfb6
......@@ -73,7 +73,7 @@
</CustomBuildStep>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling />
......@@ -97,7 +97,7 @@
</CustomBuildStep>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>
......@@ -124,7 +124,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling />
......
Workspace_msvc/lib_dec.vcxproj
View file @ e8e1bfb6
......@@ -89,7 +89,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling />
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
......@@ -126,7 +126,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
......@@ -169,7 +169,7 @@
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling />
......@@ -264,12 +264,9 @@
<ClCompile Include="..\lib_dec\init_dec.c" />
<ClCompile Include="..\lib_dec\inov_dec.c" />
<ClCompile Include="..\lib_dec\ivas_agc_dec.c" />
<ClCompile Include="..\lib_dec\ivas_allrad_dec.c" />
<ClCompile Include="..\lib_dec\ivas_binauralRenderer.c" />
<ClCompile Include="..\lib_dec\ivas_binaural_reverb.c" />
<ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig.c" />
<ClCompile Include="..\lib_dec\ivas_core_dec.c" />
<ClCompile Include="..\lib_dec\ivas_cpe_dec.c" />
<ClCompile Include="..\lib_dec\ivas_crend.c" />
<ClCompile Include="..\lib_dec\ivas_dec.c" />
<ClCompile Include="..\lib_dec\ivas_decision_matrix_dec.c" />
<ClCompile Include="..\lib_dec\ivas_dirac_dec.c" />
......@@ -278,17 +275,13 @@
<ClCompile Include="..\lib_dec\ivas_dirac_onsets_dec.c" />
<ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov.c" />
<ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_dec.c" />
<ClCompile Include="..\lib_dec\ivas_efap.c" />
<ClCompile Include="..\lib_dec\ivas_entropy_decoder.c" />
<ClCompile Include="..\lib_dec\ivas_hrtf.c" />
<ClCompile Include="..\lib_dec\ivas_init_dec.c" />
<ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c" />
<ClCompile Include="..\lib_dec\ivas_ism_param_dec.c" />
<ClCompile Include="..\lib_dec\ivas_ism_renderer.c" />
<ClCompile Include="..\lib_dec\ivas_lfe_dec.c" />
<ClCompile Include="..\lib_dec\ivas_lfe_plc.c" />
<ClCompile Include="..\lib_dec\ivas_limiter.c" />
<ClCompile Include="..\lib_dec\ivas_ls_custom_dec.c" />
<ClCompile Include="..\lib_dec\ivas_masa_dec.c" />
<ClCompile Include="..\lib_dec\ivas_mct_core_dec.c" />
<ClCompile Include="..\lib_dec\ivas_mct_dec.c" />
......@@ -296,35 +289,15 @@
<ClCompile Include="..\lib_dec\ivas_mc_param_dec.c" />
<ClCompile Include="..\lib_dec\ivas_mdct_core_dec.c" />
<ClCompile Include="..\lib_dec\ivas_mono_dmx_renderer.c" />
<ClCompile Include="..\lib_dec\ivas_objectRenderer.c" />
<ClCompile Include="..\lib_dec\ivas_objectRenderer_hrFilt.c" />
<ClCompile Include="..\lib_dec\ivas_objectRenderer_mix.c" />
<ClCompile Include="..\lib_dec\ivas_objectRenderer_sfx.c" />
<ClCompile Include="..\lib_dec\ivas_objectRenderer_sources.c" />
<ClCompile Include="..\lib_dec\ivas_objectRenderer_vec.c" />
<ClCompile Include="..\lib_dec\ivas_orient_trk.c" />
<ClCompile Include="..\lib_dec\ivas_output_init.c" />
<ClCompile Include="..\lib_dec\ivas_out_setup_conversion.c" />
<ClCompile Include="..\lib_dec\ivas_pca_dec.c" />
<ClCompile Include="..\lib_dec\ivas_post_proc.c" />
<ClCompile Include="..\lib_dec\ivas_range_uni_dec.c" />
<ClCompile Include="..\lib_dec\ivas_render_config.c" />
<ClCompile Include="..\lib_dec\ivas_reverb.c" />
<ClCompile Include="..\lib_dec\ivas_reverb_delay_line.c" />
<ClCompile Include="..\lib_dec\ivas_reverb_fft_filter.c" />
<ClCompile Include="..\lib_dec\ivas_reverb_filter_design.c" />
<ClCompile Include="..\lib_dec\ivas_reverb_iir_filter.c" />
<ClCompile Include="..\lib_dec\ivas_reverb_utils.c" />
<ClCompile Include="..\lib_dec\ivas_rom_binauralRenderer.c" />
<ClCompile Include="..\lib_dec\ivas_qmetadata_dec.c" />
<ClCompile Include="..\lib_dec\ivas_qspherical_dec.c" />
<ClCompile Include="..\lib_dec\ivas_rom_binaural_crend_head.c" />
<ClCompile Include="..\lib_dec\ivas_rom_dec.c" />
<ClCompile Include="..\lib_dec\ivas_rom_TdBinauralRenderer.c" />
<ClCompile Include="..\lib_dec\ivas_rotation.c" />
<ClCompile Include="..\lib_dec\ivas_sba_dec.c" />
<ClCompile Include="..\lib_dec\ivas_sba_dirac_stereo_dec.c" />
<ClCompile Include="..\lib_dec\ivas_sba_rendering.c" />
<ClCompile Include="..\lib_dec\ivas_sce_dec.c" />
<ClCompile Include="..\lib_dec\ivas_spar_decoder.c" />
<ClCompile Include="..\lib_dec\ivas_spar_md_dec.c" />
......@@ -392,10 +365,7 @@
<ClCompile Include="..\lib_dec\ivas_sns_dec.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\lib_dec\ivas_rom_binauralRenderer.h" />
<ClInclude Include="..\lib_dec\ivas_rom_binaural_crend_head.h" />
<ClInclude Include="..\lib_dec\ivas_rom_dec.h" />
<ClInclude Include="..\lib_dec\ivas_rom_TdBinauralRenderer.h" />
<ClInclude Include="..\lib_dec\ivas_stat_dec.h" />
<ClInclude Include="..\lib_dec\jbm_jb4sb.h" />
<ClInclude Include="..\lib_dec\jbm_jb4_circularbuffer.h" />
......@@ -418,6 +388,10 @@
<Project>{54509728-928b-44d9-a118-a6f92f08b34f}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="lib_rend.vcxproj">
<Project>{718DE063-A18B-BB72-9150-62B892E6FFA6}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
......
Workspace_msvc/lib_dec.vcxproj.filters
View file @ e8e1bfb6
......@@ -28,24 +28,6 @@
<ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_dec.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_objectRenderer.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_objectRenderer_hrfilt.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_objectRenderer_mix.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_objectRenderer_sfx.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_objectRenderer_sources.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_objectRenderer_vec.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_rom_dec.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
......@@ -406,24 +388,9 @@
<ClCompile Include="..\lib_dec\ivas_ism_renderer.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_limiter.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_output_init.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_init_dec.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_binaural_reverb.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_binauralRenderer.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_rom_binauralRenderer.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_qmetadata_dec.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
......@@ -448,15 +415,9 @@
<ClCompile Include="..\lib_dec\ivas_svd_dec.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_rotation.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_sba_dirac_stereo_dec.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_efap.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_ism_param_dec.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
......@@ -512,42 +473,21 @@
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\lib_dec.c" />
<ClCompile Include="..\lib_dec\ivas_rom_TdBinauralRenderer.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_allrad_dec.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_ls_custom_dec.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_agc_dec.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_crend.c">
<ClCompile Include="..\lib_dec\ivas_spar_foa_md_dec.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_td_decorr.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_reverb_filter_design.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_reverb_iir_filter.c">
<ClCompile Include="..\lib_dec\ivas_spar_foa_dec.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_pca_dec.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_reverb.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_reverb_delay_line.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_reverb_fft_filter.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_lfe_plc.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
......@@ -560,25 +500,10 @@
<ClCompile Include="..\lib_dec\ivas_spar_decoder.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_rom_binaural_crend_head.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_hrtf.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_orient_trk.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_reverb_utils.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_render_config.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_sba_rendering.c">
<ClCompile Include="..\lib_dec\ivas_spar_md_dec.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_dec\ivas_spar_md_dec.c">
<ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig.c">
<Filter>dec_ivas_c</Filter>
</ClCompile>
</ItemGroup>
......@@ -595,9 +520,6 @@
<ClInclude Include="..\lib_dec\ivas_rom_dec.h">
<Filter>dec_h</Filter>
</ClInclude>
<ClInclude Include="..\lib_dec\ivas_rom_binauralRenderer.h">
<Filter>dec_h</Filter>
</ClInclude>
<ClInclude Include="..\lib_dec\jbm_jb4_jmf.h">
<Filter>dec_h</Filter>
</ClInclude>
......@@ -623,12 +545,6 @@
<Filter>dec_h</Filter>
</ClInclude>
<ClInclude Include="..\lib_dec\lib_dec.h" />
<ClInclude Include="..\lib_dec\ivas_rom_TdBinauralRenderer.h">
<Filter>dec_h</Filter>
</ClInclude>
<ClInclude Include="..\lib_dec\ivas_rom_binaural_crend_head.h">
<Filter>dec_h</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<Filter Include="dec_all_c">
......
Workspace_msvc/lib_enc.vcxproj
View file @ e8e1bfb6
......@@ -89,7 +89,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling />
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
......@@ -129,7 +129,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
......@@ -176,7 +176,7 @@
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling />
......@@ -206,6 +206,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\lib_enc\ivas_agc_enc.c" />
<ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig.c" />
<ClCompile Include="..\lib_enc\ivas_core_pre_proc.c" />
<ClCompile Include="..\lib_enc\ivas_core_pre_proc_front.c" />
<ClCompile Include="..\lib_enc\ivas_enc_cov_handler.c" />
......
Workspace_msvc/lib_enc.vcxproj.filters
View file @ e8e1bfb6
......@@ -581,6 +581,9 @@
<ClCompile Include="..\lib_enc\ivas_spar_md_enc.c">
<Filter>enc_ivas_c</Filter>
</ClCompile>
<ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig.c">
<Filter>enc_ivas_c</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\lib_enc\ivas_stat_enc.h">
......
Workspace_msvc/lib_rend.vcxproj 0 → 100644
View file @ e8e1bfb6
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Unittests|Win32">
<Configuration>Unittests</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>lib_rend</ProjectName>
<ProjectGuid>{718DE063-A18B-BB72-9150-62B892E6FFA6}</ProjectGuid>
<RootNamespace>evs_dec</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unittests|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unittests|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>15.0.27428.2015</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>.\Debug_$(ProjectName)\</OutDir>
<IntDir>.\Debug_$(ProjectName)\</IntDir>
<LinkIncremental>false</LinkIncremental>
<GenerateManifest>false</GenerateManifest>
<TargetName>libivasrend</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unittests|Win32'">
<OutDir>.\Debug_$(ProjectName)\</OutDir>
<IntDir>.\Debug_$(ProjectName)\</IntDir>
<LinkIncremental>false</LinkIncremental>
<GenerateManifest>false</GenerateManifest>
<TargetName>libivasrend</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>.\Release_$(ProjectName)\</OutDir>
<IntDir>.\Release_$(ProjectName)\</IntDir>
<LinkIncremental>false</LinkIncremental>
<GenerateManifest>false</GenerateManifest>
<TargetName>libivasrend</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<CustomBuildStep>
<Message />
</CustomBuildStep>
<Midl>
<TypeLibraryName>.\Debug\$(ProjectName).tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling />
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeader />
<PrecompiledHeaderOutputFile />
<ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0c0c</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>WS2_32.lib; %(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unittests|Win32'">
<CustomBuildStep>
<Message>
</Message>
</CustomBuildStep>
<Midl>
<TypeLibraryName>.\Debug\$(ProjectName).tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0c0c</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>WS2_32.lib; %(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<CustomBuildStep>
<Message />
</CustomBuildStep>
<Midl>
<TypeLibraryName>$(IntDir)$(ProjectName).tlb</TypeLibraryName>
<HeaderFileName />
</Midl>
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions>
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling />
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeader />
<PrecompiledHeaderOutputFile />
<ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat />
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0c0c</Culture>
</ResourceCompile>
<Lib>
<AdditionalDependencies>WS2_32.lib; %(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).lib</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\lib_rend\ivas_sba_rendering.c" />
<ClCompile Include="..\lib_rend\ivas_allrad_dec.c" />
<ClCompile Include="..\lib_rend\ivas_binauralRenderer.c" />
<ClCompile Include="..\lib_rend\ivas_binaural_reverb.c" />
<ClCompile Include="..\lib_rend\ivas_crend.c" />
<ClCompile Include="..\lib_rend\ivas_efap.c" />
<ClCompile Include="..\lib_rend\ivas_hrtf.c" />
<ClCompile Include="..\lib_rend\ivas_limiter.c" />
<ClCompile Include="..\lib_rend\ivas_ls_custom_dec.c" />
<ClCompile Include="..\lib_rend\ivas_objectRenderer.c" />
<ClCompile Include="..\lib_rend\ivas_objectRenderer_hrFilt.c" />
<ClCompile Include="..\lib_rend\ivas_objectRenderer_mix.c" />
<ClCompile Include="..\lib_rend\ivas_objectRenderer_sfx.c" />
<ClCompile Include="..\lib_rend\ivas_objectRenderer_sources.c" />
<ClCompile Include="..\lib_rend\ivas_objectRenderer_vec.c" />
<ClCompile Include="..\lib_rend\ivas_orient_trk.c" />
<ClCompile Include="..\lib_rend\ivas_output_init.c" />
<ClCompile Include="..\lib_rend\ivas_render_config.c" />
<ClCompile Include="..\lib_rend\ivas_reverb.c" />
<ClCompile Include="..\lib_rend\ivas_reverb_delay_line.c" />
<ClCompile Include="..\lib_rend\ivas_reverb_fft_filter.c" />
<ClCompile Include="..\lib_rend\ivas_reverb_filter_design.c" />
<ClCompile Include="..\lib_rend\ivas_reverb_iir_filter.c" />
<ClCompile Include="..\lib_rend\ivas_reverb_utils.c" />
<ClCompile Include="..\lib_rend\ivas_rom_binauralRenderer.c" />
<ClCompile Include="..\lib_rend\ivas_rom_TdBinauralRenderer.c" />
<ClCompile Include="..\lib_rend\ivas_rom_binaural_crend_head.c" />
<ClCompile Include="..\lib_rend\ivas_rotation.c" />
<ClCompile Include="..\lib_rend\ivas_rom_rend.c" />
<ClCompile Include="..\lib_rend\lib_rend.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\lib_rend\ivas_lib_rend_internal.h" />
<ClInclude Include="..\lib_rend\ivas_rom_binauralRenderer.h" />
<ClInclude Include="..\lib_rend\ivas_rom_binaural_crend_head.h" />
<ClInclude Include="..\lib_rend\ivas_rom_rend.h" />
<ClInclude Include="..\lib_rend\ivas_rom_TdBinauralRenderer.h" />
<ClInclude Include="..\lib_rend\ivas_stat_rend.h" />
<ClInclude Include="..\lib_rend\lib_rend.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="lib_com.vcxproj">
<Project>{39ec200d-7795-4ff8-b214-b24eda5526ae}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="lib_debug.vcxproj">
<Project>{54509728-928b-44d9-a118-a6f92f08b34f}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
<ProjectExtensions>
<VisualStudio>
<UserProperties DevPartner_IsInstrumented="0" />
</VisualStudio>
</ProjectExtensions>
</Project>
\ No newline at end of file
Workspace_msvc/lib_util.vcxproj
View file @ e8e1bfb6
......@@ -73,7 +73,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling />
......@@ -93,7 +93,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unittests|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild>
<ExceptionHandling>
......@@ -117,7 +117,7 @@
<InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
<IntrinsicFunctions>false</IntrinsicFunctions>
<WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling />
......@@ -141,6 +141,7 @@
<ClCompile Include="..\lib_util\audio_file_writer.c" />
<ClCompile Include="..\lib_util\bitstream_reader.c" />
<ClCompile Include="..\lib_util\bitstream_writer.c" />
<ClCompile Include="..\lib_util\cmdln_parser.c" />
<ClCompile Include="..\lib_util\cmdl_tools.c" />
<ClCompile Include="..\lib_util\evs_rtp_payload.c" />
<ClCompile Include="..\lib_util\g192.c" />
......@@ -162,6 +163,7 @@
<ClInclude Include="..\lib_util\audio_file_writer.h" />
<ClInclude Include="..\lib_util\bitstream_reader.h" />
<ClInclude Include="..\lib_util\bitstream_writer.h" />
<ClInclude Include="..\lib_util\cmdln_parser.h" />
<ClInclude Include="..\lib_util\cmdl_tools.h" />
<ClInclude Include="..\lib_util\evs_rtp_payload.h" />
<ClInclude Include="..\lib_util\g192.h" />
......
scripts/prerenderer/Workspace_msvc/prerenderer.vcxproj → Workspace_msvc/renderer.vcxproj
View file @ e8e1bfb6
......@@ -9,11 +9,15 @@
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Unittests|Win32">
<Configuration>Unittests</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>prerenderer</ProjectName>
<ProjectGuid>{12b4c8a5-1e06-4e30-b443-d1f916f52b47}</ProjectGuid>
<RootNamespace>prerenderer</RootNamespace>
<ProjectName>renderer</ProjectName>
<ProjectGuid>{12B4C8A5-1E06-4E30-B443-D1F916F52B47}</ProjectGuid>
<RootNamespace>renderer</RootNamespace>
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
......@@ -23,6 +27,12 @@
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unittests|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<PlatformToolset>v141</PlatformToolset>
......@@ -34,27 +44,40 @@
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Unittests|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>15.0.27428.2015</_ProjectFileVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<OutDir>..</OutDir>
<OutDir>..\</OutDir>
<IntDir>.\Debug_$(ProjectName)\</IntDir>
<LinkIncremental>false</LinkIncremental>
<GenerateManifest>false</GenerateManifest>
<TargetName>IVAS_rend</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unittests|Win32'">
<OutDir>..\</OutDir>
<IntDir>.\Debug_$(ProjectName)\</IntDir>
<LinkIncremental>false</LinkIncremental>
<GenerateManifest>false</GenerateManifest>
<TargetName>IVAS_prerenderer</TargetName>
<TargetName>IVAS_rend</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<OutDir>..</OutDir>
<OutDir>..\</OutDir>
<IntDir>.\Release_$(ProjectName)\</IntDir>
<LinkIncremental>false</LinkIncremental>
<GenerateManifest>false</GenerateManifest>
<TargetName>IVAS_prerenderer</TargetName>
<TargetName>IVAS_rend</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Midl>
......@@ -63,8 +86,8 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\..\..\lib_com;..\..\..\lib_debug;..\..\..\lib_dec;..\..\..\lib_enc;..\..\..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling />
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
......@@ -76,7 +99,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
......@@ -87,16 +110,64 @@
<OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ManifestFile />
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<OptimizeReferences />
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unittests|Win32'">
<CustomBuildStep>
<Message>
</Message>
</CustomBuildStep>
<Midl>
<TypeLibraryName>$(IntDir)$(ProjectName).tlb</TypeLibraryName>
<HeaderFileName>
</HeaderFileName>
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeader>
</PrecompiledHeader>
<PrecompiledHeaderOutputFile>
</PrecompiledHeaderOutputFile>
<ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
<WarningLevel>Level4</WarningLevel>
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Culture>0x0c0c</Culture>
</ResourceCompile>
<Link>
<AdditionalDependencies>
</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ManifestFile>
</ManifestFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
<SubSystem>Console</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
<TypeLibraryName>$(IntDir)$(ProjectName).tlb</TypeLibraryName>
......@@ -109,8 +180,8 @@
<FavorSizeOrSpeed>Neither</FavorSizeOrSpeed>
<OmitFramePointers>false</OmitFramePointers>
<EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>
<AdditionalIncludeDirectories>..\..\..\lib_com;..\..\..\lib_debug;..\..\..\lib_dec;..\..\..\lib_enc;..\..\..\lib_util;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_util;..\lib_rend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling />
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
......@@ -125,7 +196,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<DebugInformationFormat />
<CompileAs>Default</CompileAs>
<DisableSpecificWarnings>4100;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
......@@ -141,43 +212,30 @@
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention />
<TargetMachine>MachineX86</TargetMachine>
<IgnoreSpecificDefaultLibraries>libcmtd.lib</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Workspace_msvc\lib_debug.vcxproj">
<ClCompile Include="..\apps\renderer.c" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="lib_debug.vcxproj">
<Project>{54509728-928B-44D9-A118-A6F92F08B34F}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\Workspace_msvc\lib_util.vcxproj">
<ProjectReference Include="lib_util.vcxproj">
<Project>{2FA8F384-0775-F3B7-F8C3-85209222FC70}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\Workspace_msvc\lib_com.vcxproj">
<ProjectReference Include="lib_com.vcxproj">
<Project>{39ec200d-7795-4ff8-b214-b24eda5526ae}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\Workspace_msvc\lib_dec.vcxproj">
<Project>{E822DDAF-0F5F-4CD0-A694-38AE69DE74D3}</Project>
<ProjectReference Include="lib_rend.vcxproj">
<Project>{718DE063-A18B-BB72-9150-62B892E6FFA6}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\prerenderer.c" />
<ClCompile Include="..\..\..\lib_dec\ivas_allrad_dec.c" />
<ClCompile Include="..\..\..\lib_dec\ivas_efap.c" />
<ClCompile Include="..\..\..\lib_dec\ivas_dirac_output_synthesis_dec.c" />
<ClCompile Include="..\..\..\lib_dec\ivas_ls_custom_dec.c" />
<ClCompile Include="..\..\..\lib_dec\ivas_vbap.c" />
<ClCompile Include="..\..\..\lib_dec\ivas_rom_dec.c" />
<ClCompile Include="..\..\..\lib_dec\ivas_limiter.c" />
<ClCompile Include="..\..\..\lib_enc\ivas_ism_metadata_enc.c" />
<ClCompile Include="..\..\..\lib_util\ivas_prerenderer.c" />
<ClCompile Include="..\..\..\lib_util\ivas_rom_prerenderer.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\lib_util\ivas_prerenderer.h" />
<ClInclude Include="..\..\..\lib_util\ivas_rom_prerenderer.h" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
......
apps/decoder.c
View file @ e8e1bfb6
......@@ -71,10 +71,14 @@ static
int32_t frame = 0; /* Counter of frames */
#define MIN_NUM_BITS_ACTIVE_FRAME 56
#ifdef REMOVE_SID_HARM_LEFTOVERS
#define NUM_BITS_SID_IVAS_5K2 104
#else
#define NUM_BITS_SID_IVAS_4K4 88
#define NUM_BITS_SID_IVAS_7K8 156
#define NUM_BITS_SID_IVAS_9K3 186
#define NUM_BITS_SID_IVAS_10K2 204
#endif
#define META_LINE_LENGTH 200
#define MAX_FRAME_SIZE ( 48000 / 50 )
#define MAX_NUM_OUTPUT_CHANNELS 16
......@@ -105,20 +109,22 @@ typedef struct
bool hrtfReaderEnabled;
char *hrtfFileName;
IVAS_DEC_INPUT_FORMAT inputFormat;
#ifdef DEBUGGING
bool forceSubframeBinauralization;
IVAS_DEC_FORCED_REND_MODE forcedRendMode;
#endif
bool customLsOutputEnabled;
char *customLsSetupFilename;
int16_t orientation_tracking;
float no_diegetic_pan;
bool renderConfigEnabled;
char *renderConfigFilename;
#ifdef DEBUGGING
bool forceSubframeBinauralization;
IVAS_DEC_FORCED_REND_MODE forcedRendMode;
#ifdef DEBUG_FOA_AGC
FILE *agcBitstream; /* temporary */
#endif
#endif
} DecArguments;
......@@ -128,12 +134,10 @@ typedef struct
static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg );
static void usage_dec( void );
#ifdef DEBUGGING
static int16_t app_own_random( int16_t *seed );
#endif
static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, HeadRotFileReader *headRotReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );
static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );
#ifdef DEBUGGING
static int16_t app_own_random( int16_t *seed );
static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( char *forcedRendModeChar );
#endif
......@@ -350,7 +354,11 @@ int main(
fprintf( stderr, "\nError: input bitstream file %s couldn't be read\n\n", arg.inputBitstreamFilename );
goto cleanup;
}
#ifdef REMOVE_SID_HARM_LEFTOVERS
} while ( bfi || num_bits < MIN_NUM_BITS_ACTIVE_FRAME || num_bits == NUM_BITS_SID_IVAS_5K2 );
#else
} while ( bfi || num_bits < MIN_NUM_BITS_ACTIVE_FRAME || num_bits == NUM_BITS_SID_IVAS_4K4 || num_bits == NUM_BITS_SID_IVAS_7K8 || num_bits == NUM_BITS_SID_IVAS_9K3 || num_bits == NUM_BITS_SID_IVAS_10K2 );
#endif
BS_Reader_Rewind( hBsReader );
......@@ -427,25 +435,25 @@ int main(
/* sanity check */
if ( arg.outputFormat != IVAS_DEC_OUTPUT_BINAURAL_ROOM )
{
fprintf( stderr, "\nExternal Renderer Config is supported only when BINAURAL_ROOM is used as output. Exiting. \n" );
fprintf( stderr, "\nExternal Renderer Config is supported only when BINAURAL_ROOM is used as output. Exiting. \n\n" );
goto cleanup;
}
if ( ( error = IVAS_DEC_GetRenderConfig( hIvasDec, &renderConfig ) ) != IVAS_ERR_OK )
{
fprintf( stderr, "\nIVAS_DEC_GetRenderConfig failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
fprintf( stderr, "\nIVAS_DEC_GetRenderConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
goto cleanup;
}
if ( RenderConfigReader_read( renderConfigReader, &renderConfig ) != IVAS_ERR_OK )
{
fprintf( stderr, "Failed to read renderer configuration from file %s\n", arg.renderConfigFilename );
fprintf( stderr, "Failed to read renderer configuration from file %s\n\n", arg.renderConfigFilename );
goto cleanup;
}
if ( ( error = IVAS_DEC_FeedRenderConfig( hIvasDec, renderConfig ) ) != IVAS_ERR_OK )
{
fprintf( stderr, "\nIVAS_DEC_FeedRenderConfig failed: %s\n", IVAS_DEC_GetErrorMessage( error ) );
fprintf( stderr, "\nIVAS_DEC_FeedRenderConfig failed: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );
goto cleanup;
}
}
......@@ -582,10 +590,10 @@ cleanup:
printf( "\n" );
}
#ifdef DEBUGGING
#ifdef DEBUG_SBA_AUDIO_DUMP
ivas_close_sba_decoder_debug_files( arg.output_Fs, numOutChannels, numTransportChannels, pca_ingest_channels );
#endif
#ifdef DEBUGGING
dbgclose();
#endif
......@@ -689,6 +697,9 @@ static bool parseCmdlIVAS_dec(
arg->forcedRendMode = IVAS_DEC_FORCE_REND_UNFORCED;
arg->forceSubframeBinauralization = false;
#ifdef DEBUG_FOA_AGC
arg->agcBitstream = NULL;
#endif
#endif
arg->output_Fs = 48000;
arg->outputFormat = IVAS_DEC_OUTPUT_MONO;
......@@ -720,9 +731,6 @@ static bool parseCmdlIVAS_dec(
arg->inputFormat = IVAS_DEC_INPUT_FORMAT_G192;
arg->no_diegetic_pan = 0.f;
#ifdef DEBUG_FOA_AGC
arg->agcBitstream = NULL;
#endif
/*-----------------------------------------------------------------*
* Initialization
......@@ -791,21 +799,6 @@ static bool parseCmdlIVAS_dec(
arg->jbmOffsetFilename = argv[i];
i++;
}
#ifdef DEBUGGING
else if ( strcmp( argv_to_upper, "-FEC" ) == 0 )
{
ftmp = 0.0f;
if ( sscanf( argv[i + 1], "%f", &ftmp ) != 1 )
{
arg->FEPatterFileName = argv[i + 1];
}
else
{
arg->FER = ftmp;
}
i += 2;
}
#endif
else if ( strcmp( argv_to_upper, "-Q" ) == 0 )
{
arg->quietModeEnabled = true;
......@@ -827,6 +820,19 @@ static bool parseCmdlIVAS_dec(
}
}
#ifdef DEBUGGING
else if ( strcmp( argv_to_upper, "-FEC" ) == 0 )
{
ftmp = 0.0f;
if ( sscanf( argv[i + 1], "%f", &ftmp ) != 1 )
{
arg->FEPatterFileName = argv[i + 1];
}
else
{
arg->FER = ftmp;
}
i += 2;
}
else if ( strcmp( argv_to_upper, "-FORCE" ) == 0 )
{
i++;
......@@ -837,6 +843,11 @@ static bool parseCmdlIVAS_dec(
i++;
}
}
else if ( strcmp( argv_to_upper, "-FORCE_SUBFRAME_BIN" ) == 0 ) /* Force binauralization to subframe (5 ms) resolution */
{
arg->forceSubframeBinauralization = true;
i++;
}
#ifdef DEBUG_MODE_INFO
#ifdef DEBUG_MODE_INFO_TWEAK
/*-----------------------------------------------------------------*
......@@ -948,13 +959,6 @@ static bool parseCmdlIVAS_dec(
}
i++;
}
#ifdef DEBUGGING
else if ( strcmp( argv_to_upper, "-FORCE_SUBFRAME_BIN" ) == 0 ) /* Force binauralization to subframe (5 ms) resolution */
{
arg->forceSubframeBinauralization = true;
i++;
}
#endif
/*-----------------------------------------------------------------*
* Option not recognized
......
apps/encoder.c
View file @ e8e1bfb6
......@@ -72,6 +72,7 @@ typedef union _EncInputFormatConfig
{
/* MONO details */
bool stereoToMonoDownmix;
#ifdef DEBUGGING
/* STEREO details */
IVAS_ENC_STEREO_MODE stereoMode;
......@@ -83,16 +84,20 @@ typedef union _EncInputFormatConfig
int16_t numObjects;
const char *metadataFiles[IVAS_MAX_NUM_OBJECTS];
} ism;
/* SBA details */
struct EncSbaConfig
{
IVAS_ENC_SBA_ORDER order;
bool isPlanar;
} sba;
/* MASA details */
IVAS_ENC_MASA_VARIANT masaVariant;
/* MC details */
IVAS_ENC_MC_LAYOUT mcLayout;
} EncInputFormatConfig;
/* Struct for storing cmdln arguments */
......@@ -112,22 +117,24 @@ typedef struct
bool quietModeEnabled;
bool delayCompensationEnabled;
const char *masaMetadataFile;
#ifdef DEBUGGING
IVAS_ENC_FORCED_MODE forcedMode;
const char *forcedModeFile;
#endif
IVAS_ENC_CHANNEL_AWARE_CONFIG caConfig;
const char *ca_config_file;
bool mimeOutput;
bool agc;
bool pca;
#ifdef DEBUGGING
IVAS_ENC_FORCED_MODE forcedMode;
const char *forcedModeFile;
#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
IVAS_ENC_AGC agc;
#endif
#ifdef DEBUG_FOA_AGC
FILE *agcBitstream; /* temporary */
#endif
#ifdef DEBUG_SBA
const char *dbg_file_tag;
#endif
#endif
bool pca;
} EncArguments;
......@@ -212,17 +219,13 @@ int main(
int16_t *pcmBuf = NULL;
#ifdef DEBUGGING
FILE *f_forcedModeProfile = NULL;
#endif
#ifdef DEBUG_SBA
int16_t numTransportChannels = 1;
#endif
#ifdef WMOPS
size_t SRAM_size = 0;
#endif
#ifdef WMOPS
size_t SRAM_size = 0;
reset_wmops();
reset_stack();
#endif
......@@ -262,12 +265,18 @@ int main(
/*------------------------------------------------------------------------------------------*
* Open input audio file
*------------------------------------------------------------------------------------------*/
if ( AudioFileReader_open( &audioReader, arg.inputWavFilename, arg.inputFs ) != IVAS_ERR_OK )
int32_t inFileSampleRate = 0;
if ( AudioFileReader_open( &audioReader, arg.inputWavFilename, &inFileSampleRate ) != IVAS_ERR_OK )
{
fprintf( stderr, "\nCan't open %s\n\n", arg.inputWavFilename );
goto cleanup;
}
if ( inFileSampleRate != 0 && /* inFileSampleRate will remain zero if input file is raw PCM */
inFileSampleRate != arg.inputFs )
{
fprintf( stderr, "Sampling rate mismatch: %d Hz requested, but %d Hz found in file %s\n", arg.inputFs, inFileSampleRate, arg.inputWavFilename );
goto cleanup;
}
/*------------------------------------------------------------------------------------------*
* Open output bitstream file
......@@ -440,11 +449,25 @@ int main(
}
break;
case IVAS_ENC_INPUT_SBA:
if ( ( error =
IVAS_ENC_ConfigureForAmbisonics(
hIvasEnc,
arg.inputFs,
totalBitrate,
arg.max_bwidth_user,
bandwidth,
arg.dtxConfig,
arg.inputFormatConfig.sba.order,
arg.inputFormatConfig.sba.isPlanar,
#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
arg.agc,
#endif
arg.pca
#ifdef DEBUG_SBA_AUDIO_DUMP
if ( ( error = IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar, arg.agc, arg.pca, &numTransportChannels ) ) != IVAS_ERR_OK )
#else
if ( ( error = IVAS_ENC_ConfigureForAmbisonics( hIvasEnc, arg.inputFs, totalBitrate, arg.max_bwidth_user, bandwidth, arg.dtxConfig, arg.inputFormatConfig.sba.order, arg.inputFormatConfig.sba.isPlanar, arg.agc, arg.pca ) ) != IVAS_ERR_OK )
,
&numTransportChannels
#endif
) ) != IVAS_ERR_OK )
{
fprintf( stderr, "\nIVAS_ENC_ConfigureForAmbisonics failed: %s\n\n", IVAS_ENC_GetErrorMessage( error ) );
goto cleanup;
......@@ -804,13 +827,6 @@ cleanup:
fclose( f_bitrateProfile );
}
#ifdef DEBUGGING
if ( f_forcedModeProfile )
{
fclose( f_forcedModeProfile );
}
#endif
IVAS_ENC_Close( &hIvasEnc );
#ifdef RAM_COUNTING_TOOL
......@@ -826,13 +842,18 @@ cleanup:
#ifdef DEBUGGING
dbgclose();
#endif
if ( f_forcedModeProfile )
{
fclose( f_forcedModeProfile );
}
#ifdef DEBUG_SBA
ivas_close_sba_encoder_debug_files();
#ifdef DEBUG_AGC
ivas_close_agc_debug_files();
#endif
#endif
#endif
return mainFailed ? -1 : 0;
......@@ -862,22 +883,24 @@ static void initArgStruct( EncArguments *arg )
arg->quietModeEnabled = false;
arg->delayCompensationEnabled = true;
arg->masaMetadataFile = NULL;
#ifdef DEBUGGING
arg->forcedMode = IVAS_ENC_FORCE_UNFORCED;
arg->forcedModeFile = NULL;
#endif
arg->caConfig = IVAS_ENC_GetDefaultChannelAwareConfig();
arg->ca_config_file = NULL;
arg->mimeOutput = false;
arg->agc = IVAS_DEFAULT_AGC;
arg->pca = false;
#ifdef DEBUGGING
arg->forcedMode = IVAS_ENC_FORCE_UNFORCED;
arg->forcedModeFile = NULL;
#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
arg->agc = IVAS_ENC_AGC_UNDEFINED;
#endif
#ifdef DEBUG_FOA_AGC
arg->agcBitstream = NULL;
#endif
#ifdef DEBUG_SBA
arg->dbg_file_tag = NULL;
#endif
#endif
arg->pca = false;
return;
}
......@@ -1039,6 +1062,54 @@ static bool parseCmdlIVAS_enc(
}
#endif /* #ifdef DEBUG_MODE_INFO_TWEAK */
#endif /* #ifdef DEBUG_MODE_INFO */
#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
/*-----------------------------------------------------------------*
* IVAS SPAR AGC option
*-----------------------------------------------------------------*/
else if ( strcmp( argv_to_upper, "-AGC" ) == 0 )
{
i++;
if ( i < argc - 4 )
{
arg->agc = ( atoi( argv[i] ) ) ? IVAS_ENC_AGC_ENABLED : IVAS_ENC_AGC_DISABLED;
if ( argv[i] == NULL || atoi( argv[i] ) < 0 || atoi( argv[i] ) > 1 )
{
fprintf( stderr, "Error: wrong adaptive gain control option specified (%d), expected 0 or 1\n\n", (int32_t) atoi( argv[i] ) );
usage_enc();
return false;
}
i++;
}
else
{
fprintf( stderr, "Error: unspecified adaptive gain control option\n\n" );
usage_enc();
return false;
}
}
#endif
#ifdef DEBUG_SBA
/*-----------------------------------------------------------------*
* IVAS SPAR debug files tag
*-----------------------------------------------------------------*/
else if ( strcmp( argv_to_upper, "-TAG" ) == 0 )
{
i++;
if ( i < argc - 4 )
{
arg->dbg_file_tag = argv[i];
++i;
}
else
{
fprintf( stderr, "Error: [IVAS SPAR Encoder] unspecified tag value \n\n" );
usage_enc();
return false;
}
}
#endif
#endif /* #ifdef DEBUGGING */
/*-----------------------------------------------------------------*
......@@ -1376,27 +1447,6 @@ static bool parseCmdlIVAS_enc(
arg->inputFormatConfig.stereoToMonoDownmix = true;
i++;
}
else if ( strcmp( argv_to_upper, "-AGC" ) == 0 )
{
i++;
if ( i < argc - 4 )
{
arg->agc = (int16_t) atoi( argv[i] );
if ( argv[i] == NULL || atoi( argv[i] ) < 0 || atoi( argv[i] ) > 1 )
{
fprintf( stderr, "Error: wrong adaptive gain control option specified (%d), expected 0 or 1\n\n", (int32_t) atoi( argv[i] ) );
usage_enc();
return false;
}
i++;
}
else
{
fprintf( stderr, "Error: unspecified adaptive gain control option\n\n" );
usage_enc();
return false;
}
}
else if ( strcmp( argv_to_upper, "-BYPASS" ) == 0 ) // VE: should be renamed to "-pca"
{
i++;
......@@ -1430,26 +1480,6 @@ static bool parseCmdlIVAS_enc(
return false;
}
}
#ifdef DEBUG_SBA
/*-----------------------------------------------------------------*
* IVAS SPAR debug files tag
*-----------------------------------------------------------------*/
else if ( strcmp( argv_to_upper, "-TAG" ) == 0 )
{
i++;
if ( i < argc - 4 )
{
arg->dbg_file_tag = argv[i];
++i;
}
else
{
fprintf( stderr, "Error: [IVAS SPAR Encoder] unspecified tag value \n\n" );
usage_enc();
return false;
}
}
#endif
/*-----------------------------------------------------------------*
* Option not recognized
......@@ -1633,14 +1663,18 @@ static void usage_enc( void )
fprintf( stdout, " The encoder produces TS26.445 Annex.2.6 Mime Storage Format, (not RFC4867 Mime Format).\n" );
fprintf( stdout, " default output bitstream file format is G.192\n" );
#ifdef DEBUG_SBA
fprintf( stdout, "-tag : Tag name for intermediate debug files\n" );
#endif
fprintf( stdout, "-agc op : SBA Adaptive gain control, op = (0, 1), by default op is 0 or deactivated\n" );
fprintf( stdout, "-bypass mode : SBA PCA by-pass, mode = (1, 2), 1 = PCA off, 2 = signal adaptive, default is 1\n" );
#ifdef DEBUGGING
fprintf( stdout, "-force T : Force specific mode, T = (speech, music, ACELP, GSC, TCX, HQ),\n" );
fprintf( stdout, " alternatively, T can be a text file where each line contains \"nb_frames T\"\n" );
#ifdef DEBUG_SBA
fprintf( stdout, "-tag : Tag name for intermediate debug files\n" );
#endif
#ifdef DEBUG_AGC_ENCODER_CMD_OPTION
fprintf( stdout, "-agc op : SBA Adaptive gain control, op = (0, 1). \n" );
fprintf( stdout, " By default op is 1 (activated) for bitrates between 24400 and 32000,\n" );
fprintf( stdout, " otherwise it is 0 (deactivated) for all other bitrates\n" );
#endif
#ifdef DEBUG_MODE_INFO
#ifdef DEBUG_MODE_INFO_TWEAK
fprintf( stdout, "-info <folder> : specify subfolder name for debug output\n" );
......
apps/renderer.c 0 → 100644
View file @ e8e1bfb6
This diff is collapsed.
ci/build_all_linux.sh
View file @ e8e1bfb6
......@@ -9,8 +9,6 @@ fi
make clean && make all -j
# build unittests
make unittests -j
# build prerenderer
make -C scripts/prerenderer -j
# build standalone TD object renderer
make -C scripts/td_object_renderer/object_renderer_standalone -j
ci/disable_ram_counting.py 0 → 100755
View file @ e8e1bfb6
import re
import os
FILE_PATH = os.path.join(os.path.dirname(__file__), "..", "lib_com", "options.h")
RE_TO_COMMENT_OUT = re.compile(r"#define\s+RAM_COUNTING_TOOL")
def main():
with open(FILE_PATH, "r", encoding="utf-8") as file:
lines = file.readlines()
for i, line in enumerate(lines):
lines[i] = RE_TO_COMMENT_OUT.sub(lambda x: f"/* {x.group(0)} */", line)
with open(FILE_PATH, "w", encoding="utf-8") as file:
file.writelines(lines)
if __name__ == "__main__":
main()
ci/run_scheduled_sanitizer_test.py
View file @ e8e1bfb6
......@@ -7,7 +7,7 @@ import pathlib
DURATION = "120"
CFG = "ci_linux.json"
CFG = "ci_linux_ltv.json"
SUPPORTED_TESTS = ["CLANG1", "CLANG2", "CLANG3", "VALGRIND"]
EP_FILE = "ep_015.g192"
GENPATT_CMD = f"gen-patt -tailstat -fer -g192 -gamma 0 -rate 0.15 -tol 0.001 -reset -n {int(DURATION) * 50} {EP_FILE}"
......@@ -32,16 +32,24 @@ def main(args):
def get_modes(in_format: str) -> list:
cmd = [SCRIPT_DIR.joinpath("runIvasCodec.py"), "-l"]
cmd = [
SCRIPT_DIR.joinpath("runIvasCodec.py"),
"-C",
"MC" if in_format in MC_MODES else in_format,
"-l"
]
list_process = subprocess.run(cmd, capture_output=True)
output = list_process.stdout.decode("utf8")
mode_list = output.splitlines()
# correction for multichannel modes to avoid selecting some mono modes...
if in_format in MC_MODES:
in_format = "MC_" + in_format
in_format = "MC_" + in_format + "_b"
mode_list = [m for m in mode_list if in_format in m]
return [m for m in output.splitlines() if in_format in m]
return mode_list
def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True):
......@@ -82,12 +90,20 @@ def run_check(modes: list, out_formats: list, tests: list, run_fec: bool = True)
subprocess.call(GENPATT_CMD.split())
# cleanup to avoid script errors
# we want "logs" and "dec" subfolders to be empty -> delete and recreate them
cleanup_folders = ["logs", "dec"]
# we want "logs" and "dec" subfolders to be empty -> delete "dec" and rename "log"
# to keep the log files from the first run with no frame losses
folders_to_delete = ["dec"]
folders_to_backup = ["logs"]
for t in tests:
for fol in cleanup_folders:
for fol in folders_to_delete:
for fi in pathlib.Path(t).joinpath(fol).iterdir():
fi.unlink()
for fol in folders_to_backup:
path = pathlib.Path(t).joinpath(fol)
new_name = pathlib.Path(str(path) + "_noPLC")
path.rename(new_name)
# need empty log folder to avoid crashes
path.mkdir()
cmd_fec = cmd_no_fec + ["--decoder_only", "-f", EP_FILE]
print("======== Script command line WITH plc: ========\n{}".format(" ".join(cmd_no_fec)))
......