Commit b329c18e authored by Fabian Bauer's avatar Fabian Bauer
Browse files

activate some more macros, till /*codec mode switching*/ branch

parent 121e79bd

lib_dec/core_dec_init_fx.c

+14 −14
Original line number Diff line number Diff line
@@ -1386,7 +1386,7 @@ void open_decoder_LPD_ivas_fx( 


        IF( st->hTcxDec != NULL )

        {

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

            IF( EQ_16( st->element_mode, EVS_MONO ) )

            {

                set16_fx( hTcxDec->old_syn_Overl, 0, shr( L_FRAME32k, 1 ) ); /* hTcxDec->Q_syn_Overl_TDACFB */
@@ -1492,7 +1492,7 @@ void open_decoder_LPD_ivas_fx( 
        test();

        test();

        test();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        IF( EQ_16( st->element_mode, EVS_MONO ) )

        {

            IF( ( NE_16( st->element_mode, IVAS_CPE_DFT ) || ( EQ_16( st->element_mode, IVAS_CPE_DFT ) && st->prev_bfi ) ) && EQ_16( st->last_codec_mode, MODE1 ) && ( st->last_core == ACELP_CORE ) )
@@ -1582,7 +1582,7 @@ void open_decoder_LPD_ivas_fx( 
                    move16();

                }

            }

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        }

#endif

        test();
@@ -1619,7 +1619,7 @@ void open_decoder_LPD_ivas_fx( 
            /*OLA -> zero */

            IF( st->hTcxDec != NULL )

            {

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

                IF( EQ_16( st->element_mode, EVS_MONO ) )

                {

                    set16_fx( hTcxDec->old_syn_Overl, 0, L_FRAME32k / 2 ); /*HQ-CORE(bfi)->TCX don't need it*/     /* Q_old_syn_Overl */
@@ -1631,7 +1631,7 @@ void open_decoder_LPD_ivas_fx( 
                {

#endif

                    reset_tcx_overl_buf_fx( st->hTcxDec );

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

                }

#endif

            }
@@ -1639,12 +1639,12 @@ void open_decoder_LPD_ivas_fx( 
            IF( st->hTcxCfg != NULL )

            {

                Copy_Scale_sig( hHQ_core->old_out_fx + NS2SA_FX2( st->output_Fs, N_ZERO_MDCT_NS ), hTcxDec->syn_OverlFB, st->hTcxCfg->tcx_mdct_window_lengthFB, negate( add( hHQ_core->Q_old_wtda, TCX_IMDCT_HEADROOM ) ) ); /* Q_old_out */

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

                IF( GT_16( st->element_mode, EVS_MONO ) )

                {

#endif

                    *Q_syn_OverlFB = *Q_old_out;

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

                }

#endif

                move16();
@@ -1670,7 +1670,7 @@ void open_decoder_LPD_ivas_fx( 
            }



            /* reset CLDFB memories */

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

            IF( EQ_16( st->element_mode, EVS_MONO ) )

            {

                cldfb_reset_memory( st->cldfbAna );
@@ -1687,7 +1687,7 @@ void open_decoder_LPD_ivas_fx( 
                {

                    cldfb_reset_memory_fx( st->cldfbSynHB );

                }

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

            }

#endif

        }
@@ -1709,13 +1709,13 @@ void open_decoder_LPD_ivas_fx( 
            E_LPC_f_lsp_a_conversion( st->lsp_old_fx, st->old_Aq_12_8_fx, M );

            Copy( st->lsp_old_fx, st->lspold_uw, M ); /* Q15 */

            Copy( st->lsf_old_fx, st->lsfold_uw, M ); /* Q2.56 */

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

            IF( GT_16( st->element_mode, EVS_MONO ) )

            {

#endif

                *Q_old_Aq_12_8 = 14;

                move16();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

            }

#endif

            IF( !st->last_con_tcx )
@@ -1745,7 +1745,7 @@ void open_decoder_LPD_ivas_fx( 
            lerp( st->mem_syn_r + sub( L_SYN_MEM, mem_syn_r_size_old ), st->mem_syn_r + sub( L_SYN_MEM, mem_syn_r_size_new ), mem_syn_r_size_new, mem_syn_r_size_old );

            Copy( st->mem_syn_r + L_SYN_MEM - M, st->mem_syn2_fx, M ); /* Qx */

        }

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        ELSE IF( EQ_16( st->element_mode, EVS_MONO ) && ( !st->tcxonly && EQ_16( st->L_frame, L_FRAME16k ) && GT_32( st->last_total_brate, ACELP_32k ) ) )

        {

            lsp2lsf_fx( st->lsp_old_fx, st->lsf_old_fx, M, st->sr_core );
@@ -1821,7 +1821,7 @@ void open_decoder_LPD_ivas_fx( 
                {

                    st->hPFstat->reset = 0;

                    move16();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

                    IF( EQ_16( st->element_mode, EVS_MONO ) )

                    {

                        Scale_sig( st->hPFstat->mem_pf_in, L_SUBFR, negate( st->Q_syn ) ); /* WB post_filter mem */ /* q_mem - st->Q_syn */
@@ -1835,7 +1835,7 @@ void open_decoder_LPD_ivas_fx( 
        }

        ELSE

        {

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD



            IF( st->hPFstat != NULL && EQ_16( st->element_mode, EVS_MONO ) )

            {