Commit 8dfc2476 authored by Jiaquan Huo's avatar Jiaquan Huo
Browse files

complete wrapping changed codes in #ifdef blocks

parent c948b8bd

lib_com/ivas_prot.h

+4 −0
Original line number Diff line number Diff line
@@ -5493,7 +5493,11 @@ void ivas_lfe_dec( 


void ivas_lfe_tdplc( 

    LFE_DEC_HANDLE hLFE,                                        /* i/o: LFE decoder handle                      */

#ifdef NONE_BE_FIX_816_LFE_PLC_FLOAT

    float *prevsynth,                                     /* i  : previous frame synthesis                */

#else

    double *prevsynth,                                     /* i  : previous frame synthesis                */

#endif

    float *ytda,                                                /* o  : output time-domain buffer               */

    const int16_t output_frame                                  /* i  : output frame length                     */

);

lib_com/ivas_rom_com.c

+21 −2
Original line number Diff line number Diff line
@@ -3129,6 +3129,7 @@ const int16_t ivas_lfe_min_shift_tbl[IVAS_LFE_NUM_COEFFS_IN_SUBGRP] = { 1, 0 }; 














const float ivas_lfe_lpf_delay[2] = { 0.00175f, 0.0035f };



























#ifdef NONE_BE_FIX_816_LFE_PLC_FLOAT















const float hamm_lfe_plc[LFE_PLC_LENANA / 2] =















{















    0.08000000000000002f, 0.08015895227847719f, 0.08063569926248770f, 0.08142991147368656f, 0.08254104003450596f, 0.08396831704748331f, 0.08571075612595230f, 0.08776715307573196f,









@@ -3147,8 +3148,26 @@ const float hamm_lfe_plc[LFE_PLC_LENANA / 2] =













    0.96233504613317988f, 0.96698111571154954f, 0.97133209998031445f, 0.97538499198789563f, 0.97913699079334116f, 0.98258550340204664f, 0.98572814655776630f, 0.98856274838967395f,















    0.99108734991333569f, 0.99330020638455863f, 0.99519978850517732f, 0.99678478347994692f, 0.99805409592381300f, 0.99900684861892730f, 0.99964238312089115f, 0.99996026021380402f















};





































#else













const double d_hamm_lfe_plc[LFE_PLC_LENANA / 2] =













{













    0.08000000000000002, 0.08015895227847719, 0.08063569926248770, 0.08142991147368656, 0.08254104003450596, 0.08396831704748331, 0.08571075612595230, 0.08776715307573196,













    0.09013608672734141, 0.09281591991816535, 0.09580480062389246, 0.09910066323844335, 0.10270123000150438, 0.10660401257268071, 0.11080631375118072, 0.11530522933984272,













    0.12009765015221685, 0.12518026416131367, 0.13054955878853602, 0.13620182333121073, 0.14213315152704381, 0.14833944425372619, 0.15481641236182375, 0.16155957963899570,













    0.16856428590349043, 0.17582569022478273, 0.18333877426912554, 0.19109834576770490, 0.19909904210500018, 0.20733533402487142, 0.21580152945181053, 0.22449177742471671,













    0.23340007214047787, 0.24252025710456171, 0.25184602938575001, 0.26137094397207467, 0.27108841822494550, 0.28099173642839037, 0.29107405443026624, 0.30132840437223085,













    0.31174769950520753, 0.32232473908701620, 0.33305221335878232, 0.34392270859668939, 0.35492871223557998, 0.36606261806086549, 0.37731673146515798, 0.38868327476598852,













    0.40015439258093899, 0.41172215725647360, 0.42337857434671339, 0.43511558813837425, 0.44692508721804453, 0.45879891007795709, 0.47072885075638249, 0.48270666450874267,













    0.49472407350552849, 0.50677277255308162, 0.51884443483328757, 0.53093071765821398, 0.54302326823571601, 0.55511372944202464, 0.56719374559732838, 0.57925496824035816,













    0.59128906189798180, 0.60328770984582458, 0.61524261985593010, 0.62714552992749328, 0.63898821399670414, 0.65076248762175315, 0.66246021363907504, 0.67407330778691554,













    0.68559374429233988, 0.69701356141781945, 0.70832486696356345, 0.71951984372179334, 0.73059075487919101, 0.74152994936378558, 0.75232986713258543, 0.76298304439630038,













    0.77348211877754336, 0.78381983439894576, 0.79398904689767136, 0.80398272836286389, 0.81379397219261318, 0.82341599786708708, 0.83284215563452701, 0.84206593110687011,













    0.85108094976182280, 0.85988098134827329, 0.86845994419199846, 0.87681190939868969, 0.88493110495139349, 0.89281191969953333, 0.90044890723675941, 0.90783678966494241,













    0.91497046124171255, 0.92184499190902180, 0.92845563070029180, 0.93479780902379184, 0.94086714381997805, 0.94665944059061280, 0.95217069629756890, 0.95739710212931617,













    0.96233504613317988, 0.96698111571154954, 0.97133209998031445, 0.97538499198789563, 0.97913699079334116, 0.98258550340204664, 0.98572814655776630, 0.98856274838967395,













    0.99108734991333569, 0.99330020638455863, 0.99519978850517732, 0.99678478347994692, 0.99805409592381300, 0.99900684861892730, 0.99964238312089115, 0.99996026021380402













};













#endif















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















 * MDFT/iMDFT ROM tables















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

































lib_enc/ivas_lfe_enc.c



+4
−0




























Original line number
Diff line number
Diff line








@@ -164,7 +164,11 @@ static void ivas_lfe_enc_quant(













        }















        else















        {













#ifdef NONE_BE_FIX_816_LFE_PLC_FLOAT















            shift = (int16_t) floorf( IVAS_LFE_SHIFTS_PER_DOUBLE * log2_f( max_value / lfe_abs_sum ) );













#else













            shift = (int16_t) floor( IVAS_LFE_SHIFTS_PER_DOUBLE * log2_f( max_value / lfe_abs_sum ) );













#endif















        }































        shift = max( min_shift * IVAS_LFE_SHIFTS_PER_DOUBLE, min( max_shift, shift ) );