Commit 10b2b6f8 authored by emerit's avatar emerit
Browse files

Merge branch 'orange/no-diegetic-pan-with-radius' of... 

Merge branch 'orange/no-diegetic-pan-with-radius' of forge.3gpp.org:ivas-codec-pc/ivas-codec into orange/no-diegetic-pan-with-radius
parents feff9cb2 121d16d6

lib_com/options.h

+2 −0
Original line number Diff line number Diff line
@@ -151,7 +151,9 @@ 


#define NO_DIEGETIC_PAN

#define FIX_CRASH_EVS_BITSTREAM_WITH_OUTPUT

#ifdef TD5

#define ISM_NO_DIEGETIC_PAN

#endif

#define FIX_372_LIB_REND_VALIDATE_IO                    /* FhG: Issue 372: IVAS_rend segfaults with unsupported I/O configs - add validation checks of I/O config */

#define FIX_376_SBA_ROTATE                              /*DLB: Fix for issue 376*/

#define TD5                                             /* Eri: Contribution 17: Extended metadata for 6 DoF rendering in TD renderer */

lib_util/ism_file_reader.c

+5 −5
Original line number Diff line number Diff line
@@ -39,7 +39,11 @@ 
#define META_LINE_LENGTH 200 /* max number of characters at one line of metadata input/output file */

#ifdef TD5

#define NUM_ISM_METADATA_PER_LINE 7 /* Number of ISM metadata per line in a metadata file */

#ifdef ISM_NO_DIEGETIC_PAN

#define NUM_MIN_ISM_METADATA 1 /* Minimum number of metadata parameters (azimuth and elevation) */

#else

#define NUM_MIN_ISM_METADATA 2 /* Minimum number of metadata parameters (azimuth and elevation) */

#endif

#else

#define NUM_ISM_METADATA_PER_LINE 5 /* Number of ISM metadata per line in a metadata file */

#endif
@@ -150,11 +154,7 @@ ivas_error IsmFileReader_readNextFrame( 
    }

#ifdef TD5

    /* Check if minimum number of metadata values were read. Additional values are ignored. */

#ifdef ISM_NO_DIEGETIC_PAN

    if ( ( i != 1 ) && ( i != NUM_MIN_ISM_METADATA ) && ( i != NUM_ISM_METADATA_PER_LINE ) )

#else

    if ( i < NUM_MIN_ISM_METADATA )

#endif

#else

    if ( i != NUM_ISM_METADATA_PER_LINE )

#endif

lib_util/ism_file_writer.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ ivas_error IsmFileWriter_open( 


    strncpy( metadata_filename_loc, filePathWav, sizeof( metadata_filename_loc ) - 1 );

    snprintf( ext_meta, sizeof( ext_meta ), ".%d.csv", obj_num );

    const int32_t maxNumCharactersToAppend = (int32_t) sizeof( metadata_filename_loc ) - strlen( metadata_filename_loc ) - 1;

    const int32_t maxNumCharactersToAppend = (int32_t) ( sizeof( metadata_filename_loc ) - strlen( metadata_filename_loc ) - 1 );

    strncat( metadata_filename_loc, ext_meta, maxNumCharactersToAppend );



    strcpy( filePath, metadata_filename_loc );