Commit 566bbc0a authored by emerit's avatar emerit
Browse files

metadata file format as decided by group

parent 837cf0ae

lib_util/ism_file_reader.c

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

#ifdef ISM_NON_DIEGETIC_PAN

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

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

#else

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

#endif

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

#endif

#ifdef ISM_NON_DIEGETIC_PAN

#define TYPE_ISM_METADATA_SOURCE           1

#define TYPE_ISM_METADATA_NON_DIEGETIC_PAN 2
@@ -108,7 +109,7 @@ ivas_error IsmFileReader_readNextFrame( 
    char char_buff[META_LINE_LENGTH];

    float meta_prm[NUM_ISM_METADATA_PER_LINE];

#ifdef ISM_NON_DIEGETIC_PAN

    const float meta_prm_default[NUM_ISM_METADATA_PER_LINE] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, FLT_MAX };

    const float meta_prm_default[NUM_ISM_METADATA_PER_LINE] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.0f };

#else

    const float meta_prm_default[NUM_ISM_METADATA_PER_LINE] = { 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, 0.0f, 0.0f };

#endif
@@ -158,7 +159,7 @@ ivas_error IsmFileReader_readNextFrame( 
    }



#ifdef ISM_NON_DIEGETIC_PAN

    if ( fabs( meta_prm[NUM_ISM_METADATA_PER_LINE - 1] ) == 1.f )

    if ( meta_prm[NUM_ISM_METADATA_PER_LINE - 1] == 1.f )

    {

        ismMetadata->metadata_flag = TYPE_ISM_METADATA_NON_DIEGETIC_PAN;

    }