Commit 2eda3ad0 authored by Archit Tamarapu's avatar Archit Tamarapu
Browse files

[cleanup] accept FIX_1217_OBJECT_EDIT_FILE_INTERFACE

parent 13755cf7

apps/decoder.c

+0 −61
Original line number Original line Diff line number Diff line
@@ -32,9 +32,7 @@ 




#include "lib_dec.h"

#include "lib_dec.h"

#include <string.h>

#include <string.h>

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

#include <math.h>

#include <math.h>

#endif

#include "cmdl_tools.h"

#include "cmdl_tools.h"

#include "audio_file_writer.h"

#include "audio_file_writer.h"

#include "bitstream_reader.h"

#include "bitstream_reader.h"
@@ -50,9 +48,7 @@ 
#include "aeid_file_reader.h"

#include "aeid_file_reader.h"

#endif

#endif

#include "split_render_file_read_write.h"

#include "split_render_file_read_write.h"

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

#include "obj_edit_file_reader.h"

#include "obj_edit_file_reader.h"

#endif

#ifdef VARIABLE_SPEED_DECODING

#ifdef VARIABLE_SPEED_DECODING

#include "tsm_scale_file_reader.h"

#include "tsm_scale_file_reader.h"

#include <math.h>

#include <math.h>
@@ -148,9 +144,7 @@ typedef struct 
    bool dpidEnabled;

    bool dpidEnabled;

    uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];

    uint16_t directivityPatternId[IVAS_MAX_NUM_OBJECTS];

    bool objEditEnabled;

    bool objEditEnabled;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    char *objEditFileName;

    char *objEditFileName;

#endif





} DecArguments;

} DecArguments;
@@ -179,24 +173,15 @@ typedef struct 




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

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

static void usage_dec( void );

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 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 );

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 );

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 DEBUGGING

#ifdef DEBUGGING

static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );

static ivas_error printBitstreamInfoVoip( DecArguments arg, BS_READER_HANDLE hBsReader, IVAS_DEC_HANDLE hIvasDec );

static int16_t app_own_random( int16_t *seed );

static int16_t app_own_random( int16_t *seed );

static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( char *forcedRendModeChar );

static IVAS_DEC_FORCED_REND_MODE parseForcedRendModeDec( char *forcedRendModeChar );

#endif

#endif

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

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

#else

static void do_object_editing( IVAS_EDITABLE_PARAMETERS *editableParameters );

#endif









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

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

    int16_t *pcmBuf = NULL;

    IVAS_RENDER_FRAMESIZE asked_frame_size;

    IVAS_RENDER_FRAMESIZE asked_frame_size;

    IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;

    IVAS_DEC_HRTF_BINARY_WRAPPER hHrtfBinary;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader *objectEditFileReader = NULL;

    ObjectEditFileReader *objectEditFileReader = NULL;

#endif

#ifdef DEBUGGING

#ifdef DEBUGGING

    int32_t noClipping;

    int32_t noClipping;

    int32_t cnt_frames_limited;

    int32_t cnt_frames_limited;
@@ -434,7 +417,6 @@ int main( 
        }

        }

    }

    }





#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

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

     * Open object editing instruction file

     * Open object editing instruction file

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

     *------------------------------------------------------------------------------------------*/
@@ -447,7 +429,6 @@ int main( 
            goto cleanup;

            goto cleanup;

        }

        }

    }

    }

#endif





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

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

     * Configure the decoder

     * Configure the decoder
