Commit 08305d0c authored by bayers's avatar bayers
Browse files

Merge branch... 

Merge branch '459-ho-dirac-bit-rate-switching-metadata-buffers-are-not-reallocated-correctly' into 'main'

[Non-BE] Resolve "HO-DirAC bit rate switching: metadata buffers are not reallocated correctly"

See merge request !653
parents 92420d58 b43760e8

lib_com/ivas_dirac_com.c

+2 −0
Original line number Diff line number Diff line
@@ -199,7 +199,9 @@ 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 */

    {

#ifndef SBA_MODE_CLEAN_UP

lib_com/ivas_prot.h

+10 −2
Original line number Diff line number Diff line
@@ -3881,8 +3881,12 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( 
#endif

    const float *onset_filter 

    ,

#ifdef FIX_393_459_460_SBA_MD

    float *diffuseness,

#else

#ifdef JBM_TSM_ON_TCS

    const int16_t md_idx,

#endif

#endif

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

);
@@ -3893,7 +3897,11 @@ void ivas_dirac_dec_output_synthesis_process_subframe_psd_ls( 
    DIRAC_DEC_HANDLE hDirAC,                                    /* i/o: DirAC handle                                */

#ifdef JBM_TSM_ON_TCS

    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

#endif

    float *reference_power_smooth,

    float qualityBasedSmFactor

lib_com/ivas_stat_com.h

+2 −0
Original line number Diff line number Diff line
@@ -180,7 +180,9 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ 
#define FIX_462_HRTF_FILE_BR_SWITCH_MEM_ERR             /* Eri: Fix for issue 462: Use-of-uninitialized memory in external HRTF deallocation in decoder together with BR switching */

#define FIX_487_LOWRATE_SBA_TUNING_FIX                  /* Dlb: TUning fix for low bitrate cases to match theoretical longest SPAR MD bitstream */

#define FIX_490_MASA_2TC_LBR_DTX                        /* Nokia: Fixes issue 490 by correcting condition. */

#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_163_SBA_TD_DECORR_OPT                       /* Dlb : Issue 163 : TD decorr state optimization in SBA for certain output formats */

lib_dec/ivas_dirac_dec.c

+164 −19

File changed.

Preview size limit exceeded, changes collapsed.