Commit 4e7d890b authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_393_459_460_SBA_MD

parent d27b9cf1

lib_com/ivas_dirac_com.c

+0 −3
Original line number Diff line number Diff line
@@ -160,9 +160,6 @@ ivas_error ivas_dirac_config( 
    }

    hConfig->enc_param_start_band = 0;

    hConfig->dec_param_estim = FALSE;

#ifndef FIX_393_459_460_SBA_MD

    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, element_mode, ivas_total_brate, sba_order, hConfig->nbands - spar_dirac_split_band ) ) != IVAS_ERR_OK )

lib_com/ivas_prot.h

+0 −8
Original line number Diff line number Diff line
@@ -3757,11 +3757,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( 
    const int16_t nchan_transport,                              /* i  : number of transport channels                */

    const int16_t nbslots,                                                  /* i  : number of slots to process                  */

    const float *onset_filter,

#ifdef FIX_393_459_460_SBA_MD

    float *diffuseness,

#else

    const int16_t md_idx,

#endif

    const int16_t hodirac_flag                                  /* i  : flag to indicate HO-DirAC mode              */

);
@@ -3770,11 +3766,7 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls( 
    float ImagBuffer[][MAX_PARAM_SPATIAL_SUBFRAMES][CLDFB_NO_CHANNELS_MAX],/* i : LS signals                                   */

    DIRAC_DEC_HANDLE hDirAC,                                               /* i/o: DirAC handle                                */

    const int16_t nbslots,                                                 /* i  : number of slots to process                  */

#ifdef FIX_393_459_460_SBA_MD

    float *diffuseness_vector,                                  /* i  : diffuseness (needed for direction smoothing)*/

#else

    const int16_t diff_md_idx, /* i  : md slot idx of diffuseness to use           */

#endif

    float *reference_power_smooth,

    float qualityBasedSmFactor

);

lib_com/ivas_stat_com.h

+0 −3
Original line number Diff line number Diff line
@@ -180,9 +180,6 @@ typedef struct ivas_dirac_config_data_struct 
{

    int16_t enc_param_start_band;

    int16_t dec_param_estim;

#ifndef FIX_393_459_460_SBA_MD

    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
@@ -147,7 +147,6 @@ 
/*#define FIX_I4_OL_PITCH*/                             /* fix open-loop pitch used for EVS core switching */



#define FIX_196_REFACTOR_RENDERER_OUTPUT_CONFIG         /* Phi: issue 196 - refactoring renderer output configuration */

#define FIX_393_459_460_SBA_MD                          /* FhG: fix issues 393, 459, 460, 494 all related to MD buffers and the read index for accessing them */

#define FIX_501_TABLE_IDX_INIT                          /* Dlb: Fix for the issue 501 */

#define FIX_506_WARNINGS                                /* FhG/Eri/Dlb/VA: Issue 508, Warnings on MacOS */

#define FIX_296_CFG_LFE_SCENE_DESC                       /* FhG: Fix issue 296 - add configurable LFE handling to the scene description file */

lib_dec/ivas_dirac_dec.c

+0 −279

File changed.

Preview size limit exceeded, changes collapsed.