Commit 65e7a439 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_391_SBA

parent 9bf44294

lib_com/ivas_dirac_com.c

+0 −2
Original line number Diff line number Diff line
@@ -173,9 +173,7 @@ ivas_error ivas_dirac_config( 
    }

    hConfig->enc_param_start_band = 0;

    hConfig->dec_param_estim = FALSE;

#ifdef FIX_391_SBA

    hConfig->dec_param_estim_old = hConfig->dec_param_estim;

#endif

    if ( ivas_format == SBA_FORMAT ) /* skip for MASA decoder */

    {

        if ( ( error = ivas_dirac_sba_config( hQMetaData, nchan_transport, nSCE, nCPE, element_mode, ivas_total_brate, sba_order, sba_mode, hConfig->nbands - spar_dirac_split_band ) ) != IVAS_ERR_OK )

lib_com/ivas_stat_com.h

+0 −2
Original line number Diff line number Diff line
@@ -181,9 +181,7 @@ typedef struct ivas_dirac_config_data_struct 
{

    int16_t enc_param_start_band;

    int16_t dec_param_estim;

#ifdef FIX_391_SBA

    int16_t dec_param_estim_old;

#endif

    int16_t nbands;



} DIRAC_CONFIG_DATA, *DIRAC_CONFIG_DATA_HANDLE;

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -150,7 +150,6 @@ 






#define FIX_391_SBA                                     /* Dlb: Fix for issue 391 for SBA */

#define LBR_ADAP_SMOOTHING_OPT                          /* FhG: Issue 436: complexity optimization of adaptive smoothing in low-bitrate SBA */



#define FIX_425_MASA_BRSW_RENDERER                      /* Nokia: Issue 425: renderer not reconfigure in MASA bitrate switching */

lib_dec/ivas_dirac_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1127,9 +1127,7 @@ ivas_error ivas_dirac_dec_config( 
        hDirAC->dirac_bs_md_write_idx = 0;

        hDirAC->dirac_read_idx = 0;

        hDirAC->spar_to_dirac_write_idx = 0;

#ifdef FIX_391_SBA

        hDirAC->hConfig->dec_param_estim_old = hDirAC->hConfig->dec_param_estim;

#endif

        if ( st_ivas->mc_mode == MC_MODE_MCMASA )

        {

            hDirAC->dirac_md_buffer_length = MAX_PARAM_SPATIAL_SUBFRAMES;
@@ -1341,7 +1339,6 @@ ivas_error ivas_dirac_dec_config( 
        hDirAC->dithering_seed = DIRAC_DITH_SEED;

        st_ivas->hDirAC = hDirAC;

    }

#ifdef FIX_391_SBA

    else if ( hDirAC->hConfig->dec_param_estim_old != hDirAC->hConfig->dec_param_estim )

    {

        int16_t num_slots_in_subfr;
@@ -1500,7 +1497,6 @@ ivas_error ivas_dirac_dec_config( 
#endif

        }

    }

#endif

#ifdef JBM_TSM_ON_TCS

    /* allocate transport channels*/

    if ( flag_config == DIRAC_OPEN )