Commit dd65968e authored by vaclav's avatar vaclav
Browse files

- fix compilation warning when SBA_BR_SWITCHING_CLEAN_UP is disabled 

- clean out remaining ToDo comments
parent 105938cc

lib_enc/ivas_sba_enc.c

+4 −8
Original line number Diff line number Diff line
@@ -106,7 +106,10 @@ ivas_error ivas_sba_enc_reconfigure( 
    Encoder_Struct *st_ivas /* i/o: IVAS encoder structure      */

)

{

    int16_t n, nSCE_old, nCPE_old, nchan_transport_old;

#ifdef SBA_BR_SWITCHING_CLEAN_UP

    int16_t n;

#endif

    int16_t nSCE_old, nCPE_old, nchan_transport_old;

    int32_t ivas_total_brate;

    ivas_error error;

    ENCODER_CONFIG_HANDLE hEncoderConfig;
@@ -218,8 +221,6 @@ ivas_error ivas_sba_enc_reconfigure( 
                {

                    return error;

                }



                // VE: TBV - populate 'hSpar->hFrontVad' with 'hCoreCoder[0]' instead of resetting it to init-state?

            }



            ivas_spar_config( ivas_total_brate, min( st_ivas->sba_analysis_order, IVAS_MAX_SBA_ORDER ),
@@ -259,13 +260,11 @@ ivas_error ivas_sba_enc_reconfigure( 
            hEncoderConfig->element_mode_init = IVAS_CPE_MDCT;

        }



        /*TODO : Verify if full SPAR close and open can be used instead of submodules close and open */

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

        {

            /* FB mixer handle */

            if ( st_ivas->sba_mode == SBA_MODE_SPAR )

            {

                // VE: TBV whether 'hFbMixer' can be reused

                if ( hDirAC->hFbMixer != NULL )

                {

#ifndef SBA_BR_SWITCHING_CLEAN_UP
@@ -278,7 +277,6 @@ ivas_error ivas_sba_enc_reconfigure( 


                if ( sba_mode_old == SBA_MODE_SPAR )

                {

                    // VE: dirty patch -> reconfiguration of SPAR MD, TD_decorr, FbMixer modules should be used instead !!

#ifndef SBA_BR_SWITCHING_CLEAN_UP

                    IVAS_FB_CFG *fb_cfg;

                    int16_t nchan_internal, sba_order_internal;
@@ -328,8 +326,6 @@ ivas_error ivas_sba_enc_reconfigure( 
                    {

                        return error;

                    }



                    // VE: TBV - populate 'hSpar->hFrontVad' with 'hCoreCoder[0]' instead of resetting it to init-state?

#endif

                }

            }