Commit cc2b0a4f authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept OBJ_EDITING_COMMANDLINE

parent fc8601a3

apps/decoder.c

+0 −14
Original line number Diff line number Diff line
@@ -129,9 +129,7 @@ typedef struct 
    AcousticEnvironmentSequence aeSequence;

    bool dpidEnabled;

    uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];

#ifdef OBJ_EDITING_COMMANDLINE

    bool objEditEnabled;

#endif

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    char *objEditFileName;

#endif
@@ -426,15 +424,9 @@ int main( 
    uint16_t aeID = arg.aeSequence.count > 0 ? arg.aeSequence.pID[0] : 65535;



#ifdef LIB_DEC_REVISION

#ifdef OBJ_EDITING_COMMANDLINE

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled,

                                       arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled,

                                       arg.non_diegetic_pan_enabled, arg.non_diegetic_pan_gain_fx, arg.dpidEnabled, aeID, arg.objEditEnabled, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

#else

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled,

                                       arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled,

                                       arg.non_diegetic_pan_enabled, arg.non_diegetic_pan_gain_fx, arg.dpidEnabled, aeID, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )

#endif

#else

    if ( ( error = IVAS_DEC_Configure( hIvasDec, arg.output_Fs, arg.outputConfig, arg.tsmEnabled, arg.renderFramesize, arg.customLsOutputEnabled, arg.hrtfReaderEnabled, arg.enableHeadRotation, arg.enableExternalOrientation, arg.orientation_tracking, arg.renderConfigEnabled, arg.non_diegetic_pan_enabled, arg.non_diegetic_pan_gain_fx,

                                       arg.dpidEnabled, aeID, arg.delayCompensationEnabled ) ) != IVAS_ERR_OK )
@@ -915,9 +907,7 @@ static bool parseCmdlIVAS_dec( 
    {

        arg->directivityPatternId[i] = 65535;

    }

#ifdef OBJ_EDITING_COMMANDLINE

    arg->objEditEnabled = false;

#endif

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    arg->objEditFileName = NULL;

#endif
@@ -1389,7 +1379,6 @@ static bool parseCmdlIVAS_dec( 


            i += tmp;

        }

#ifdef OBJ_EDITING_COMMANDLINE

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

        {

            arg->objEditEnabled = true;
@@ -1413,7 +1402,6 @@ static bool parseCmdlIVAS_dec( 
            i++;

#endif

        }

#endif



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

         * Option not recognized
@@ -1602,12 +1590,10 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      without braces and spaces, with ':' character separating ID from duration and ',' separating\n" );

    fprintf( stdout, "                      ID and duration pairs, where duration is specified in frames\n" );

    fprintf( stdout, "                      for BINAURAL_ROOM_REVERB output configuration.\n" );

#ifdef OBJ_EDITING_COMMANDLINE

#ifndef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    fprintf( stdout, "-obj_edit           : Enable objects editing\n" );

#else

    fprintf( stdout, "-obj_edit File      : Object editing instructions file or NULL for built-in example\n" );

#endif

#endif



    fprintf( stdout, "-level level        : Complexity level, level = (1, 2, 3), will be defined after characterisation. \n" );

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ 
// object-editing feature porting

#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 NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES             // Nokia:  Fix 1399_1400 issue in float, this is essential for the BASOP porting

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

#define OBJ_EDIT_BASOP

lib_dec/ivas_init_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -3855,7 +3855,6 @@ static ivas_error doSanityChecks_IVAS( 
    }





#ifdef OBJ_EDITING_COMMANDLINE

    IF( st_ivas->hDecoderConfig->Opt_ObjEdit_on )

    {

#ifdef FIX_BRATE_SWITCHING
@@ -3871,7 +3870,6 @@ static ivas_error doSanityChecks_IVAS( 
            return IVAS_ERROR( IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED, "Wrong set-up: Obect editing is not supported in this IVAS format." );

        }

    }

#endif



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    test();

lib_dec/ivas_stat_dec.h

+0 −2
Original line number Diff line number Diff line
@@ -1070,9 +1070,7 @@ typedef struct decoder_config_structure 
    Word16 Opt_ExternalOrientation;              /* indicates whether external orientations are used */

    Word16 Opt_dpid_on;                          /* indicates whether Directivity pattern option is used */

    Word16 Opt_aeid_on;                          /* indicates whether Acoustic environment option is used */

#ifdef OBJ_EDITING_COMMANDLINE

    Word16 Opt_ObjEdit_on; /* indicates whether object editing option is used */

#endif

    Word16 Opt_tsm; /* indicates whether time scaling modification is activated */

    IVAS_RENDER_FRAMESIZE render_framesize;

    Word16 Opt_delay_comp; /* flag indicating delay compensation active */

lib_dec/lib_dec.h

+0 −2
Original line number Diff line number Diff line
@@ -125,9 +125,7 @@ ivas_error IVAS_DEC_Configure( 
    const Word16 non_diegetic_pan_gain_fx,                  /* i  : non diegetic panning gain                                               */

    const bool dpidEnabled,                                 /* i  : enable directivity pattern option                                       */

    const UWord16 acousticEnvironmentId,                    /* i  : Acoustic environment ID                                                 */

#ifdef OBJ_EDITING_COMMANDLINE

    const bool objEditEnabled,                              /* i  : enable object editing                                                   */

#endif

    const bool delayCompensationEnabled                     /* i  : enable delay compensation                                               */

);