Commit 146421e7 authored by fotopoulou's avatar fotopoulou
Browse files

remove if condition that is remaining by mistake from porting !1437

parent 16cd4860

lib_dec/ivas_ism_param_dec.c

+75 −95
Original line number Diff line number Diff line
@@ -773,7 +773,8 @@ void ivas_ism_dec_digest_tc( 
                    {

                        efap_determine_gains( st_ivas->hEFAPdata, st_ivas->hIsmRendererData->gains[i], azimuth, elevation, EFAP_MODE_EFAP );

#ifdef OBJ_EDITING_API

                        v_multc( st_ivas->hIsmRendererData->gains[i], st_ivas->hIsmMetaData[i]->edited_gain, st_ivas->hIsmRendererData->gains[i], st_ivas->hEFAPdata->numSpk );

                        v_multc( st_ivas->hIsmRendererData->gains[i],

                                 st_ivas->hIsmMetaData[i]->edited_gain, st_ivas->hIsmRendererData->gains[i], st_ivas->hEFAPdata->numSpk );

#endif

                    }

                }
@@ -1451,8 +1452,7 @@ void ivas_param_ism_params_to_masa_param_mapping( 
        st_ivas->hISMDTX.dtx_flag = 1;

    }

#endif

    if ( st_ivas->nchan_ism > 1 )

    {



    if ( st_ivas->hISMDTX.dtx_flag )

    {

        float energy_ratio;
@@ -1525,7 +1525,6 @@ void ivas_param_ism_params_to_masa_param_mapping( 
                hSpatParamRendCom->surroundingCoherence[sf_idx][bin_idx] = 0.0;

            }

        }



#ifdef OBJ_EDITING_PARAMISM_BIN

        for ( obj = 0; obj < st_ivas->nchan_ism; obj++ )

        {
@@ -1565,25 +1564,6 @@ void ivas_param_ism_params_to_masa_param_mapping( 
        }

#endif

    }

    }

    else

    {

        hSpatParamRendCom->numSimultaneousDirections = 1;

        azimuth[0] = (int16_t) roundf( hParamIsmDec->azimuth_values[0] );

        elevation[0] = (int16_t) roundf( hParamIsmDec->elevation_values[0] );



        for ( sf_idx = 0; sf_idx < MAX_PARAM_SPATIAL_SUBFRAMES; sf_idx++ )

        {

            for ( bin_idx = 0; bin_idx < nBins; bin_idx++ )

            {

                hSpatParamRendCom->azimuth[sf_idx][bin_idx] = azimuth[0];

                hSpatParamRendCom->elevation[sf_idx][bin_idx] = elevation[0];

                hSpatParamRendCom->energy_ratio1[sf_idx][bin_idx] = 1.0f;

                hSpatParamRendCom->spreadCoherence[sf_idx][bin_idx] = 0.0f;

                hSpatParamRendCom->surroundingCoherence[sf_idx][bin_idx] = 0.0;

            }

        }

    }



    return;

}