Commit 130ba3bc authored by multrus's avatar multrus
Browse files

[cleanup] accept NONBE_FIX_947_STEREO_DMX_FADOPT

parent 83b938a3

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -171,7 +171,6 @@ 
/* 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_FADOPT                       /* Orange: Fading optimisation */  

#define NONBE_FIX_982_OMASA_DELAY_COMP_5MS                    /* FhG : issue #982 : 5ms and 20ms output different for OMASA */



#ifdef SPLIT_REND_WITH_HEAD_ROT

lib_enc/ivas_stereo_dmx_evs.c

+0 −23
Original line number Diff line number Diff line
@@ -1359,11 +1359,7 @@ void stereo_dmx_evs_enc( 
{



    float dmx_weight, corr;

#ifdef NONBE_FIX_947_STEREO_DMX_FADOPT

    int16_t k, m, n, pha_len, fad_len, input_subframe, input_frame, n_fad_r, n_fad_g, m_fad_g, n_fad_cnt, sbfad_len;

#else

    int16_t k, m, n, pha_len, fad_len, input_subframe, input_frame, n_fad_r, n_fad_g, m_fad_g, n_fad_cnt;

#endif

    float data_f[CPE_CHANNELS][L_FRAME48k];

    float mem_prev[STEREO_DMX_EVS_FAD_LEN_MAX], data_mem[STEREO_DMX_EVS_DATA_LEN_MAX];

    float dmx_poc_data[L_FRAME48k], dmx_pha_data[L_FRAME48k], subframe_energy[STEREO_DMX_EVS_NB_SBFRM];
@@ -1609,11 +1605,7 @@ void stereo_dmx_evs_enc( 
        else

        {

            hPHA->n_fad_g = input_frame - hPHA->n_fad_g - 1;

#ifdef NONBE_FIX_947_STEREO_DMX_FADOPT

            hPHA->n_fad_cnt = 0;

#else

            hPHA->n_fad_cnt = is_transient ? 0 : n_fad_r - hPHA->n_fad_cnt;

#endif

        }

    }

    else if ( is_transient )
@@ -1630,7 +1622,6 @@ void stereo_dmx_evs_enc( 
        n_fad_cnt = hPHA->n_fad_cnt;

        m_fad_g = input_frame - n_fad_g - 1;



#ifdef NONBE_FIX_947_STEREO_DMX_FADOPT

        if ( n_fad_r == 1 )

        {

            n_fad_cnt = 0;
@@ -1682,20 +1673,6 @@ void stereo_dmx_evs_enc( 
                }

            }

        }

#else

        for ( n = 0; n < fad_len; n++ )

        {

            p_dmx_data[n] *= fad_g[n_fad_g];

            p_dmx_data[n] += fad_g[m_fad_g] * p_dmx_data_fo[n];



            if ( ++n_fad_cnt == n_fad_r )

            {

                n_fad_cnt = 0;

                n_fad_g++;

                m_fad_g--;

            }

        }

#endif



        hPHA->n_fad_g = n_fad_g;

        hPHA->n_fad_cnt = n_fad_cnt;