Commit 99086059 authored by bayers's avatar bayers
Browse files

Fix #393, #459. #460, #494, all related to the DirAC metadata buffers and the... 

Fix #393, #459. #460, #494, all related to the DirAC metadata buffers and the read index used to access them. Non-BE, under define FIX_393_459_460_SBA_MD, active
parent 86dcf5af

lib_com/ivas_dirac_com.c

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

    hConfig->enc_param_start_band = 0;

    hConfig->dec_param_estim = FALSE;

#ifndef FIX_393_459_460_SBA_MD

#ifdef FIX_391_SBA

    hConfig->dec_param_estim_old = hConfig->dec_param_estim;

#endif

#endif

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

    {

lib_com/ivas_prot.h

+9 −1
Original line number Diff line number Diff line
@@ -3878,8 +3878,12 @@ void ivas_dirac_dec_output_synthesis_process_subframe_gain_shd( 
    const float *onset_filter 

#ifdef HODIRAC                                                      

    ,

#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              */

#endif
@@ -3891,7 +3895,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
@@ -185,8 +185,10 @@ 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

#ifdef FIX_391_SBA

    int16_t dec_param_estim_old;

#endif

#endif

    int16_t nbands;

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ 
#define JBM_TSM_ON_TCS                                  /* FhG: run the TSM part of JBM on the TCs instead of the final output pcm waveforms */



#define FIX_DTX_428                                     /* FhG: fix for issue 428, crash with DTX and bitrate switching */

#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 */



/* ################## End DEVELOPMENT switches ######################### */

/* clang-format on */

lib_dec/ivas_dirac_dec.c

+163 −14

File changed.

Preview size limit exceeded, changes collapsed.