Commit a54b38d4 authored by vaclav's avatar vaclav
Browse files

Merge branch '1354_basop_PortFlpMR1253' into 'main-pc' 

Port float MR1253 to BASOP

See merge request !1235
parents 83cd426e 6610d4d0

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -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 ############################ */

lib_dec/lib_dec_fx.c

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