Commit f84e4112 authored by TYAGIRIS's avatar TYAGIRIS
Browse files

split rendering SA4 released BASOP code on float IVAS

parent 86862b41

Makefile

+23 −2
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 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)) 



# Name of CLI binaries
@@ -140,7 +142,12 @@ 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_LIBCOM      = $(addprefix $(OBJDIR)/,$(SRCS_LIBCOM:.c=.o))

OBJS_LIBDEBUG    = $(addprefix $(OBJDIR)/,$(SRCS_LIBDEBUG:.c=.o))
@@ -187,7 +194,11 @@ $(LIB_LIBREND): $(OBJS_LIBREND) $(OBJS_LIBISAR) 
	$(QUIET_AR)$(AR) rcs $@ $^



$(LIB_LC3PLUS): $(OBJS_LC3PLUS)

ifeq "$(INCLUDE_SPLIT)" "1"

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

else



endif



$(LIB_LIBUTIL): $(OBJS_LIBUTIL)

	$(QUIET_AR)$(AR) rcs $@ $^
@@ -196,13 +207,23 @@ $(CLI_APIENC): $(OBJS_CLI_APIENC) $(LIB_LIBENC) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(L 
	$(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) $(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_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_APIPOSTREND): $(OBJS_CLI_APPPOSTREND) $(LIB_LIBISAR) $(LIB_LIBCOM) $(LIB_LIBUTIL) $(LIB_LIBDEBUG) $(LIB_LC3PLUS)

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPPOSTREND) -L. -lisar -livasutil -livasdebug -livascom -llc3plus $(LDLIBS) -o $(CLI_APIPOSTREND)

ifeq "$(INCLUDE_SPLIT)" "1"

	$(QUIET_LINK)$(CC) $(LDFLAGS) $(OBJS_CLI_APPPOSTREND) -L. -lisar -livasutil -livasdebug -llc3plus -livascom $(LDLIBS) -o $(CLI_APIPOSTREND)

endif



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

Workspace_msvc/decoder.vcxproj

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ 
  </ItemDefinitionGroup>

  <ItemGroup>

    <ClCompile Include="..\apps\decoder.c" />

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

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="lib_dec.vcxproj">

Workspace_msvc/encoder.vcxproj

+3 −0
Original line number Diff line number Diff line
@@ -169,6 +169,9 @@ 
      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

    </ProjectReference>

  </ItemGroup>

  <ItemGroup>

    <ClInclude Include="..\lib_com\enhUL32.h" />

  </ItemGroup>

  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

  <ImportGroup Label="ExtensionTargets">

  </ImportGroup>

Workspace_msvc/isar_post_rend.vcxproj

+2 −0
Original line number Diff line number Diff line
@@ -148,6 +148,8 @@ 
  </ItemDefinitionGroup>

  <ItemGroup>

    <ClCompile Include="..\apps\isar_post_rend.c" />

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

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

  </ItemGroup>

  <ItemGroup>

    <ProjectReference Include="lib_debug.vcxproj">

Workspace_msvc/lib_com.vcxproj

+16 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 
    <ClCompile>

      <Optimization>Disabled</Optimization>

      <AdditionalIncludeDirectories>..\lib_com;..\lib_debug;..\lib_dec;..\lib_enc;..\lib_rend;..\lib_isar;..\lib_lc3plus;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>

      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;$(Macros);WIN32;%(PreprocessorDefinitions);</PreprocessorDefinitions>

      <ExceptionHandling />

      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -142,14 +142,20 @@ 
    <ClCompile Include="..\lib_com\cldfb.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <ClCompile Include="..\lib_com\env_adj.c" />
@@ -163,6 +169,7 @@ 
    <ClCompile Include="..\lib_com\fill_spectrum.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_com\gs_bitallocation.c" />
@@ -269,6 +276,7 @@ 
    <ClCompile Include="..\lib_com\tec_com.c" />

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

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

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

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

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

    <ClCompile Include="..\lib_com\vlpc_2st_com.c" />
@@ -287,8 +295,14 @@ 
    <ClInclude Include="..\lib_com\basop_util.h" />

    <ClInclude Include="..\lib_com\cnst.h" />

    <ClInclude Include="..\lib_com\common_api_types.h" />

    <ClInclude Include="..\lib_com\complex_basop.h" />

    <ClInclude Include="..\lib_com\control.h" />

    <ClInclude Include="..\lib_com\count.h" />

    <ClInclude Include="..\lib_com\enh1632.h" />

    <ClInclude Include="..\lib_com\enh32.h" />

    <ClInclude Include="..\lib_com\enh40.h" />

    <ClInclude Include="..\lib_com\enh64.h" />

    <ClInclude Include="..\lib_com\enhUL32.h" />

    <ClInclude Include="..\lib_com\ivas_cnst.h" />

    <ClInclude Include="..\lib_com\ivas_error.h" />

    <ClInclude Include="..\lib_com\ivas_error_utils.h" />
@@ -298,6 +312,7 @@ 
    <ClInclude Include="..\lib_com\move.h" />

    <ClInclude Include="..\lib_com\options.h" />

    <ClInclude Include="..\lib_com\prot.h" />

    <ClInclude Include="..\lib_com\prot_fx2.h" />

    <ClInclude Include="..\lib_com\rom_com.h" />

    <ClInclude Include="..\lib_com\stat_com.h" />

    <ClInclude Include="..\lib_com\stl.h" />