diff --git a/lib_com/options.h b/lib_com/options.h index 109e81094fcc579ea4c6cce04c9a31d7d83f8f60..1dff6b76cf4c57b058e4c5987042bc563044e301 100755 --- a/lib_com/options.h +++ b/lib_com/options.h @@ -182,6 +182,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 ############################ */ diff --git a/lib_dec/lib_dec_fx.c b/lib_dec/lib_dec_fx.c index 561384c87e3c2fd7e408cefecfa6dfd9e57a7e46..9470cba02f00fbf698eaad955f6931bafabddcaa 100644 --- a/lib_dec/lib_dec_fx.c +++ b/lib_dec/lib_dec_fx.c @@ -2841,7 +2841,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 ) );