Commit d8677827 authored by Arthur Tritthart's avatar Arthur Tritthart
Browse files

Fix MR 871 by replacing back Madd_32_32 by L_add_sat+Mpy_32_32

parent b01a6c47

lib_dec/ivas_spar_decoder.c

+2 −2
Original line number Diff line number Diff line
@@ -1930,7 +1930,7 @@ void ivas_spar_dec_upmixer_sf_fx( 
                                cldfb_par_fx = L_add_sat( cldfb_par_fx, Mpy_32_16_1( mixer_mat_fx[out_ch][in_ch][spar_band], tmp ) );     /*q1*/

#else

                                Word32 tmp = L_shl_sat( bin2band->pp_cldfb_weights_per_spar_band_fx[cldfb_band][spar_band], 9 ); /*Q22 -> Q31(sat)*/

                                cldfb_par_fx = Madd_32_32( cldfb_par_fx, mixer_mat_fx[out_ch][in_ch][spar_band], tmp );          /*q1*/

                                cldfb_par_fx = L_add_sat( cldfb_par_fx, Mpy_32_32( mixer_mat_fx[out_ch][in_ch][spar_band], tmp ) );     /*q1*/

#endif

                            }

                        }
@@ -2030,7 +2030,7 @@ void ivas_spar_dec_upmixer_sf_fx( 
                            cldfb_par_fx = L_add_sat( cldfb_par_fx, Mpy_32_16_1( mixer_mat_fx[out_ch][in_ch][spar_band], tmp ) );     /*q1*/

#else

                            Word32 tmp = L_shl_sat( bin2band->pp_cldfb_weights_per_spar_band_fx[cldfb_band][spar_band], 9 ); /*Q22 -> Q31(sat)*/

                            cldfb_par_fx = Madd_32_32( cldfb_par_fx, mixer_mat_fx[out_ch][in_ch][spar_band], tmp );          /*q1*/

                            cldfb_par_fx = L_add_sat(cldfb_par_fx, Mpy_32_32( mixer_mat_fx[out_ch][in_ch][spar_band], tmp ) );      /*q1*/

#endif

                        }

                        Out_re_fx = Madd_32_32( Out_re_fx, cldfb_in_ts_re_fx[in_ch][ts][cldfb_band], cldfb_par_fx ); /*q1-25*/