Commit 476abd49 authored by vaclav's avatar vaclav
Browse files

Merge remote-tracking branch 'remotes/origin/main' into... 

Merge remote-tracking branch 'remotes/origin/main' into nokia/contribution-omasa-combined-format-refactor-merge
parents fe755e17 43a6b2d3

lib_com/ivas_prot.h

+18 −0
Original line number Diff line number Diff line
@@ -5184,6 +5184,24 @@ void ivas_binRenderer_close( 
    BINAURAL_RENDERER_HANDLE *hBinRenderer                      /* i/o: decoder binaural renderer handle                */

);



#ifdef FIX_1720_HRTF_FASTCONV

void ivas_binaural_hrtf_close(

    HRTFS_FASTCONV_HANDLE *hHrtfFastConv                        /* i/o: decoder binaural hrtf handle                */

);



ivas_error ivas_init_binaural_hrtf(

  HRTFS_FASTCONV *HrtfFastConv                               /* i/o: FASTCONV HRTF structure */

);



ivas_error ivas_allocate_binaural_hrtf(

    HRTFS_FASTCONV *HrtfFastConv,                               /* i/o: FASTCONV HRTF structure */

    AUDIO_CONFIG input_config,                                  /* i  : input audio configuration */

    BINAURAL_INPUT_AUDIO_CONFIG bin_input_config,               /* i : binaural input audio config */

    RENDERER_TYPE renderer_type,                                /* i : renderer type */

    int16_t allocate_init_flag                                  /* i  : Memory allocation flag  */

);

#endif



#ifdef JBM_PARAMUPMIX

void ivas_binaural_cldfb(

    Decoder_Struct *st_ivas,                                    /* i/o: IVAS decoder structure                                  */

lib_com/ivas_stereo_ica_com.c

+0 −1
Original line number Diff line number Diff line
@@ -77,7 +77,6 @@ static void interpTargetChannel( 
        return;

    }



    /* IVAS-220: QCToDo: (check N for dependency on the inputFs) */

    N = L_shift_adapt;

    factor = ( (float) N ) / abs( d );

    interp_factor2 = factor / INTERP_FACTOR1;

lib_com/options.h

100644 → 100755
+4 −0
Original line number Diff line number Diff line
@@ -174,6 +174,7 @@ 
#define COVARIANCE_MEMORY_OPT                           /* Dlb : Issue 231: define SPAR covariance buffers in stack instead of inter-frame heap */

#define NONBE_FIX_589_JBM_TC_OFFSETS                    /* FhG: issue 589: wrong offset into the TC buffers is used in some rendering paths in the JBM main rendering function */

#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_1720_HRTF_FASTCONV                          /* Dlb : Binaural and Binaural room format RAM saving in SBA mode */

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

#define FIX_194_LFE_DELAY_EXTREND                       /* FhG: Issue 194: Fix delay alignment of LFE in external renderer */

#define FIX_582_INDEX_OUT_OF_BOUNDS_SNS_AVQ_DEC         /* FhG: fix an undefined behaviour error in SNS AVQ decoding */
@@ -183,6 +184,7 @@ 
#define FIX_621_MSVQ_UBSAN_NULL_PTR_OFFSET              /* Eri: Issue 621 :  UBSAN:  applying non-zero offset 7200 to null pointer in lsf_msvq_ma_enc.c  */

#define FIX_600_CLEANUP_OF_MANUAL_INSTRUMENTATION       /* Eri: Issue 600 :  removed manual WMCtool instrumentation outside of WMC_TOOL_SKIP defines     */

#define NONBE_FIX_539_MASA_384K_CHIRP                   /* Nokia: issue 539, puts the normalization of the energy ratios at the correct place, affect MASA 384k only */

#define FIX_635_UBSAN_UNDEFINED_BEHAVIOUR_QMETA         /* Nokia: issue 635 adding cast to uint16_t in q_metadata_enc */



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

#define TD_TDREND_FIX_NULLPTR_ACCESS                    /* FhG: avoid nullptr access in ivas_rend_TDObjRendOpen */
@@ -205,6 +207,8 @@ 
#define FIX617_UBSAN_DIVBYZERO_STEREOCNG                /* Eri: Issue 617: Decoder UBSAN: division by zero in stereo cng when inut is 16kHz and output is 32kHz */

#define FIX_279_CODE_COVERAGE                           /* Dlb : issue 279 , clean up unused function */

#define FIX_549_PARAM_ISM_BIN_GAIN                      /* FhG: Issue 549 : fix too quiet binaural output in ParamISM */

#define FIX_618_STEREO_SW_DIV_BY_ZERO                   /* VA: fix issue 618 - UBSAN: division-by-zero in stereo bitrate switching */

#define FIX_625_IDX_OOB                                 /* FhG: Fix index out-of-bounds UBSAN error (issue 625) */



#define MASA_AND_OBJECTS                                /* Nokia: Combination of MASA and objects */

lib_dec/ivas_binRenderer_internal.c

+405 −3

File changed.

Preview size limit exceeded, changes collapsed.

lib_dec/ivas_init_dec.c

+4 −1
Original line number Diff line number Diff line
@@ -2241,7 +2241,10 @@ void ivas_destroy_dec( 


    /* CRend binaural renderer handle */

    ivas_HRTF_CRend_binary_close( &st_ivas->hSetOfHRTF );



#ifdef FIX_1720_HRTF_FASTCONV

    /* Fastconv HRTF memories */

    ivas_binaural_hrtf_close( &st_ivas->hHrtfFastConv );

#endif

    /* Fastconv HRTF filters */

    ivas_HRTF_fastconv_binary_close( &st_ivas->hHrtfFastConv );