Commit 8958209b authored by Fabian Bauer's avatar Fabian Bauer
Browse files

Merge branch 'main' into 1326-complexity-issue-ism-4-32-kbps-fb-to-binaural-basop

parents b7784a07 41ec6b7e

Workspace_msvc/lib_dec.vcxproj

+0 −14
Original line number Diff line number Diff line
@@ -145,22 +145,17 @@ 
    <ClCompile Include="..\lib_dec\acelp_core_dec_ivas_fx.c" />

    <ClCompile Include="..\lib_dec\acelp_core_switch_dec_fx.c" />

    <ClCompile Include="..\lib_dec\amr_wb_dec_fx.c" />

    <ClCompile Include="..\lib_dec\arith_coder_dec.c" />

    <ClCompile Include="..\lib_dec\arith_coder_dec_fx.c" />

    <ClCompile Include="..\lib_dec\ari_dec.c" />

    <ClCompile Include="..\lib_dec\ari_dec_fx.c" />

    <ClCompile Include="..\lib_dec\ari_hm_dec.c" />

    <ClCompile Include="..\lib_dec\avq_dec_fx.c" />

    <ClCompile Include="..\lib_dec\bass_psfilter.c" />

    <ClCompile Include="..\lib_dec\bass_psfilter_fx.c" />

    <ClCompile Include="..\lib_dec\cng_dec_fx.c">

      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>

    </ClCompile>

    <ClCompile Include="..\lib_dec\core_dec_init.c" />

    <ClCompile Include="..\lib_dec\core_dec_init_fx.c" />

    <ClCompile Include="..\lib_dec\core_dec_reconf_fx.c" />

    <ClCompile Include="..\lib_dec\core_dec_switch_fx.c" />

    <ClCompile Include="..\lib_dec\core_switching_dec.c" />

    <ClCompile Include="..\lib_dec\core_switching_dec_fx.c" />

    <ClCompile Include="..\lib_dec\dec2t32_fx.c" />

    <ClCompile Include="..\lib_dec\dec4t64_fx.c" />
@@ -176,9 +171,7 @@ 
    <ClCompile Include="..\lib_dec\dec_pit_exc_fx.c" />

    <ClCompile Include="..\lib_dec\dec_post_fx.c" />

    <ClCompile Include="..\lib_dec\dec_ppp_fx.c" />

    <ClCompile Include="..\lib_dec\dec_prm.c" />

    <ClCompile Include="..\lib_dec\dec_prm_fx.c" />

    <ClCompile Include="..\lib_dec\dec_tcx.c" />

    <ClCompile Include="..\lib_dec\dec_tcx_fx.c" />

    <ClCompile Include="..\lib_dec\dec_tran_fx.c" />

    <ClCompile Include="..\lib_dec\dec_uv_fx.c" />
@@ -191,12 +184,10 @@ 
    <ClCompile Include="..\lib_dec\er_sync_exc_fx.c" />

    <ClCompile Include="..\lib_dec\er_util_fx.c" />

    <ClCompile Include="..\lib_dec\evs_dec_fx.c" />

    <ClCompile Include="..\lib_dec\fd_cng_dec.c" />

    <ClCompile Include="..\lib_dec\fd_cng_dec_fx.c" />

    <ClCompile Include="..\lib_dec\FEC_adapt_codebook_fx.c" />

    <ClCompile Include="..\lib_dec\FEC_clas_estim_fx.c" />

    <ClCompile Include="..\lib_dec\FEC_fx.c" />

    <ClCompile Include="..\lib_dec\FEC_HQ_core.c" />

    <ClCompile Include="..\lib_dec\FEC_HQ_core_fx.c" />

    <ClCompile Include="..\lib_dec\FEC_HQ_phase_ecu_fx.c" />

    <ClCompile Include="..\lib_dec\FEC_lsf_estim_fx.c" />
@@ -216,7 +207,6 @@ 
    <ClCompile Include="..\lib_dec\hq_lr_dec_fx.c" />

    <ClCompile Include="..\lib_dec\igf_dec_fx.c" />

    <ClCompile Include="..\lib_dec\igf_scf_dec_fx.c" />

    <ClCompile Include="..\lib_dec\init_dec.c" />

    <ClCompile Include="..\lib_dec\init_dec_fx.c" />

    <ClCompile Include="..\lib_dec\inov_dec_fx.c" />

    <ClCompile Include="..\lib_dec\ivas_agc_dec_fx.c" />
