Commit 20a0ece1 authored by multrus's avatar multrus
Browse files

merge from main

parents 4438b209 4fd431dc

apps/decoder.c

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ typedef struct 
    hrtfFileReader *hrtfReader;

    char *hrtfFileName;



    IVAS_DEC_HRTF_HANDLE *hHrtfTD;

    IVAS_DEC_HRTF_TD_HANDLE *hHrtfTD;



    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics;

apps/renderer.c

+10 −3
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ int main( 
    IVAS_DEC_HRTF_CREND_HANDLE *hHrtfCrend = NULL;

    IVAS_DEC_HRTF_FASTCONV_HANDLE *hHrtfFastConv = NULL;

    IVAS_DEC_HRTF_PARAMBIN_HANDLE *hHrtfParambin = NULL;

    IVAS_DEC_HRTF_HANDLE *hHrtfTD = NULL;

    IVAS_DEC_HRTF_TD_HANDLE *hHrtfTD = NULL;

    IVAS_DEC_HRTF_STATISTICS_HANDLE *hHrtfStatistics = NULL;

    IsmPositionProvider *positionProvider = NULL;

    LfeRoutingConfig *lfeRoutingConfigs[RENDERER_MAX_MC_INPUTS];
@@ -961,9 +961,9 @@ int main( 


        if ( hrtfFileReader != NULL )

        {

            if ( ( error = IVAS_REND_GetHrtfHandle( hIvasRend, &hHrtfTD ) ) != IVAS_ERR_OK )

            if ( ( error = IVAS_REND_GetHrtfTdHandle( hIvasRend, &hHrtfTD ) ) != IVAS_ERR_OK )

            {

                fprintf( stderr, "\nIVAS_REND_GetHrtfHandle failed: %s\n\n", ivas_error_to_string( error ) );

                fprintf( stderr, "\nIVAS_REND_GetHrtfTdHandle failed: %s\n\n", ivas_error_to_string( error ) );

                goto cleanup;

            }
@@ -2611,7 +2611,14 @@ static CmdlnArgs defaultArgs( 
    args.outConfig.audioConfig = IVAS_AUDIO_CONFIG_INVALID;

    args.outConfig.outSetupCustom.num_spk = 0;

    args.outConfig.outSetupCustom.num_lfe = 0;

#ifdef FIX_HRTF_LEFTOVERS

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

    {

        args.inConfig.ambisonicsBuses[i].audioConfig = IVAS_AUDIO_CONFIG_INVALID;

    }

#else

    args.inConfig.ambisonicsBuses->audioConfig = IVAS_AUDIO_CONFIG_INVALID;

#endif



    for ( i = 0; i < RENDERER_MAX_ISM_INPUTS + RENDERER_MAX_MASA_INPUTS; ++i )

    {

lib_com/common_api_types.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ typedef enum 
typedef struct ivas_masa_metadata_frame_struct *IVAS_MASA_METADATA_HANDLE;

typedef struct ivas_masa_decoder_ext_out_meta_struct *IVAS_MASA_DECODER_EXT_OUT_META_HANDLE;



typedef struct ivas_hrtf_TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_HANDLE;

typedef struct ivas_hrtf_TDREND_HRFILT_FiltSet_struct *IVAS_DEC_HRTF_TD_HANDLE;

typedef struct ivas_hrtf_crend_structure *IVAS_DEC_HRTF_CREND_HANDLE;

typedef struct ivas_hrtf_fastconv_struct *IVAS_DEC_HRTF_FASTCONV_HANDLE;

typedef struct ivas_hrtf_parambin_struct *IVAS_DEC_HRTF_PARAMBIN_HANDLE;

lib_com/ivas_cnst.h

+3 −0
Original line number Diff line number Diff line
@@ -229,6 +229,9 @@ typedef enum 
/* format signaling in SID frames */

#define SID_FORMAT_NBITS                        3                           /* Bit 0 | Bit 1 | Bit 2 */

                                                                            /*-------|-------|------ */

#ifdef FIX_1384_MSAN_ivas_spar_dec_open

#define SID_FORMAT_NONE                         (-0x1)                      /*    n/a|    n/a|    n/a*/

#endif

#define SID_DFT_STEREO                          0x0                         /*      0|      0|     0 */

#define SID_MDCT_STEREO                         0x1                         /*      1|      0|     0 */

#define SID_ISM                                 0x2                         /*      0|      1|     0 */

lib_com/options.h

+7 −0
Original line number Diff line number Diff line
@@ -165,8 +165,14 @@ 
#define FIX_1119_SPLIT_RENDERING_VOIP                   /* FhG: Add split rendering support to decoder in VoIP mode */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define FIX_1377_HANDLE_ERROR_CODE                      /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */

#define FIX_HRTF_LEFTOVERS                              /* VA: HRTF updates - bring float main in line with BASOP main */

#define FIX_1384_MSAN_ivas_spar_dec_open                /* VA: issue 1386: fix use-of-uninitialized value in ivas_spar_dec_open() */

#define FIX_1384_MSAN_stereo_tcx_core_enc               /* VA: issue 1384: fix use-of-uninitialized value in stereo_tcx_core_enc() */

#define FIX_1388_MSAN_ivas_init_decoder                 /* VA: issue 1388: fix use-of-uninitialized value in ivas_init_decoder() */

#define FIX_1383_HEAD_TRACK_SANITIZER                   /* Nok: issue 1383: Fix head tracking struc values reading in renderer */

#define FIX_1385_INIT_IGF_STOP_FREQ                     /* FhG: Initialize infoIGFStopFreq in init_igf_dec() */





/* #################### End BE switches ################################## */



/* #################### Start NON-BE switches ############################ */
@@ -177,6 +183,7 @@ 
#define NONBE_1244_FIX_SWB_BWE_MEMORY                   /* VA: issue 1244: fix to SWB BWE memory in case of switching from FB coding - pending a review by Huawei */ 

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define NONBE_1328_FIX_NON_LINEARITY                    /* VA: Fix possible issue when computing bwe_exc_extended and previous frame were almost 0  */

#define NONBE_1344_REND_MASA_LOW_FS                     /* Nokia: Issue 1344: Fix sanitizer errors when using IVAS_rend to render MASA with lower sampling rates */





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