Commit cabc90ba authored by Tapani Pihlajakuja's avatar Tapani Pihlajakuja
Browse files

Merge branch 'basop-2515-possible-porting-error-in-tdrend_rend_rendersourcehrfilt_fx' into 'main' 

Resolve "Possible porting error in TDREND_REND_RenderSourceHRFilt_fx"

Closes #2515

See merge request !2931
parents 0a594b7d d41a553b

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ 
#define FIX_BASOP_2524_MASA_REDUCE_META_BUG             /* Nokia: BASOP issue 2524: Fix wrong reset of W_tmp in reduce_metadata_further_fx */

#define FIX_BASOP_2520_PARAMBIN_THRESHOLD_FIX           /* Nokia: BASOP issue 2520: Fix wrong threshold in ParamBin */

#define FIX_BASOP_2510_UNNECESSARY_ASSERT               /* Nokia: BASOP issue 2510: Fix by removing assert */

#define FIX_2515_TDREND_PORT_ERROR_SCALING              /* Nokia: BASOP issue 2515: Fix port error by changing to correct scaling */



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

lib_rend/ivas_objectRenderer_hrFilt_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -84,7 +84,11 @@ ivas_error TDREND_REND_RenderSourceHRFilt_fx( 
    Scale_sig32( Src_p->hrf_left_prev_fx, Src_p->filterlength, sub( Src_p->hrf_left_prev_e, left_filter_e ) );

    Scale_sig32( hrf_left_delta_fx, Src_p->filterlength, sub( *hrf_left_delta_e, left_filter_e ) );

    Scale_sig32( Src_p->hrf_right_prev_fx, Src_p->filterlength, sub( Src_p->hrf_right_prev_e, right_filter_e ) );

#ifdef FIX_2515_TDREND_PORT_ERROR_SCALING

    Scale_sig32( hrf_right_delta_fx, Src_p->filterlength, sub( *hrf_right_delta_e, right_filter_e ) );

#else

    Scale_sig32( hrf_right_delta_fx, Src_p->filterlength, sub( *hrf_right_delta_e, left_filter_e ) );

#endif

    Src_p->hrf_left_prev_e = left_filter_e;

    move16();

    *hrf_left_delta_e = left_filter_e;