Commit 0cfb4561 authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge remote-tracking branch 'origin/main' into nokia/contribution-omasa-combined-format

parents b43a78a1 7a8f63bd

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ 
#define FIX_557_CRASH_IN_ISM_DTX                        /* VA issue 557: fix crash in 1ISM 48 kbps DTX */

#define FIX_563_PARAMMC_LIMITER                         /* FhG: issue 563: fix ILD limiter when coming from silence w/o transient set             */



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



#define IGF_TUNING_96                                   /* FhG: Issue 546: slight tuning of IGF config used in 96 kbps stereo, 128 kbps SBA and others */

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

#define FIX_522_ISM_FIRST_SID                           /* VA: fix ISM decoder crash if first received frame is an SID */

lib_enc/ivas_core_pre_proc_front.c

+8 −0
Original line number Diff line number Diff line
@@ -163,7 +163,9 @@ 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,7 +182,9 @@ 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 )

    {
@@ -208,7 +212,9 @@ 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 )
@@ -462,8 +468,10 @@ 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 );