Merge branch 'main' into 1950_basop_portFlpMr2198 (0e1fda4b) · Commits · SA4 / Audio / IVAS BASOP

.gitlab-ci/variables.yml

+3 −0

Original line number	Diff line number	Diff line
		@@ -81,6 +81,8 @@ variables:
		RUNNER_TAG: "ivas-basop-linux"
		LOGS_BACKUP_SOURCE_DIR: ""
		LOGS_BACKUP_TARGET_DIR: ""
		# set this to true to skip the external HRTF testcases in pytest calls
		DISABLE_HRTF: "false"
		MANUAL_PIPELINE_TYPE:
		description: "Type for the manual pipeline run. Use 'pytest-compare' to run comparison test against reference float codec."
		value: 'default'
		@@ -102,3 +104,4 @@ variables:
		- 'peaq-enc-passthrough'
		- 'long-term-logs'
		- 'backup-long-term-logs'
		- 'test-long-self-test'

CMakeLists.txt

+34 −18

Original line number	Diff line number	Diff line
		@@ -125,65 +125,74 @@ project(stereo-evs LANGUAGES C)
		set_property(GLOBAL PROPERTY USE_FOLDERS ON) # make Visual Studio projects look nicer
		include(CTest)

		file(GLOB libBasopSrcs "lib_basop/*.c")
		file(GLOB libBasopHeaders "lib_basop/*.h")
		add_library(lib_basop ${libBasopSrcs} ${libBasopHeaders})
		if(UNIX)
		target_link_libraries(lib_basop PRIVATE m)
		endif()
		target_include_directories(lib_basop PUBLIC lib_basop PRIVATE lib_com lib_enc lib_dec lib_rend lib_debug lib_isar)
		target_include_directories(lib_basop PRIVATE lib_lc3plus)

		file(GLOB libComSrcs "lib_com/*.c")
		file(GLOB libComHeaders "lib_com/*.h")
		add_library(lib_com ${libComSrcs} ${libComHeaders})
		if(UNIX)
		target_link_libraries(lib_com PRIVATE m)
		endif()
		target_include_directories(lib_com PUBLIC lib_com PRIVATE lib_enc lib_dec lib_rend lib_debug lib_isar)
		target_include_directories(lib_com PUBLIC lib_com PRIVATE lib_basop lib_enc lib_dec lib_rend lib_debug lib_isar)
		target_include_directories(lib_com PRIVATE lib_lc3plus)

		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)
		target_include_directories(lib_debug PUBLIC lib_debug PRIVATE lib_enc lib_dec lib_rend lib_isar)
		target_link_libraries(lib_debug lib_basop lib_com)
		target_include_directories(lib_debug PUBLIC lib_debug PRIVATE lib_basop lib_enc lib_dec lib_rend lib_isar)

		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)
		target_include_directories(lib_enc PUBLIC lib_enc PRIVATE lib_dec lib_rend lib_isar)
		target_link_libraries(lib_enc lib_basop lib_com lib_debug)
		target_include_directories(lib_enc PUBLIC lib_enc PRIVATE lib_basop lib_dec lib_rend lib_isar)
		target_include_directories(lib_enc PRIVATE lib_lc3plus)

		file(GLOB libLC3plusSrcs "lib_lc3plus/*.c")
		file(GLOB libLC3plusHeaders "lib_lc3plus/*.h")
		add_library(lib_lc3plus ${libLC3plusSrcs} ${libLC3plusHeaders})
		target_include_directories(lib_lc3plus PUBLIC lib_lc3plus PRIVATE lib_com lib_debug)
		target_include_directories(lib_lc3plus PUBLIC lib_lc3plus PRIVATE lib_basop 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.
		target_link_libraries(lib_rend lib_dec lib_basop lib_com lib_debug) # Todo refactor: This dependency on lib_dec should be removed.
		target_link_libraries(lib_rend lib_lc3plus lib_isar)
		target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_enc lib_isar)
		target_include_directories(lib_rend PUBLIC lib_rend PRIVATE lib_basop lib_enc lib_isar)


		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_rend lib_debug lib_isar)
		target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_enc lib_isar)
		target_link_libraries(lib_dec lib_com lib_basop lib_rend lib_debug lib_isar)
		target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_basop lib_enc lib_isar)

		file(GLOB libUtilSrcs "lib_util/*.c")
		file(GLOB libUtilHeaders "lib_util/*.h")
		add_library(lib_util ${libUtilSrcs} ${libUtilHeaders})
		target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_com lib_enc lib_dec lib_rend lib_debug)
		target_include_directories(lib_util PUBLIC lib_util PRIVATE lib_basop lib_com lib_enc lib_dec lib_rend lib_debug)
		target_include_directories(lib_util PRIVATE lib_lc3plus lib_isar)

		if(NOT WMOPS)
		add_executable(ivas_lc3plus_unit_test ${CMAKE_SOURCE_DIR}/scripts/split_rendering/lc3plus_basop/ivas_lc3plus_unit_test.c)
		target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_debug lib_isar)
		target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_basop lib_com lib_debug lib_isar)
		endif()

		file(GLOB libISARSrcs "lib_isar/*.c")
		file(GLOB libISARHeaders "lib_isar/*.h")

		add_library(lib_isar ${libISARSrcs} ${libISARHeaders})
		target_link_libraries(lib_isar lib_com lib_debug lib_lc3plus) # Todo refactor: This dependency on lib_dec should be removed.
		target_include_directories(lib_isar PUBLIC lib_isar PRIVATE lib_enc lib_dec lib_rend)
		target_link_libraries(lib_isar lib_basop lib_com lib_debug lib_lc3plus) # Todo refactor: This dependency on lib_dec should be removed.
		target_include_directories(lib_isar PUBLIC lib_isar PRIVATE lib_basop lib_enc lib_dec lib_rend)


		add_executable(IVAS_cod apps/encoder.c)
		@@ -199,12 +208,19 @@ if(WIN32)
		endif()

		add_executable(IVAS_rend apps/renderer.c)
		target_link_libraries(IVAS_rend lib_rend lib_util lib_isar)
		target_link_libraries(IVAS_rend lib_rend lib_util lib_isar lib_com)
		target_include_directories(IVAS_rend PRIVATE lib_enc)

		add_executable(ISAR_post_rend apps/isar_post_rend.c)
		target_link_libraries(ISAR_post_rend lib_isar lib_util)
		target_include_directories(ISAR_post_rend PRIVATE lib_isar)
		target_link_libraries(ISAR_post_rend lib_basop lib_isar lib_util lib_com)
		target_include_directories(ISAR_post_rend PRIVATE lib_basop lib_isar)

		add_executable(ambi_converter apps/ambi_converter.c)
		target_link_libraries(ambi_converter lib_util lib_com lib_basop)
		if(UNIX)
		target_link_libraries(ambi_converter m)
		endif()
		target_include_directories(ambi_converter PRIVATE lib_basop lib_util lib_com lib_debug)

		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)
		@@ -218,4 +234,4 @@ if(COPY_EXECUTABLES_FROM_BUILD_DIR)
		endif()

		# Allow creating packages for CMake install
		install(TARGETS lib_enc lib_dec lib_rend lib_com lib_util ARCHIVE DESTINATION lib)
		install(TARGETS lib_enc lib_dec lib_rend lib_basop lib_com lib_util ARCHIVE DESTINATION lib)

