Commit 5901df99 authored by Dominik Weckbecker's avatar Dominik Weckbecker 💬
Browse files

clean up ifdefs

parent 17c43771

lib_dec/lib_dec.c

+1 −8
Original line number Diff line number Diff line
@@ -1042,9 +1042,7 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
    {

        if ( hIvasDec->st_ivas->ivas_format == ISM_FORMAT || hIvasDec->st_ivas->ivas_format == MASA_ISM_FORMAT || hIvasDec->st_ivas->ivas_format == SBA_ISM_FORMAT )

        {

#ifdef OBJ_EDITING_API

            if ( hIvasDec->st_ivas->ism_mode == ISM_MODE_DISC || hIvasDec->st_ivas->ism_mode == ISM_MASA_MODE_DISC || hIvasDec->st_ivas->ism_mode == ISM_SBA_MODE_DISC )

#endif

            {

                int16_t obj;

                ISM_METADATA_HANDLE *hIsmMetaData = hIvasDec->st_ivas->hIsmMetaData;
@@ -1058,16 +1056,14 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
                    hIsmMetaData[obj]->edited_gain = 1.0f;

                }



#ifdef OBJ_EDITING_API

                if ( hIvasDec->st_ivas->ism_mode == ISM_SBA_MODE_DISC )

                {

                    hIvasDec->st_ivas->hSbaIsmData->gain_bed = 1.0f;

                }

#endif

            }

        }

    }

#ifdef OBJ_EDITING_API



    if ( hIvasDec->st_ivas->hParamIsmDec != NULL )

    {

        if ( hIvasDec->st_ivas->ism_mode == ISM_MODE_PARAM )
@@ -1082,7 +1078,6 @@ ivas_error IVAS_DEC_FeedFrame_Serial( 
            hParamIsmDec->has_been_edited = 0;

        }

    }

#endif

#endif



    return IVAS_ERR_OK;
@@ -1110,9 +1105,7 @@ ivas_error IVAS_DEC_GetEditableParameters( 
    hIvasEditableParameters->num_obj = hIvasDec->st_ivas->nchan_ism;

    if ( hIvasDec->st_ivas->ivas_format == ISM_FORMAT || hIvasDec->st_ivas->ivas_format == SBA_ISM_FORMAT )

    {

#ifdef OBJ_EDITING_API

        if ( hIvasDec->st_ivas->ism_mode == ISM_MODE_DISC || hIvasDec->st_ivas->ism_mode == ISM_SBA_MODE_DISC )

#endif

        {

            int16_t obj;

            for ( obj = 0; obj < hIvasEditableParameters->num_obj; obj++ )