Commit 42050068 authored by vaclav's avatar vaclav
Browse files

- Merge remote-tracking branch 'remotes/origin/main' into... 

- Merge remote-tracking branch 'remotes/origin/main' into 2460-remove-duplicated-code-various-functions
parents 24d8a9cc 5b8cdb5a

Workspace_msvc/lib_com.vcxproj

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

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

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

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

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

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

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

Workspace_msvc/lib_com.vcxproj.filters

+3 −6
Original line number Diff line number Diff line
@@ -265,12 +265,6 @@ 
    <ClCompile Include="..\lib_com\get_gain_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>
@@ -481,6 +475,9 @@ 
    <ClCompile Include="..\lib_com\rom_com_fx.c">

      <Filter>common_all_c</Filter>

    </ClCompile>

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

      <Filter>common_all_c</Filter>

    </ClCompile>

  </ItemGroup>

  <ItemGroup>

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

lib_com/gs_bitallocation_fx.c

+945 −276

File changed.

Preview size limit exceeded, changes collapsed.

lib_com/gs_bitallocation_ivas_fx.c

deleted100644 → 0
+0 −1170

File deleted.

Preview size limit exceeded, changes collapsed.

lib_com/options.h

+2 −1
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
#define HARM_2456_APPLY_SCALE                           /* FhG basop issue 2456: Harmonize apply_scale_ind(), apply_scale_ivas_fx() */

#define HARM_2454_TCX_RES_Q_SPEC                        /* FhG: harmonization of tcx_res_Q_spec_fx() and tcx_res_Q_spec_ivas_fx() */

#define FIX_FLOAT_1535_ARI_RES_Q_CLEANUP                /* FhG: remove dead code from tcx_ari_res_Q_spec() */

#define FIX_2467_RENAME_GSC_FUNCTION                    /* VA: basop issue 2467: Removal of unused function/table and renaming of _ivas_fx versions to default ones. */

#define HARMONIZE_FUNC                                  /* VA: basop issue 2460: Remove duplicated code: various functions */



/* #################### End BE switches ################################## */
@@ -102,7 +103,7 @@ 
#define FIX_2283_ISM_MD_DELAY                           /* Dolby: Fix ISM metadata delay round-off */

#define FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING      /* FhG: basop issue 2262: correct buffer update for FD-CNG buffer in case of BR switching */

#define FIX_2440_AGC_PRESCALING                         /* FhG: basop issue 2440: Fix loop bounds when scaling p_output_fx before ivas_spar_dec_agc_pca_fx() */



#define FIX_2471_REMOVE_POSSIBLE_OVRF                   /* VA: basop issue 2471: correcting undesired overflow */

/* ##################### End NON-BE switches ########################### */



/* ################## End MAINTENANCE switches ######################### */