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

Crash fix for [Multi-channel 7_1_4 bitrate switching from 13.2 kbps to 512... 

Crash fix for [Multi-channel 7_1_4 bitrate switching from 13.2 kbps to 512 kbps, 48kHz in, 48kHz out, HOA3 out] fxd enc fxd dec case and warning fix
parent e534435f

lib_dec/ivas_mc_param_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static ivas_error param_mc_get_diff_proto_info_fx( const Word32 *proto_mtx, cons 
static void param_mc_update_mixing_matrices_fx( PARAM_MC_DEC_HANDLE hParamMC, Word32 *mixing_matrix[], Word16 *mixing_matrix_fx, Word32 *mixing_matrix_res[], Word16 *mixing_matrix_res_exp, const UWord16 nX, const UWord16 nY );





static void param_mc_protoSignalComputation_fx( Word32 *RealBuffer_fx, Word32 *ImagBuffer_fx, Word32 *proto_frame_f_fx, const PARAM_MC_DIFF_PROTO_INFO *diff_proto_info, const Word16 num_freq_bands, Word16 Cldfb_Real_Imag_exp, Word16 *proto_frame_f_fx_q /* Word16 ImagBuffer_fx_e, Word16 *common_e*/ );

static void param_mc_protoSignalComputation_fx( Word32 *RealBuffer_fx, Word32 *ImagBuffer_fx, Word32 *proto_frame_f_fx, const PARAM_MC_DIFF_PROTO_INFO *diff_proto_info, const Word16 num_freq_bands, const Word16 Cldfb_Real_Imag_exp, Word16 *proto_frame_f_fx_q /* Word16 ImagBuffer_fx_e, Word16 *common_e*/ );



/*-------------------------------------------------------------------------

 * ivas_param_mc_dec_open()

lib_dec/ivas_sba_rendering_internal_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ void ivas_mc2sba_fx( 
                FOR( k = 0; k < output_frame; k++ )

                {

#ifdef OPT_BIN_RENDERER_V2

                    buffer_tmp_fx[j][k] = Madd_32_32( buffer_tmp_fx[j][k], L_shl( in_buffer_td_fx[i][k], 2 ), gains_fx[j] ); /*Q+29-31+2==Q*/

                    buffer_tmp_fx[j][k] = Madd_32_32( buffer_tmp_fx[j][k], L_shl_sat( in_buffer_td_fx[i][k], 2 ), gains_fx[j] ); /*Q+29-31+2==Q*/

#else                                                                                                                        /* OPT_BIN_RENDERER_V2 */

                    buffer_tmp_fx[j][k] = L_add( buffer_tmp_fx[j][k], L_shl( Mult_32_32( in_buffer_td_fx[i][k], gains_fx[j] ), 2 ) ); /*Q+29-31+2==Q*/

#endif                                                                                                                       /* OPT_BIN_RENDERER_V2 */