Commit 17f92b46 authored by Vidhya V P's avatar Vidhya V P
Browse files

Address review comments : set 2

parent 17ea12b3

lib_dec/ivas_sba_dec.c

+22 −13
Original line number Diff line number Diff line
@@ -726,21 +726,24 @@ ivas_error ivas_sba_dec_reconfigure( 


            hDirAC = st_ivas->hDirAC;

        }



#ifndef SBA_BR_SWITCHING_RECONFIG

        if ( hDirAC != NULL )

#else

        if ( ( hDirAC != NULL )

            && ( sba_mode_old == st_ivas->sba_mode ) )

#endif

        {

            ivas_dirac_dec_config( st_ivas, DIRAC_RECONFIGURE_MODE );



#ifndef SBA_BR_SWITCHING_RECONFIG

            mvs2s( hDirAC->dirac_to_spar_md_bands, hSpar->dirac_to_spar_md_bands, DIRAC_MAX_NBANDS );

            hSpar->enc_param_start_band = hDirAC->hConfig->enc_param_start_band;

#endif

        }



        if ( ( error = ivas_dirac_sba_config( st_ivas->hQMetaData, &st_ivas->nchan_transport, &st_ivas->nSCE, &st_ivas->nCPE, &st_ivas->element_mode_init, ivas_total_brate, st_ivas->sba_analysis_order, st_ivas->sba_mode, IVAS_MAX_NUM_BANDS - SPAR_DIRAC_SPLIT_START_BAND ) ) != IVAS_ERR_OK )

        {

            return error;

        }

    }



    if ( st_ivas->nchan_transport == 1 )

    {

        st_ivas->element_mode_init = IVAS_SCE;
@@ -808,24 +811,27 @@ ivas_error ivas_sba_dec_reconfigure( 
    }

#endif

#ifdef SBA_BR_SWITCHING_RECONFIG

    if ( sba_mode_old != st_ivas->sba_mode ) // VE: TBD - possibly merge with the 'else if' branch below

    if ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_SBA_LINEAR_DEC || ( sba_mode_old != st_ivas->sba_mode ) )

    {

        DIRAC_CONFIG_FLAG flag_config;



        flag_config = DIRAC_OPEN;

        if ( st_ivas->hDirAC != NULL )

        {

            if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_RECONFIGURE_MODE ) ) != IVAS_ERR_OK )

            flag_config = DIRAC_RECONFIGURE;

            if ( sba_mode_old != st_ivas->sba_mode && st_ivas->sba_mode != SBA_MODE_SPAR )

            {

                return error;

                flag_config = DIRAC_RECONFIGURE_MODE;

            }

        }

        else

        {

            if ( ( error = ivas_dirac_dec_config( st_ivas, DIRAC_OPEN ) ) != IVAS_ERR_OK )



        if ( ( error = ivas_dirac_dec_config( st_ivas, flag_config ) ) != IVAS_ERR_OK )

        {

            return error;

        }

        

    }

    }

#endif

#else

#ifdef SBA_BR_SWITCHING

    if ( ( st_ivas->renderer_type != RENDERER_DISABLE && st_ivas->renderer_type != RENDERER_SBA_LINEAR_DEC ) )

    {
@@ -844,6 +850,9 @@ ivas_error ivas_sba_dec_reconfigure( 
            }

        }

    }

#endif

#endif

#ifdef SBA_BR_SWITCHING

    else if ( st_ivas->renderer_type == RENDERER_DISABLE || ( st_ivas->renderer_type == RENDERER_SBA_LINEAR_DEC && st_ivas->sba_mode != SBA_MODE_SPAR ) )

    {

        if ( st_ivas->hDirAC != NULL )