Commit d46c3e3b authored by vaclav's avatar vaclav
Browse files

introduce OBJ_EDITING_COMMANDLINE switch

parent 65ba3215

apps/decoder.c

+5 −5
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ typedef struct 
    AcousticEnvironmentSequence aeSequence;

    bool dpidEnabled;

    uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];

#ifdef OBJ_EDITING_EXAMPLE

#ifdef OBJ_EDITING_COMMANDLINE

    bool objEditEnabled;

#endif
@@ -432,7 +432,7 @@ int main( 
    asked_frame_size = arg.renderFramesize;

    uint16_t aeID = arg.aeSequence.count > 0 ? arg.aeSequence.pID[0] : 65535;



#ifdef OBJ_EDITING_EXAMPLE

#ifdef OBJ_EDITING_COMMANDLINE

    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,

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

#else
@@ -1109,7 +1109,7 @@ static bool parseCmdlIVAS_dec( 
        arg->directivityPatternId[i] = 65535;

    }



#ifdef OBJ_EDITING_EXAMPLE

#ifdef OBJ_EDITING_COMMANDLINE

    arg->objEditEnabled = false;



#endif
@@ -1565,7 +1565,7 @@ static bool parseCmdlIVAS_dec( 


            i += tmp;

        }

#ifdef OBJ_EDITING_EXAMPLE

#ifdef OBJ_EDITING_COMMANDLINE

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

        {

            arg->objEditEnabled = true;
@@ -1773,7 +1773,7 @@ static void usage_dec( void ) 
    fprintf( stdout, "-aeid ID | File     : Acoustic environment ID (number > 0)\n" );

    fprintf( stdout, "                      alternatively, it can be a text file where each line contains \"ID duration\"\n" );

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

#ifdef OMASA_OBJECT_EDITING

#ifdef OBJ_EDITING_COMMANDLINE

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

#endif

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

lib_com/options.h

+1 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ 
#define OBJ_EDITING_INTERFACE                          /* Interface for object editing */

#ifdef OBJ_EDITING_INTERFACE

#define OBJ_EDITING_API                                /* object editing changes related to the API */

#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 */

lib_dec/ivas_init_dec.c

+1 −1
Original line number Diff line number Diff line
@@ -2908,7 +2908,7 @@ static ivas_error doSanityChecks_IVAS( 
        }

    }



#ifdef OBJ_EDITING_API

#ifdef OBJ_EDITING_COMMANDLINE

    if ( st_ivas->hDecoderConfig->Opt_ObjEdit_on )

    {

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

lib_dec/ivas_stat_dec.h

+1 −1
Original line number Diff line number Diff line
@@ -1028,7 +1028,7 @@ typedef struct decoder_config_structure 
    int16_t Opt_ExternalOrientation;             /* indicates whether external orientations are used */

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

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

#ifdef OBJ_EDITING_API

#ifdef OBJ_EDITING_COMMANDLINE

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

#endif

#ifdef DEBUGGING

lib_dec/lib_dec.c

+4 −4
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ static void init_decoder_config( 
    hDecoderConfig->Opt_ExternalOrientation = 0;

    hDecoderConfig->Opt_dpid_on = 0;

    hDecoderConfig->Opt_aeid_on = 0;

#ifdef OBJ_EDITING_API

#ifdef OBJ_EDITING_COMMANDLINE

    hDecoderConfig->Opt_ObjEdit_on = 0;

#endif
@@ -442,7 +442,7 @@ ivas_error IVAS_DEC_Configure( 
    const float non_diegetic_pan_gain,                 /* i  : non diegetic panning gain                        */

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

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

#ifdef OBJ_EDITING_API

#ifdef OBJ_EDITING_COMMANDLINE

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

#endif

    const bool delayCompensationEnabled /* i  : enable delay compensation                        */
@@ -504,7 +504,7 @@ ivas_error IVAS_DEC_Configure( 
    hDecoderConfig->Opt_ExternalOrientation = enableExternalOrientation;

    hDecoderConfig->Opt_dpid_on = (int16_t) dpidEnabled;

    hDecoderConfig->Opt_aeid_on = acousticEnvironmentId != 65535 ? TRUE : FALSE;

#ifdef OBJ_EDITING_API

#ifdef OBJ_EDITING_COMMANDLINE

    hDecoderConfig->Opt_ObjEdit_on = (int16_t) objEditEnabled;

#endif
@@ -3933,7 +3933,7 @@ static ivas_error printConfigInfo_dec( 
        {

            fprintf( stdout, "Acoustic environment ID:ON\n" );

        }

#ifdef OBJ_EDITING_API

#ifdef OBJ_EDITING_COMMANDLINE



        if ( st_ivas->hDecoderConfig->Opt_ObjEdit_on )

        {