Commit a961d619 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_ISM_METADATA_READER

parent 1361aa52

lib_com/delay_comp.c

+0 −8
Original line number Diff line number Diff line
@@ -50,11 +50,7 @@ 
 *--------------------------------------------------------------------------*/



/*! r: delay value in ns */

#ifdef FIX_GET_DELAY_RETURN

int32_t get_delay(

#else

float get_delay(

#endif

    const int16_t enc_dec,            /* i  : encoder/decoder flag                */

    const int32_t io_fs,              /* i  : input/output sampling frequency     */

    const IVAS_FORMAT ivas_format,    /* i  : IVAS format                         */
@@ -63,11 +59,7 @@ float get_delay( 
    const int32_t binaural_latency_ns /* i  : binaural renderer HRTF delay in ns  */

)

{

#ifdef FIX_GET_DELAY_RETURN

    int32_t delay = 0;

#else

    float delay = 0;

#endif



    if ( enc_dec == ENC )

    {

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -149,7 +149,6 @@ 
#define SBA_BR_SWITCHING                                /* Issue 114: Changes for sba bit rate switching*/

#define FIX_ITD                                         /* Contribution 16: TD renderer ITD improvement and code cleanup */

#define BRATE_SWITCHING_RENDERING                       /* Bitrate switching changes related to the renderers */

#define FIX_GET_DELAY_RETURN                            /* Issue 223: change return data type in function get_delay() */

#define NTT_REDUC_COMP_POC                              /* NTT Contribution 10: Complexity reduction of phase spectrum in stereo downmix*/

#define FIX_ISM_DECODER_PRINTOUT                        /* Issue 229: fix ISM decoder printout */

#define FIX_ITD_CNG                                     /* Eri Contribution 11: Fix for CNG ITD */

lib_com/prot.h

+0 −4
Original line number Diff line number Diff line
@@ -712,11 +712,7 @@ int16_t lev_dur( 
);



/*! r: delay value in ns */

#ifdef FIX_GET_DELAY_RETURN

int32_t get_delay(

#else

float get_delay(

#endif

    const int16_t enc_dec,            /* i  : encoder/decoder flag                  */

    const int32_t io_fs,              /* i  : input/output sampling frequency       */

    const IVAS_FORMAT ivas_format,    /* i  : IVAS format                           */

lib_dec/lib_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -1055,11 +1055,7 @@ ivas_error IVAS_DEC_GetDelay( 
    st_ivas = hIvasDec->st_ivas;

    hDecoderConfig = st_ivas->hDecoderConfig;



#ifdef FIX_GET_DELAY_RETURN

    *nSamples = NS2SA( hDecoderConfig->output_Fs, get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0], st_ivas->renderer_type, st_ivas->binaural_latency_ns ) );

#else

    *nSamples = NS2SA( hDecoderConfig->output_Fs, (int32_t) ( get_delay( DEC, hDecoderConfig->output_Fs, st_ivas->ivas_format, st_ivas->cldfbAnaDec[0], st_ivas->renderer_type, st_ivas->binaural_latency_ns ) + 0.5f ) );

#endif



    *timeScale = hDecoderConfig->output_Fs;

lib_enc/lib_enc.c

+0 −4
Original line number Diff line number Diff line
@@ -951,11 +951,7 @@ ivas_error IVAS_ENC_GetDelay( 
        return IVAS_ERR_UNEXPECTED_NULL_POINTER;

    }



#ifdef FIX_GET_DELAY_RETURN

    *delay = NS2SA( hEncoderConfig->input_Fs, get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL, RENDERER_DISABLE, 0 ) );

#else

    *delay = NS2SA( hEncoderConfig->input_Fs, (int32_t) ( get_delay( ENC, hEncoderConfig->input_Fs, hEncoderConfig->ivas_format, NULL, RENDERER_DISABLE, 0 ) + 0.5f ) );

#endif



    *delay *= hEncoderConfig->nchan_inp;