Commit 3b9badc9 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_1113_EXTREND_ISAR

parent 0c974037

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -161,7 +161,6 @@ 


#define FIX_CREND_SIMPLIFY_CODE                         /* Ora : simplify line code in crend */

#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 FIX_1113_CLDFB_REND_IN_ISAR                     /* issue 1113: fix the use of CLDFB renderer in split-rendering at the external renderer */



#define FIX_POINT_HRTF_FILE_FORMAT                     /* All: fix point hrtf binary file format */

lib_dec/ivas_binRenderer_internal.c

+0 −17
Original line number Diff line number Diff line
@@ -1271,12 +1271,7 @@ ivas_error ivas_rend_openCldfbRend( 
        hBinRenderer->conv_band = convBand;

    }



#ifdef FIX_1113_EXTREND_ISAR

    ivas_output_init( hBinRenderer->hInputSetup, inConfig );

#else

    hBinRenderer->hInputSetup->is_loudspeaker_setup = 0;

    hBinRenderer->hInputSetup->output_config = inConfig;

#endif

    if ( ( error = getAudioConfigNumChannels( inConfig, &hBinRenderer->hInputSetup->nchan_out_woLFE ) ) != IVAS_ERR_OK )

    {

        return error;
@@ -1308,7 +1303,6 @@ ivas_error ivas_rend_openCldfbRend( 
    }



#ifdef FIX_1113_CLDFB_REND_IN_ISAR

#ifdef FIX_1113_EXTREND_ISAR

    if ( inConfig == IVAS_AUDIO_CONFIG_FOA )

    {

        pCldfbRend->binaural_latency_ns = (int32_t) ( pCldfbRend->hHrtfFastConv->FASTCONV_FOA_latency_s * 1000000000.f );
@@ -1326,9 +1320,6 @@ ivas_error ivas_rend_openCldfbRend( 
        /* should never happen for SBA */

        return IVAS_ERR_INVALID_OUTPUT_FORMAT;

    }

#else

    pCldfbRend->binaural_latency_ns = (int32_t) ( pCldfbRend->hHrtfFastConv->FASTCONV_HOA3_latency_s * 1000000000.f );

#endif

#else

    pCldfbRend->binaural_latency_ns = (int32_t) ( FASTCONV_HOA3_latency_s * 1000000000.f );

#endif
@@ -2199,12 +2190,8 @@ void ivas_binRenderer( 
    }



/* HOA decoding to CICP19 if needed*/

#ifdef FIX_1113_EXTREND_ISAR

    if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 &&

         ( hBinRenderer->nInChannels != HOA3_CHANNELS && hBinRenderer->nInChannels != HOA2_CHANNELS && hBinRenderer->nInChannels != FOA_CHANNELS ) )

#else

    if ( hBinRenderer->hInputSetup->is_loudspeaker_setup == 0 && hBinRenderer->nInChannels != 16 )

#endif

    {

        ivas_sba2mc_cldfb( *( hBinRenderer->hInputSetup ), RealBuffer, ImagBuffer, hBinRenderer->nInChannels, hBinRenderer->conv_band, numTimeSlots, hBinRenderer->hoa_dec_mtx );

    }
@@ -2262,11 +2249,7 @@ void ivas_binRenderer( 
                    }

                    else

                    {

#ifdef FIX_1113_EXTREND_ISAR

                        rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, Rmat_local, hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, hBinRenderer->hInputSetup->ambisonics_order );

#else

                        rotateFrame_shd_cldfb( RealBuffer, ImagBuffer, Rmat_local, hBinRenderer->hInputSetup->nchan_out_woLFE, numTimeSlots, 3 );

#endif

                    }



                    ivas_binRenderer_filterModule( Cldfb_RealBuffer_Binaural[pos_idx], Cldfb_ImagBuffer_Binaural[pos_idx], RealBuffer, ImagBuffer, numTimeSlots, hBinRenderer, pos_idx );

lib_rend/ivas_rotation.c

+0 −4
Original line number Diff line number Diff line
@@ -502,12 +502,8 @@ void rotateFrame_shd_cldfb( 
    float realRot[2 * HEADROT_ORDER + 1], imagRot[2 * HEADROT_ORDER + 1];

    float SHrotmat[HEADROT_SHMAT_DIM][HEADROT_SHMAT_DIM];



#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.c

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

                    if ( hRendCfg->split_rend_config.rendererSelection == ISAR_SPLIT_REND_RENDERER_SELECTION_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;
@@ -4140,11 +4136,7 @@ ivas_error IVAS_REND_InitConfig( 
 *

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



#ifdef FIX_1113_EXTREND_ISAR

ivas_error IVAS_REND_GetRenderConfig(

#else

int16_t IVAS_REND_GetRenderConfig(

#endif

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

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

)
@@ -4207,11 +4199,7 @@ int16_t IVAS_REND_GetRenderConfig( 
 *

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



#ifdef FIX_1113_EXTREND_ISAR

ivas_error IVAS_REND_FeedRenderConfig(

#else

int16_t IVAS_REND_FeedRenderConfig(

#endif

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

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

)

lib_rend/lib_rend.h

+0 −8
Original line number Diff line number Diff line
@@ -238,20 +238,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

int16_t IVAS_REND_GetRenderConfig(

#endif

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

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

);



#ifdef FIX_1113_EXTREND_ISAR

ivas_error IVAS_REND_FeedRenderConfig(

#else

int16_t IVAS_REND_FeedRenderConfig(

#endif

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

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

);