Commit 66e9f8b5 authored by multrus's avatar multrus
Browse files

Merge branch 'main' into minor-tune-svd-wmops-mr1010x

parents 539feaf6 08fbe2db

Workspace_msvc/lib_enc.vcxproj

+0 −2
Original line number Diff line number Diff line
@@ -379,8 +379,6 @@ 
    <ClCompile Include="..\lib_enc\multi_harm.c" />

    <ClCompile Include="..\lib_enc\nelp_enc.c" />

    <ClCompile Include="..\lib_enc\nelp_enc_fx.c" />

    <ClCompile Include="..\lib_enc\noise_adjust.c" />

    <ClCompile Include="..\lib_enc\nois_est.c" />

    <ClCompile Include="..\lib_enc\pitch_ol.c" />

    <ClCompile Include="..\lib_enc\pitch_ol2.c" />

    <ClCompile Include="..\lib_enc\pit_enc.c" />

Workspace_msvc/lib_enc.vcxproj.filters

+0 −4
Original line number Diff line number Diff line
@@ -216,10 +216,6 @@ 
    <ClCompile Include="..\lib_enc\multi_harm.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\nois_est.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\noise_adjust.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_enc\pit_enc.c">

lib_com/basop_util.c

+0 −6
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ 
#include "basop_settings.h"

#include "cnst.h"





#define WMC_TOOL_SKIP



extern const Word32 SqrtTable[32];     // Q31

extern const Word16 SqrtDiffTable[32]; /* Q15 */
@@ -2660,6 +2657,3 @@ cmplx CL_mult_32x16( cmplx input, cmplx_s coeff ) 
#endif

    return result;

}
 




#undef WMC_TOOL_SKIP

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -149,5 +149,6 @@ 
#define FIX_11_1_IVAS_SPAR_DEC_UPMIXER_SF_RND_COEFFS            /* FhG  ivas_spar_com.c: Zeroes very small negative coeffs via L_shr_r (was L_shr) */

#define FIX_ISSUE_1237                          /* VA: replacement of Copy_Scale_sig_16_32_DEPREC() that are doing 16 bits left shift by Copy_Scale_sig_16_32_no_sat() */

#define FIX_ISSUE_1237_KEEP_EVS_BE              /* VA: Fix to keep EVS bitexactness to 26.444 */

#define FIX_ISSUE_1214                          /* Ittiam: Fix for issue 1214: Energy leakage in IGF tiles for MDCT-stereo @64kbps SWB*/

#endif

#define FIX_MINOR_SVD_WMOPS_MR1010X             /* FhG: Minor WMOPS tuning, bit-exact to previous version, saves about 8.2 WMOPS for MR1010 */

lib_com/prot.h

+1 −1
Original line number Diff line number Diff line
@@ -8161,7 +8161,7 @@ void IGFEncApplyStereo( 
);





void IGFEncResetTCX10BitCounter(

void IGFEncResetTCX10BitCounter_ivas_fx(

    const IGF_ENC_INSTANCE_HANDLE hIGFEnc /* i  : instance handle of IGF Encoder */

);