Commit 3a447156 authored by lefort's avatar lefort
Browse files

Set of PHA corrected.

parent cac77554

lib_enc/ivas_stereo_dmx_evs.c

+7 −7
Original line number Diff line number Diff line
@@ -68,11 +68,11 @@ 
#ifdef ENHANCED_STEREO_DMX



#define STEREO_DMX_EVS_PHA_LEN_16 15.0f

#define STEREO_DMX_EVS_FAD_LEN_16 15.0f

#define STEREO_DMX_EVS_FAD_LEN_16 2.0f

#define STEREO_DMX_EVS_PHA_LEN_32 5.0f

#define STEREO_DMX_EVS_FAD_LEN_32 5.0f

#define STEREO_DMX_EVS_FAD_LEN_32 1.0f

#define STEREO_DMX_EVS_PHA_LEN_48 5.0f

#define STEREO_DMX_EVS_FAD_LEN_48 5.0f

#define STEREO_DMX_EVS_FAD_LEN_48 0.5f



#define STEREO_DMX_EVS_ISD_THRES       1.3f

#define STEREO_DMX_EVS_ISD_DIST_THRES  0.42f
@@ -1162,15 +1162,15 @@ void stereo_dmx_evs_enc( 
        dmx_pha_data[n] = (mem_out_curr[0][n] + mem_out_curr[1][n])*0.5f;

    }



    calc_energy( dmx_pha_data, dmx_pha_data, &(hStereoDmxEVS->hPHA->dmx_ener), input_frame, STEREO_DMX_EVS_DMX_EGY_FORGETTING );

    /*calc_energy( dmx_pha_data, dmx_pha_data, &(hStereoDmxEVS->hPHA->dmx_ener), input_frame, STEREO_DMX_EVS_DMX_EGY_FORGETTING );

    dmx_gain = sqrtf((hStereoDmxEVS->aux_dmx_energy[0] + hStereoDmxEVS->aux_dmx_energy[1]) / (hStereoDmxEVS->hPHA->dmx_ener));

    /*if (hStereoDmxEVS->aux_dmx_energy[0] > hStereoDmxEVS->aux_dmx_energy[1]) {

    *//*if (hStereoDmxEVS->aux_dmx_energy[0] > hStereoDmxEVS->aux_dmx_energy[1]) {

        dmx_gain = sqrtf( ( hStereoDmxEVS->aux_dmx_energy[0] + EPSILON ) / ( hStereoDmxEVS->hPHA->dmx_ener + EPSILON ) );

    } else {

        dmx_gain = sqrtf( ( hStereoDmxEVS->aux_dmx_energy[1] + EPSILON ) / ( hStereoDmxEVS->hPHA->dmx_ener + EPSILON ) );

    }*/

    }*//*

    adapt_gain(dmx_pha_data, dmx_pha_data, dmx_gain, hStereoDmxEVS->hPHA->dmx_old_gain, input_frame, hStereoDmxEVS->s_wnd);

    hStereoDmxEVS->hPHA->dmx_old_gain = dmx_gain;

    hStereoDmxEVS->hPHA->dmx_old_gain = dmx_gain;*/



    // prc switch