@@ -780,19 +761,11 @@ int main( 




    if ( arg.voipMode )

    if ( arg.voipMode )

    {

    {

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

        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

    else

    {

    {

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

        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 )

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

    RotationFileReader_close( &refRotReader );

    Vector3PairFileReader_close( &referenceVectorReader );

    Vector3PairFileReader_close( &referenceVectorReader );

    RenderConfigReader_close( &renderConfigReader );

    RenderConfigReader_close( &renderConfigReader );

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader_close( &objectEditFileReader );

    ObjectEditFileReader_close( &objectEditFileReader );

#endif





    if ( BS_Reader_Close( &hBsReader ) != IVAS_ERR_OK )

    if ( BS_Reader_Close( &hBsReader ) != IVAS_ERR_OK )

    {

    {
@@ -1062,9 +1033,7 @@ static bool parseCmdlIVAS_dec( 
    }

    }





    arg->objEditEnabled = false;

    arg->objEditEnabled = false;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    arg->objEditFileName = NULL;

    arg->objEditFileName = NULL;

#endif





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

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

     * Initialization

     * Initialization
@@ -1598,7 +1567,6 @@ static bool parseCmdlIVAS_dec( 
        {

        {

            arg->objEditEnabled = true;

            arg->objEditEnabled = true;

            i++;

            i++;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

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

            {

            {

                fprintf( stderr, "Error: Object editing instruction filename not specified!\n\n" );

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

                arg->objEditFileName = argv[i]; /* read edit instructions from this file */

            }

            }

            i++;

            i++;

#endif

        }

        }





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

        /*-----------------------------------------------------------------*
@@ -1824,11 +1791,7 @@ static void usage_dec( void ) 
    fprintf( stdout, "                      ID and duration pairs, where duration is specified in frames\n" );

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

#endif

#endif

    fprintf( stdout, "                      for BINAURAL_ROOM_REVERB output configuration.\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" );

    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, "-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" );

    fprintf( stdout, "                      Currently, all values default to level 3 (full functionality).\n" );

    fprintf( stdout, "-q                  : Quiet mode, no frame counter\n" );

    fprintf( stdout, "-q                  : Quiet mode, no frame counter\n" );
@@ -2178,9 +2141,7 @@ static ivas_error decodeG192( 
    RotFileReader *externalOrientationFileReader,

    RotFileReader *externalOrientationFileReader,

    RotFileReader *refRotReader,

    RotFileReader *refRotReader,

    Vector3PairFileReader *referenceVectorReader,

    Vector3PairFileReader *referenceVectorReader,

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader *objectEditFileReader,

    ObjectEditFileReader *objectEditFileReader,

#endif

    ISAR_SPLIT_REND_BITS_DATA *splitRendBits,

    ISAR_SPLIT_REND_BITS_DATA *splitRendBits,

    IVAS_DEC_HANDLE hIvasDec,

    IVAS_DEC_HANDLE hIvasDec,

    int16_t *pcmBuf )

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

                        return error;

                    }

                    }





#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                    if ( arg.objEditFileName != NULL )

                    if ( arg.objEditFileName != NULL )

                    {

                    {

                        if ( ( error = ObjectEditFileReader_readNextFrame( objectEditFileReader ) ) != IVAS_ERR_OK )

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

                            return error;

                        }

                        }

                    }

                    }

#endif





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

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

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                    do_object_editing( &editableParameters, objectEditFileReader );

                    do_object_editing( &editableParameters, objectEditFileReader );

#else

                    do_object_editing( &editableParameters );

#endif





                    /* set new object parameters*/

                    /* set new object parameters*/

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

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

    RotFileReader *externalOrientationFileReader,

    RotFileReader *refRotReader,

    RotFileReader *refRotReader,

    Vector3PairFileReader *referenceVectorReader,

    Vector3PairFileReader *referenceVectorReader,

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    ObjectEditFileReader *objectEditFileReader,

    ObjectEditFileReader *objectEditFileReader,

#endif

    IVAS_DEC_HANDLE hIvasDec,

    IVAS_DEC_HANDLE hIvasDec,

    int16_t *pcmBuf )

    int16_t *pcmBuf )

{

{
@@ -3412,7 +3365,6 @@ static ivas_error decodeVoIP( 
            }

            }

        }

        }





#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

#ifdef NONBE_FIX_1255_OBJ_EDIT_JBM

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

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

#else

#else
@@ -3425,7 +3377,6 @@ static ivas_error decodeVoIP( 
                return error;

                return error;

            }

            }

        }

        }

#endif





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

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

        while ( nextPacketRcvTime_ms <= systemTime_ms )

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

                }





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

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

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

                do_object_editing( &editableParameters, objectEditFileReader );

                do_object_editing( &editableParameters, objectEditFileReader );

#else

                do_object_editing( &editableParameters );

#endif





                /* set new object parameters */

                /* set new object parameters */

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

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

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





static void do_object_editing(

static void do_object_editing(

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    IVAS_EDITABLE_PARAMETERS *editableParameters,

    IVAS_EDITABLE_PARAMETERS *editableParameters,

    ObjectEditFileReader *objectEditFileReader )

    ObjectEditFileReader *objectEditFileReader )

