Commit 5aae34ae authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_947_STEREO_DMX_EVS_POC

parent 9008f440

lib_com/options.h

+0 −3
Original line number Diff line number Diff line
@@ -171,10 +171,7 @@ 
/* all switches in this category should start with "NONBE_" */



#define NONBE_FIX_978_MC_TDREND_REVERB                        /* Eri : activate reverb for TDREND with headtracking */

#define NONBE_FIX_947_STEREO_DMX_EVS_POC                      /* Orange: Fix clicks on POC */

#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC

#define NONBE_FIX_947_STEREO_DMX_ROMOPT                       /* Orange: ROM optimisation for POC*/  

#endif

#define NONBE_FIX_947_STEREO_DMX_EVS_PHA                      /* Orange: Fix issues on PHA */

#ifdef NONBE_FIX_947_STEREO_DMX_EVS_PHA

#define NONBE_FIX_947_STEREO_DMX_FADOPT                       /* Orange: Fading optimisation */

lib_enc/ivas_rom_enc.c

+0 −23
Original line number Diff line number Diff line
@@ -534,7 +534,6 @@ const float ari_bit_estimate_s17_LC[RANGE_N_CONTEXT][RANGE_N_SYMBOLS] = 
 * Stereo downmix to EVS ROM tables

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



#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC



