Commit cc73cdb4 authored by Marek Szczerba's avatar Marek Szczerba
Browse files

Merge branch 'main' into philips/contribution-38-control-metadata-reverb

parents bb5ca0d3 808d9ba5

lib_com/env_stab.c

+7 −0
Original line number Diff line number Diff line
@@ -44,6 +44,9 @@ 
#include "prot.h"

#include "rom_com.h"

#include "wmc_auto.h"

#ifdef FIX_594_STL_INCLUDE

#include "stl.h"

#endif

#ifdef DEBUGGING

#include "assert.h"

#endif
@@ -92,8 +95,12 @@ float env_stability( 
#ifdef BASOP_NOGLOB

        Overflow = 0;

        env_delta = shl_o( *mem_env_delta, 1, &Overflow );

#else

#ifdef FIX_595_SHL_NOGLOB

        env_delta = shl( *mem_env_delta, 1 );

#else

        env_delta = shl_o( *mem_env_delta, 1 );

#endif

#endif

    }

    else

lib_com/ifft_rel.c

+4 −0
Original line number Diff line number Diff line
@@ -229,7 +229,11 @@ void ifft_rel( 
     *-----------------------------------------------------------------*/



    idx = fft256_read_indexes;

#ifdef FIX_622_SILENCE_USAN_WARNING

    xi0 = &temp[0] - 1;

#else

    xi0 = temp - 1;

#endif

    if ( n == 128 )

    {

        for ( i = 0; i < n; i++ )

lib_com/ivas_cnst.h

+5 −0
Original line number Diff line number Diff line
@@ -887,7 +887,12 @@ enum fea_names 
#define MDCT_ST_PLC_FADEOUT_DELAY_4_LSP_FADE    3



typedef enum {

#ifdef FIX_619_ADD_UNDEF_VAL_FOR_CONCEALMENT_MODE

    NOISE_GEN_MODE_UNDEF = -1,

    EQUAL_CORES = 0,

#else

    EQUAL_CORES,

#endif

    TCX10_IN_0_TCX20_IN_1,

    TCX20_IN_0_TCX10_IN_1,

} TONALMDCTCONC_NOISE_GEN_MODE;

lib_com/options.h

+7 −3
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ 
#define FIX_569_TD_FILTER_LENGTH                        /* Eri: Issue 569: If an HRTF binary file exceeds the SFX_SPAT_BIN_MAX_FILTER_LENGTH the decoder crashes. This truncates the filter when generated from the model.  */

#define ISM_FB_16k4                                     /* VA: Issue: 579: change BW from SWB to FB in NxISM conditions to match the EVS codec */

#define FIX_580_PARAMMC_ENER_BURSTS                     /* FhG: issue 580: energy bursts due to ILD holding when energy relations change too much */

#define FIX_595_SHL_NOGLOB                              /* FhG: Issue 595: compilation with BASOP_NOGLOB disabled */

#define UPDATE_FASTCONV_SBA_FILTER                      /* Dlb: Issue 584: Update SBA CLDFB-Domain HRTFs */

#define FIX_570_SF_EXT_ORIENTATION

#define FIX_593_STL_INCLUDE                             /* FhG: Issue 593: correct include of stl.h in lib_enc/ivas_stereo_eclvq_enc.c */
@@ -191,6 +192,8 @@ 
#define FIX_MEM_REALLOC_IND_LIST                        /* VA: issue 601: failure of the automatic memory re-allocation mechanism when ind_list[] buffer is depleted in MASA mode with 2 TC*/

#define FIX_581_CLANG_OFFSET_TO_NULL                    /* FhG: issue 581: fix CLANG error about applying an offset to a NULL pointer */

#define JBM_PARAMUPMIX                                  /* Dlb: Issue 471: Integrate the Multichannel Parametric Upmix into the JBM path */

#define FIX_582_INDEX_OUT_OF_BOUNDS_SNS_AVQ_DEC         /* FhG: fix an undefined behaviour error in SNS AVQ decoding */

#define FIX_614_ADD_TO_NULL_PTR_DIRAC_SETUP             /* FhG: Issue 614: prevent adding to a null pointer in dirac setup code */



/* Fixes for bugs found during split rendering contribution development */

#define REND_STATIC_MEM_OPT                             /* Dlb: Static memory optimisation for external renderer */
@@ -199,8 +202,11 @@ 
#define TD_TDREND_FIX_NULLPTR_ACCESS                    /* FhG: avoid nullptr access in ivas_rend_TDObjRendOpen */

#define TD_REND_FIX_DIV_BY_ZERO                         /* FhG: avoid division by zero in sincResample fn */

#define RENAME_GWLPR                                    /* FhG: Rename clashing symbol */



#define SPLIT_REND_WITH_HEAD_ROT                        /* Dlb,FhG: Split Rendering contributions 21 and 35 */

#define FIX_594_STL_INCLUDE                             /* FhG: issue 594: Missing include of stl.h */



#define FIX_619_ADD_UNDEF_VAL_FOR_CONCEALMENT_MODE      /* FhG: fix usan error */

#define FIX_622_SILENCE_USAN_WARNING                    /* FhG: silenceusan warning in ifft code */



/* ################## End BE DEVELOPMENT switches ######################### */
@@ -210,11 +216,9 @@ 
/* all switches in this category should start with "CR_" */

#define CR_FIX_585_MASA_2TC_DTX_EXT                     /* Nokia: issue 585: fixes transition artifacts in MASA 2TC DTX by applying correct condition */





/* ##################### End NON-BE CR switches ########################### */







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



/* clang-format on */

lib_dec/ivas_dirac_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -2383,7 +2383,11 @@ void ivas_dirac_dec_render_sf( 
    reference_power = DirAC_mem.reference_power;

    reference_power_smooth = DirAC_mem.reference_power + hDirAC->num_freq_bands;

    onset_filter = DirAC_mem.onset_filter;

#ifdef FIX_614_ADD_TO_NULL_PTR_DIRAC_SETUP

    onset_filter_subframe = ( DirAC_mem.onset_filter == NULL ) ? NULL : DirAC_mem.onset_filter + hDirAC->num_freq_bands;

#else

    onset_filter_subframe = DirAC_mem.onset_filter + hDirAC->num_freq_bands;

#endif



    hodirac_flag = ivas_get_hodirac_flag( st_ivas->hDecoderConfig->ivas_total_brate, st_ivas->sba_analysis_order );