Commit 928abcc2 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_921_OMASA_DELAY_PRINTOUT

parent c6ce0505

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ 
/*#define SPLIT_REND_WITH_HEAD_ROT  */                  /* Dlb,FhG: Split Rendering contributions 21 and 35 */



#define FIX_CRASH_LONG_BRIR                             /* Orange : Fix crash when long BRIR is set */

#define FIX_921_OMASA_DELAY_PRINTOUT                    /* VA: issue 921: correct OMASA decoder delay printout */

#define FIX_929_RENDERER_CMDL                           /* Nokia: issue #929: renderer command line option */

#define FIX_910_REMOVE_DUPLICATION_TD_REND              /* VA: issue 910: remove duplication of function ivas_td_binaural_renderer() */

#define FIX_940_DEBUGGING_VARIABLE                      /* Nokia: issue #940: remove debugging variable */

lib_dec/lib_dec.c

+0 −4
Original line number Diff line number Diff line
@@ -2153,11 +2153,7 @@ ivas_error IVAS_DEC_GetDelay( 
    nSamples[2] = (int16_t) roundf( (float) st_ivas->binaural_latency_ns * hDecoderConfig->output_Fs / 1000000000.f );

    nSamples[0] = nSamples[1] + nSamples[2];



#ifdef FIX_921_OMASA_DELAY_PRINTOUT

    if ( st_ivas->ivas_format == MASA_FORMAT || st_ivas->ivas_format == MASA_ISM_FORMAT )

#else

    if ( st_ivas->ivas_format == MASA_FORMAT )

#endif

    {

        /* note: in MASA, all delay is compensated at the decoder by default, so subtract the encoder delay for print-out */

        nSamples[1] -= NS2SA( hDecoderConfig->output_Fs, IVAS_ENC_DELAY_NS );