Commit 617ebe4d authored by vaclav's avatar vaclav
Browse files

port FIX_921_OMASA_DELAY_PRINTOUT

parent f9a567b8

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -181,6 +181,7 @@ 
#define SPLIT_REND_POSE_CORRECTION_UNUSED_BITS

#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#endif

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



/* #################### End BASOP porting switches ############################ */

lib_dec/lib_dec_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -2843,7 +2843,12 @@ ivas_error IVAS_DEC_GetDelay( 
    nSamples[0] = add( nSamples[1], nSamples[2] );

    move16();



#ifdef FIX_921_OMASA_DELAY_PRINTOUT

    test();

    IF( EQ_16( (Word16) st_ivas->ivas_format, MASA_FORMAT ) || EQ_16( (Word16) st_ivas->ivas_format, MASA_ISM_FORMAT ) )

#else

    IF( EQ_16( (Word16) 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] = sub( nSamples[1], NS2SA_FX2( hDecoderConfig->output_Fs, IVAS_ENC_DELAY_NS ) );