Commit 61ec1538 authored by multrus's avatar multrus
Browse files

[cleanup] accept DEC_ICA_DELAY_INTERP

parent 2fb14e0d

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ 
#define BASOP_NOGLOB                                    /* Disable global symbols in BASOPs, Overflow/Carry in BASOPs disabled, additional BASOPs in case of Overflow */

#define BITSTREAM_INDICES_MEMORY                        /* Don't count memory for bitstream Indice at the encoder - it is a temporary solution for development only */



#define DEC_ICA_DELAY_INTERP                            /* ICA Decoder Target Delay Interpolation in TD stereo */

#define LSF_RE_USE_SECONDARY_CHANNEL                    /* TD stereo Secondary channel LSF Q improvement */

#ifdef LSF_RE_USE_SECONDARY_CHANNEL

/*#define LSF_RE_USE_SECONDARY_CHANNEL_REUSEMODE */     /* switch to isolate the reuse mode case */

lib_dec/ivas_stat_dec.h

+0 −2
Original line number Diff line number Diff line
@@ -344,10 +344,8 @@ typedef struct stereo_tca_dec_data_structure 
    int16_t corrLagStats;     /* corr lag stats in current frame */

    int16_t prevCorrLagStats; /* corr lag stats in previous frame */



#ifdef DEC_ICA_DELAY_INTERP

    int16_t interp_dec_prevNCShift;         /* NC Shift in previous frame */

    int16_t interp_dec_switch_to_zero_diff; /* switch flag for interpolation */

#endif



    float memChanL[L_DEC_MEM_LEN_ICA]; /* left channel input to correct at the cross-over */

    float memChanR[L_DEC_MEM_LEN_ICA]; /* right channel input to correct at the cross-over */

lib_dec/ivas_stereo_ica_dec.c

+0 −8
Original line number Diff line number Diff line
@@ -151,7 +151,6 @@ void stereo_tca_dec( 
    /* IVAS_fmToDo: QCTodo: Need to address [16, 32] kHz @ Encoder --> 48 kHz Decoder. 48kHz-->48kHz is ok */

    /*target_idx = (hStereoTCA->refChanIndx == L_CH_INDX) ? R_CH_INDX : L_CH_INDX;*/



#ifdef DEC_ICA_DELAY_INTERP

    if ( hCPE->element_mode == IVAS_CPE_TD && hCPE->last_element_mode == IVAS_CPE_TD )

    {

        if ( hStereoTCA->corrLagStats == hStereoTCA->prevCorrLagStats && hStereoTCA->interp_dec_switch_to_zero_diff == 0 )
@@ -176,7 +175,6 @@ void stereo_tca_dec( 
        hStereoTCA->interp_dec_prevNCShift = currentNCShift;

        hStereoTCA->interp_dec_switch_to_zero_diff = 0;

    }

#endif



    ref = ptrChanL;

    target = ptrChanR;
@@ -203,11 +201,7 @@ void stereo_tca_dec( 
    }



    /* target signal adjustment for temporal shift variations */

#ifdef DEC_ICA_DELAY_INTERP

    if ( hStereoTCA->prevCorrLagStats != hStereoTCA->corrLagStats || bothChannelShift || ( hStereoTCA->interp_dec_switch_to_zero_diff == 1 && hCPE->element_mode == IVAS_CPE_TD ) )

#else

    if ( ( hStereoTCA->prevCorrLagStats != hStereoTCA->corrLagStats ) || bothChannelShift )

#endif

    {

        l_shift_adapt = L_SHIFT_ADAPT_16k;

        if ( output_Fs > 16000 )
@@ -366,10 +360,8 @@ void stereo_tca_init_dec( 
    hStereoTCA->corrLagStats = 0;

    hStereoTCA->prevCorrLagStats = 0;



#ifdef DEC_ICA_DELAY_INTERP

    hStereoTCA->interp_dec_prevNCShift = 0;

    hStereoTCA->interp_dec_switch_to_zero_diff = 0;

#endif



    set_f( hStereoTCA->memChanL, 0.0f, L_DEC_MEM_LEN_ICA );

    set_f( hStereoTCA->memChanR, 0.0f, L_DEC_MEM_LEN_ICA );