Commit 9c9d91e2 authored by vaclav's avatar vaclav
Browse files

HARM_HQ_CORE2

parent ba0ecb03

lib_com/interleave_spectrum_fx.c

+3 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ void interleave_spectrum_fx( 
    Word32 *coefs,      /* i/o: input and output coefficients   Q12  */

    const Word16 length /* i  : length of spectrum              Q0   */

)

#ifndef HARM_HQ_CORE2

#ifndef HARM_HQ_CORE

{

    Word16 i, j, k;

    Word32 *p1, *p2, *p3, *p4;
@@ -227,7 +227,7 @@ void interleave_spectrum_ivas_fx( 
 * Deinterleave the spectrum

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



#ifdef HARM_HQ_CORE2

#ifdef HARM_HQ_CORE

void de_interleave_spectrum_fx(

#else

void ivas_de_interleave_spectrum_fx(
@@ -325,7 +325,7 @@ void ivas_de_interleave_spectrum_fx( 


    return;

}

#ifndef HARM_HQ_CORE2

#ifndef HARM_HQ_CORE



void de_interleave_spectrum_fx(

    Word32 *coefs,      /* i/o: input and output coefficients   Q12 */

lib_com/ivas_prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -1750,7 +1750,7 @@ void ivas_fill_spectrum_fx( 
    const Word16 element_mode 

);

#endif

#ifndef HARM_HQ_CORE2

#ifndef HARM_HQ_CORE

void ivas_de_interleave_spectrum_fx(

    Word32 *coefs,                                              /* i/o: input and output coefficients   Q12 */

    const Word16 length                                         /* i  : length of spectrum              Q0  */

lib_com/prot_fx.h

+1 −1
Original line number Diff line number Diff line
@@ -1610,7 +1610,7 @@ void interleave_spectrum_fx( 
    const Word16 length /* i  : length of spectrum            Q0  */

);



#ifndef HARM_HQ_CORE2

#ifndef HARM_HQ_CORE

void interleave_spectrum_ivas_fx(

    Word32 *coefs,      /* i/o: input and output coefficients   Q12  */

    const Word16 length /* i  : length of spectrum              Q0   */

lib_com/rom_com.h

+5 −3
Original line number Diff line number Diff line
@@ -1486,9 +1486,11 @@ extern const Word16 tab_hup_l_fx[]; // Q15 
extern const Word16 mfreq_loc_Q2fx[];   // Q0

extern const Word16 mfreq_loc_div_25[]; // Q0



#ifndef HARM_HQ_CORE2

extern const Word16 band_len_idx[];           // Q0

extern const Word16 band_len_ener_shift[];    // Q0

extern const Word16 fine_gain_pred_sqrt_bw[]; // Q11

#endif

extern const Word16 ivas_band_len_idx[];               // Q0

extern const Word16 ivas_band_len_ener_shift[];        // Q0

extern const Word16 ivas_fine_gain_pred_sqrt_bw[];     // Q11

lib_com/rom_com_fx.c

+2 −0
Original line number Diff line number Diff line
@@ -25776,6 +25776,7 @@ const Word16 mfreq_loc_div_25[] = { 7, 15, 31, 47, 63, 79, 95, 111, 127, 143, 15 
/*   sfm/8= [  1     2     3     4     6     8    10    12];           */

/* % idx=      0     1     2     3     4     5    6      7;            */

/* call with band_len_idx[sfm_size>>3]                                 */

#ifndef HARM_HQ_CORE2

const Word16 band_len_idx[1 + ( MAX_SFM_LEN_FX / 8 )] = {

    // Q0

    /*sfm/8*/ /*1*/ /*2 */ /*3 */ /*4 */ /*6  */ /*8  */ /*10*/                                  /*12*/
@@ -25784,6 +25785,7 @@ const Word16 band_len_idx[1 + ( MAX_SFM_LEN_FX / 8 )] = { 
const Word16 band_len_ener_shift[8] = { 1, 2, 2, 2, 3, 3, 4 /*sfm==80*/, 4 /*sfm==96*/ }; /* 96 requires 1 bit more than 48 */ // Q0

/*% sfms=[8,16,24,32,48,64,80,96], round(sqrt(sfms)*2^11) */

const Word16 fine_gain_pred_sqrt_bw[8] = { 5793, 8192, 10033, 11585, 14189, 16384, 18318, 20066 }; /* (Q11) */

#endif

const Word16 ivas_band_len_idx[1 + ( MAX_SFM_LEN_FX / 8 )] = {

    /*sfm/8*/ /*1*/ /*2 */ /*3 */ /*4 */ /*6  */ /*8  */ /*10*/                                                /*12*/

    -1, 0 /*8*/, 1 /*16*/, 2 /*24*/, 3 /*32*/, 4 /*40*/, 5 /*48 */, -1, 6 /*64 */, -1, 7 /*80*/, -1, 8         /*96*/