Commit 3fa7478f authored by vaclav's avatar vaclav
Browse files

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

- Merge remote-tracking branch 'remotes/origin/main' into 2462-bug-in-calculating-parcor-coefficient-in-calc_rc0_h
parents 4482b23f df7d10dc

Workspace_msvc/lib_enc.vcxproj

+0 −1
Original line number Diff line number Diff line
@@ -242,7 +242,6 @@ 
    <ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd_fx.c" />

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

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

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

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

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

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

Workspace_msvc/lib_enc.vcxproj.filters

+0 −3
Original line number Diff line number Diff line
@@ -253,9 +253,6 @@ 
    <ClCompile Include="..\lib_enc\igf_enc_fx.c">

      <Filter>encoder_all_c</Filter>

    </ClCompile>

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

      <Filter>encoder_all_c</Filter>

    </ClCompile>

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

      <Filter>encoder_all_c</Filter>

    </ClCompile>

lib_com/fd_cng_com_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -169,7 +169,9 @@ void initFdCngCom( 
#ifndef FIX_BASOP_2262_OLAP_BUFFER_SYNTH_SWITCHING

    set32_fx( hFdCngCom->olapBufferSynth_fx, 0, FFTLEN );

#endif

#ifndef FIX_BASOP_REMOVE_SYNTH2_FX

    set32_fx( hFdCngCom->olapBufferSynth2_fx, 0, FFTLEN );

#endif

    set32_fx( hFdCngCom->exc_cng_32fx, 0, L_FRAME16k );

    set16_fx( hFdCngCom->exc_cng, 0, L_FRAME16k );

lib_com/fft_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -2791,6 +2791,7 @@ void DoRTFTn_fx_ivas( 
    return;

}



#ifndef HQ_ALIGN_DUPLICATED_CODE

void fft3_fx_ivas(

    const Word32 X[], // Qx

    Word32 Y[],       // Qx
@@ -3287,7 +3288,7 @@ void ifft3_fx_ivas( 


    return;

}



#endif



static void rfft_post(

    const Word16 *sine_table, // Q15

lib_com/hq_tools_fx.c

+24 −0
Original line number Diff line number Diff line
@@ -2640,7 +2640,22 @@ void enforce_zero_for_min_envelope_fx( 
    return;

}



#ifdef HQ_ALIGN_DUPLICATED_CODE

/*--------------------------------------------------------------------------*

 * apply_envelope()

 *

 * Apply spectral envelope without envelope adjustments and noisefill

 *--------------------------------------------------------------------------*/



void apply_envelope_enc_fx(

    const Word16 *coeff,     /* i  : Normalized spectrum                    Q12 */

    const Word16 *norm,      /* i  : Envelope                               Q0  */

    const Word16 num_sfm,    /* i  : Total number of bands                  Q0  */

    const Word16 *sfm_start, /* i  : Sub band start indices                 Q0  */

    const Word16 *sfm_end,   /* i  : Sub band end indices                   Q0  */

    Word32 *coeff_out        /* o  : scaled spectrum                        Q12 */

)

#else

/*--------------------------------------------------------------------------*

 * apply_envelope()

 *
@@ -2655,6 +2670,7 @@ void apply_envelope_enc_ivas_fx( 
    const Word16 *sfm_end,   /* i  : Sub band end indices                   Q0  */

    Word32 *coeff_out        /* o  : coded/noisefilled spectrum             Q12 */

)

#endif

{

    Word16 i;

    Word16 sfm;
@@ -2680,11 +2696,19 @@ void apply_envelope_enc_ivas_fx( 
}





#ifdef HQ_ALIGN_DUPLICATED_CODE

/*--------------------------------------------------------------------------*

 * apply_envelope_fx()

 *

 * Apply spectral envelope with envelope adjustments

 *--------------------------------------------------------------------------*/

#else

/*--------------------------------------------------------------------------*

 * apply_envelope()

 *

 * Apply spectral envelope with envelope adjustments

 *--------------------------------------------------------------------------*/

#endif



void apply_envelope_fx(

    const Word16 *coeff,     /* i/o: Coded/noisefilled normalized spectrum  Q12 */