Commit 01be39f2 authored by vaclav's avatar vaclav
Browse files

remove ivas_HQ_FEC_Mem_update_fx()

parent b86d1387

lib_com/ivas_prot_fx.h

+2 −1
Original line number Diff line number Diff line
@@ -1599,6 +1599,7 @@ void ivas_hq_core_dec_fx( 
    Word16 *Q_output 

);



#ifdef CLEANUP_HQ_CORE

void ivas_HQ_FEC_Mem_update_fx(

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

    Word32 *t_audio_q_fx,                                       /*Q12*/
@@ -1614,7 +1615,7 @@ void ivas_HQ_FEC_Mem_update_fx( 
    Word16 hq_core_type,                                        /* i : normal or low-rate MDCT(HQ) core         */

    Word16 output_frame 

);



#endif

/* o  : Consumed bits  Q0 */

Word16 ivas_hq_classifier_dec_fx(                          

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

lib_dec/FEC_HQ_core_fx.c

+2 −1
Original line number Diff line number Diff line
@@ -399,6 +399,7 @@ void HQ_FEC_processing_fx( 
    return;

}



#ifndef CLEANUP_HQ_CORE

void ivas_HQ_FEC_Mem_update_fx(

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

    Word32 *t_audio_q_fx, /*Q12*/
@@ -677,7 +678,7 @@ void ivas_HQ_FEC_Mem_update_fx( 


    return;

}



#endif

void HQ_FEC_Mem_update_fx(

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

    Word32 *t_audio_q_fx, /*Q12*/

lib_dec/hq_core_dec_fx.c

+20 −2
Original line number Diff line number Diff line
@@ -484,15 +484,22 @@ void ivas_hq_core_dec_fx( 
    Word32 normq_fx[NB_SFM];

    Word16 mean_en_high_fx;

    Word16 SWB_fenv_fx[SWB_FENV + DIM_FB];

#ifndef CLEANUP_HQ_CORE

    const Word16 *sfmsize, *sfm_start, *sfm_end;

#endif

    Word16 gapsynth_fx[L_FRAME48k];

    Word16 tmp, tmp_loop;

    Word32 L_tmp;

    UWord16 lsb;

    Word16 L_spec;

#ifndef CLEANUP_HQ_CORE

    HQ_NBFEC_HANDLE hHQ_nbfec;

#endif

    HQ_DEC_HANDLE hHQ_core;



#ifndef CLEANUP_HQ_CORE

    hHQ_nbfec = st_fx->hHQ_nbfec;

#endif

    hHQ_core = st_fx->hHQ_core;



    TCX_DEC_HANDLE hTcxDec;
@@ -519,11 +526,13 @@ void ivas_hq_core_dec_fx( 
    set16_fx( wtda_audio_16, 0, 2 * L_FRAME48k );

    mean_en_high_fx = 0;

    move16();

    Q_audio = 12;

    Q_audio = Q12;

    move16();

    Q_G_audio = 12;

    Q_G_audio = Q12;

    move16();

#ifndef CLEANUP_HQ_CORE

    sfm_start = sfm_end = NULL;

#endif

    num_Sb = nb_sfm = 0;

    move16();

    move16();
@@ -697,6 +706,8 @@ void ivas_hq_core_dec_fx( 
            /* HQ low rate decoder */

            hq_lr_dec_fx( st_fx, t_audio_q, inner_frame, num_bits, &is_transient );

#endif

            is_transient = 0;

            move16();

            hqswb_clas = is_transient; /* Q0 */

            move16();

            Q_audio = 12;
@@ -742,9 +753,16 @@ void ivas_hq_core_dec_fx( 
                }

            }

        }



#ifdef CLEANUP_HQ_CORE

        HQ_FEC_Mem_update_fx( st_fx, t_audio_q, normq_fx, ynrm, num_bands_p, is_transient, hqswb_clas,

                                   core_switching_flag, nb_sfm, num_Sb, &mean_en_high_fx, hq_core_type, output_frame );

#else

        ivas_HQ_FEC_Mem_update_fx( st_fx, t_audio_q, normq_fx, ynrm, num_bands_p, is_transient, hqswb_clas,

                                   core_switching_flag, nb_sfm, num_Sb, &mean_en_high_fx, hq_core_type, output_frame );

#endif

    }



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

     * Attenuate HFs in case of band-width switching (from higher BW to lower BW)

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