Commit c52f5870 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_TDREND_STANDALONE

parent 92f7e4dc

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ 
/*#define FIX_IVAS_185_MDCT_ST_PLC_FADEOUT*/            /* IVAS-185 fix bug in TCX-PLC fadeout for MDCT-Stereo and improve fadeout by fading to background noise instead of white noise */

/*#define FIX_I1_113*/                                  /* under review : MCT bit distribution optimization for SBA high bitrates*/



#define FIX_TDREND_STANDALONE                           /* Fix for TD standalone renderer (broken after update of hHrtfTD pointer and addition of hRenderConfig */

#define FIX_MDCT_KERNEL_RATE_SWITCHING_PLC              /* force kernel that can handle ACELP -> TCX transition frame lengths for transition frames in decoder */

#define FIX_SBA_CLEAN_UP_OPT                            /* Fix for tickets #6, #10, #17 and #20 */

#define FIX_28_SBA_LS_RENDER                            /* FhG: fix for discontinuities in SBA LS renderer */

lib_dec/ivas_objectRenderer.c

+0 −23
Original line number Diff line number Diff line
@@ -302,7 +302,6 @@ ivas_error ObjRenderIVASFrame( 
            TDREND_MIX_SRC_SetPlayState( st_ivas->hBinRendererTd, nS, TDREND_PLAYSTATUS_PLAYING );

        }

    }

#ifdef FIX_TDREND_STANDALONE

    if ( st_ivas->hRenderConfig != NULL ) /* Renderer Configuration not enabled in TD standalone renderer */

    {

        if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )
@@ -317,23 +316,9 @@ ivas_error ObjRenderIVASFrame( 
            }

        }

    }

#else

    if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )

    {

        if ( st_ivas->ini_frame == 0 )

        {

            ivas_reverb_open( &st_ivas->hCrend->hReverb, NULL, st_ivas->hRenderConfig, st_ivas->hDecoderConfig->output_Fs );

        }

        for ( subframe_idx = 0; subframe_idx < 4; subframe_idx++ )

        {

            ivas_reverb_process( st_ivas->hCrend->hReverb, st_ivas->transport_config, 0, output, reverb_signal, subframe_idx );

        }

    }

#endif



    /* Call the renderer */

    TDREND_GetMix( st_ivas->hBinRendererTd, output, output_frame, st_ivas->hDecoderConfig->output_Fs );

#ifdef FIX_TDREND_STANDALONE

    if ( st_ivas->hRenderConfig != NULL ) /* Renderer Configuration not enabled in TD standalone renderer */

    {

        if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )
@@ -343,14 +328,6 @@ ivas_error ObjRenderIVASFrame( 
            v_add( reverb_signal[1], output[1], output[1], output_frame );

        }

    }

#else

    if ( st_ivas->hRenderConfig->roomAcoustics.late_reverb_on )

    {

        /* add reverb to rendered signals */

        v_add( reverb_signal[0], output[0], output[0], output_frame );

        v_add( reverb_signal[1], output[1], output[1], output_frame );

    }

#endif

    return IVAS_ERR_OK;

}

scripts/td_object_renderer/object_renderer_standalone/object_renderer_standalone/renderer_standalone.c

+0 −8
Original line number Diff line number Diff line
@@ -151,12 +151,8 @@ int main( int argc, char *argv[] ) 
    /*------------------------------------------------------------------------------------------*

     * Struct initializations

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

#ifdef FIX_TDREND_STANDALONE

    st_ivas->hHrtfTD = NULL;

    st_ivas->hRenderConfig = NULL;

#else

    st_ivas->hHrtf = NULL;

#endif

    st_ivas->hHeadTrackData = NULL;

    st_ivas->ivas_format = ISM_FORMAT;

    f_quat_traj = NULL;
@@ -471,11 +467,7 @@ int main( int argc, char *argv[] ) 


    ivas_td_binaural_close( &st_ivas->hBinRendererTd );

    count_free( st_ivas->hDecoderConfig );

#ifdef FIX_TDREND_STANDALONE

    st_ivas->hHrtfTD = NULL;

#else    

    ivas_HRTF_binary_close( &st_ivas->hHrtfTD );

#endif



    /* ISM metadata handles */

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