Commit 90aab4df authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_BASOP_2511_PROTO_REF_POWER_FIX

parent 3497a75b

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ 
/* any switch which is non-be wrt. TS 26.251 V3.0 */



#define FIX_1540_EXPOSE_PT_IN_RTP_HEADER_API            /* Expose Payload Type setting in RTP Header */

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

#define FIX_BASOP_2512_WRONG_SHIFT_IN_DIRAC_CONFIG      /* Nokia: BASOP 2512: Fix wrong division by shift */

#define FIX_BASOP_2513_EXTRA_RETURN_REND_OPEN           /* Nokia: BASOP issue 2513: Removes extra return block */

#define FIX_BASOP_2514_EFAP_PORTING_ERROR               /* Nokia: BASOP issue 2514: Fix wrongly ported line */

lib_rend/ivas_dirac_rend_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -1492,11 +1492,7 @@ 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]++;