Commit c49005e3 authored by Anjaneyulu Sana's avatar Anjaneyulu Sana
Browse files

Merge branch 'complexity_ltv_omasa_crash' into 'main' 

[allow regression] Fix for a crash in LTV complexity measurement pipeline

See merge request !1421
parents 8e60c68d c9506c85

lib_dec/fd_cng_dec_fx.c

+26 −23
Original line number Diff line number Diff line
@@ -1536,8 +1536,8 @@ Word16 ApplyFdCng_ivas_fx( 
                Word16 shift2 = L_norm_arr( cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ) ) );

                Word16 shift = s_max( sub( hFdCngDec->bandNoiseShape_exp, shift1 ), sub( *cngNoiseLevel_exp, shift2 ) );



                scale_sig32( cngNoiseLevel, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), sub( sub( hFdCngDec->bandNoiseShape_exp, shift1 ), shift ) );

                scale_sig32( cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ) ), sub( sub( *cngNoiseLevel_exp, shift2 ), shift ) );

                scale_sig32( cngNoiseLevel, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), sub( hFdCngDec->bandNoiseShape_exp, shift ) );

                scale_sig32( cngNoiseLevel + sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopFFTbin, hFdCngCom->startBand ) ), sub( *cngNoiseLevel_exp, shift ) );



                *cngNoiseLevel_exp = shift;

                move16();
@@ -1688,16 +1688,15 @@ Word16 ApplyFdCng_ivas_fx( 
                            move32();

                        }

                    }

                    /* adapt scaling for rest of the buffer */

                    s = sub( *cngNoiseLevel_exp, add( hFdCngDec->bandNoiseShape_exp, s2 ) );



                    FOR( ; j < FFTCLDFBLEN; j++ )

                    {

                        cngNoiseLevel[j] = L_shl( cngNoiseLevel[j], s ); /*Q31 - hFdCngDec->bandNoiseShape_exp + s*/

                        move32();

                    }

                    Word16 shift1 = L_norm_arr( cngNoiseLevel, j );

                    Word16 shift2 = L_norm_arr( &cngNoiseLevel[j], sub( FFTCLDFBLEN, j ) );

                    Word16 shift = s_max( sub( add( hFdCngDec->bandNoiseShape_exp, s2 ), shift1 ), sub( *cngNoiseLevel_exp, shift2 ) );



                    *cngNoiseLevel_exp = add( hFdCngDec->bandNoiseShape_exp, s2 );

                    scale_sig32( cngNoiseLevel, j, sub( add( hFdCngDec->bandNoiseShape_exp, s2 ), shift ) );

                    scale_sig32( &cngNoiseLevel[j], sub( FFTCLDFBLEN, j ), sub( *cngNoiseLevel_exp, shift ) );



                    *cngNoiseLevel_exp = shift;

                    move16();

                }

            }
@@ -1761,18 +1760,15 @@ Word16 ApplyFdCng_ivas_fx( 
                            move32();

                        }

                    }

                    /* adapt scaling for rest of the buffer */

                    s = sub( *cngNoiseLevel_exp, add( hFdCngDec->bandNoiseShape_exp, s2 ) );



                    FOR( ; j < FFTCLDFBLEN; j++ )

                    {

                        /* NOTE: saturation is added here as part of issue 1218 fix. after rescaling the fdcng noise estimation buffers, due to slight precision loss, values may slightly overflow */

                        cngNoiseLevel[j] = L_shl_sat( cngNoiseLevel[j], s ); /*Q31 - hFdCngDec->bandNoiseShape_exp + s*/

                        move32();

                    }

                    Word16 shift1 = L_norm_arr( cngNoiseLevel, j );

                    Word16 shift2 = L_norm_arr( &cngNoiseLevel[j], sub( FFTCLDFBLEN, j ) );

                    Word16 shift = s_max( sub( add( hFdCngDec->bandNoiseShape_exp, s2 ), shift1 ), sub( *cngNoiseLevel_exp, shift2 ) );



                    scale_sig32( cngNoiseLevel, j, sub( add( hFdCngDec->bandNoiseShape_exp, s2 ), shift ) );

                    scale_sig32( &cngNoiseLevel[j], sub( FFTCLDFBLEN, j ), sub( *cngNoiseLevel_exp, shift ) );



                    *cngNoiseLevel_exp = add( hFdCngDec->bandNoiseShape_exp, s2 );

                    *cngNoiseLevel_exp = shift;

                    move16();

                }

            }
@@ -2399,8 +2395,15 @@ void perform_noise_estimation_dec_ivas_fx( 
                ELSE

                {

                    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;



                    Word16 shift1 = L_norm_arr( msNoiseEst, npart );

                    Word16 shift2 = L_norm_arr( &msNoiseEst[npart], sub( NPART_SHAPING, npart ) );

                    Word16 shift = s_max( sub( hFdCngDec->msPeriodog_exp, shift1 ), sub( hFdCngDec->msNoiseEst_exp, shift2 ) );



                    scale_sig32( msNoiseEst, npart, sub( hFdCngDec->msPeriodog_exp, shift ) );

                    scale_sig32( &msNoiseEst[npart], sub( NPART_SHAPING, npart ), sub( hFdCngDec->msNoiseEst_exp, shift ) );



                    hFdCngDec->msNoiseEst_exp = shift;

                    move16();

                }
@@ -5071,8 +5074,8 @@ void FdCng_decodeSID_ivas_fx( 
    Word16 shift2 = L_norm_arr( hFdCngCom->cngNoiseLevel + sub( hFdCngCom->stopBand, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopBand, hFdCngCom->startBand ) ) );

    Word16 shift = s_max( sub( hFdCngCom->sidNoiseEstExp, shift1 ), sub( hFdCngCom->cngNoiseLevelExp, shift2 ) );



    scale_sig32( hFdCngCom->cngNoiseLevel, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), sub( sub( hFdCngCom->sidNoiseEstExp, shift1 ), shift ) );

    scale_sig32( hFdCngCom->cngNoiseLevel + sub( hFdCngCom->stopBand, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopBand, hFdCngCom->startBand ) ), sub( sub( hFdCngCom->cngNoiseLevelExp, shift2 ), shift ) );

    scale_sig32( hFdCngCom->cngNoiseLevel, sub( hFdCngCom->stopBand, hFdCngCom->startBand ), sub( hFdCngCom->sidNoiseEstExp, shift ) );

    scale_sig32( hFdCngCom->cngNoiseLevel + sub( hFdCngCom->stopBand, hFdCngCom->startBand ), sub( FFTCLDFBLEN, sub( hFdCngCom->stopBand, hFdCngCom->startBand ) ), sub( hFdCngCom->cngNoiseLevelExp, shift ) );



    hFdCngCom->cngNoiseLevelExp = shift;

    move16();