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

temporarily delete OBJ_EDITING_EXAMPLE

parent 6c584b82

apps/decoder.c

+1 −82
Original line number Diff line number Diff line
@@ -56,11 +56,7 @@ 
#include "debug.h"

#endif

#include "wmc_auto.h"

#ifdef OBJ_EDITING_API

#ifdef OBJ_EDITING_EXAMPLE

#include <math.h>

#endif

#endif





#define WMC_TOOL_SKIP
@@ -157,9 +153,6 @@ typedef struct 
    AcousticEnvironmentSequence aeSequence;

    bool dpidEnabled;

    uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];

#ifdef OBJ_EDITING_EXAMPLE

    bool objEditEnabled;

#endif



} DecArguments;
@@ -1166,9 +1159,6 @@ static bool parseCmdlIVAS_dec( 
    {

        arg->directivityPatternId[i] = 65535;

    }

#ifdef OBJ_EDITING_EXAMPLE

    arg->objEditEnabled = false;

#endif



    /*-----------------------------------------------------------------*

     * Initialization
@@ -1682,13 +1672,6 @@ static bool parseCmdlIVAS_dec( 


            i += tmp;

        }

#ifdef OBJ_EDITING_EXAMPLE

        else if ( strcmp( argv_to_upper, "-OBJ_EDIT" ) == 0 )

        {

            arg->objEditEnabled = true;

            i++;

        }

#endif



        /*-----------------------------------------------------------------*

         * Option not recognized
@@ -2276,11 +2259,6 @@ static ivas_error decodeG192( 
    int16_t isSplitRend, isSplitCoded;

    IVAS_RENDER_CONFIG_DATA renderConfig;

    RenderConfigReader *renderConfigReader = NULL;

#ifdef OBJ_EDITING_API

#ifdef OBJ_EDITING_EXAMPLE

    IVAS_EDITABLE_PARAMETERS editableParameters;

#endif

#endif



    if ( ( error = IVAS_DEC_is_split_rendering_enabled( hIvasDec, &isSplitRend ) ) != IVAS_ERR_OK )

    {
@@ -2629,65 +2607,6 @@ static ivas_error decodeG192( 


#endif

#ifdef OBJ_EDITING_API

#ifdef OBJ_EDITING_EXAMPLE

                if ( arg.objEditEnabled )

                {



                    /* Do object info editing here */

                    /* get object parameters */

                    if ( ( error = IVAS_DEC_GetEditableParameters( hIvasDec, &editableParameters ) ) != IVAS_ERR_OK )

                    {

                        fprintf( stderr, "\nError: could not get the editable parameters: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                        goto cleanup;

                    }



                    /* edit object parameters...*/



                    /* put the objects equally spaced at the horizontal plane */

                    /* and play a little bit with the gains... */

                    int16_t obj_idx, non_diegetic_obj_idx;

                    int16_t num_nondiegetic_objects;



                    num_nondiegetic_objects = 0;

                    for ( obj_idx = 0; obj_idx < editableParameters.num_obj; obj_idx++ )

                    {

                        if ( !editableParameters.ism_metadata[obj_idx].non_diegetic_flag )

                        {

                            num_nondiegetic_objects++;

                        }

                    }

                    if ( num_nondiegetic_objects )

                    {

                        float start_angle, angle_inc;

                        angle_inc = 360.0f / (float) num_nondiegetic_objects;

                        start_angle = angle_inc / 2.0f;

                        for ( obj_idx = 0, non_diegetic_obj_idx = 0; obj_idx < editableParameters.num_obj; obj_idx++ )

                        {

                            if ( !editableParameters.ism_metadata[obj_idx].non_diegetic_flag )

                            {

                                editableParameters.ism_metadata[obj_idx].elevation = 0.0f;

                                editableParameters.ism_metadata[obj_idx].azimuth = start_angle + (float) non_diegetic_obj_idx * angle_inc;

                                non_diegetic_obj_idx++;

                            }

                        }

                    }



                    /* breakover object gains */

                    for ( obj_idx = 0; obj_idx < editableParameters.num_obj; obj_idx++ )

                    {

                        editableParameters.ism_metadata[obj_idx].gain = 0.5f + (float) ( ( frame + obj_idx * 50 ) % 250 ) / 250.0f;

                    }



                    editableParameters.gain_bed = 0.5f;



                    /* set new object parameters*/

                    if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )

                    {

                        fprintf( stderr, "\nError: could not set the editable parameters: %s\n\n", IVAS_DEC_GetErrorMessage( error ) );

                        goto cleanup;

                    }

                }

#endif

                /* Do the final preparations needed for rendering */

                if ( ( error = IVAS_DEC_PrepareRenderer( hIvasDec ) ) != IVAS_ERR_OK )

                {

lib_com/options.h

+0 −2
Original line number Diff line number Diff line
@@ -212,8 +212,6 @@ 
#define TMP_FIX_SPLIT_REND                              // temporary fix to split-rendering (it follows the later state of the framework but it is needed now because of current test-conditions)

#define TMP_FIX_OMASA_SR_BE                             // temporary fix to keep OMASA split-rendering BE

#endif

#define OBJ_EDITING_EXAMPLE                             /* obj editing example code in decoder.c */





/* #################### End BASOP porting switches ############################ */