const float Stereo_dmx_s_wnd_coef_16k[L_FRAME16k >> 2] = {

    0.00009518625f, 0.00038070876f, 0.00085645882f, 0.00152225529f, 0.00237784467f, 0.00342290120f, 0.00465702698f, 0.00607975212f, 0.00769053493f, 0.00948876211f,
@@ -593,28 +592,6 @@ const float Stereo_dmx_s_wnd_coef_48k[L_FRAME48k >> 2] = { 
    0.46899585921f, 0.47225590178f, 0.47551712789f, 0.47877939840f, 0.48204257416f, 0.48530651596f, 0.48857108456f, 0.49183614071f, 0.49510154512f, 0.49836715849f, 

};



#else

const float Stereo_dmx_s_wnd_coef_16k[L_FRAME16k >> 4] = {

    0.00154133327f, 0.0138150426f, 0.0380602330f, 0.0736799166f, 0.119797014f, 0.175276011f, 0.238750681f, 0.308658302f, 0.383277327f, 0.460770488f,

    0.539229512f, 0.616722703f, 0.691341758f, 0.761249363f, 0.824724138f, 0.880203009f, 0.926320136f, 0.961939812f, 0.986184955f, 0.998458624f,

};



const float Stereo_dmx_s_wnd_coef_32k[L_FRAME32k >> 4] = {

    0.000385481922f, 0.00346577191f, 0.00960735977f, 0.0187723786f, 0.0309043285f, 0.0459284224f, 0.0637519881f, 0.0842651874f, 0.107341543f, 0.132838756f,

    0.160599619f, 0.190453023f, 0.222214893f, 0.255689442f, 0.290670186f, 0.326941460f, 0.364279807f, 0.402454913f, 0.441231340f, 0.480370134f,

    0.519629955f, 0.558768749f, 0.597545147f, 0.635720134f, 0.673058629f, 0.709329903f, 0.744310737f, 0.777785182f, 0.809546947f, 0.839400351f,

    0.867161214f, 0.892658472f, 0.915734828f, 0.936248004f, 0.954071581f, 0.969095647f, 0.981227636f, 0.990392625f, 0.996534228f, 0.999614537f

};



const float Stereo_dmx_s_wnd_coef_48k[L_FRAME48k >> 4] = {

    0.000171337553f, 0.00154133327f, 0.00427756971f, 0.00837254710f, 0.0138150426f, 0.0205901340f, 0.0286792554f, 0.0380602330f, 0.0487073623f, 0.0605914444f,

    0.0736799166f, 0.0879369006f, 0.103323318f, 0.119797014f, 0.137312800f, 0.155822709f, 0.175276011f, 0.195619285f, 0.216796920f, 0.238750681f,

    0.261420637f, 0.284744442f, 0.308658302f, 0.333096594f, 0.357992321f, 0.383277327f, 0.408882231f, 0.434736967f, 0.460770488f, 0.486911595f,

    0.513088524f, 0.539229512f, 0.565263212f, 0.591117799f, 0.616722703f, 0.642007649f, 0.666903436f, 0.691341758f, 0.715255499f, 0.738579512f,

    0.761249363f, 0.783203125f, 0.804380774f, 0.824724138f, 0.844177306f, 0.862687230f, 0.880203009f, 0.896676719f, 0.912063122f, 0.926320136f,

    0.939408541f, 0.951292694f, 0.961939812f, 0.971320748f, 0.979409873f, 0.986184955f, 0.991627395f, 0.995722473f, 0.998458624f, 0.999828696f

};

#endif



const float Stereo_dmx_wnd_coef_32k[L_FRAME32k] = {

    0.00245436677f, 0.00736304140f, 0.0122715384f, 0.0171797406f, 0.0220875274f, 0.0269947834f, 0.0319013894f, 0.0368072242f, 0.0417121723f, 0.0466161147f,

lib_enc/ivas_rom_enc.h

+0 −6
Original line number Diff line number Diff line
@@ -120,15 +120,9 @@ extern const uint16_t ECSQ_tab_vals[ECSQ_PARAM_COUNT - 1][1 + ECSQ_TAB_VALS_SIZE 
 * Stereo downmix to EVS ROM tables

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



#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC

extern const float Stereo_dmx_s_wnd_coef_16k[L_FRAME16k >> 2];

extern const float Stereo_dmx_s_wnd_coef_32k[L_FRAME32k >> 2];

extern const float Stereo_dmx_s_wnd_coef_48k[L_FRAME48k >> 2];

#else

extern const float Stereo_dmx_s_wnd_coef_16k[L_FRAME16k >> 4];

extern const float Stereo_dmx_s_wnd_coef_32k[L_FRAME32k >> 4];

extern const float Stereo_dmx_s_wnd_coef_48k[L_FRAME48k >> 4];

#endif

extern const float Stereo_dmx_wnd_coef_32k[L_FRAME32k];

extern const float Stereo_dmx_wnd_coef_48k[L_FRAME48k];

lib_enc/ivas_stereo_dmx_evs.c

+0 −40
Original line number Diff line number Diff line
@@ -1225,7 +1225,6 @@ static void weighted_ave( 
    const float wnd[]          /* i  : window coef                    */

)

{

#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC



#ifdef NONBE_FIX_947_STEREO_DMX_ROMOPT
@@ -1271,25 +1270,6 @@ static void weighted_ave( 


#endif



#else



    int16_t i, len;

    float gain_tmp = 0.f, gain_sub;



    len = input_frame >> 4;

    gain_sub = gain - old_gain;



    for ( i = 0; i < len; i++ )

    {

        gain_tmp = old_gain + gain_sub * wnd[i];

        dst[i] = src1[i] * gain_tmp + src2[i] * ( 1.0f - gain_tmp );

    }

    for ( ; i < input_frame; i++ )

    {

        dst[i] = src1[i] * gain + src2[i] * ( 1.0f - gain_tmp );

    }



#endif



    return;

}
@@ -1407,7 +1387,6 @@ static void adapt_gain( 
    const float wnd[]          /* i  : window coef                    */

)

{

#ifdef NONBE_FIX_947_STEREO_DMX_EVS_POC



#ifdef NONBE_FIX_947_STEREO_DMX_ROMOPT
@@ -1450,25 +1429,6 @@ static void adapt_gain( 
        dst[i] = src[i] * gain;

    }



#else



    int16_t i, len;

    float gain_tmp, gain_sub;



    len = input_frame >> 4;

    gain_sub = gain - old_gain;



    for ( i = 0; i < len; i++ )

    {

        gain_tmp = old_gain + gain_sub * wnd[i];

        dst[i] = src[i] * gain_tmp;

    }

    for ( ; i < input_frame; i++ )

    {

        dst[i] = src[i] * gain;

    }



#endif



    return;

}