Commit bf5f8377 authored by vaclav's avatar vaclav
Browse files

remove nested switches

parent 4c21f1bb

lib_dec/lib_dec.c

+0 −10
Original line number Diff line number Diff line
@@ -1283,11 +1283,7 @@ ivas_error IVAS_DEC_GetEditableParameters( 
        }

#endif

    }

#ifdef NONBE_1217_INIT_OBJ_EDIT

    else if ( st_ivas->ivas_format == MASA_ISM_FORMAT || ( st_ivas->ivas_format == MASA_FORMAT && st_ivas->nchan_ism > 0 ) )

#else

    else if ( st_ivas->ivas_format == MASA_ISM_FORMAT && ( ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ || ism_mode == ISM_MASA_MODE_DISC ) )

#endif

    {

        /* object editing possible only in two highest OMASA modes */

        if ( st_ivas->ism_mode == ISM_MASA_MODE_DISC )
@@ -1306,11 +1302,7 @@ ivas_error IVAS_DEC_GetEditableParameters( 
                hIvasEditableParameters->ism_metadata[obj].non_diegetic_flag = st_ivas->hIsmMetaData[obj]->non_diegetic_flag;

            }

        }

#ifdef NONBE_1217_INIT_OBJ_EDIT

        else if ( ism_mode == ISM_MASA_MODE_PARAM_ONE_OBJ )

#else

        else

#endif

        {

            /* Handle MONO output */

            if ( st_ivas->renderer_type != RENDERER_MONO_DOWNMIX )
@@ -1337,7 +1329,6 @@ ivas_error IVAS_DEC_GetEditableParameters( 
                hIvasEditableParameters->ism_metadata[obj].non_diegetic_flag = st_ivas->hIsmMetaData[obj]->non_diegetic_flag;

            }

        }

#ifdef NONBE_1217_INIT_OBJ_EDIT

        else if ( ism_mode == ISM_MASA_MODE_MASA_ONE_OBJ || ism_mode == ISM_MODE_NONE )

        {

            hIvasEditableParameters->num_obj = 0;
@@ -1347,7 +1338,6 @@ ivas_error IVAS_DEC_GetEditableParameters( 
        {

            assert( 0 && "This should never happen!" );

        }

#endif

#endif

    }

#else