Commit 44563b75 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

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

Merge remote-tracking branch 'origin/main' into float-1528-ivas_rend-ism-rendering-not-working-correctly-for-omasa-input-with-5-ms-output
parents 4320e52d 0491b1ac

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/fd_cng_com_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -166,8 +166,12 @@ void initFdCngCom( 


    set16_fx( hFdCngCom->coherence_fx, 16384 /* 0.5 in Q15 */, MDCT_ST_DTX_NUM_COHERENCE_BANDS );



#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/fill_spectrum_fx.c

+24 −2
Original line number Diff line number Diff line
@@ -43,7 +43,19 @@ 
#include "ivas_prot_fx.h"





#ifdef HARM_HQ_CORE

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

 * fill_spectrum()

 *

 * Apply spectral filling by

 * - filling zero-bit bands below BWE region

 * - applying BWE above transition frequency

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



void fill_spectrum_fx(

#else

void ivas_fill_spectrum_fx(

#endif

    Word16 *coeff,                    /* i/o: normalized MLT spectrum / nf spectrum                Q12 */

    Word32 *L_coeff_out,              /* i/o: Noisefilled MLT spectrum                             Q12 */

    const Word16 *R,                  /* i  : number of pulses per band                            Q0  */
@@ -173,7 +185,6 @@ void ivas_fill_spectrum_fx( 
        move16();

    }





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

     * Build noise-fill codebook

     *----------------------------------------------------------------*/
@@ -250,10 +261,15 @@ void ivas_fill_spectrum_fx( 
    /*----------------------------------------------------------------*

     * Harmonic BWE, HVQ BWE and HQ SWB BWE

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



    test();

    IF( EQ_16( HQ_mode, HQ_HARMONIC ) )

    {

#ifdef HARM_HQ_CORE

        harm_bwe_fx( coeff_fine, coeff, num_sfm, sfm_start, sfm_end, last_sfm, R, prev_hq_mode, norm, noise_level, prev_noise_level, bwe_seed, L_coeff_out, element_mode );

#else

        ivas_harm_bwe_fx( coeff_fine, coeff, num_sfm, sfm_start, sfm_end, last_sfm, R, prev_hq_mode, norm, noise_level, prev_noise_level, bwe_seed, L_coeff_out, element_mode );

#endif

    }

    ELSE IF( EQ_16( HQ_mode, HQ_HVQ ) )

    {
@@ -262,12 +278,17 @@ void ivas_fill_spectrum_fx( 
    }

    ELSE IF( EQ_16( HQ_mode, HQ_GEN_SWB ) || EQ_16( HQ_mode, HQ_GEN_FB ) )

    {

#ifdef HARM_HQ_CORE

        hq_bwe_fx( element_mode, HQ_mode, L_coeff_out1, hq_generic_fenv, L_coeff_out, hq_generic_offset, prev_L_swb_norm, hq_generic_exc_clas, sfm_end, num_sfm, num_env_bands, R );

#else

        hq_bwe_ivas_fx( HQ_mode, L_coeff_out1, hq_generic_fenv, L_coeff_out, hq_generic_offset, prev_L_swb_norm, hq_generic_exc_clas, sfm_end, num_sfm, num_env_bands, R );

#endif

    }



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

     * HQ WB BWE refinements

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



    test();

    IF( EQ_16( length, L_FRAME16k ) && LE_32( L_core_brate, HQ_32k ) )

    {
@@ -304,7 +325,7 @@ void ivas_fill_spectrum_fx( 


    return;

}



#ifndef HARM_HQ_CORE

void fill_spectrum_fx(

    Word16 *coeff,                    /* i/o: normalized MLT spectrum / nf spectrum                Q12 */

    Word32 *L_coeff_out,              /* i/o: Noisefilled MLT spectrum                             Q12 */
@@ -564,3 +585,4 @@ void fill_spectrum_fx( 


    return;

}

#endif