Commit 192263d9 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

Merge remote-tracking branch 'origin/main' into fix_compiler_warnings_with_debugging_off

parents b6873c57 dcc4595a

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ 
#define FIX_917_LCLD_WARNINGS                           /* Dlb: issue 917 and 918: fix LCLD codec warnings*/

#define FIX_920_IGF_INIT_ERROR                          /* FhG: issue 920: fix bitrate mismatch in initial IGF config to avoid error message in same cases */

#define FIX_923_EXTERNAL_REND_COMMAND_LINE              /* VA: issue 923: enable external renderer command-line options in UPPER case letters */

#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 );