Commit 6233468b authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_FIX_I59

parent d3b6ebd4

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ 
#define SBA_BR_SWITCHING_RECONFIG                       /* Issue 114: Changes for SBA bitrate switching with reconfiguration for bitrates with different number of transport channels*/

#endif



#define FIX_FIX_I59                                     /* Issue 59:  small fix concerning LFE delay rounding */

#define HRTF_BINARY_FILE                                /* HRTF filters' binary file used for binaural rendering. */



#define FIX_197_CREND_INTERFACE

lib_dec/ivas_lfe_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -437,11 +437,7 @@ ivas_error ivas_create_lfe_dec( 


    lfe_addl_delay_s = block_offset_s - hLFE->lfe_block_delay_s;

    lfe_addl_delay_s = max( 0.0f, lfe_addl_delay_s );

#ifdef FIX_FIX_I59

    add_delay_sa = (int16_t) roundf( (float) binauralization_delay_ns * output_Fs / 1000000000.f );

#else

    add_delay_sa = NS2SA( output_Fs, binauralization_delay_ns + 0.5f );

#endif

    hLFE->lfe_addl_delay = (int16_t) ( lfe_addl_delay_s * output_Fs ) + add_delay_sa;

    hLFE->lfe_block_delay_s += lfe_addl_delay_s + add_delay_sa / output_Fs;

lib_rend/ivas_binauralRenderer.c

+0 −19
Original line number Diff line number Diff line
@@ -689,7 +689,6 @@ ivas_error ivas_binRenderer_open( 
            return error;

        }



#ifdef FIX_FIX_I59

        if ( st_ivas->renderer_type == RENDERER_BINAURAL_FASTCONV )

        {

            if ( hBinRenderer->ivas_format == MC_FORMAT )
@@ -718,24 +717,6 @@ ivas_error ivas_binRenderer_open( 
            st_ivas->binaural_latency_ns = (int32_t) ( FASTCONV_BRIR_latency_s * 1000000000.f );

#endif

        }

#else

        if ( hBinRenderer->ivas_format == MC_FORMAT )

        {

#ifdef HRTF_BINARY_FILE

            st_ivas->binaural_latency_ns = (int32_t) ( st_ivas->hHrtfFastConv->FASTCONV_HRIR_latency_s * 1000000000.f );

#else

            st_ivas->binaural_latency_ns = (int32_t) ( FASTCONV_HRIR_latency_s * 1000000000.f );

#endif

        }

        else

        {

#ifdef HRTF_BINARY_FILE

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

#else

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

#endif

        }

#endif

    }



    /* Allocate memories needed for reverb module */