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

[cleanup] accept FIX_1217_OBJECT_EDIT_FILE_INTERFACE

parent 59eeff86

apps/decoder.c

+0 −59
Original line number Diff line number Diff line
@@ -47,9 +47,7 @@ 
#include "aeid_file_reader.h"

#endif

#include "split_render_file_read_write.h"

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

#include "obj_edit_file_reader.h"

#endif

#include "vector3_pair_file_reader.h"

#include "wmc_auto.h"

#include "options.h"
@@ -130,9 +128,7 @@ typedef struct 
    bool dpidEnabled;

    uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];

    bool objEditEnabled;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    char *objEditFileName;

#endif



} DecArguments;
@@ -161,19 +157,10 @@ typedef struct 


static bool parseCmdlIVAS_dec( int16_t argc, char **argv, DecArguments *arg );

static void usage_dec( void );

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ObjectEditFileReader *objectEditFileReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

#else

static ivas_error decodeG192( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, ISAR_SPLIT_REND_BITS_DATA *splitRendBits, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

static ivas_error decodeVoIP( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, RotFileReader *headRotReader, RotFileReader *externalOrientationFileReader, RotFileReader *refRotReader, Vector3PairFileReader *referenceVectorReader, IVAS_DEC_HANDLE hIvasDec, int16_t *pcmBuf );

#endif

static ivas_error load_hrtf_from_file( IVAS_DEC_HRTF_BINARY_WRAPPER *hHrtfBinary, IVAS_DEC_HANDLE hIvasDec, const IVAS_AUDIO_CONFIG OutputConfig, const int32_t output_Fs );

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

#else

static void do_object_editing_fx( IVAS_EDITABLE_PARAMETERS *editableParameters );

#endif





/*------------------------------------------------------------------------------------------*
@@ -205,9 +192,7 @@ int main( 
    int16_t *pcmBuf = NULL;

    IVAS_RENDER_FRAMESIZE asked_frame_size;

    IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader *objectEditFileReader = NULL;

#endif



#ifdef WMOPS

    reset_wmops();
@@ -401,7 +386,6 @@ int main( 
        }

    }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

     * Open object editing instruction file

     *------------------------------------------------------------------------------------------*/
@@ -414,7 +398,6 @@ int main( 
            goto cleanup;

        }

    }

#endif



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

     * Configure the decoder
@@ -654,19 +637,11 @@ int main( 


    if ( arg.voipMode )

    {

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

        error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, hIvasDec, pcmBuf );

#else

        error = decodeVoIP( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, hIvasDec, pcmBuf );

#endif

    }

    else

    {

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

        error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, objectEditFileReader, &splitRendBits, hIvasDec, pcmBuf );

#else

        error = decodeG192( arg, hBsReader, &hHrtfBinary, headRotReader, externalOrientationFileReader, refRotReader, referenceVectorReader, &splitRendBits, hIvasDec, pcmBuf );

#endif

    }



    if ( error == IVAS_ERR_OK || error == IVAS_ERR_END_OF_FILE )
@@ -724,9 +699,7 @@ cleanup: 
    RotationFileReader_close( &refRotReader );

    Vector3PairFileReader_close( &referenceVectorReader );

    RenderConfigReader_close( &renderConfigReader );

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader_close( &objectEditFileReader );