Makefile

+26 −35

Original line number	Diff line number	Diff line

		# GNU Makefile

		# Paths
		SRC_LIBBASOP = lib_basop
		SRC_LIBCOM = lib_com
		SRC_LIBDEBUG = lib_debug
		SRC_LIBDEC = lib_dec
		@@ -14,15 +14,15 @@ SRC_APP = apps
		BUILD = build
		OBJDIR = obj

		INCLUDE_SPLIT = 1

		SRC_DIRS = $(sort -u $(SRC_LIBCOM) $(SRC_LIBDEBUG) $(SRC_LIBDEC) $(SRC_LIBENC) $(SRC_LIBREND) $(SRC_LIBISAR) $(SRC_LC3PLUS) $(SRC_LIBUTIL) $(SRC_APP))
		SRC_DIRS = $(sort -u $(SRC_LIBBASOP) $(SRC_LIBCOM) $(SRC_LIBDEBUG) $(SRC_LIBDEC) $(SRC_LIBENC) $(SRC_LIBREND) $(SRC_LIBISAR) $(SRC_LC3PLUS) $(SRC_LIBUTIL) $(SRC_APP))

		# Name of CLI binaries
		CLI_APIDEC ?= IVAS_dec
		CLI_APIENC ?= IVAS_cod
		CLI_APIREND ?= IVAS_rend
		CLI_APIPOSTREND ?= ISAR_post_rend
		CLI_AMBICONVERT ?= ambi_converter
		LIB_LIBBASOP ?= libivasbasop.a
		LIB_LIBCOM ?= libivascom.a
		LIB_LIBDEBUG ?= libivasdebug.a
		LIB_LIBDEC ?= libivasdec.a
		@@ -32,7 +32,6 @@ LIB_LIBISAR ?= libisar.a
		LIB_LC3PLUS ?= liblc3plus.a
		LIB_LIBUTIL ?= libivasutil.a


		# Default tool settings
		CC ?= gcc
		RM ?= rm -f
		@@ -148,6 +147,7 @@ SRCS_SPLIT_REND = ivas_CQMFDecoder.c ivas_CQMFEncoder.c ivas_PerceptualModel.c i

		###############################################################################

		SRCS_LIBBASOP = $(foreach DIR,$(SRC_LIBBASOP),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		SRCS_LIBCOM = $(foreach DIR,$(SRC_LIBCOM),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		SRCS_LIBDEBUG = $(foreach DIR,$(SRC_LIBDEBUG),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		SRCS_LIBDEC = $(foreach DIR,$(SRC_LIBDEC),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		@@ -155,13 +155,9 @@ SRCS_LIBENC = $(foreach DIR,$(SRC_LIBENC),$(patsubst $(DIR)/%,%,$(wildcard $(D
		SRCS_LIBREND = $(foreach DIR,$(SRC_LIBREND),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		SRCS_LIBUTIL = $(foreach DIR,$(SRC_LIBUTIL),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		SRCS_LIBISAR = $(foreach DIR,$(SRC_LIBISAR),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		ifeq "$(INCLUDE_SPLIT)" "1"
		SRCS_LC3PLUS = $(foreach DIR,$(SRC_LC3PLUS),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
		else
		# SRCS_LIBREND := $(filter-out $(SRCS_SPLIT_REND),$(SRCS_LIBREND))
		# SRCS_LIBUTIL := $(filter-out $(SRCS_SPLIT_REND),$(SRCS_LIBUTIL))
		endif

		OBJS_LIBBASOP = $(addprefix $(OBJDIR)/,$(SRCS_LIBBASOP:.c=.o))
		OBJS_LIBCOM = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.o))
		OBJS_LIBDEBUG = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEBUG:.c=.o))
		OBJS_LIBDEC = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEC:.c=.o))
		@@ -170,12 +166,14 @@ OBJS_LIBREND = $(addprefix $(OBJDIR)/,$(SRCS_LIBREND:.c=.o))
		OBJS_LIBISAR = $(addprefix $(OBJDIR)/,$(SRCS_LIBISAR:.c=.o))
		OBJS_LC3PLUS = $(addprefix $(OBJDIR)/,$(SRCS_LC3PLUS:.c=.o))
		OBJS_LIBUTIL = $(addprefix $(OBJDIR)/,$(SRCS_LIBUTIL:.c=.o))
		OBJS_AMBICONVERT = $(OBJDIR)/ambi_convert.o
		OBJS_CLI_APIDEC = $(OBJDIR)/decoder.o
		OBJS_CLI_APIENC = $(OBJDIR)/encoder.o
		OBJS_CLI_APPREND = $(OBJDIR)/renderer.o
		OBJS_CLI_APPPOSTREND = $(OBJDIR)/isar_post_rend.o
		OBJS_CLI_AMBICONVERT = $(OBJDIR)/ambi_converter.o

		DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.P) $(SRCS_LIBDEBUG:.c=.P) $(SRCS_LIBDEC:.c=.P) \
		DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBBASOP:.c=.P) $(SRCS_LIBCOM:.c=.P) $(SRCS_LIBDEBUG:.c=.P) $(SRCS_LIBDEC:.c=.P) \
		$(SRCS_LIBENC:.c=.P) $(SRCS_LIBUTIL:.c=.P) $(SRCS_LIBREND:.c=.P) $(SRCS_LIBISAR:.c=.P) \
		$(SRCS_LC3PLUS:.c=.P))

		@@ -188,6 +186,9 @@ all: $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND)
		$(OBJDIR):
		$(QUIET)mkdir -p $(OBJDIR)

		$(LIB_LIBBASOP): $(OBJS_LIBBASOP)
		$(QUIET_AR)$(AR) rcs $@ $^

		$(LIB_LIBCOM): $(OBJS_LIBCOM)
		$(QUIET_AR)$(AR) rcs $@ $^

		@@ -207,44 +208,34 @@ $(LIB_LIBREND): $(OBJS_LIBREND) $(OBJS_LIBISAR)
		$(QUIET_AR)$(AR) rcs $@ $^

		$(LIB_LC3PLUS): $(OBJS_LC3PLUS)
		ifeq "$(INCLUDE_SPLIT)" "1"
		$(QUIET_AR)$(AR) rcs $@ $^
		else

		endif
		# Dependency on OBJS_LIBCOM added temporarily for unit-test to work
		$(LIB_LIBUTIL): $(OBJS_LIBUTIL) $(OBJS_LIBCOM)
		$(LIB_LIBUTIL): $(OBJS_LIBUTIL) $(OBJS_LIBBASOP) $(OBJS_LIBCOM)
		$(QUIET_AR)$(AR) rcs $@ $^

		$(CLI_APIENC): $(OBJS_CLI_APIENC) $(LIB_LIBENC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC) -L. -livasenc -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC)
		$(CLI_APIENC): $(OBJS_CLI_APIENC) $(LIB_LIBBASOP) $(LIB_LIBENC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC) -L. -livasbasop -livasenc -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC)

		$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS) $(LIB_LIBISAR)
		ifeq "$(INCLUDE_SPLIT)" "1"
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug -llc3plus $(LDLIBS) -o $(CLI_APIDEC)
		else
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasdec -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIDEC)
		endif
		$(CLI_APIDEC): $(OBJS_CLI_APIDEC) $(LIB_LIBBASOP) $(LIB_LIBDEC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS) $(LIB_LIBISAR)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasbasop -livasdec -livascom -livasutil -livasdebug -llc3plus $(LDLIBS) -o $(CLI_APIDEC)

		$(CLI_APIREND): $(OBJS_CLI_APPREND) $(LIB_LIBREND) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LIBDEC) $(LIB_LC3PLUS) $(LIB_LIBISAR)
		ifeq "$(INCLUDE_SPLIT)" "1"
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -lisar -livasdec -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIREND)
		else
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasrend -livasdec -livasutil -livasdebug -livascom $(LDLIBS) -o $(CLI_APIREND)
		endif
		$(CLI_APIREND): $(OBJS_CLI_APPREND) $(LIB_LIBBASOP) $(LIB_LIBREND) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LIBDEC) $(LIB_LC3PLUS) $(LIB_LIBISAR)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasbasop -livasrend -lisar -livasdec -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIREND)

		$(CLI_APIPOSTREND): $(OBJS_CLI_APPPOSTREND) $(LIB_LIBISAR) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)
		ifeq "$(INCLUDE_SPLIT)" "1"
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPPOSTREND) -L. -lisar -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIPOSTREND)
		endif
		$(CLI_APIPOSTREND): $(OBJS_CLI_APPPOSTREND) $(LIB_LIBBASOP) $(LIB_LIBISAR) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPPOSTREND) -L. -livasbasop -lisar -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIPOSTREND)

		$(CLI_AMBICONVERT): $(OBJS_CLI_AMBICONVERT) $(OBJS_AMBICONVERT) $(LIB_LIBBASOP) $(LIB_LIBCOM)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_AMBICONVERT) $(OBJS_AMBICONVERT) -L. -livascom -livasbasop $(LDLIBS) -o $(CLI_AMBICONVERT)

		libs: $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBREND) $(LIB_LIBISAR) $(LIB_LC3PLUS) $(LIB_LIBUTIL)
		libs: $(LIB_LIBBASOP) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBREND) $(LIB_LIBISAR) $(LIB_LC3PLUS) $(LIB_LIBUTIL)

		clean:
		$(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_APIREND) $(CLI_APIPOSTREND) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBUTIL) $(LIB_LIBREND) $(LIB_LIBISAR) $(LIB_LC3PLUS)
		$(QUIET)$(RM) $(CLI_APIENC) $(CLI_APIDEC) $(CLI_APIREND) $(CLI_APIPOSTREND) $(CLI_AMBICONVERT) $(LIB_LIBENC) $(LIB_LIBDEBUG) $(OBJS_LIBBASOP) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBUTIL) $(LIB_LIBREND) $(LIB_LIBISAR) $(LIB_LC3PLUS)

		$(OBJDIR)/%.o : %.c \| $(OBJDIR)
		$(QUIET_CC)$(CC) $(CFLAGS) -c -MD -o $@ $<

