Merge branch 'main' into kiene/consolidate-basop-ci-code (a9835222) · Commits · SA4 / Audio / IVAS BASOP

.gitignore

0 → 100644

+86 −0

Original line number	Diff line number	Diff line
		# .gitignore for IVAS public collaboration Git repository

		# Compiler output Unix
		IVAS_cod
		IVAS_dec
		IVAS_rend
		ISAR_post_rend
		ambi_converter
		obj/
		*.a
		*.o
		*.P

		# default CMake
		build//

		# Compiler output VS2017
		IVAS_cod.exe
		IVAS_dec.exe
		IVAS_rend.exe
		ISAR_post_rend.exe
		ambi_converter.exe
		*.user
		.vs/
		Debug_*/
		Release_*/
		*.obj
		*.pdb

		# Standalone TD object renderer
		scripts/td_object_renderer/object_renderer_standalone/renderer_standalone
		scripts/td_object_renderer/object_renderer_standalone/renderer_standalone.exe

		# General/scripts
		.DS_Store
		.vscode
		.cache
		.idea
		*.log
		*.bak
		.\#*
		scripts/c-code_instrument/
		scripts/ifdef_instrument.list
		scripts/ref/
		scripts/test/
		scripts/out/
		scripts/self_test_summary.txt
		scripts/cppp/
		binary/
		tests/**/[c\|d]ut
		tests/**/ref
		tests/*/testv
		tests/hrtf_binary_loading/bitstream/*
		tests/hrtf_binary_loading/dec_out_/
		scripts/testv/_cut.pcm
		scripts/testv/_cut.wav
		scripts/testv/stvOMASA_*.met
		scripts/testv/stvOMASA_*.csv
		scripts/testv/stvOMASA_2ISM_1MASA1TC48c.wav
		scripts/testv/stvOMASA_3ISM_1MASA1TC48c.wav
		scripts/testv/stvO*
		# default reference binary name
		IVAS_cod_ref*
		IVAS_dec_ref*
		IVAS_rend_ref*
		ISAR_post_rend_ref*

		# Python files that pop up when running scripts
		__pycache__/
		*.py[cod]
		*$py.class

		# history
		.history/

		#externals
		Externals/

		# coan output files that are created when cleaning out switches
		coan_out_*

		# Additional ignored locations for the BASOP repo
		/ci
		/scripts
		/tests
		/pytest.ini

CMakeLists.txt

+16 −2

Original line number	Diff line number	Diff line
		@@ -174,7 +174,7 @@ 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_basop lib_rend lib_debug lib_isar)
		target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_basop lib_enc lib_isar)
		target_include_directories(lib_dec PUBLIC lib_dec lib_rend PRIVATE lib_basop lib_enc lib_isar lib_util)

		file(GLOB libUtilSrcs "lib_util/*.c")
		file(GLOB libUtilHeaders "lib_util/*.h")
		@@ -184,7 +184,7 @@ 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_basop lib_com lib_debug lib_isar)
		target_link_libraries(ivas_lc3plus_unit_test lib_rend lib_dec lib_util lib_com lib_basop lib_debug lib_isar)
		endif()

		file(GLOB libISARSrcs "lib_isar/*.c")
		@@ -201,6 +201,12 @@ if(WIN32)
		target_link_libraries(IVAS_cod Ws2_32)
		endif()

		add_executable(IVAS_cod_fmtsw apps/encoder_fmtsw.c)
		target_link_libraries(IVAS_cod_fmtsw lib_enc lib_util)
		if(WIN32)
		target_link_libraries(IVAS_cod_fmtsw Ws2_32)
		endif()

		add_executable(IVAS_dec apps/decoder.c)
		target_link_libraries(IVAS_dec lib_dec lib_util)
		if(WIN32)
		@@ -215,9 +221,17 @@ add_executable(ISAR_post_rend apps/isar_post_rend.c)
		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 lib_debug)
		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)
		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_cod_fmtsw POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:IVAS_cod_fmtsw>" "${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 ISAR_post_rend POST_BUILD VERBATIM COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ISAR_post_rend>" "${CMAKE_CURRENT_SOURCE_DIR}/")

Makefile

+16 −23

Original line number	Diff line number	Diff line
		@@ -14,15 +14,15 @@ SRC_APP = apps
		BUILD = build
		OBJDIR = obj

		INCLUDE_SPLIT = 1

		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_APIENC_FMTSW ?= IVAS_cod_fmtsw
		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
		@@ -33,7 +33,6 @@ LIB_LIBISAR ?= libisar.a
		LIB_LC3PLUS ?= liblc3plus.a
		LIB_LIBUTIL ?= libivasutil.a


		# Default tool settings
		CC ?= gcc
		RM ?= rm -f
		@@ -77,6 +76,9 @@ LDLIBS += -lm

		# Clang sanitizer compiler options
		CCCLANG = clang
		ifeq "$(CLANG)" "0"
		CC = $(CCCLANG)
		endif
		ifeq "$(CLANG)" "1"
		CC = $(CCCLANG)
		CFLAGS += -fsanitize=memory
		@@ -157,12 +159,7 @@ 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))
		@@ -173,10 +170,13 @@ 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_APIENC_FMTSW = $(OBJDIR)/encoder_fmtsw.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_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) \
		@@ -186,7 +186,7 @@ DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBBASOP:.c=.P) $(SRCS_LIBCOM:.c=.P) $(SRCS

		.PHONY: all clean

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

		$(OBJDIR):
		$(QUIET)mkdir -p $(OBJDIR)
		@@ -213,11 +213,8 @@ $(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_LIBBASOP) $(OBJS_LIBCOM)
		$(QUIET_AR)$(AR) rcs $@ $^
		@@ -225,24 +222,20 @@ $(LIB_LIBUTIL): $(OBJS_LIBUTIL) $(OBJS_LIBBASOP) $(OBJS_LIBCOM)
		$(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_APIENC_FMTSW): $(OBJS_CLI_APIENC_FMTSW) $(LIB_LIBBASOP) $(LIB_LIBENC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIENC_FMTSW) -L. -livasbasop -livasenc -livascom -livasutil -livasdebug $(LDLIBS) -o $(CLI_APIENC_FMTSW)

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

		$(CLI_APIREND): $(OBJS_CLI_APPREND) $(LIB_LIBBASOP) $(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. -livasbasop -livasrend -lisar -livasdec -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIREND)
		else
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPREND) -L. -livasbasop -livasrend -livasdec -livasutil -livasdebug -livascom $(LDLIBS) -o $(CLI_APIREND)
		endif

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

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

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

		@@ -250,7 +243,7 @@ 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) $(OBJS_LIBBASOP) $(LIB_LIBCOM) $(LIB_LIBDEC) $(LIB_LIBUTIL) $(LIB_LIBREND) $(LIB_LIBISAR) $(LIB_LC3PLUS)
		$(QUIET)$(RM) $(CLI_APIENC) $(CLI_APIENC_FMTSW) $(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

+22 −0

Original line number	Diff line number	Diff line
		@@ -24,6 +24,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encoder", "encoder.vcxproj"
		{63747FE7-94BA-410C-8D7F-EB47555DD994} = {63747FE7-94BA-410C-8D7F-EB47555DD994}
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "encoder_fmtsw", "encoder_fmtsw.vcxproj", "{CA7EA15E-09A4-4196-A8EA-2A5F6F84862B}"
		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}
		@@ -45,6 +50,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "isar_post_rend", "isar_post
		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
		Debug\|Win32 = Debug\|Win32
		@@ -101,6 +111,12 @@ Global
		{B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Release\|Win32.ActiveCfg = Release\|Win32
		{B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Release\|Win32.Build.0 = Release\|Win32
		{B3FC9DFC-7268-8660-7C0D-B60BAF02C554}.Release\|x64.ActiveCfg = Release\|Win32
		{CA7EA15E-09A4-4196-A8EA-2A5F6F84862B}.Debug\|Win32.ActiveCfg = Debug\|Win32
		{CA7EA15E-09A4-4196-A8EA-2A5F6F84862B}.Debug\|Win32.Build.0 = Debug\|Win32
		{CA7EA15E-09A4-4196-A8EA-2A5F6F84862B}.Debug\|x64.ActiveCfg = Debug\|Win32
		{CA7EA15E-09A4-4196-A8EA-2A5F6F84862B}.Release\|Win32.ActiveCfg = Release\|Win32
		{CA7EA15E-09A4-4196-A8EA-2A5F6F84862B}.Release\|Win32.Build.0 = Release\|Win32
		{CA7EA15E-09A4-4196-A8EA-2A5F6F84862B}.Release\|x64.ActiveCfg = Release\|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
		@@ -131,6 +147,12 @@ Global
		{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

+176 −0

Original line number	Diff line number	Diff line
		<?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>
		</ItemGroup>
		<PropertyGroup Label="Globals">
		<ProjectName>ambi_converter</ProjectName>
		<ProjectGuid>{2074FFD6-8056-4C5F-8A08-0B2607D1FEFF}</ProjectGuid>
		<RootNamespace>renderer</RootNamespace>
		<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
		</PropertyGroup>
		<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
		<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|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>
		<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)'=='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>
		<IntDir>.\Debug_$(ProjectName)\</IntDir>
		<LinkIncremental>false</LinkIncremental>
		<GenerateManifest>false</GenerateManifest>
		<TargetName>ambi_converter</TargetName>
		</PropertyGroup>
		<PropertyGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">
		<OutDir>..\</OutDir>
		<IntDir>.\Release_$(ProjectName)\</IntDir>
		<LinkIncremental>false</LinkIncremental>
		<GenerateManifest>false</GenerateManifest>
		<TargetName>ambi_converter</TargetName>
		</PropertyGroup>
		<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Debug\|Win32'">
		<Midl>
		<TypeLibraryName>$(IntDir)$(ProjectName).tlb</TypeLibraryName>
		<HeaderFileName />
		</Midl>
		<ClCompile>
		<Optimization>Disabled</Optimization>
		<AdditionalIncludeDirectories>..\lib_basop;..\lib_enc;..\lib_dec;..\lib_com;..\lib_debug;..\lib_util;..\lib_isar;..\lib_rend;..\lib_lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;$(Macros);%(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>
		<TreatWarningAsError>false</TreatWarningAsError>
		</ClCompile>
		<ResourceCompile>
		<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<Culture>0x0c0c</Culture>
		</ResourceCompile>
		<Link>
		<AdditionalDependencies />
		<OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
		<SuppressStartupBanner>true</SuppressStartupBanner>
		<ManifestFile />
		<GenerateDebugInformation>true</GenerateDebugInformation>
		<ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
		<SubSystem>Console</SubSystem>
		<RandomizedBaseAddress>false</RandomizedBaseAddress>
		<DataExecutionPrevention />
		<TargetMachine>MachineX86</TargetMachine>
		</Link>
		</ItemDefinitionGroup>
		<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">
		<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_basop;..\lib_enc;..\lib_dec;..\lib_com;..\lib_debug;..\lib_util;..\lib_isar;..\lib_rend;..\lib_lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
		<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<StringPooling>true</StringPooling>
		<ExceptionHandling />
		<BasicRuntimeChecks>Default</BasicRuntimeChecks>
		<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
		<FunctionLevelLinking>true</FunctionLevelLinking>
		<FloatingPointModel>Precise</FloatingPointModel>
		<RuntimeTypeInfo>false</RuntimeTypeInfo>
		<PrecompiledHeader />
		<PrecompiledHeaderOutputFile />
		<ProgramDataBaseFileName>$(IntDir)$(ProjectName).pdb</ProgramDataBaseFileName>
		<WarningLevel>Level4</WarningLevel>
		<SuppressStartupBanner>true</SuppressStartupBanner>
		<DebugInformationFormat />
		<CompileAs>Default</CompileAs>
		<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
		<TreatWarningAsError>false</TreatWarningAsError>
		</ClCompile>
		<ResourceCompile>
		<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
		<Culture>0x0c0c</Culture>
		</ResourceCompile>
		<Link>
		<OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
		<SuppressStartupBanner>true</SuppressStartupBanner>
		<ManifestFile />
		<GenerateDebugInformation>false</GenerateDebugInformation>
		<ProgramDatabaseFile>$(IntDir)$(ProjectName).pdb</ProgramDatabaseFile>
		<SubSystem>Console</SubSystem>
		<RandomizedBaseAddress>false</RandomizedBaseAddress>
		<DataExecutionPrevention />
		<TargetMachine>MachineX86</TargetMachine>
		<IgnoreSpecificDefaultLibraries>libcmtd.lib</IgnoreSpecificDefaultLibraries>
		</Link>
		</ItemDefinitionGroup>
		<ItemGroup>
		<ClCompile Include="..\apps\ambi_converter.c" />
		</ItemGroup>
		<ItemGroup>
		<ProjectReference Include="lib_basop.vcxproj">
		<Project>{63747fe7-94ba-410c-8d7f-eb47555dd994}</Project>
		</ProjectReference>
		<ProjectReference Include="lib_com.vcxproj">
		<Project>{39ec200d-7795-4ff8-b214-b24eda5526ae}</Project>
		</ProjectReference>
		<ProjectReference Include="lib_util.vcxproj">
		<Project>{2FA8F384-0775-F3B7-F8C3-85209222FC70}</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