Commit 0c453dec authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_1113_EXTREND_ISAR

parent 64375ab2

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ 
#define FIX_1377_HANDLE_ERROR_CODE                      /* Eri: Add missing error code handling from IVAS_REND_SetObjectIDs */

#define FIX_1053_REVERB_RECONFIGURATION

#define TMP_FIX_1119_SPLIT_RENDERING_VOIP               /* FhG: Add error check for unsupported config: split rendering with VoIP mode */

#define FIX_1113_EXTREND_ISAR                           /* FhG: issue 1113: fix external renderer asserts for FOA/HOA2 and CLDFB config */

#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 FIX_938_COMPILER_WARNING                        /* FhG: Fix compiler warning in ivas_mdct_core_reconstruct() */

#define FIX_1376_MISSING_ISM_METADATA                   /* FhG: IVAS_rend: throw error if there exists an ISM input without a corresponding metadata file path */

lib_rend/ivas_rotation_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1026,12 +1026,8 @@ void rotateFrame_shd_cldfb_fx( 
    move16();

    move16();



#ifdef FIX_1113_EXTREND_ISAR

    assert( ( nInChannels == HOA3_CHANNELS || nInChannels == HOA2_CHANNELS || nInChannels == FOA_CHANNELS ) &&

            "Number of channels must correspond to an ambisonics order!" );

#else

    assert( nInChannels == HEADROT_SHMAT_DIM && "Number of channels must be 16!" );

#endif



    /* initialize rotation matrices with zeros */

    FOR( i = 0; i < HEADROT_SHMAT_DIM; i++ )

lib_rend/lib_rend.h

+0 −8
Original line number Diff line number Diff line
@@ -260,20 +260,12 @@ ivas_error IVAS_REND_InitConfig( 
    const IVAS_AUDIO_CONFIG outAudioConfig          /* i  : output audioConfig                                  */

);



#ifdef FIX_1113_EXTREND_ISAR

ivas_error IVAS_REND_GetRenderConfig(

#else

Word16 IVAS_REND_GetRenderConfig(

#endif

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: IVAS renderer handle                                */

    const IVAS_RENDER_CONFIG_HANDLE hRCout          /* o  : Render configuration handle                         */

);



#ifdef FIX_1113_EXTREND_ISAR

ivas_error IVAS_REND_FeedRenderConfig(

#else

Word16 IVAS_REND_FeedRenderConfig(

#endif

    IVAS_REND_HANDLE hIvasRend,                     /* i/o: IVAS renderer handle                                */

    const IVAS_RENDER_CONFIG_DATA renderConfig      /* i  : Render configuration struct                         */

);

lib_rend/lib_rend_fx.c

+0 −12
Original line number Diff line number Diff line
@@ -2967,11 +2967,7 @@ static ivas_error updateSbaPanGains( 
                {

                    IF( EQ_32( hRendCfg->split_rend_config.rendererSelection, IVAS_BIN_RENDERER_TYPE_FASTCONV ) )

                    {

#ifdef FIX_1113_EXTREND_ISAR

                        assert( *rendCtx.pOutSampleRate == 48000 && "split binaural fast conv mode is currently supported with 48k sampling rate only" );

#else

                        assert( inConfig == IVAS_AUDIO_CONFIG_HOA3 && ( *rendCtx.pOutSampleRate == 48000 ) && "split binaural fast conv mode is currently supported with HOA3 input and 48k sampling rate only" );

#endif

                        IF( ( error = ivas_rend_openCldfbRend( &inputSba->cldfbRendWrapper, inConfig, outConfig, &rendCtx.pSplitRendWrapper->multiBinPoseData, *rendCtx.pOutSampleRate ) ) != IVAS_ERR_OK )

                        {

                            return error;
@@ -4794,11 +4790,7 @@ ivas_error IVAS_REND_InitConfig( 
 *

 *-------------------------------------------------------------------*/



#ifdef FIX_1113_EXTREND_ISAR

ivas_error IVAS_REND_GetRenderConfig(

#else

Word16 IVAS_REND_GetRenderConfig(

#endif

    IVAS_REND_HANDLE hIvasRend,            /* i/o: IVAS renderer handle        */

    const IVAS_RENDER_CONFIG_HANDLE hRCout /* o  : Render configuration handle */

)
@@ -4855,11 +4847,7 @@ Word16 IVAS_REND_GetRenderConfig( 
 *

 *-------------------------------------------------------------------*/



#ifdef FIX_1113_EXTREND_ISAR

ivas_error IVAS_REND_FeedRenderConfig(

#else

Word16 IVAS_REND_FeedRenderConfig(

#endif

    IVAS_REND_HANDLE hIvasRend,                /* i/o: IVAS renderer handle        */

    const IVAS_RENDER_CONFIG_DATA renderConfig /* i  : Render configuration struct */

)