Commit ea7d1ccc authored by Jan Kiene's avatar Jan Kiene
Browse files

revert to EVS test fix commit

parent 28a649d3

lib_enc/ext_sig_ana_fx.c

+3 −59
Original line number Diff line number Diff line
@@ -567,18 +567,6 @@ void core_signal_analysis_high_bitrate_fx( 
                            spectrum[frameno], &hTcxEnc->tnsData[frameno], &hTcxEnc->fUseTns[frameno], NULL );

#ifdef IVAS_CODE

            IF( st->hTcxCfg->fIsTNSAllowed )

#endif

            {

                EncodeTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, &hTcxEnc->tnsData[frameno],

                                  param_core + frameno * NPRM_DIV + 1 + NOISE_FILL_RANGES + LTPSIZE, pTnsSize + frameno, pTnsBits + frameno );

                test();

                test();

                TNSAnalysis_fx( st->hTcxCfg, L_frameTCX,

                                st->hTcxCfg->tcx_coded_lines,

                                transform_type[frameno], ( frameno == 0 ) && ( st->last_core == ACELP_CORE ),

                                spectrum[frameno], &hTcxEnc->tnsData[frameno], &hTcxEnc->fUseTns[frameno], NULL );

#ifdef IVAS_CODE

                IF( st->hTcxCfg->fIsTNSAllowed )

#endif

            {

                EncodeTnsData_fx( st->hTcxCfg->pCurrentTnsConfig, &hTcxEnc->tnsData[frameno],
@@ -601,51 +589,6 @@ void core_signal_analysis_high_bitrate_fx( 
                 * LPC analysis

                 *---------------------------------------------------------------*/



#ifdef IVAS_CODE

                IF( st->tcxonly )

#endif

                {

                    HBAutocorrelation_fx( st->hTcxCfg, lpc_left_overlap_mode, lpc_right_overlap_mode, &st->speech_enc_pe[frameno * tcx10Size],

                                          shr( L_frame, sub( nSubframes, 1 ) ), r, M );



                    FOR( i = 0; i <= M; i++ )

                    {

                        move16();

                        move16();

                        r_l[frameno][i] = L_Extract_lc( r[i], &r_h[frameno][i] );

                    }



                    adapt_lag_wind( r_h[frameno], r_l[frameno], M, alw_pitch_lag_12k8[frameno], alw_voicing[frameno], st->sr_core );



                    E_LPC_lev_dur( r_h[frameno], r_l[frameno], A, epsP, M, NULL );



                    E_LPC_a_lsp_conversion( A, lsp[nSubframes - 1 - frameno], st->lspold_enc_fx, M );

                }

                IF( st->igf )

                {

                    ProcessIGF_fx( st->hIGFEnc, st, spectrum[frameno], &( spectrum_e[frameno] ), powerSpec, &powerSpec_e, transform_type[frameno] == TCX_20, hTcxEnc->fUseTns[frameno], ( st->last_core == ACELP_CORE ), frameno );

                }



                /* Copy memory */

                Copy( lsp_new, st->lspold_enc_fx, M );

            }

            IF( EQ_16( transform_type[frameno], TCX_5 ) )

            {

                /* group sub-windows: interleave bins according to their frequencies */

                FOR( i = 0; i < tcx5SizeFB; i++ )

                {

                    interleaveBuf[2 * i] = spectrum[frameno][i];

                    move32();

                    interleaveBuf[2 * i + 1] = spectrum[frameno][tcx5SizeFB + i];

                    move32();

                }

                Copy32( interleaveBuf, spectrum[frameno], tcx10SizeFB );

            }



            /*--------------------------------------------------------------*

             * LPC analysis

             *---------------------------------------------------------------*/



#ifdef IVAS_CODE

            IF( st->tcxonly )

#endif
@@ -678,3 +621,4 @@ void core_signal_analysis_high_bitrate_fx( 


    return;

}