Commit 894ec608 authored by Manuel Jander's avatar Manuel Jander
Browse files

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

Merge remote-tracking branch 'origin/main' into 1010-complexity-high-complexity-overhead-for-parammc-decoding
parents 6a9f686c 35646f13

Workspace_msvc/lib_enc.vcxproj

+0 −10
Original line number Diff line number Diff line
@@ -408,25 +408,15 @@ 
    <ClCompile Include="..\lib_enc\swb_pre_proc_fx.c" />

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Workspace_msvc/lib_enc.vcxproj.filters

+0 −39
Original line number Diff line number Diff line
@@ -160,15 +160,6 @@ 
    <ClCompile Include="..\lib_enc\enc_gen_voic.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>
@@ -307,36 +298,6 @@ 
    <ClCompile Include="..\lib_enc\swb_tbe_enc.c">

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

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

      <Filter>enc_all_c</Filter>

    </ClCompile>

lib_com/rom_com.c

+19 −0
Original line number Diff line number Diff line
@@ -14271,6 +14271,25 @@ const Word16 win_lpc_hb_wb_fx[(L_LOOK_12k8 + L_SUBFR + L_FRAME) * 5 / 32] = 
    32611,   32698,   32751

};













const Word16 win_lpc_hb_wb_ivas_fx[(L_LOOK_12k8 + L_SUBFR + L_FRAME) * 5 / 32] =













{//Q15













	6, 51, 140, 274,













	453, 675, 940, 1247,













	1596, 1985, 2414, 2882,













	3386, 3926, 4499, 5106,













	5743, 6410, 7104, 7823,













	8566, 9331, 10114, 10915,













	11731, 12559, 13398, 14245,













	15099, 15955, 16813, 17669,













	18523, 19370, 20209, 21037,













	21853, 22654, 23437, 24202,













	24945, 25664, 26358, 27025,













	27662, 28269, 28842, 29382,













	29886, 30354, 30783, 31172,













	31521, 31828, 32093, 32315,













	32494, 32628, 32717, 32762













};









































const Word16 ola_win_shb_switch_fold_fx[L_SUBFR16k] =















{//Q15

























lib_com/rom_com.h



+1
−0




























Original line number
Diff line number
Diff line








@@ -612,6 +612,7 @@ extern const Word16 cos_fb_exc_fx[32]; // Q15





























extern const Word16 win_lpc_shb_fx[];                                        // Q15 /* Window for calculating SHB LPC coeffs */















extern const Word16 win_lpc_hb_wb_fx[];                                      // Q15













extern const Word16 win_lpc_hb_wb_ivas_fx[];                                 // Q15















extern const Word16 ola_win_shb_switch_fold_fx[];                            // Q15















extern const Word16 win_flatten_fx[];                                        // Q15















extern const Word16 win_flatten_4k_fx[];                                     // Q15

































lib_dec/gs_dec_fx.c



+4
−1




























Original line number
Diff line number
Diff line








@@ -1587,7 +1587,10 @@ void gsc_dec_ivas_fx(













        {















            pvq_core_dec_fx( st_fx, gsc_sfm_start, gsc_sfm_end, gsc_sfm_size, concat_out, &Q_tmp, bit, nb_subbands, bits_per_bands, NULL, inpulses_fx, imaxpulse_fx, ACELP_CORE );















#ifdef MSAN_FIX













            Scale_sig( concat_out, s_max( gsc_sfm_end[nb_subbands - 1], 0 ), sub( Q_PVQ_OUT, Q_tmp ) ); /* Q_PVQ_OUT */













            IF( nb_subbands > 0 )













            {













                Scale_sig( concat_out, gsc_sfm_end[nb_subbands - 1], sub( Q_PVQ_OUT, Q_tmp ) ); /* Q_PVQ_OUT */













            }















#else















            Scale_sig( concat_out, gsc_sfm_end[nb_subbands - 1], sub( Q_PVQ_OUT, Q_tmp ) ); /* Q_PVQ_OUT */















#endif