Commit 6fb9241d authored by Jan Kiene's avatar Jan Kiene
Browse files

cleanup and refactoring

parent 0a070491

lib_com/ivas_prot.h

+7 −1
Original line number Diff line number Diff line
@@ -2091,7 +2091,7 @@ void IGFDecApplyStereo( 
    const int16_t restrict_hopsize,

#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

    const int16_t bfi,                                          /* i  : frame loss == 1, frame good == 0        */

    const int16_t apply_damping_bfi                                  /* i  : decoder element mode                    */

    const int16_t bfi_apply_damping                                  /* i  : decoder element mode                    */

#else

    const int16_t bfi                                           /* i  : frame loss == 1, frame good == 0        */

#endif
@@ -5448,6 +5448,12 @@ void TonalMdctConceal_whiten_noise_shape( 
    const int16_t L_frame,

    const TONALMDCTCONC_NOISE_SHAPE_WHITENING_MODE

);



int16_t get_igf_startline(

    Decoder_State *st,

    int16_t L_frame,

    int16_t L_frameTCX

);

#endif



float rand_triangular_signed(

lib_com/ivas_stereo_psychlpc_com.c

+1 −2
Original line number Diff line number Diff line
@@ -71,8 +71,7 @@ static void SpectrumWeighting_Init( 
#ifndef MDCT_STEREO_PLC_FADE_2_BG_NOISE

static

#endif

    ivas_error

    PsychoacousticParameters_Init(

ivas_error PsychoacousticParameters_Init(

        const int32_t sr_core,  /* i  : sampling rate of core-coder                                     */

        const int16_t nBins,    /* i  : Number of bins (spectral lines)                                 */

        const int8_t nBands,    /* i  : Number of spectrum subbands                                     */

lib_dec/core_dec_init.c

+0 −1
Original line number Diff line number Diff line
@@ -553,7 +553,6 @@ void open_decoder_LPD( 
        st->hTcxDec->prev_widow_left_rect = 0;



#ifdef MDCT_STEREO_PLC_FADE_2_BG_NOISE

        /* Todo: should be considered for other stereo modes as well */

        if ( is_init || is_mct || !( st->element_mode == IVAS_CPE_MDCT && st->element_mode == last_element_mode ) )

        {

            st->hTcxDec->CngLevelBackgroundTrace_bfi = PLC_MIN_CNG_LEV;

lib_dec/dec_tcx.c

+1 −17
Original line number Diff line number Diff line
@@ -1104,23 +1104,7 @@ void decoder_tcx_noisefilling( 
     *-----------------------------------------------------------------*/



    /* Init lengths */

    if ( st->igf == 0 )

    {

        if ( st->narrowBand == 0 )

        {

            /* minimum needed for output with sampling rates lower then the

               nominal sampling rate */

            infoIGFStartLine = min( L_frameTCX, L_frame );

        }

        else

        {

            infoIGFStartLine = L_frameTCX;

        }

    }

    else

    {

        infoIGFStartLine = min( st->hIGFDec->infoIGFStartLine, L_frameTCX );

    }

    infoIGFStartLine = get_igf_startline( st, L_frame, L_frameTCX );



    noiseFillingSize = L_spec;

    if ( st->igf )

lib_dec/er_dec_tcx.c

+1 −5
Original line number Diff line number Diff line
@@ -560,11 +560,8 @@ void con_tcx( 


        if ( alpha != 1.0f )

        {

            float lsp_local[M];

            float lsp_fade[M];

            float alpha_inv;

            float lsp_local[M], lsp_fade[M], alpha_inv;



            wmops_sub_start( "Fade LSPs" );

            alpha_inv = 1.0f - alpha;



            a2lsp_stab( A_local, lsp_local, lsp_local );
@@ -575,7 +572,6 @@ void con_tcx( 
            }



            lsp2a_stab( lsp_fade, A_local, M );

            wmops_sub_end();

        }

    }

#endif