Commit 695e2ab0 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept OBJ_EDITING_EXAMPLE

parent 57c989bf

apps/decoder.c

+0 −8
Original line number Diff line number Diff line
@@ -194,13 +194,11 @@ static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBs 
static int16_t app_own_random( int16_t *seed );

static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( char *forcedRendModeChar );

#endif

#ifdef OBJ_EDITING_EXAMPLE

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters, ObjectEditFileReader *objectEditFileReader );

#else

static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters );

#endif

#endif





/*------------------------------------------------------------------------------------------*
@@ -2623,12 +2621,10 @@ static ivas_error decodeG192( 
#endif



                    /* Do object metadata editing here ... */

#ifdef OBJ_EDITING_EXAMPLE

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                    do_object_editing( &editableParameters, objectEditFileReader );

#else

                    do_object_editing( &editableParameters );

#endif

#endif



                    /* set new object parameters*/
@@ -3551,14 +3547,12 @@ static ivas_error decodeVoIP( 
                }



                /* Do object metadata editing here ... */

#ifdef OBJ_EDITING_EXAMPLE

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                do_object_editing( &editableParameters, objectEditFileReader );

#else

                do_object_editing( &editableParameters );

#endif



#endif

                /* set new object parameters */

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

                {
@@ -3871,7 +3865,6 @@ cleanup: 
    return error;

}



#ifdef OBJ_EDITING_EXAMPLE



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

 * do_object_editing()
@@ -3992,7 +3985,6 @@ static void do_object_editing( 
    return;

}



#endif

#ifdef DEBUGGING



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

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -202,7 +202,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

#define OBJ_EDITING_COMMANDLINE                         /* obj editing command-line option */

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

#define OMASA_OBJECT_EDITING                            /* Nokia: object editing interface for OMASA */

#define OBJ_EDITING_PARAMISM_BIN                        /* Nokia: object editing for ParamISM to binaural */

#define FIX_BRATE_SWITCHING                             /* VA: fix bitrate switching cases in OMASA and OSBA */