Commit f26cc865 authored by Vidhya V P's avatar Vidhya V P
Browse files

Fix for DTX with SBA BR switching crash

parent bf5cda2b

lib_enc/ivas_front_vad.c

+1 −5
Original line number Diff line number Diff line
@@ -396,12 +396,8 @@ ivas_error front_vad_spar( 


    hFrontVad = hSpar->hFrontVad;

    st = hSpar->hCoreCoderVAD;

#ifdef SBA_BR_SWITCHING_RECONFIG

    if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_total_brate <= SBA_DTX_BITRATE_THRESHOLD &&

         hEncoderConfig->ivas_total_brate == hEncoderConfig->last_ivas_total_brate )

#else



    if ( hEncoderConfig->Opt_DTX_ON && hEncoderConfig->ivas_total_brate <= SBA_DTX_BITRATE_THRESHOLD )

#endif

    {

        /*------------------------------------------------------------------*

         * Initialization

lib_enc/ivas_sba_enc.c

+21 −0
Original line number Diff line number Diff line
@@ -523,6 +523,27 @@ ivas_error ivas_sba_enc_reconfigure( 
#else

        ivas_corecoder_enc_reconfig( st_ivas, nSCE_old, nCPE_old, nchan_transport_old );

#endif



#ifdef SBA_BR_SWITCHING_RECONFIG

        if ( st_ivas->hEncoderConfig->Opt_DTX_ON )

        {

            if ( ( sba_mode_old != st_ivas->sba_mode ) || ( nchan_transport_old != st_ivas->nchan_transport ) )

            {

                for ( int16_t sce_id = 0; sce_id < st_ivas->nSCE; sce_id++ )

                {

                    st_ivas->hSCE[sce_id]->hCoreCoder[0]->ini_frame = 1;

                }



                for ( int16_t cpe_id = 0; cpe_id < st_ivas->nCPE; cpe_id++ )

                {

                    for ( int16_t n = 0; n < CPE_CHANNELS; n++ )

                    {

                        st_ivas->hCPE[cpe_id]->hCoreCoder[n]->ini_frame = 1;

                    }

                }

            }

        }

#endif

    }



    return error;