Remove extra encoder app (ccd084ed) · Commits · SA4 / Audio / IVAS BASOP

Makefile

+2 −7

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ SRC_DIRS = $(sort -u $(SRC_LIBBASOP) $(SRC_LIBCOM) $(SRC_LIBDEBUG) $(SRC_LIBDEC
		# 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
		@@ -184,7 +183,6 @@ 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
		@@ -197,7 +195,7 @@ DEPS = $(addprefix $(OBJDIR)/,$(SRCS_LIBBASOP:.c=.P) $(SRCS_LIBCOM:.c=.P) $(SRCS

		.PHONY: all clean

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

		$(OBJDIR):
		$(QUIET)mkdir -p $(OBJDIR)
		@@ -233,9 +231,6 @@ $(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)
		$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APIDEC) -L. -livasbasop -livasdec -livascom -livasutil -livasdebug -llc3plus $(LDLIBS) -o $(CLI_APIDEC)

		@@ -254,7 +249,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_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)
		$(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

+0 −11

Original line number	Diff line number	Diff line
		@@ -24,11 +24,6 @@ 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}
		@@ -111,12 +106,6 @@ 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

apps/encoder_fmtsw.c

deleted100644 → 0

+0 −2456

File deleted.

Preview size limit exceeded, changes collapsed.

readme.txt

+3 −17

Original line number	Diff line number	Diff line
		@@ -33,13 +33,12 @@

		These files represent the 3GPP EVS Codec Extension for Immersive Voice and
		Audio Services (IVAS) BASOP C simulation. All code is writtten
		in ISO/IEC C99. The system is implemented as six separate programs:
		in ISO/IEC C99. The system is implemented as five separate programs:

		IVAS_cod IVAS Encoder
		IVAS_dec IVAS Decoder
		IVAS_rend IVAS External Renderer
		ISAR_post_rend ISAR Post Renderer
		IVAS_cod_fmtsw IVAS Encoder with support for format switching
		ambi_converter example program for Ambisonics format conversion

		For encoding using the coder program, the input is a binary
		@@ -144,8 +143,7 @@ The package includes a Makefile for gcc, which has been verified on
		"c-code" and typing the command: make. The resulting encoder/decoder/renderer/
		ISAR_post_renderer executables are named "IVAS_cod", "IVAS_dec", "IVAS_rend",
		and "ISAR_post_rend". All reside in the c-code directory. In addition, this
		directory will contain a version of the encoder with support for format switching
		(named "IVAS_cod_fmtsw") and an example program for Ambisonics format conversion
		directory will contain an example program for Ambisonics format conversion
		(named "ambi_converter").

		The package also includes a solution-file for Microsoft Visual Studio 2017 (x86).
		@@ -154,8 +152,7 @@ To compile the code, please open "Workspace_msvc\Workspace_msvc.sln" and build
		renderer executable. The resulting encoder/decoder/renderer/ISAR_post_renderer
		executables are "IVAS_cod.exe", "IVAS_dec.exe", "IVAS_rend.exe", and
		"ISAR_post_rend.exe". All reside in the c-code main directory. In addition, this
		directory will contain a version of the encoder with support for format switching
		(named "IVAS_cod_fmtsw.exe") and an example program for Ambisonics format conversion
		directory will contain an example program for Ambisonics format conversion
		(named "ambi_converter.exe").


		@@ -424,17 +421,6 @@ the following conventions are supported:
		Either the input or the output convention must always be ACN-SN3D.


		The usage of the "IVAS_cod_fmtsw" program is as follows:
		--------------------------------------------------------

		Usage: IVAS_cod_fmtsw format_switching_file

		Mandatory parameters:
		---------------------
		format_switching_file: Text file containing a valid encoder command line in each line



		MULTICHANNEL LOUDSPEAKER INPUT / OUTPUT CONFIGURATIONS
		======================================================
		The loudspeaker positions for each MC layouts are assumed to have the following azimuth and elevation