Commit 5d68b4d8 authored by vaclav's avatar vaclav
Browse files

Merge branch '1354_ref_PortFlpMR1253' into 'float-pc' 

Port float MR1253 to BASOP FLP ref

See merge request !1236
parents 90693484 cdb723aa

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -200,6 +200,7 @@ 
#endif

#define NONBE_FIX_855_JBM_FLUSH_OFFSET                  /* FhG: issue #855: add missing switch here for the code in JBM flushing  */

#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 BASOP porting switches ############################ */

lib_dec/lib_dec.c

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