Commit 1b591569 authored by Jan Kiene's avatar Jan Kiene
Browse files

Accept FIX_921_OMASA_DELAY_PRINTOUT

parent 3fa9b7e5

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ 
#define ISAR_BITSTREAM_UPDATE_LC3PLUS                   /* FhG: Multiple improvements to the ISAR bitstream when LC3plus is used. See MR 1456 for details. */

#define FIX_1372_ISAR_POST_REND

#endif

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

#define NONBE_FIX_926_OSBA_DECODER_CRASH_PLANAR_SBA           /* FhG: issue 926: crash in OSBA decoding with planar FOA */

#define FIX_929_RENDERER_CMDL                   /* Nokia: issue #929: renderer command line option */

#define NONBE_FIX_BINAURAL_ROOM_IR_REVERBERATOR               /* FhG: re-enable acidentially disabled reverberator for BINAURAL_ROOM_IR */

lib_dec/lib_dec_fx.c

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