Commit 8b2580c0 authored by Jouni Paulus's avatar Jouni Paulus
Browse files

Merge remote-tracking branch 'origin/main' into 481-unused-variables-within-hr_metadata

parents 25af36a0 4de9d026

lib_com/options.h

100644 → 100755
+2 −1
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ 


#define MC_PARAMUPMIX_MODE                              /* Dlb: Contribution 39: Multichannel Parametric Upmix */

#define FIX_469_BRSWITCH_PUPMIX                         /* Dlb: Fix issue 469 for Param Upmix bitrate switching */

#define FIX_MASA_DELAY_PRINTOUT                         /* VA: issue 444: fix MASA decoder delay printout */



#define HODIRAC                                         /* FhG: Contribution 32: Sector-based HO-DirAC method for SBA at high bitrates */

#define DIRAC_ALLOC_HARM                                /* VA: harmonize DirAC parameters allocation/deallocation */

lib_dec/lib_dec.c

+8 −0
Original line number Diff line number Diff line
@@ -1622,6 +1622,14 @@ 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_MASA_DELAY_PRINTOUT

    if ( st_ivas->ivas_format == MASA_FORMAT )

    {

        /* 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 );

    }

#endif



    *timeScale = hDecoderConfig->output_Fs;



    return IVAS_ERR_OK;