@@ -246,7 +236,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_mct_dec_mct_fx.c" />

    <ClCompile Include="..\lib_dec\ivas_mc_paramupmix_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_mc_param_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_mc_param_dec_fx.c" />

    <ClCompile Include="..\lib_dec\ivas_mdct_core_dec.c" />

    <ClCompile Include="..\lib_dec\ivas_mono_dmx_renderer.c" />

    <ClCompile Include="..\lib_dec\ivas_objectRenderer_internal.c" />
@@ -310,18 +299,15 @@ 
    <ClCompile Include="..\lib_dec\rom_dec.c" />

    <ClCompile Include="..\lib_dec\rst_dec_fx.c" />

    <ClCompile Include="..\lib_dec\stat_noise_uv_dec_fx.c" />

    <ClCompile Include="..\lib_dec\swb_bwe_dec.c" />

    <ClCompile Include="..\lib_dec\swb_bwe_dec_fx.c" />

    <ClCompile Include="..\lib_dec\swb_bwe_dec_hr_fx.c" />

    <ClCompile Include="..\lib_dec\swb_bwe_dec_lr_fx.c" />

    <ClCompile Include="..\lib_dec\swb_tbe_dec.c" />

    <ClCompile Include="..\lib_dec\swb_tbe_dec_fx.c" />

    <ClCompile Include="..\lib_dec\syn_outp_fx.c" />

    <ClCompile Include="..\lib_dec\tcq_core_dec_fx.c" />

    <ClCompile Include="..\lib_dec\tcx_utils_dec_fx.c" />

    <ClCompile Include="..\lib_dec\tns_base_dec_fx.c" />

    <ClCompile Include="..\lib_dec\TonalComponentDetection_fx.c" />

    <ClCompile Include="..\lib_dec\tonalMDCTconcealment.c" />

    <ClCompile Include="..\lib_dec\tonalMDCTconcealment_fx.c" />

    <ClCompile Include="..\lib_dec\transition_dec_fx.c" />

    <ClCompile Include="..\lib_dec\updt_dec_fx.c" />

Workspace_msvc/lib_dec.vcxproj.filters

+0 −42
Original line number Diff line number Diff line
@@ -8,9 +8,6 @@ 
    <ClCompile Include="..\lib_dec\amr_wb_dec_fx.c">

      <Filter>decoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\core_dec_init.c">

      <Filter>decoder_evs_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\core_dec_init_fx.c">

      <Filter>decoder_evs_c</Filter>

    </ClCompile>
@@ -137,9 +134,6 @@ 
    <ClCompile Include="..\lib_dec\ivas_mc_param_dec.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_mc_param_dec_fx.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ivas_mc_paramupmix_dec.c">

      <Filter>decoder_ivas_c</Filter>

    </ClCompile>
@@ -275,36 +269,24 @@ 
    <ClCompile Include="..\lib_dec\acelp_core_dec_ivas_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ari_dec.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ari_dec_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\ari_hm_dec.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\arith_coder_dec.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\arith_coder_dec_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\avq_dec_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\bass_psfilter.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\bass_psfilter_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\cng_dec_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\core_switching_dec.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\core_switching_dec_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>
@@ -320,15 +302,9 @@ 
    <ClCompile Include="..\lib_dec\dec_pit_exc_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\dec_prm.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\dec_prm_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\dec_tcx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\dec_tcx_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>
@@ -365,9 +341,6 @@ 
    <ClCompile Include="..\lib_dec\er_util_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\fd_cng_dec.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\fd_cng_dec_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>
@@ -380,9 +353,6 @@ 
    <ClCompile Include="..\lib_dec\FEC_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\FEC_HQ_core.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\FEC_HQ_core_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>
@@ -437,9 +407,6 @@ 
    <ClCompile Include="..\lib_dec\igf_scf_dec_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\init_dec.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\init_dec_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>
@@ -515,15 +482,9 @@ 
    <ClCompile Include="..\lib_dec\stat_noise_uv_dec_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\swb_bwe_dec.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\swb_bwe_dec_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\swb_tbe_dec.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\swb_tbe_dec_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>
@@ -542,9 +503,6 @@ 
    <ClCompile Include="..\lib_dec\TonalComponentDetection_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\tonalMDCTconcealment.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

    <ClCompile Include="..\lib_dec\tonalMDCTconcealment_fx.c">

      <Filter>decoder_all_c</Filter>

    </ClCompile>

lib_dec/FEC_HQ_core.c

