Commit 62132422 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

clean up if conditions in IVAS_DEC_GetObjectMetadata

parent ec5cae29

lib_dec/lib_dec.c

+2 −38
Original line number Diff line number Diff line
@@ -2122,8 +2122,6 @@ ivas_error IVAS_DEC_GetObjectMetadata( 
    {

#ifdef OBJ_EDITING_DECODER

        if ( st_ivas->ism_mode == ISM_MODE_DISC )

        {

            if ( 1 )

        {

                metadata->azimuth = st_ivas->hIsmRendererData->edited_azimuth[objectIdx];

                metadata->elevation = st_ivas->hIsmRendererData->edited_elevation[objectIdx];
@@ -2134,31 +2132,11 @@ ivas_error IVAS_DEC_GetObjectMetadata( 
                metadata->gainFactor = st_ivas->hIsmRendererData->edited_gains[objectIdx];

                metadata->non_diegetic_flag = st_ivas->hIsmRendererData->non_diegetic_flag[objectIdx];

        }

            else

            {

                metadata->azimuth = hIsmMeta->azimuth;

                metadata->elevation = hIsmMeta->elevation;

                metadata->radius = hIsmMeta->radius;

                metadata->yaw = hIsmMeta->yaw;

                metadata->pitch = hIsmMeta->pitch;

                metadata->spread = 0.f;

                metadata->gainFactor = 1.f;

                metadata->non_diegetic_flag = hIsmMeta->non_diegetic_flag;

            }

        }

#ifdef OBJ_EDITING_PARAMISM

        else if ( st_ivas->ism_mode == ISM_MODE_PARAM )

        {

            if ( 1 )

        {

            metadata->azimuth = st_ivas->hParamIsmDec->edited_azimuth_values[objectIdx];

            metadata->elevation = st_ivas->hParamIsmDec->edited_elevation_values[objectIdx];

            }

            else

            {

                metadata->azimuth = hIsmMeta->azimuth;

                metadata->elevation = hIsmMeta->elevation;

            }

            metadata->radius = hIsmMeta->radius;

            metadata->yaw = hIsmMeta->yaw;

            metadata->pitch = hIsmMeta->pitch;
@@ -2168,8 +2146,6 @@ ivas_error IVAS_DEC_GetObjectMetadata( 
        }

#endif

        else if ( st_ivas->ism_mode == ISM_SBA_MODE_DISC || st_ivas->ism_mode == ISM_MASA_MODE_DISC )

        {

            if ( 1 )

        {

                metadata->azimuth = st_ivas->hIsmRendererData->edited_azimuth[objectIdx];

                metadata->elevation = st_ivas->hIsmRendererData->edited_elevation[objectIdx];
@@ -2181,18 +2157,6 @@ ivas_error IVAS_DEC_GetObjectMetadata( 
                metadata->non_diegetic_flag = st_ivas->hIsmRendererData->non_diegetic_flag[objectIdx];

        }

        else

            {

                metadata->azimuth = hIsmMeta->azimuth;

                metadata->elevation = hIsmMeta->elevation;

                metadata->radius = hIsmMeta->radius;

                metadata->yaw = hIsmMeta->yaw;

                metadata->pitch = hIsmMeta->pitch;

                metadata->spread = 0.f;

                metadata->gainFactor = 1.f;

                metadata->non_diegetic_flag = hIsmMeta->non_diegetic_flag;

            }

        }

        else

#endif

        {

            metadata->azimuth = hIsmMeta->azimuth;