Commit 05b3a000 authored by multrus's avatar multrus
Browse files

[cleanup] accept FIX_OUTPUT_FRAME

parent ad1c5787

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ 
#define FIX_1990_SANITIZER_IN_REVERB_LOAD               /* Nokia: Fix issue part of issue 1990 by introducing missing free of structure - keep until #2059 is addressed */

#define TMP_1342_WORKAROUND_DEC_FLUSH_BROKEN_IN_SR      /* FhG: Temporary workaround for incorrect implementation of decoder flush with split rendering */

#define NONBE_1122_KEEP_EVS_MODE_UNCHANGED              /* FhG: Disables fix for issue 1122 in EVS mode to keep BE tests green. This switch should be removed once the 1122 fix is added to EVS via a CR.  */

#define FIX_OUTPUT_FRAME                                /* VA: harmonize "output_frame" parameter usage to correspond to FLP */

#define HARMONIZE_ISSUE_2435_WRITETNSDATA               /* FhG basop 2435: Harmonize WriteTnsData*_fx(), EncodeTnsData*_fx() */

#define HARM_2336_DOTP                                       /* VA: basop 2336; Harmonisation of some dot_product function + some BE optimisation */

#define FIX_2431_AVOID_CALLOC                           /* VA: basp issue 2431: avoid use of calloc() */

lib_dec/amr_wb_dec_fx.c

+0 −5
Original line number Diff line number Diff line
@@ -143,12 +143,7 @@ ivas_error amr_wb_dec_fx( 
    move16();

    st_fx->coder_type = GENERIC;

    move16();

#ifdef FIX_OUTPUT_FRAME

    output_frame = extract_l( Mult_32_16( st_fx->output_Fs, INV_FRAME_PER_SEC_Q15 ) );

#else

    output_frame = st_fx->output_frame_fx; /*Q0*/

    move16();                              /* frame length of the input signal */

#endif



    st_fx->bpf_off = 0;

    move16();

lib_dec/core_dec_init_fx.c

+0 −14
Original line number Diff line number Diff line
@@ -738,11 +738,7 @@ void open_decoder_LPD_fx( 
        test();

        IF( EQ_16( st->core, ACELP_CORE ) && EQ_16( st->last_core, HQ_CORE ) )

        {

#ifdef FIX_OUTPUT_FRAME

            frame_ener_fx( st->hTcxDec->L_frameTCX, UNVOICED_CLAS, st->previoussynth_fx, -1, &st->enr_old_fx, 1, 0, 0, 0 );

#else

            frame_ener_fx( st->output_frame_fx, UNVOICED_CLAS, st->previoussynth_fx, -1, &st->enr_old_fx, 1, 0, 0, 0 );

#endif

        }

    }

    ELSE
@@ -1177,10 +1173,6 @@ void open_decoder_LPD_ivas_fx( 
    {

        st->hTcxDec->L_frameTCX = extract_l( Mult_32_16( st->output_Fs, INV_FRAME_PER_SEC_Q15 ) );

        move16();

#ifndef FIX_OUTPUT_FRAME

        st->output_frame_fx = st->hTcxDec->L_frameTCX; /* Q0 */

        move16();

#endif

        if ( st->ini_frame == 0 )

        {

            st->L_frameTCX_past = st->hTcxDec->L_frameTCX;
@@ -1803,13 +1795,7 @@ void open_decoder_LPD_ivas_fx( 
        test();

        IF( st->core == ACELP_CORE && EQ_16( st->last_core, HQ_CORE ) )

        {

#ifdef FIX_OUTPUT_FRAME

            frame_ener_fx( st->hTcxDec->L_frameTCX, UNVOICED_CLAS, st->previoussynth_fx, -1, &st->enr_old_fx, 1, 0, 0, 0 );

#else

            st->output_frame_fx = st->hTcxDec->L_frameTCX; /* Q0 */

            move16();

            frame_ener_fx( st->output_frame_fx, UNVOICED_CLAS, st->previoussynth_fx, -1, &st->enr_old_fx, 1, 0, 0, 0 );

#endif

        }

    }

    ELSE

lib_dec/core_dec_switch_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -338,10 +338,6 @@ void mode_switch_decoder_LPD_ivas_fx( 
        {

            st->hTcxDec->L_frameTCX = extract_l( Mult_32_16( st->output_Fs, INV_FRAME_PER_SEC_Q15 ) ); /* Q0 */

            move16();

#ifndef FIX_OUTPUT_FRAME

            st->output_frame_fx = st->hTcxDec->L_frameTCX; /* Q0 */

            move16();

#endif

        }



        IF( st->hTcxCfg != NULL )

lib_dec/evs_dec_fx.c

+0 −4
Original line number Diff line number Diff line
@@ -100,11 +100,7 @@ ivas_error evs_dec_fx( 
        move16();

    }



#ifdef FIX_OUTPUT_FRAME

    output_frame = extract_l( Mult_32_16( st_fx->output_Fs, INV_FRAME_PER_SEC_Q15 ) );

#else

    output_frame = st_fx->output_frame_fx; /*Q0*/

#endif

    move16();



    core_switching_flag = 0;