Commit 610e9393 authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1219_fix' into 'main'

Fix for 3GPP issue 1219: Assert in ApplyFdCng_ivas_fx of BASOP decoder for float encoder MASA bitstream using DTX at 32 kbps

See merge request !1075
parents 44ccb23e 654635c9
Loading
Loading
Loading
Loading
Loading
+3 −4
Original line number Diff line number Diff line
@@ -2690,10 +2690,9 @@ void perform_noise_estimation_dec_ivas_fx(
                }
                ELSE
                {
                    Word16 tmp = s_max( sub( hFdCngDec->msPeriodog_exp, getScaleFactor32( msPeriodog, npart ) ), sub( hFdCngDec->msNoiseEst_exp, getScaleFactor32( &msNoiseEst[npart], sub( NPART_SHAPING, npart ) ) ) );
                    Copy_Scale_sig32( msPeriodog, msNoiseEst, npart, sub( hFdCngDec->msPeriodog_exp, tmp ) );              /*Q31 - tmp*/
                    scale_sig32( &msNoiseEst[npart], sub( NPART_SHAPING, npart ), sub( hFdCngDec->msNoiseEst_exp, tmp ) ); /*Q31 - tmp*/
                    hFdCngDec->msNoiseEst_exp = tmp;
                    Copy32( msPeriodog, msNoiseEst, npart );
                    scale_sig32( &msNoiseEst[npart], sub( NPART_SHAPING, npart ), sub( hFdCngDec->msNoiseEst_exp, hFdCngDec->msPeriodog_exp ) );
                    hFdCngDec->msNoiseEst_exp = hFdCngDec->msPeriodog_exp;
                    move16();
                }