Commit 36325f77 authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Merge branch 'main' into 1751-replace-shl_ro-by-overflow-free-alternatives

parents aa060860 d12363f0

lib_rend/ivas_omasa_ana_fx.c

+17 −17
Original line number Diff line number Diff line
@@ -451,8 +451,8 @@ static void ivas_omasa_param_est_ana_fx( 
                inp_q = data_f_q;

                cldfbAnalysis_ts_fx_var_q( &( data_f_fx[i][i_mult( l_ts, ts )] ), Chnl_RealBuffer_fx[i], Chnl_ImagBuffer_fx[i], l_ts, hOMasa->cldfbAnaEnc[i], &inp_q );



                cr_q = s_min( cr_q, getScaleFactor32( Chnl_ImagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX ) );

                ci_q = s_min( ci_q, getScaleFactor32( Chnl_RealBuffer_fx[i], CLDFB_NO_CHANNELS_MAX ) );

                cr_q = s_min( cr_q, L_norm_arr( Chnl_ImagBuffer_fx[i], CLDFB_NO_CHANNELS_MAX ) );

                ci_q = s_min( ci_q, L_norm_arr( Chnl_RealBuffer_fx[i], CLDFB_NO_CHANNELS_MAX ) );

            }

            sf = sub( s_min( cr_q, ci_q ), 4 );

            FOR( i = 0; i < nchan_ism; i++ )
@@ -697,7 +697,6 @@ static void ivas_omasa_dmx_fx( 
                    data_out_f_fx[j][k] = BASOP_Util_Add_Mant32Exp( data_out_f_fx[j][k], data_e[j], L_tmp, scale, &in_e[k] );

                    move32();

                }

            }

                max_e = in_e[0];

                move16();

                FOR( l = 1; l < L_FRAME48k; l++ )
@@ -716,6 +715,7 @@ static void ivas_omasa_dmx_fx( 
                }

                data_e[j] = max_e;

                move16();

            }



            prev_gains_fx[i][j] = L_deposit_h( gains_fx[j] ); // Q31

            move32();