deleted100644 → 0
+0 −136
Original line number Diff line number Diff line 
/******************************************************************************************************



   (C) 2022-2025 IVAS codec Public Collaboration with portions copyright Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

   contributors to this repository. All Rights Reserved.



   This software is protected by copyright law and by international treaties.

   The IVAS codec Public Collaboration consisting of Dolby International AB, Ericsson AB,

   Fraunhofer-Gesellschaft zur Foerderung der angewandten Forschung e.V., Huawei Technologies Co. LTD.,

   Koninklijke Philips N.V., Nippon Telegraph and Telephone Corporation, Nokia Technologies Oy, Orange,

   Panasonic Holdings Corporation, Qualcomm Technologies, Inc., VoiceAge Corporation, and other

   contributors to this repository retain full ownership rights in their respective contributions in

   the software. This notice grants no license of any kind, including but not limited to patent

   license, nor is any license granted by implication, estoppel or otherwise.



   Contributors are required to enter into the IVAS codec Public Collaboration agreement before making

   contributions.



   This software is provided "AS IS", without any express or implied warranties. The software is in the

   development stage. It is intended exclusively for experts who have experience with such software and

   solely for the purpose of inspection. All implied warranties of non-infringement, merchantability

   and fitness for a particular purpose are hereby disclaimed and excluded.



   Any dispute, controversy or claim arising under or in relation to providing this software shall be

   submitted to and settled by the final, binding jurisdiction of the courts of Munich, Germany in

   accordance with the laws of the Federal Republic of Germany excluding its conflict of law rules and

   the United Nations Convention on Contracts on the International Sales of Goods.



*******************************************************************************************************/



/*====================================================================================

    EVS Codec 3GPP TS26.443 Nov 04, 2021. Version 12.14.0 / 13.10.0 / 14.6.0 / 15.4.0 / 16.3.0

  ====================================================================================*/



#include <stdint.h>

#include "options.h"

#include <math.h>

#include "cnst.h"

#include "rom_dec.h"

#include "rom_com.h"

#include "prot.h"

#include "wmc_auto.h"

#include "prot_fx.h"





void save_synthesis_hq_fec_fx(

    Decoder_State *st,         /* i/o: decoder state structure     */

    const Word32 output_fx[],  /* i  : decoded synthesis           */

    const Word16 output_frame, /* i  : decoded synthesis           */

    CPE_DEC_HANDLE hCPE        /* i  : CPE decoder structure       */

)

{

    Word16 post_hq_delay;



    SWITCH( st->element_mode )

    {

        case EVS_MONO:

            post_hq_delay = NS2SA_FX2( st->output_Fs, POST_HQ_DELAY_NS );

            BREAK;

        case IVAS_SCE:

            post_hq_delay = NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS );

            BREAK;

        case IVAS_CPE_DFT:

            test();

            IF( EQ_16( hCPE->nchan_out, 1 ) && hCPE->hStereoDft->hConfig->res_cod_mode == STEREO_DFT_RES_COD_OFF )

            {

                post_hq_delay = NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS );

            }

            ELSE

            {

                post_hq_delay = 0;

                move16();

            }

            BREAK;

        default:

            post_hq_delay = 0;

            move16();

            BREAK;

    }



    test();

    test();

    test();

    test();

    test();

    IF( ( EQ_16( st->codec_mode, MODE1 ) && st->hTcxDec != NULL ) && ( ( ( st->core == ACELP_CORE ) && !( EQ_16( st->bfi, 1 ) && EQ_16( st->con_tcx, 1 ) ) ) || EQ_16( st->core, HQ_CORE ) ) )

    {

        Copy( st->hTcxDec->synth_history_fx + output_frame, st->hTcxDec->synth_history_fx, add( sub( output_frame, post_hq_delay ), NS2SA_FX2( st->output_Fs, PH_ECU_MEM_NS ) ) );

        FOR( Word16 i = 0; i < output_frame; i++ )

        {

            st->hTcxDec->old_synthFB_fx[( ( i + output_frame ) - post_hq_delay )] = extract_h( L_shl_sat( output_fx[i], 16 ) ); // Q16

            move16();

        }



        IF( st->element_mode == EVS_MONO )

        {

            /* reset the remaining buffer, which is read in TCX concealment the necessary samples to fill

               this buffer are not available for all cases, the impact on the output is limited */



            set16_fx( st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), post_hq_delay ), 0, post_hq_delay );

            IF( GE_16( output_frame, L_FRAME16k ) )

            {

                Copy( st->prev_synth_buffer_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS ) ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) );

            }

            ELSE

            {

                Copy( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );

            }



            IF( st->core != ACELP_CORE )

            {

                IF( GE_16( output_frame, L_FRAME16k ) )

                {

                    Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ) ), NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ) );

                    Copy( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );

                }

                ELSE

                {

                    Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS ) ), NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ) );

                    Copy( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );

                }

            }

        }

        ELSE

        {

            IF( st->core != ACELP_CORE )

            {

                Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), post_hq_delay ), post_hq_delay );

                Copy( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );

            }

        }

    }

    return;

}

