Commit 3240a5ad authored by Jan Kiene's avatar Jan Kiene
Browse files

Merge branch 'basop-2257-assert-in-omasa-pre-renderer-2' into 'main' 

[non-BE][rend-non-BE] Resolve "Assert in OMASA pre-renderer"

Closes #2257

See merge request !2695
parents e65c4372 23454830

lib_com/cldfb_fx.c

+3 −0
Original line number Diff line number Diff line
@@ -595,6 +595,9 @@ void cldfbAnalysis_ts_fx_var_q( 
    IF( NE_16( h_cldfb->Q_cldfb_state, *q_cldfb ) )

    {

        Word16 norm_st = L_norm_arr( timeBuffer_fx, offset );

#ifdef FIX_2257_INCR_GUARD_BITS

        norm_st = sub( norm_st, find_guarded_bits_fx( shr( h_cldfb->no_channels, 2 ) ) );

#endif

        IF( GE_16( norm_st, sub( *q_cldfb, h_cldfb->Q_cldfb_state ) ) )

        {

            scale_sig32( timeBuffer_fx, offset, sub( *q_cldfb, h_cldfb->Q_cldfb_state ) );

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ 
#define FIX_1381_BWD                                    /* VA: issue 1381: apply no hysteresis in BWD at higher bitrates also in mono MASA and OMASA */

#define FIX_2285_CODE_DECODER_INIT_BW                   /* VA: basop issue 2285: fix core-decoder initialization bandwidth */

#define FIX_2306_MISSING_UPDATE_LOWRATE_PITCH_GAIN      /* Dolby: Fix missing update of low-rate pitch gain in the S/M classifier */

#define FIX_2257_INCR_GUARD_BITS                        /* FhG: take correct rendering frame-size into account for guard-bits calculation */

#define FIX_2297_SBA_SCALING_32KHZ                      /* VA: basop issue 2297: Fix scaling factor before the SBA decoder for output_Fs = 32 or 16 */



/* ##################### End NON-BE switches ########################### */