#else

    IVAS_EDITABLE_PARAMETERS *editableParameters )

#endif

{

{

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

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

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

    /* and play a little bit with the gains... */
@@ -3874,7 +3817,6 @@ static void do_object_editing( 
        }

        }

    }

    }





#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    if ( objectEditFileReader != NULL )

    if ( objectEditFileReader != NULL )

    {

    {

        ReadObjectEditInfo *readInfo;

        ReadObjectEditInfo *readInfo;
@@ -3933,7 +3875,6 @@ static void do_object_editing( 
    }

    }

    else

    else

    {

    {

#endif

        if ( num_nondiegetic_objects )

        if ( num_nondiegetic_objects )

        {

        {

            float start_angle, angle_inc;

            float start_angle, angle_inc;
@@ -3957,9 +3898,7 @@ static void do_object_editing( 
        }

        }





        editableParameters->gain_bed = 0.5f;

        editableParameters->gain_bed = 0.5f;

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    }

    }

#endif









    return;

    return;

lib_com/ivas_error.h

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

    IVAS_ERR_DIRECTIVITY_NOT_SUPPORTED,

    IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,

    IVAS_ERR_ACOUSTIC_ENVIRONMENT_NOT_SUPPORTED,

    IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED,

    IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED,

#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

    IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED,

    IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED,

#endif

    IVAS_ERR_INVALID_HRTF,

    IVAS_ERR_INVALID_HRTF,

    IVAS_ERR_INVALID_HRTF_SAMPLING_RATE,

    IVAS_ERR_INVALID_HRTF_SAMPLING_RATE,

    IVAS_ERR_BINARY_FILE_WITHOUT_BINAURAL_RENDERER_DATA,

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

            return "Acoustic environment not supported";

        case IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED:

        case IVAS_ERR_OBJECTS_EDITING_NOT_SUPPORTED:

            return "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:

        case IVAS_ERR_OBJECTS_EDITING_AND_PANNING_NOT_SUPPORTED:

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

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

#endif

        case IVAS_ERR_INVALID_HRTF:

        case IVAS_ERR_INVALID_HRTF:

            return "Unsupported HRTF filter set";

            return "Unsupported HRTF filter set";

        case IVAS_ERR_INVALID_HRTF_SAMPLING_RATE:

        case IVAS_ERR_INVALID_HRTF_SAMPLING_RATE:

lib_com/options.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -197,7 +197,6 @@ 
#define FIX_HRTF_LOAD_API                               // solves API conflicts between HRTF and object-editing features

#define FIX_HRTF_LOAD_API                               // solves API conflicts between HRTF and object-editing features

#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_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 TMP_FIX_OMASA_SR_BE                             // temporary fix to keep OMASA split-rendering BE

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

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

lib_dec/ivas_init_dec.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -3243,12 +3243,10 @@ static ivas_error doSanityChecks_IVAS( 
        }

        }

    }

    }





#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

    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." );

        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

#ifdef DEBUGGING

#ifdef DEBUGGING

    if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || ( output_config != IVAS_AUDIO_CONFIG_BINAURAL && output_config != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != MC_MODE_MCT ) ) )

    if ( ( st_ivas->hDecoderConfig->force_rend == FORCE_TD_RENDERER ) && ( ( st_ivas->ivas_format != MC_FORMAT && st_ivas->ivas_format != ISM_FORMAT ) || ( output_config != IVAS_AUDIO_CONFIG_BINAURAL && output_config != IVAS_AUDIO_CONFIG_BINAURAL_ROOM_REVERB ) || ( st_ivas->ivas_format == ISM_FORMAT && st_ivas->ism_mode == ISM_MODE_PARAM ) || ( st_ivas->ivas_format == MC_FORMAT && st_ivas->mc_mode != MC_MODE_MCT ) ) )

    {

    {

lib_util/obj_edit_file_reader.c

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

#include "prot.h"









#ifdef FIX_1217_OBJECT_EDIT_FILE_INTERFACE

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

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

 * ObjectEditFileReader_open()

 * ObjectEditFileReader_open()

 *

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




    return;

    return;

}
 
}
 
#endif