Commit 8b40d934 authored by emerit's avatar emerit
Browse files

metadata file format with flag to signal non diegetic line

parent 2ec5c6d6

lib_util/ism_file_reader.c

+2 −17
Original line number Diff line number Diff line
@@ -158,29 +158,15 @@ ivas_error IsmFileReader_readNextFrame( 
    }



#ifdef ISM_NON_DIEGETIC_PAN

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

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

    {

        ismMetadata->metadata_flag = TYPE_ISM_METADATA_NON_DIEGETIC_PAN;

        ismMetadata->azimuth = meta_prm[NUM_ISM_METADATA_PER_LINE - 1];

        ismMetadata->elevation = meta_prm_default[1];

        ismMetadata->radius = meta_prm_default[2];

        ismMetadata->spread = meta_prm_default[3];

        ismMetadata->gainFactor = meta_prm_default[4];

        ismMetadata->yaw = meta_prm_default[5];

        ismMetadata->pitch = meta_prm_default[6];

    }

    else

    {

        ismMetadata->metadata_flag = TYPE_ISM_METADATA_SOURCE;

        ismMetadata->azimuth = meta_prm[0];

        ismMetadata->elevation = meta_prm[1];

        ismMetadata->radius = meta_prm[2];

        ismMetadata->spread = meta_prm[3];

        ismMetadata->gainFactor = meta_prm[4];

        ismMetadata->yaw = meta_prm[5];

        ismMetadata->pitch = meta_prm[6];

    }

#else

#endif

    ismMetadata->azimuth = meta_prm[0];

    ismMetadata->elevation = meta_prm[1];

    ismMetadata->radius = meta_prm[2];
@@ -188,7 +174,6 @@ ivas_error IsmFileReader_readNextFrame( 
    ismMetadata->gainFactor = meta_prm[4];

    ismMetadata->yaw = meta_prm[5];

    ismMetadata->pitch = meta_prm[6];

#endif



    /* verify whether the read metadata values are in an expected range */

#ifdef ISM_NON_DIEGETIC_PAN

lib_util/ism_file_writer.c

+1 −16
Original line number Diff line number Diff line
@@ -114,23 +114,8 @@ ivas_error IsmFileWriter_writeFrame( 
    file = ismWriter->file;



    /* IVAS_fmToDo: work in progress; currently position_azimuth, position_elevation, position_radius, spread, gain_factor */

#ifdef FIX_293_EXT_RENDERER_CLI

    sprintf( char_buff, "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f,%+07.2f,%+06.2f\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor, ismMetadata.yaw, ismMetadata.pitch );

#endif

#ifdef ISM_NON_DIEGETIC_PAN

    if ( ismMetadata.metadata_flag == 2 )

    {

        //     snprintf( char_buff, sizeof( char_buff ), "%+07.2f\n", ismMetadata.non_diegetic_pan );

        snprintf( char_buff, sizeof( char_buff ), "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f,%+07.2f,%+06.2f,\t%d\n", ismMetadata.azimuth / 90.f, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor, ismMetadata.yaw, ismMetadata.pitch, ismMetadata.metadata_flag );

    }

    else if ( ismMetadata.metadata_flag == 0 )

    {

        snprintf( char_buff, sizeof( char_buff ), "VAD == 0\t%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f,%+07.2f,%+06.2f,\t%d\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor, ismMetadata.yaw, ismMetadata.pitch, ismMetadata.metadata_flag );

    }

    else

    {

        snprintf( char_buff, sizeof( char_buff ), "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f,%+07.2f,%+06.2f,\t%d\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor, ismMetadata.yaw, ismMetadata.pitch, ismMetadata.metadata_flag );

    }

    snprintf( char_buff, sizeof( char_buff ), "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f,%+07.2f,%+06.2f,\t%d\n", ismMetadata.metadata_flag == 2 ? ismMetadata.azimuth / 90.f : ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor, ismMetadata.yaw, ismMetadata.pitch, ismMetadata.metadata_flag == 2 );

#else

    snprintf( char_buff, sizeof( char_buff ), "%+07.2f,%+06.2f,%05.2f,%06.2f,%04.2f,%+07.2f,%+06.2f\n", ismMetadata.azimuth, ismMetadata.elevation, ismMetadata.radius, ismMetadata.spread, ismMetadata.gainFactor, ismMetadata.yaw, ismMetadata.pitch );

#endif