lib_dec/FEC_HQ_core_fx.c

+92 −0
Original line number Diff line number Diff line
@@ -1961,6 +1961,98 @@ static void Next_good_after_burst_erasures_fx( 
    return;

}





void save_synthesis_hq_fec_fx(

    Decoder_State *st,         /* i/o: decoder state structure     */

    const Word32 output_fx[],  /* i  : decoded synthesis           */

    const Word16 output_frame, /* i  : decoded synthesis           */

    CPE_DEC_HANDLE hCPE        /* i  : CPE decoder structure       */

)

{

    Word16 post_hq_delay;



    SWITCH( st->element_mode )

    {

        case EVS_MONO:

            post_hq_delay = NS2SA_FX2( st->output_Fs, POST_HQ_DELAY_NS );

            BREAK;

        case IVAS_SCE:

            post_hq_delay = NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS );

            BREAK;

        case IVAS_CPE_DFT:

            test();

            IF( EQ_16( hCPE->nchan_out, 1 ) && hCPE->hStereoDft->hConfig->res_cod_mode == STEREO_DFT_RES_COD_OFF )

            {

                post_hq_delay = NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS );

            }

            ELSE

            {

                post_hq_delay = 0;

                move16();

            }

            BREAK;

        default:

            post_hq_delay = 0;

            move16();

            BREAK;

    }



    test();

    test();

    test();

    test();

    test();

    IF( ( EQ_16( st->codec_mode, MODE1 ) && st->hTcxDec != NULL ) && ( ( ( st->core == ACELP_CORE ) && !( EQ_16( st->bfi, 1 ) && EQ_16( st->con_tcx, 1 ) ) ) || EQ_16( st->core, HQ_CORE ) ) )

    {

        Copy( st->hTcxDec->synth_history_fx + output_frame, st->hTcxDec->synth_history_fx, add( sub( output_frame, post_hq_delay ), NS2SA_FX2( st->output_Fs, PH_ECU_MEM_NS ) ) );

        FOR( Word16 i = 0; i < output_frame; i++ )

        {

            st->hTcxDec->old_synthFB_fx[( ( i + output_frame ) - post_hq_delay )] = extract_h( L_shl_sat( output_fx[i], 16 ) ); // Q16

            move16();

        }



        IF( st->element_mode == EVS_MONO )

        {

            /* reset the remaining buffer, which is read in TCX concealment the necessary samples to fill

               this buffer are not available for all cases, the impact on the output is limited */



            set16_fx( st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), post_hq_delay ), 0, post_hq_delay );

            IF( GE_16( output_frame, L_FRAME16k ) )

            {

                Copy( st->prev_synth_buffer_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS ) ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) );

            }

            ELSE

            {

                Copy( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );

            }



            IF( st->core != ACELP_CORE )

            {

                IF( GE_16( output_frame, L_FRAME16k ) )

                {

                    Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ) ), NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ) );

                    Copy( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );

                }

                ELSE

                {

                    Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS ) ), NS2SA_FX2( st->output_Fs, DELAY_CLDFB_NS ) );

                    Copy( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, DELAY_BWE_TOTAL_NS - DELAY_CLDFB_NS ) ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );

                }

            }

        }

        ELSE

        {

            IF( st->core != ACELP_CORE )

            {

                Copy( st->delay_buf_out_fx, st->hTcxDec->old_synthFB_fx + sub( shl( output_frame, 1 ), post_hq_delay ), post_hq_delay );

                Copy( st->hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), st->hTcxDec->old_synthFB_fx + shl( output_frame, 1 ), NS2SA_FX2( st->output_Fs, PH_ECU_LOOKAHEAD_NS ) );

            }

        }

    }

    return;

}





#ifdef ADD_IVAS_HQ_CODE_FEC

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

 * save_synthesis_hq_fec()

lib_dec/ari_dec.c

deleted100644 → 0
+0 −338

File deleted.

Preview size limit exceeded, changes collapsed.