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

completely activate harmonization, EVS and IVAS paths in harmonized function -... 

completely activate harmonization, EVS and IVAS paths in harmonized function - tonal concealment init is running in non-harmonized manner
parent eb2c6b15

lib_com/prot_fx.h

+2 −2
Original line number Diff line number Diff line
@@ -7088,7 +7088,7 @@ ivas_error ppp_quarter_decoder_fx( 
    DTFS_STRUCTURE PREV_CW_D_FX,      /* i  : Previous DTFS                                            */

    Decoder_State *st_fx );



#ifndef HARMONIZE_2583_open_decoder_LPD_

#ifndef HARMONIZE_2583_open_decoder_LPD

void open_decoder_LPD_fx(

    Decoder_State *st,

    const Word32 total_brate, /* Q0 */
@@ -7097,7 +7097,7 @@ void open_decoder_LPD_fx( 
);

#endif



#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

void open_decoder_LPD_fx(

#else

void open_decoder_LPD_ivas_fx(

lib_dec/core_dec_init_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
 *

 * Initialization of state variables

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

#ifndef HARMONIZE_2583_open_decoder_LPD_

#ifndef HARMONIZE_2583_open_decoder_LPD

void open_decoder_LPD_fx(

    Decoder_State *st,

    const Word32 total_brate, /* Q0 */
@@ -1079,7 +1079,7 @@ void acelp_plc_mdct_transition_fx( 
    return;

}



#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

void open_decoder_LPD_fx(

#else

void open_decoder_LPD_ivas_fx(

lib_dec/core_dec_switch_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ void mode_switch_decoder_LPD_fx( 
    test();

    IF( NE_16( fscale, st->fscale ) || ( switchWB != 0 ) || ( bSwitchFromAmrwbIO != 0 ) || EQ_16( st->last_codec_mode, MODE1 ) || st->force_lpd_reset )

    {

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        open_decoder_LPD_fx( st, total_brate, 0, bwidth, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 );

#else

        open_decoder_LPD_fx( st, total_brate, bwidth, 0 );
@@ -327,7 +327,7 @@ void mode_switch_decoder_LPD_ivas_fx( 
    assert( (Word16) ( st->sr_core / FRAMES_PER_SEC ) == extract_l( Mult_32_16( st->sr_core, INV_FRAME_PER_SEC_Q15 ) ) );

    IF( NE_16( fscale, st->fscale ) || switchWB || bSwitchFromAmrwbIO || EQ_16( st->last_codec_mode, MODE1 ) || st->force_lpd_reset )

    {

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        open_decoder_LPD_fx( st, total_brate, last_total_brate, bwidth, MCT_flag, last_element_mode, 0, Q_syn_Overl_TDAC, Q_fer_samples, Q_syn_Overl, Q_syn_Overl_TDACFB, Q_syn_OverlFB, Q_old_out, Q_old_outLB, Q_old_Aq_12_8 );

#else

        open_decoder_LPD_ivas_fx( st, total_brate, last_total_brate, bwidth, MCT_flag, last_element_mode, 0, Q_syn_Overl_TDAC, Q_fer_samples, Q_syn_Overl, Q_syn_Overl_TDACFB, Q_syn_OverlFB, Q_old_out, Q_old_outLB, Q_old_Aq_12_8 );

lib_dec/init_dec_fx.c

+2 −2
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ ivas_error init_decoder_fx( 
    /* Init Decoder */

    IF( st_fx->element_mode == EVS_MONO )

    {

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        open_decoder_LPD_fx( st_fx, st_fx->total_brate, 0, st_fx->bwidth, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0 );

#else

        open_decoder_LPD_fx( st_fx, st_fx->total_brate, st_fx->bwidth, 1 );
@@ -898,7 +898,7 @@ ivas_error init_decoder_fx( 
        move16();

        move16();

        move16();

#ifdef HARMONIZE_2583_open_decoder_LPD_

#ifdef HARMONIZE_2583_open_decoder_LPD

        open_decoder_LPD_fx( st_fx, st_fx->total_brate, st_fx->last_total_brate, st_fx->bwidth, 0, st_fx->element_mode, 1, &Q_syn_Overl_TDAC, &Q_fer_samples, &Q_syn_Overl, &Q_syn_Overl_TDACFB, &Q_syn_OverlFB, &Q_old_out, &Q_old_outLB, &Q_old_Aq_12_8 );

#else

        open_decoder_LPD_ivas_fx( st_fx, st_fx->total_brate, st_fx->last_total_brate, st_fx->bwidth, 0, st_fx->element_mode, 1, &Q_syn_Overl_TDAC, &Q_fer_samples, &Q_syn_Overl, &Q_syn_Overl_TDACFB, &Q_syn_OverlFB, &Q_old_out, &Q_old_outLB, &Q_old_Aq_12_8 );