Commit a600e619 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'ivas-float-update-merge-2' into 'main' 

Proposed updates to IVAS float code

See merge request !9
parents bff0e7b9 8f68c68d

Makefile

+10 −5
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ endif 
CFLAGS   += -std=c99 -pedantic -Wcast-qual -Wall -W -Wextra -Wno-long-long     \

            -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes  \

            -Werror-implicit-function-declaration \

            -Wno-unused-function -Wno-implicit-fallthrough

            -Wno-implicit-fallthrough -ffp-contract=off



# libs to link

LDLIBS   += -lm
@@ -95,8 +95,8 @@ LDFLAGS += -g3 
endif



ifeq "$(GCOV)" "1"

CFLAGS  += -fprofile-arcs -ftest-coverage

LDFLAGS += -fprofile-arcs -ftest-coverage

CFLAGS  += -fprofile-arcs -ftest-coverage -fprofile-update=atomic

LDFLAGS += -fprofile-arcs -ftest-coverage -fprofile-update=atomic

endif



ifeq "$(STRIP)" "1"
@@ -116,6 +116,9 @@ CFLAGS += $(foreach DIR,$(SRC_DIRS),-I$(DIR)) 
# Source file search paths

VPATH     = $(SRC_DIRS)



# Filter out files that are not part of the build

EXCLUDED_FILES = SNR_calc_fx.c



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



SRCS_LIBCOM   = $(foreach DIR,$(SRC_LIBCOM),$(patsubst $(DIR)/%,%,$(wildcard $(DIR)/*.c)))
@@ -125,6 +128,8 @@ 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_LIBENC := $(filter-out $(EXCLUDED_FILES),$(SRCS_LIBENC))



OBJS_LIBCOM      = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.o))

OBJS_LIBDEBUG    = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEBUG:.c=.o))

OBJS_LIBDEC      = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEC:.c=.o))
@@ -161,8 +166,8 @@ $(LIB_LIBENC): $(OBJS_LIBENC) 


$(LIB_LIBREND): $(OBJS_LIBREND)

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



$(LIB_LIBUTIL): $(OBJS_LIBUTIL)

# Dependency on OBJS_LIBCOM added temporarily for unit-test to work

$(LIB_LIBUTIL): $(OBJS_LIBUTIL) $(OBJS_LIBCOM)

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



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

Workspace_msvc/lib_com.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -229,7 +229,6 @@ 
    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com.c" />

    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com.c" />

    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc.c" />

    <ClCompile Include="..\lib_com\ivas_td_decorr.c" />

    <ClCompile Include="..\lib_com\ivas_tools.c" />

    <ClCompile Include="..\lib_com\ivas_transient_det.c" />

    <ClCompile Include="..\lib_com\lag_wind.c" />

Workspace_msvc/lib_com.vcxproj.filters

+1 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <ItemGroup>

    <ClCompile Include="..\lib_com\ivas_dirac_com.c">
@@ -451,9 +451,6 @@ 
    <ClCompile Include="..\lib_com\ivas_mdct_imdct.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_td_decorr.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_com\ivas_ism_com.c">

      <Filter>common_ivas_c</Filter>

    </ClCompile>

Workspace_msvc/lib_dec.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -264,7 +264,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_svd_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_tcx_core_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_td_low_rate_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_vbap.c" />

    <ClCompile Include="..\lib_dec\jbm_jb4sb.c" />

    <ClCompile Include="..\lib_dec\jbm_jb4_circularbuffer.c" />

    <ClCompile Include="..\lib_dec\jbm_jb4_inputbuffer.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+1 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

  <ItemGroup>

    <ClCompile Include="..\lib_dec\ivas_vbap.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_agc_dec.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>