Commit 2eaeb027 authored by vaclav's avatar vaclav
Browse files

merge HARM_HQ_CORE2 into HARM_HQ_CORE

parent 0686cbf6

lib_com/ivas_prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -1654,7 +1654,7 @@ Word16 ivas_assign_gain_bits_fx( 
    Word16 *Rcalc                                               /* o  : Bit budget for shape quantizer       Q3 */

);

#endif

#ifdef HARM_HQ_CORE2

#ifdef HARM_HQ_CORE

void ivas_fine_gain_pred_fx(

    const Word16 *sfm_start,                                    /* i  : Sub band start indices                  */

    const Word16 *sfm_end,                                      /* i  : Sub band end indices                    */

lib_com/low_rate_band_att_fx.c

+4 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
 * Fine gain prediction

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



#ifdef HARM_HQ_CORE2

#ifdef HARM_HQ_CORE

void fine_gain_pred_fx(

#else

void ivas_fine_gain_pred_fx(
@@ -31,7 +31,7 @@ void ivas_fine_gain_pred_fx( 
    Word16 *xq,              /* i/o: Quantized vector /quantized vector with finegain adj Q15*/

    Word16 *y,               /* i/o: Quantized vector (int)      Q0  */

    Word16 *fg_pred,         /* o  : Predicted fine gains        Q12 */

#ifdef HARM_HQ_CORE2

#ifdef HARM_HQ_CORE

    const Word16 element_mode, /* i  : element mode                    */

#endif

    const Word16 core /* i  : Core                            */
@@ -80,7 +80,7 @@ void ivas_fine_gain_pred_fx( 
                exp = sub( 31, add( exp, sub( 30, shl( shift, 1 ) ) ) );

                L_tmp = Isqrt_lc( L_tmp, &exp ); /*31 - exp */



#ifdef HARM_HQ_CORE2

#ifdef HARM_HQ_CORE

                IF( element_mode == EVS_MONO )

                {

                    Mpy_32_16_ss( L_tmp, ivas_fine_gain_pred_sqrt_bw[bw_idx], &L_tmp, &lsb ); /*31-exp+11-15=27-exp */
@@ -143,7 +143,7 @@ void ivas_fine_gain_pred_fx( 
    return;

}



#ifndef HARM_HQ_CORE2

#ifndef HARM_HQ_CORE

void fine_gain_pred_fx(

    const Word16 *sfm_start, /* i  : Sub band start indices          */

    const Word16 *sfm_end,   /* i  : Sub band end indices            */

lib_com/prot_fx.h

+3 −2
Original line number Diff line number Diff line
@@ -4674,7 +4674,7 @@ void fine_gain_pred_fx( 
    Word16 *xq,              /* i/o: Quantized vector /quantized vector with finegain adj Q15*/

    Word16 *y,               /* i/o: Quantized vector (int)          */

    Word16 *fg_pred,         /* o  : Predicted fine gains        Q12 */

#ifdef HARM_HQ_CORE2

#ifdef HARM_HQ_CORE

    const Word16 element_mode, /* i  : element mode                    */

#endif

    const Word16 core /* i  : Core                            */
@@ -6760,6 +6760,7 @@ Word16 pvq_core_dec_fx( 
    Word16 *maxpulse,

    const Word16 core );



#ifndef HARM_HQ_CORE

Word16 ivas_pvq_core_dec_fx(

    Decoder_State *st_fx,

    const Word16 *sfm_start,
@@ -6774,7 +6775,7 @@ Word16 ivas_pvq_core_dec_fx( 
    Word16 *npulses,

    Word16 *maxpulse,

    const Word16 core );



#endif

void decode_energies_fx(

    Decoder_State *st_fx,

    PVQ_DEC_HANDLE hPVQ, /* i/o: PVQ decoder handle */

lib_dec/hq_hr_dec_fx.c

+4 −0
Original line number Diff line number Diff line
@@ -342,7 +342,11 @@ void ivas_hq_hr_dec_fx( 
    }

    ELSE

    {

#ifdef HARM_HQ_CORE

        pvq_core_dec_fx( st_fx, sfm_start, sfm_end, sfmsize, t_audio_q_norm, &Q_audio, sum, nb_sfm, Rsubband, R, pulses, maxpulse, HQ_CORE );

#else

        ivas_pvq_core_dec_fx( st_fx, sfm_start, sfm_end, sfmsize, t_audio_q_norm, &Q_audio, sum, nb_sfm, Rsubband, R, pulses, maxpulse, HQ_CORE );

#endif

    }



    test();

lib_dec/peak_vq_dec_fx.c

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ static void peak_vq_dec_fx( 


    pvq_decode_frame_fx( st_fx, pvq_vector, npulses, pvq_inp_vector, hvq_band_start, hvq_band_end, hvq_band_width, pvq_bands, Rk, pvq_bits, core );



#ifdef HARM_HQ_CORE2

#ifdef HARM_HQ_CORE

    fine_gain_pred_fx( hvq_band_start, hvq_band_end, hvq_band_width, k_sort, npulses, pvq_maxpulse, NULL,

                       pvq_bands, pvq_vector, pvq_inp_vector, fg_pred, st_fx->element_mode, core );

#else