Commit f9ba2703 authored by Nishant S Kulgod's avatar Nishant S Kulgod
Browse files

commit 1

parent f7d1e1f8

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -79,5 +79,4 @@ 
#define SIMPLIFY_CODE_BE   // Simplify synthesis loop

#define CR_2109_to_2112_cd0_ce0  /* This is related to the CRs include in the 26.444 package of 21-12. Concerns lead_deindexing and  */

#define FIX_QMETADATA_PENALTY /* Nokia: transform penalty calculation in qmetadata into integer operations */

#define FIX_1013_CRASH_HQ_CORE_DEC /* Ittiam: Saturation added on the lines of EVS */

#endif

lib_com/trans_inv_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -543,11 +543,7 @@ void preecho_sb_fx( 
                        tmp_fx1 = norm_l( es_mdct_hb_fx[i] );

                        tmp_fxL1 = L_shl( es_mdct_hb_fx[i], tmp_fx1 );

                        tmp_fxL2 = L_shl( mean_prev_hb_fx_loc, tmp_fx1 );

#ifdef FIX_1013_CRASH_HQ_CORE_DEC

                        tmp_fx1 = round_fx_sat( tmp_fxL1 );

#else

                        tmp_fx1 = round_fx( tmp_fxL1 );

#endif

                        tmp_fx2 = round_fx( tmp_fxL2 );

                        tmp_fx3 = div_s( tmp_fx2, tmp_fx1 );

                        min_g_hb_fx[i] = Frac_sqrt( tmp_fx3 );

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/core_switching_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -1817,7 +1817,7 @@ ivas_error core_switching_post_dec_ivas_fx( 
                    L_tmp2 = 0;

                    move32();

                    move32();

                    tmp = st_fx->previoussynth_fx[i + delay_comp];

                    tmp = shl( st_fx->previoussynth_fx[i + delay_comp], *Qsynth );

                    L_tmp = L_mac0( L_tmp, div_s( i, tmpDelta ), synth[i + delay_comp] ); /* Qsynth */

                    L_tmp = L_shl( L_tmp, 1 );

                    L_tmp2 = L_mac0( L_tmp2, div_s( sub( tmpDelta, i ), tmpDelta ), tmp ); /* Qsynth */

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,