Commit 3af778b5 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch 'SBA_LTV_crash_fixes' into 'main' 

Fix for crash issues observered for SBA format with LTV set

See merge request !299
parents f57df654 288585af

lib_com/float_to_fix_ops.c

+5 −5
Original line number Diff line number Diff line
@@ -789,11 +789,11 @@ void stereo_tcx_dec_mode_switch_reconf_To_fixed_2( 
                //st->hFdCngDec->msPeriodog_ST_fx[p] = (Word32) ( st->hFdCngDec->msPeriodog_ST[p] * ( 1u << ( 31 - st->hFdCngDec->msPeriodog_ST_exp ) ) );

            }



            st->hFdCngDec->hFdCngCom->cngNoiseLevelExp = 31 - Q4; // Q4

            for ( int p = 0; p < FFTCLDFBLEN; p++ )

            {

                st->hFdCngDec->hFdCngCom->cngNoiseLevel[p] = (Word32) ( st->hFdCngDec->hFdCngCom->cngNoiseLevel_flt[p] * ( 1u << ( 31 - st->hFdCngDec->hFdCngCom->cngNoiseLevelExp ) ) );

            }

           // st->hFdCngDec->hFdCngCom->cngNoiseLevelExp = 31 - Q4; // Q4

            //for ( int p = 0; p < FFTCLDFBLEN; p++ )

            //{

              //  st->hFdCngDec->hFdCngCom->cngNoiseLevel[p] = (Word32) ( st->hFdCngDec->hFdCngCom->cngNoiseLevel_flt[p] * ( 1u << ( 31 - st->hFdCngDec->hFdCngCom->cngNoiseLevelExp ) ) );

            //}

            //st->hFdCngDec->hFdCngCom->sidNoiseEstExp = 31 - Q4;

            //st->hFdCngDec->partNoiseShape_exp = 31 - Q4;

            //for ( int p = 0; p < NPART; p++ )

lib_dec/ivas_sba_dirac_stereo_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1195,7 +1195,7 @@ void ivas_sba_dirac_stereo_smooth_parameters_fx( 
                                move16();

                                // The Q format of mixer_mat_prev_fx is Q30 so applying the left shift.

                                hStereoDft->mixer_mat_smooth_fx[i][j][b + k * IVAS_MAX_NUM_BANDS] =

                                    L_add(Mpy_32_16_1(hStereoDft->mixer_mat_smooth_fx[i][j][b + k * IVAS_MAX_NUM_BANDS], beta),

                                    L_add_sat(Mpy_32_16_1(hStereoDft->mixer_mat_smooth_fx[i][j][b + k * IVAS_MAX_NUM_BANDS], beta),

                                               L_shl(Mpy_32_16_1(hMdDec->mixer_mat_prev_fx[i_hist][i][j][b], sub((Word16)0x7FFF, beta)), Q1));

                                move32();

                            }