Commit 5cdef1ad authored by Sandesh Venkatesh's avatar Sandesh Venkatesh
Browse files

Merge branch '3gpp_issue_1045_fix' into 'main' 

Fix for 3GPP issue 1045: High MLD for ISM + FER + bitrate switching in WB

See merge request !829
parents a14b95dc 0abb04a3

lib_dec/TonalComponentDetection_fx.c

+6 −6
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ void ivas_DetectTonalComponents_fx( 
        // till nSamplesCore different Q and nSamples - nSamplesCore in different Q

        Scale_sig32( pScaledMdctSpectrum + nSamplesCore, sub( nSamples, nSamplesCore ), sub( lastMDCTSpectrum_exp, tmp_e ) ); /*q_pScaledMdctSpectrum+lastMDCTSpectrum_exp-tmp_e*/

        lastMDCTSpect_exp = sub( 31, q_pScaledMdctSpectrum );

    }



        FOR( Word16 i = nSamplesCore; i < nSamples; ++i )

        {
@@ -112,6 +111,7 @@ void ivas_DetectTonalComponents_fx( 
            pScaledMdctSpectrum[i] = W_extract_h( W_shl( tmp, Q15 ) );                       /*q_pScaledMdctSpectrum*/

            move32();

        }

    }



    /* Guard bit */

    lastMDCTSpect_exp = add( lastMDCTSpect_exp, 1 );

lib_dec/tonalMDCTconcealment_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ static void ivas_CalcPowerSpecAndDetectTonalComponents_fx( 
                                   hTonalMDCTConc->lastPitchLag,

                                   pitchLag,

                                   hTonalMDCTConc->lastBlockData.spectralData,

                                   add( hTonalMDCTConc->lastBlockData.spectralData_exp, hTonalMDCTConc->lastBlockData.gain_tcx_exp ),

                                   hTonalMDCTConc->lastBlockData.spectralData_exp,

                                   hTonalMDCTConc->lastBlockData.scaleFactors,

                                   hTonalMDCTConc->lastBlockData.scaleFactors_exp,

                                   hTonalMDCTConc->lastBlockData.scaleFactors_max_e,