Commit ae161f30 authored by vaillancour's avatar vaillancour
Browse files

Merge branch 'main' into basop-2435-harmonize-writetnsdata_ivas_fx-writetnsdata_fx

parents 2c6c9e50 880e808b

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ 
#define FIX_2437_HARMONIZE_ENCODERINDEX                 /* FhG: basop issue 2437 EncoderIndex_ivas_fx() and EncoderIndex_fx()*/

#define FIX_2385_GETTCXONLY                             /* FhG: issue 2385 : harmonizing getTcxonly_ivas_fx() and getTcxonly_ivas_fx() functions */

#define FIX_2196_UNREACHABLE_CODE_IN_OSBA_STEREO_OUTPUT /* FhG: remove unreachable code in ivas_osba_stereo_add_channels */

#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() */



/* #################### End BE switches ################################## */

lib_dec/amr_wb_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -136,8 +136,12 @@ 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

+10 −0
Original line number Diff line number Diff line
@@ -747,7 +747,11 @@ 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
@@ -1182,8 +1186,10 @@ 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;
@@ -1806,9 +1812,13 @@ 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

+2 −0
Original line number Diff line number Diff line
@@ -338,8 +338,10 @@ 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

+4 −0
Original line number Diff line number Diff line
@@ -97,7 +97,11 @@ 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;