Commit 2b11e9ab authored by bayers's avatar bayers
Browse files

fix small merge error in ParamISM decoding function

parent 68b6fc68

lib_dec/ivas_ism_param_dec.c

+3 −17
Original line number Diff line number Diff line
@@ -790,29 +790,15 @@ void ivas_param_ism_dec( 
    /* Initialization */

    hDirAC = st_ivas->hDirAC;

    assert( hDirAC );

// sgi2bay: please review merge

// <<<<<<< HEAD

// #ifdef FIX_549_DMX_GAIN

// #ifdef API_5MS

//     for ( i = 0; i < PARAM_ISM_MAX_DMX; i++ )

//     {

//         p_tc[i] = output_f[i];

//     }

// #else

// =======

//     hSpatParamRendCom = st_ivas->hSpatParamRendCom;

//     assert( hSpatParamRendCom );

// >>>>>>> main

// merged to:

    hSpatParamRendCom = st_ivas->hSpatParamRendCom;

    assert( hSpatParamRendCom );

#ifdef API_5MS

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

    {

        p_tc[i] = output_f[i];

    }

#else

    hSpatParamRendCom = st_ivas->hSpatParamRendCom;

    assert( hSpatParamRendCom );

// merge end



    ene_tc = 0.0f;

    ene_sum = 0.0f;

    last_gain = st_ivas->hDirAC->hParamIsm->last_dmx_gain;