Commit b8b9bac0 authored by vaclav's avatar vaclav
Browse files

issue 921: correct OMASA decoder delay printout; under OMASA_DELAY_PRINTOUT

parent eed8e9d0

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ 
#define FIX_881_REMOVE_LFE_ADDITION_IN_ISM              /* VA: issue 881: remove LFE addition in ISM format */

#define FIX_887_ARRAY_SIZE_DFT_MDCT_STEREO              /* VA: Fix the definition of buffers/arrays in DFT and MDCT stereo to satisfy gcc v 11.4.0 */

#define FIX_891_PARAMUPMIX_CLEANUP                      /* Dlb: issue 891: remove unneeded code from ParamUpmix */

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



/* #################### End BE switches ################################## */

lib_dec/lib_dec.c

+4 −0
Original line number Diff line number Diff line
@@ -2352,7 +2352,11 @@ 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 );