Commit 691f03e0 authored by Vidhya V P's avatar Vidhya V P
Browse files

Reconfiguration changes -SBA bitrate switching

parent e770e7f0

lib_com/ivas_sba_config.c

+2 −2
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ SBA_MODE ivas_sba_mode_select( 


    return sba_mode;

}



#ifndef SBA_BR_SWITCHING_RECONFIG

#ifdef SBA_BR_SWITCHING

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

 * get_sba_reinit_flag()
@@ -118,7 +118,7 @@ int16_t get_sba_reinit_flag( 
    return sba_reinit_flag;

}

#endif



#endif

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

 * ivas_sba_config()

 *

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ 
#define FIX_MCT_PLC_RECOVERY                            /* Issue 184: scale the old synthesis part correctly in the first good frame after lost frames in MCT modes - to be activated after previous switch is merged */

#define SBA_BR_SWITCHING_2                              /* Issue 114: Changes for sba bit rate switching with reconfigurations*/

#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/

#define SBA_BR_SWITCHING_RECONFIG                       /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different transport channels*/

#define FIX_AGC_WINFUNC_MEMORY                          /* Issue 62: lower agc_com.winFunc memory consumption */

#define FIX_ITD                                         /* Contribution 16: TD renderer ITD improvement and code cleanup */

#define REMOVE_SID_HARM_LEFTOVERS                       /* Issue 192: remove leftovers from the SID bitrate harmonization */

lib_dec/ivas_corecoder_dec_reconfig.c

+7 −1
Original line number Diff line number Diff line
@@ -483,7 +483,13 @@ ivas_error ivas_cldfb_dec_reconfig( 
            }

        }

    }



#ifdef SBA_BR_SWITCHING_RECONFIG

    /* CLDFB Interpolation weights */

    if ( st_ivas->sba_mode == SBA_MODE_SPAR && ( numCldfbAnalyses_old != numCldfbAnalyses || numCldfbSyntheses_old != numCldfbSyntheses || nchan_transport_old != st_ivas->nchan_transport ) )

    {

        ivas_spar_get_cldfb_gains( st_ivas->hSpar, st_ivas->cldfbAnaDec[0], st_ivas->cldfbSynDec[0], hDecoderConfig );

    }

#endif

    return IVAS_ERR_OK;

}

#endif

lib_dec/ivas_dirac_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -209,7 +209,11 @@ ivas_error ivas_dirac_dec_config( 
    if ( flag_config == DIRAC_RECONFIGURE && st_ivas->ivas_format == SBA_FORMAT )

    {

        int16_t tmp1, tmp2, tmp3;

#ifdef SBA_BR_SWITCHING_RECONFIG

        ivas_sba_config( ivas_total_brate, st_ivas->sba_analysis_order, -1, &nchan_transport_old, st_ivas->sba_planar, &tmp1, &tmp2, &tmp3 );

#else

        ivas_sba_config( st_ivas->hDecoderConfig->last_ivas_total_brate, st_ivas->sba_analysis_order, -1, &nchan_transport_old, st_ivas->sba_planar, &tmp1, &tmp2, &tmp3 );

#endif

    }



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

lib_dec/ivas_init_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ ivas_error ivas_dec_setup( 
            if ( st_ivas->ini_frame > 0 && ivas_total_brate != st_ivas->hDecoderConfig->last_ivas_total_brate && ivas_total_brate > IVAS_SID_5k2 )

#endif

            {

#ifndef SBA_BR_SWITCHING_RECONFIG

#ifdef SBA_BR_SWITCHING

#ifndef SBA_BR_SWITCHING_2

                if ( get_sba_reinit_flag( ivas_total_brate, st_ivas->hDecoderConfig->last_ivas_total_brate ) )
@@ -146,13 +147,16 @@ ivas_error ivas_dec_setup( 
                }

                else

                {

#endif

#endif

                    if ( ( error = ivas_sba_dec_reconfigure( st_ivas ) ) != IVAS_ERR_OK )

                    {

                        return error;

                    }

#ifndef SBA_BR_SWITCHING_RECONFIG

#ifdef SBA_BR_SWITCHING

                }

#endif

#endif

            }

            else