Commit b403bd06 authored by vaclav's avatar vaclav
Browse files

Merge branch 'discISM_DTX' of https://forge.3gpp.org/rep/ivas-codec-pc/ivas-codec into discISM_DTX

parents b8044756 043ba83e

lib_dec/acelp_core_dec.c

+3 −3
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ ivas_error acelp_core_dec( 
                }

#ifdef PARAM_ISM_DTX_CNG

                if ( !st->read_sid_info )

                // if (!st->read_sid_info && st->cng_paramISM_flag) /* read_sid_info can only be 0 in ParamISM mode */

                // if (!st->read_sid_info && st->cng_ism_flag) /* read_sid_info can only be 0 in ParamISM mode */

                {

                    float noise_lvl_highest;
@@ -1132,7 +1132,7 @@ ivas_error acelp_core_dec( 
            }



#ifdef PARAM_ISM_DTX_CNG

            if ( st->element_mode != IVAS_CPE_TD && !st->cng_paramISM_flag )

            if ( st->element_mode != IVAS_CPE_TD && !st->cng_ism_flag )

#else

            if ( st->element_mode != IVAS_CPE_TD )

#endif
@@ -1312,7 +1312,7 @@ ivas_error acelp_core_dec( 
            if ( ( st->core_brate == FRAME_NO_DATA || st->core_brate == SID_2k40 ) && ( st->cng_type == FD_CNG ) && ( st->hFdCngDec->hFdCngCom->numCoreBands < st->cldfbSyn->no_channels ) )

            {

#ifdef PARAM_ISM_DTX_CNG

                generate_comfort_noise_dec_hf( realBuffer, imagBuffer, st->hFdCngDec->hFdCngCom, st->cng_paramISM_flag );

                generate_comfort_noise_dec_hf( realBuffer, imagBuffer, st->hFdCngDec->hFdCngCom, st->cng_ism_flag );

#else

                generate_comfort_noise_dec_hf( realBuffer, imagBuffer, st->hFdCngDec->hFdCngCom );

#endif

lib_dec/fd_cng_dec.c

+6 −6
Original line number Diff line number Diff line
@@ -1085,7 +1085,7 @@ void generate_comfort_noise_dec( 


    seed2 = &( hFdCngCom->seed2 );

#ifdef PARAM_ISM_DTX_CNG

    if ( ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 ) || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) )

    if ( ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 ) || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) )

#else

    if ( st->element_mode == IVAS_CPE_MDCT && st->idchan == 1 )

#endif
@@ -1099,7 +1099,7 @@ void generate_comfort_noise_dec( 
    if ( hFdCngCom->startBand == 0 )

    {

#ifdef PARAM_ISM_DTX_CNG

        if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) )

        if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) )

#else

        if ( st->element_mode == IVAS_CPE_MDCT )

#endif
@@ -1128,7 +1128,7 @@ void generate_comfort_noise_dec( 
    {

        /* Real part in FFT bins */

#ifdef PARAM_ISM_DTX_CNG

        if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) )

        if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) )

#else

        if ( st->element_mode == IVAS_CPE_MDCT )

#endif
@@ -1146,7 +1146,7 @@ void generate_comfort_noise_dec( 


        /* Imaginary part in FFT bins */

#ifdef PARAM_ISM_DTX_CNG

        if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) )

        if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) )

#else

        if ( st->element_mode == IVAS_CPE_MDCT )

#endif
@@ -1228,7 +1228,7 @@ void generate_comfort_noise_dec( 
            {

                /* Real part in CLDFB band */

#ifdef PARAM_ISM_DTX_CNG

                if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) )

                if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) )

#else

                if ( st->element_mode == IVAS_CPE_MDCT )

#endif
@@ -1245,7 +1245,7 @@ void generate_comfort_noise_dec( 


                /* Imaginary part in CLDFB band */

#ifdef PARAM_ISM_DTX_CNG

                if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_paramISM_flag ) )

                if ( st->element_mode == IVAS_CPE_MDCT || ( st->element_mode == IVAS_SCE && st->cng_ism_flag ) )

#else

                if ( st->element_mode == IVAS_CPE_MDCT )

#endif

lib_dec/init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ ivas_error init_decoder( 
    st->cna_dirac_flag = 0;

    st->cng_sba_flag = 0;

#ifdef PARAM_ISM_DTX_CNG

    st->cng_paramISM_flag = 0;

    st->cng_ism_flag = 0;

    st->read_sid_info = 1; /* by default read the sid info from bitstream */

#endif

lib_dec/ivas_ism_dtx_dec.c

+2 −2
Original line number Diff line number Diff line
@@ -80,12 +80,12 @@ static void ivas_ism_preprocessing( 
            st->read_sid_info = 0; /* do not read the sid info from bitstream but use the estimated noise */

        }



        st->cng_paramISM_flag = 1;

        st->cng_ism_flag = 1;

    }

#ifndef DISCRETE_ISM_DTX_CNG

    else

    {

        st->cng_paramISM_flag = 0;

        st->cng_ism_flag = 0;

    }

#endif

lib_dec/ivas_ism_metadata_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ ivas_error ivas_ism_metadata_dec( 
#ifdef PARAM_ISM_DTX_CNG

    for ( ch = 0; ch < *nchan_transport; ch++ )

    {

        hSCE[ch]->hCoreCoder[0]->cng_paramISM_flag = 0;

        hSCE[ch]->hCoreCoder[0]->cng_ism_flag = 0;

    }

#endif