Commit 09b3632c authored by Jan Kiene's avatar Jan Kiene
Browse files

accept FIX_560_VAD_FLAG

parent 00b80aeb

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ 
#define VLBR_20MS_MD                                    /* Dlb: SBA VLBR 20ms Optimization*/

#define SBA_MODE_CLEANUP_2                              /* Dlb : changes part of fix issue #523 for unused signaling bit in SBA SID*/

#define FIX_137_SID_MD_BITS                             /* Dlb: Fix issue #137 , SID bitrate mismatch correction */

#define FIX_560_VAD_FLAG                                /* Eri: Issue 560 - VAD flag issue for unified stereo */

#define FIX_549_DMX_GAIN                                /* FhG: issue 549: ParamISM output too quiet */

#define FIX_470_MASA_JBM_EXT                            /* Nokia: Issue 470, fix MASA EXT output with JBM */

#define ISM_FB                                          /* issue 556: change SWB to FB coding in 1ISM at 24.4 kbps */

lib_enc/ivas_core_pre_proc_front.c

+0 −13
Original line number Diff line number Diff line
@@ -161,9 +161,6 @@ ivas_error pre_proc_front_ivas( 
    float temp1F_icatdmResampBuf[L_FILT_MAX]; /* temp buffers for ICA TDM resamplers */

    int16_t old_pitch1;                       /* previous frame OL pitch[1] @12.8 kHz */

    int16_t LR_localVAD;

#ifndef FIX_560_VAD_FLAG

    int16_t LR_vad_flag;

#endif

    ivas_error error;



    push_wmops( "pre_proc_front" );
@@ -180,9 +177,6 @@ ivas_error pre_proc_front_ivas( 
    res_cod_SNR_M = tmpF;



    LR_localVAD = 0;

#ifndef FIX_560_VAD_FLAG

    LR_vad_flag = 0;

#endif



    if ( hSCE != NULL )

    {
@@ -210,9 +204,6 @@ ivas_error pre_proc_front_ivas( 
        {

            /* Combine localVAD and vad_flag from LR processing */

            LR_localVAD = hCPE->hCoreCoder[0]->localVAD || hCPE->hCoreCoder[1]->localVAD;

#ifndef FIX_560_VAD_FLAG

            LR_vad_flag = hCPE->hFrontVad[0]->hVAD->vad_flag || hCPE->hFrontVad[1]->hVAD->vad_flag;

#endif

        }



        if ( hCPE->hStereoTD != NULL )
@@ -466,10 +457,6 @@ ivas_error pre_proc_front_ivas( 
        /* Add down mix stereo activity to LR vad_flag_dtx */

        *vad_flag_dtx = *vad_flag_dtx || st->vad_flag;



#ifndef FIX_560_VAD_FLAG

        /* Combine the LR VAD flag and stereo downmix VAD flag */

        st->vad_flag = ( LR_vad_flag || st->vad_flag );

#endif



        /* Determine hangover flag status based on LR localVAD and downmix localVAD */

        *vad_hover_flag = *vad_flag_dtx && !( LR_localVAD || st->localVAD );