Workspace_msvc/Workspace_msvc.sln

+31 −0

Original line number	Diff line number	Diff line
		@@ -15,10 +15,19 @@ EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_debug", "lib_debug.vcxproj", "{54509728-928B-44D9-A118-A6F92F08B34F}"
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "decoder", "decoder.vcxproj", "{E3DCBC31-7FC9-D127-E000-529F8460D5FD}"
		ProjectSection(ProjectDependencies) = postProject
		{63747FE7-94BA-410C-8D7F-EB47555DD994} = {63747FE7-94BA-410C-8D7F-EB47555DD994}
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encoder", "encoder.vcxproj", "{B3FC9DFC-7268-8660-7C0D-B60BAF02C554}"
		ProjectSection(ProjectDependencies) = postProject
		{63747FE7-94BA-410C-8D7F-EB47555DD994} = {63747FE7-94BA-410C-8D7F-EB47555DD994}
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer.vcxproj", "{12B4C8A5-1E06-4E30-B443-D1F916F52B47}"
		ProjectSection(ProjectDependencies) = postProject
		{63747FE7-94BA-410C-8D7F-EB47555DD994} = {63747FE7-94BA-410C-8D7F-EB47555DD994}
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_lc3plus", "lib_lc3plus.vcxproj", "{95030B82-70CD-4C6B-84D4-61096035BEA2}"
		EndProject
		@@ -30,6 +39,16 @@ EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_isar", "lib_isar.vcxproj", "{869A305E-D99E-4C3A-BDB3-AA57ABCCE619}"
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isar_post_rend", "isar_post_rend.vcxproj", "{12374ADC-0E5C-4FDD-B903-71D572413831}"
		ProjectSection(ProjectDependencies) = postProject
		{B3FC9DFC-7268-8660-7C0D-B60BAF02C554} = {B3FC9DFC-7268-8660-7C0D-B60BAF02C554}
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lib_basop", "lib_basop.vcxproj", "{63747FE7-94BA-410C-8D7F-EB47555DD994}"
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ambi_converter", "ambi_converter.vcxproj", "{2074FFD6-8056-4C5F-8A08-0B2607D1FEFF}"
		ProjectSection(ProjectDependencies) = postProject
		{39EC200D-7795-4FF8-B214-B24EDA5526AE} = {39EC200D-7795-4FF8-B214-B24EDA5526AE}
		EndProjectSection
		EndProject
		Global
		GlobalSection(SolutionConfigurationPlatforms) = preSolution
		@@ -111,6 +130,18 @@ Global
		{12374ADC-0E5C-4FDD-B903-71D572413831}.Release\|Win32.ActiveCfg = Release\|Win32
		{12374ADC-0E5C-4FDD-B903-71D572413831}.Release\|Win32.Build.0 = Release\|Win32
		{12374ADC-0E5C-4FDD-B903-71D572413831}.Release\|x64.ActiveCfg = Release\|Win32
		{63747FE7-94BA-410C-8D7F-EB47555DD994}.Debug\|Win32.ActiveCfg = Debug\|Win32
		{63747FE7-94BA-410C-8D7F-EB47555DD994}.Debug\|Win32.Build.0 = Debug\|Win32
		{63747FE7-94BA-410C-8D7F-EB47555DD994}.Debug\|x64.ActiveCfg = Debug\|Win32
		{63747FE7-94BA-410C-8D7F-EB47555DD994}.Release\|Win32.ActiveCfg = Release\|Win32
		{63747FE7-94BA-410C-8D7F-EB47555DD994}.Release\|Win32.Build.0 = Release\|Win32
		{63747FE7-94BA-410C-8D7F-EB47555DD994}.Release\|x64.ActiveCfg = Release\|Win32
		{2074FFD6-8056-4C5F-8A08-0B2607D1FEFF}.Debug\|Win32.ActiveCfg = Debug\|Win32
		{2074FFD6-8056-4C5F-8A08-0B2607D1FEFF}.Debug\|Win32.Build.0 = Debug\|Win32
		{2074FFD6-8056-4C5F-8A08-0B2607D1FEFF}.Debug\|x64.ActiveCfg = Debug\|Win32
		{2074FFD6-8056-4C5F-8A08-0B2607D1FEFF}.Release\|Win32.ActiveCfg = Release\|Win32
		{2074FFD6-8056-4C5F-8A08-0B2607D1FEFF}.Release\|Win32.Build.0 = Release\|Win32
		{2074FFD6-8056-4C5F-8A08-0B2607D1FEFF}.Release\|x64.ActiveCfg = Release\|Win32
		EndGlobalSection
		GlobalSection(SolutionProperties) = preSolution
		HideSolutionNode = FALSE

Workspace_msvc/ambi_converter.vcxproj

0 → 100644

+172 −0

File added.

Preview size limit exceeded, changes collapsed.