Commit e006b0ee authored by vaclav's avatar vaclav
Browse files

Merge branch '19-unify-cng-flag-in-sba' into 'main' 

Resolve issue #19: Unify CNG flag in SBA

See merge request !28
parents 325ccfda 7d5784c9

lib_dec/acelp_core_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -1296,7 +1296,7 @@ ivas_error acelp_core_dec( 
            st->cldfbSyn->bandsToZero = st->cldfbSyn->no_channels - st->cldfbAna->no_channels;

        }



        if ( !st->cng_dirac_flag || st->element_mode == IVAS_CPE_MDCT )

        if ( !st->cng_sba_flag || st->element_mode == IVAS_CPE_MDCT )

        {

            /*WB/SWB-FD_CNG*/

            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 ) )

lib_dec/fd_cng_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -2055,7 +2055,7 @@ void FdCngDecodeMDCTStereoSID( 
    int16_t is_out_ms;



    is_out_ms = 0;

    if ( hCPE->hCoreCoder[0]->cng_spar_flag == 1 )

    if ( hCPE->hCoreCoder[0]->cng_sba_flag )

    {

        is_out_ms = 1;

    }

lib_dec/init_dec.c

+1 −2
Original line number Diff line number Diff line
@@ -746,8 +746,7 @@ ivas_error init_decoder( 


    st->tdm_LRTD_flag = 0;

    st->cna_dirac_flag = 0;

    st->cng_dirac_flag = 0;

    st->cng_spar_flag = 0;

    st->cng_sba_flag = 0;





    return error;

lib_dec/ivas_core_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ ivas_error ivas_core_dec( 


    if ( sts[0]->element_mode == IVAS_CPE_MDCT && sts[0]->total_brate == SID_2k40 )

    {

        if ( sts[0]->cng_dirac_flag )

        if ( sts[0]->cng_sba_flag )

        {

            FdCngDecodeDiracMDCTStereoSID( hCPE );

        }

lib_dec/ivas_decision_matrix_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ void ivas_decision_matrix_dec( 
                st->L_frame = L_FRAME;

            }

        }

        else if ( st->total_brate == SID_2k40 && st->idchan == 1 && st->element_mode == IVAS_CPE_MDCT && st->cng_dirac_flag == 0 )

        else if ( st->total_brate == SID_2k40 && st->idchan == 1 && st->element_mode == IVAS_CPE_MDCT && st->cng_sba_flag == 0 )

        {

            /* read channel coherence */

            st->hFdCngDec->hFdCngCom->coherence = (float) get_next_indice( st, 4 ) / 15.f;