Commit 99248cd4 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into... 

Merge branch 'main' of ssh://forge.3gpp.org:29419/sa4/audio/ivas-basop into basop-2537-harmonization-transient-detection-gettcxmaxenergychange-gettcxavgtemporalflatnessmeasure
parents a8233b84 cabc90ba

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ 
#define FIX_BASOP_2526_SPAR_MASA_PARAM_MAP_Q_BUG        /* Nokia: BASOP issue 2526: Fix wrong Q variable in SPAR to MASA param mapping */

#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_dirac_rend_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -1252,8 +1252,10 @@ void initDiffuseResponses_fx( 
                    move16();

                    Word16 num_horizontal_speakers_isq = ISqrt16( num_horizontal_speakers, &exp_var1 );   // q15-exp_var1

                    num_horizontal_speakers_isq = shr( num_horizontal_speakers_isq, negate( exp_var1 ) ); // q15

#ifndef FIX_BASOP_2510_UNNECESSARY_ASSERT

                    assert( 0 );

                    /*No stream hitting*/

#endif

                    FOR( i = 0; i < num_channels; i++ )

                    {

                        diffuse_response_function_fx[i] = mult( diffuse_response_function_fx[i], num_horizontal_speakers_isq ); // q15

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;