Commit f42d6ee1 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1753_fix' into 'main' 

Fix for 3GPP issue 1753: Renderer crash in OMASA to MASA (diffuse_meta_merge_1x1_fx)

See merge request !1805
parents aea225ae fe4a6d04

lib_rend/ivas_masa_merge_fx.c

+5 −0
Original line number Diff line number Diff line
@@ -192,6 +192,11 @@ void diffuse_meta_merge_1x1_fx( 
            tmp = BASOP_Util_Divide3232_Scale( total_diff_nrg_fx, L_add( total_nrg_fx, EPSILON_FX ), &scale );

            L_tmp1 = L_deposit_h( tmp ); /* Q( 31 - ( scale + total_nrg_e - total_diff_nrg_e ) ) */

            scale = add( scale, sub( total_diff_nrg_e, total_nrg_e ) );

            if ( L_tmp1 == 0 )

            {

                scale = 30;

                move16();

            }

            L_tmp2 = L_sub( L_shl( 1, scale ), L_tmp1 );



            L_tmp1 = BASOP_Util_Add_Mant32Exp( dir_ratio_ism_fx, dir_ratio_ism_e, L_tmp2, scale, &tmp );