Commit 2a9e19a1 authored by multrus's avatar multrus
Browse files

Merge branch 'basop-2511-probably-porting-mistake-in-protosignalcomputation_shd_fx' into 'main' 

[non-BE][split-non-BE][allow-regression] Resolve "Probably porting mistake in protoSignalComputation_shd_fx"

Closes #2511

See merge request !2929
parents 21e1a6bd 95a06f25

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ 
#define FIX_BASOP_2497_MCMASA_LFE_WRONG_SF_INDEX        /* Nokia: BASOP 2497: Fix wrong subframe index in McMASA LFE synth. */

#define FIX_BASOP_2496_OMASA_OBJ_EDIT_WRONG_ASSIGN      /* Nokia: BASOP 2496: Fix wrong assignment in OMASA object edit code */

#define FIX_2495_Q_ALIGN_OSBA_RENDERER                  /* FhG: Basop issue #2495: Corrected exponent scaling of outAudio.data_fx before buffer accumulation in renderSbaToBinaural(). */

#define FIX_BASOP_2511_PROTO_REF_POWER_FIX              /* FhG: BASOP 2511; Fix reference power computation in protoSignalComputation_shd_fx() */



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

lib_rend/ivas_dirac_rend_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -1482,7 +1482,11 @@ void protoSignalComputation_shd_fx( 
                    move32();

                    *p_k_fx[k] = L_shl( *p_k_fx[k], Q1 ); // left shift is done to maintain constant Q factor Q(q_cldfb+min_q_shift)

                    move32();

#ifdef FIX_BASOP_2511_PROTO_REF_POWER_FIX

                    reference_power_fx[idx1] = Madd_32_32( reference_power_fx[idx1], *p_k_fx[k], *p_k_fx[k] ); // Q(2*(q_cldfb + min_q_shift)-31)

#else

                    reference_power_fx[idx1] = Mpy_32_32( *p_k_fx[k], *p_k_fx[k] ); // Q(2*(q_cldfb + min_q_shift)-31)

#endif

                    move32();

                    p_k_fx[k]++;