#endif



    if ( BS_Reader_Close( &hBsReader ) != IVAS_ERR_OK )

    {
@@ -908,9 +881,7 @@ static bool parseCmdlIVAS_dec( 
        arg->directivityPatternId[i] = 65535;

    }

    arg->objEditEnabled = false;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    arg->objEditFileName = NULL;

#endif



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

     * Initialization
@@ -1383,7 +1354,6 @@ static bool parseCmdlIVAS_dec( 
        {

            arg->objEditEnabled = true;

            i++;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

            if ( argc - i <= 3 || argv[i][0] == '-' )

            {

                fprintf( stderr, "Error: Object editing instruction filename not specified!\n\n" );
@@ -1400,7 +1370,6 @@ static bool parseCmdlIVAS_dec( 
                arg->objEditFileName = argv[i]; /* read edit instructions from this file */

            }

            i++;

#endif

        }



        /*-----------------------------------------------------------------*
@@ -1590,11 +1559,7 @@ 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" );

#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



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

    fprintf( stdout, "                      Currently, all values default to level 3 (full functionality).\n" );
@@ -1923,9 +1888,7 @@ static ivas_error decodeG192( 
    RotFileReader *externalOrientationFileReader,

    RotFileReader *refRotReader,

    Vector3PairFileReader *referenceVectorReader,

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader *objectEditFileReader,

#endif

    ISAR_SPLIT_REND_BITS_DATA *splitRendBits,

    IVAS_DEC_HANDLE hIvasDec,

    int16_t *pcmBuf )
@@ -2254,7 +2217,6 @@ static ivas_error decodeG192( 
                        return error;

                    }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                    if ( arg.objEditFileName != NULL )

                    {

                        if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )
@@ -2263,14 +2225,9 @@ static ivas_error decodeG192( 
                            return error;

                        }

                    }

#endif



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

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                    do_object_editing_fx( &editableParameters, objectEditFileReader );

#else

                    do_object_editing_fx( &editableParameters );

#endif



                    /* set new object parameters*/

                    if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
@@ -2691,9 +2648,7 @@ static ivas_error decodeVoIP( 
    RotFileReader *externalOrientationFileReader,

    RotFileReader *refRotReader,

    Vector3PairFileReader *referenceVectorReader,

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader *objectEditFileReader,

#endif

    IVAS_DEC_HANDLE hIvasDec,

    int16_t *pcmBuf )

{
@@ -2972,7 +2927,6 @@ static ivas_error decodeVoIP( 
            }

        }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

        if ( arg.objEditEnabled && arg.objEditFileName != NULL && vec_pos_update == 0 )

#else
@@ -2985,7 +2939,6 @@ static ivas_error decodeVoIP( 
                return error;

            }

        }

#endif



        /* read all packets with a receive time smaller than the system time */

        while ( nextPacketRcvTime_ms <= systemTime_ms )
@@ -3087,11 +3040,7 @@ static ivas_error decodeVoIP( 
                }



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

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                do_object_editing_fx( &editableParameters, objectEditFileReader );

#else

                do_object_editing_fx( &editableParameters );

#endif



                /* set new object parameters */

                if ( ( error = IVAS_DEC_SetEditableParameters( hIvasDec, editableParameters ) ) != IVAS_ERR_OK )
@@ -3411,12 +3360,8 @@ cleanup: 
 *---------------------------------------------------------------------*/



static void do_object_editing_fx(

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    IVAS_EDITABLE_PARAMETERS *editableParameters,

    ObjectEditFileReader *objectEditFileReader )

#else

    IVAS_EDITABLE_PARAMETERS *editableParameters )

#endif

{

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

    /* and play a little bit with the gains... */
@@ -3432,7 +3377,6 @@ static void do_object_editing_fx( 
        }

    }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    if ( objectEditFileReader != NULL )

    {

        ReadObjectEditInfo *readInfo;
@@ -3495,7 +3439,6 @@ static void do_object_editing_fx( 
    }

    else

    {

#endif

        if ( num_nondiegetic_objects )

        {

            float start_angle, angle_inc;
@@ -3519,9 +3462,7 @@ static void do_object_editing_fx( 
        }



        editableParameters->gain_bed_fx = ( 1 << 28 ); // 0.5 in Q29

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    }

#endif



    return;

}

lib_com/ivas_error.h

+0 −4
Original line number Diff line number Diff line
@@ -78,9 +78,7 @@ typedef enum 
    IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED,

    IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,

    IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED,

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED,

#endif

    IVAS_ERR_INVALID_HRTF,

    IVAS_ERR_INVALID_HRTF_SAMPLING_RATE,

    IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA,
@@ -258,10 +256,8 @@ static inline const char *ivas_error_to_string( ivas_error error_code ) 
            return "Acoustic environment not supported";

        case IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED:

            return "Objects editing not supported";

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

        case IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED:

            return "Wrong use of both Object editing and Non-diegetic panning";

#endif

        case IVAS_ERR_INVALID_HRTF:

            return "Unsupported HRTF filter set";

        case IVAS_ERR_INVALID_HRTF_SAMPLING_RATE:

lib_com/options.h

+0 −1
Original line number Diff line number Diff line
@@ -122,7 +122,6 @@ 
#define TMP_FIX_OMASA_SR_BE                             // temporary fix to keep OMASA split-rendering BE

#define NONBE_1399_1400_FIX_OBJ_EDIT_ISSUES             // Nokia:  Fix 1399_1400 issue in float, this is essential for the BASOP porting

#define OBJ_EDIT_BASOP

#define FIX_1217_OBJECT_EDIT_FILE_INTERFACE             /* Nokia: issue #1217: add decoder functionality to read object edit instructions from a file */

#define NONBE_1217_OBJ_EDIT_FOA                         /* VA/Nokia: isse 1217: fix crash in object editing to FOA output in ParamISM */

#define NONBE_FIX_1255_OBJ_EDIT_JBM                     /* VA: issue 1255: restore object editing in JBM */

#define FIX_1372_OSBA_OBJECT_EDITING                    /* VA: issue 1372: Fix OSBA object-editing in BINAURAL_ROOM_IR */

lib_dec/ivas_init_dec_fx.c

+0 −2
Original line number Diff line number Diff line
@@ -3872,13 +3872,11 @@ static ivas_error doSanityChecks_IVAS( 
        }

    }



#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    test();

    IF( st_ivas->hDecoderConfig->Opt_ObjEdit_on && st_ivas->hDecoderConfig->Opt_non_diegetic_pan )

    {

        return IVAS_ERROR( IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED, "Wrong set-up: Only object editing or Non-diegetic panning can be used." );

    }

#endif



    return IVAS_ERR_OK;

}

lib_util/obj_edit_file_reader.c

+0 −2
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ the United Nations Convention on Contracts on the International Sales of Goods. 
#include "prot_fx.h"





#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

 * ObjectEditFileReader_open()

 *
@@ -275,4 +274,3 @@ void ObjectEditFileReader_close( 


    return;

}
 
#endif