Commit fad8df27 authored by emerit's avatar emerit
Browse files

Ericsson comments

parent 8e033911

lib_util/ism_file_reader.c

+0 −1
Original line number Diff line number Diff line
@@ -180,7 +180,6 @@ ivas_error IsmFileReader_readNextFrame( 
#ifdef ISM_NON_DIEGETIC_PAN

    if ( ismMetadata->metadata_flag == TYPE_ISM_METADATA_NON_DIEGETIC_PAN )

    {

        ismMetadata->azimuth = ismMetadata->azimuth * 90.f;

        if ( ismMetadata->azimuth > 90 || ismMetadata->azimuth < -90 )

        {

            return IVAS_ERR_ISM_INVALID_METADATA_VALUE;

lib_util/ism_file_writer.c

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ ivas_error IsmFileWriter_writeFrame( 


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

#ifdef ISM_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.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 );

    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 == 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

scripts/td_object_renderer/example_kit/enc.bash

+4 −0
Original line number Diff line number Diff line
@@ -10,3 +10,7 @@ $BIN/IVAS_cod -ism +4 md_1.csv md_2_non_diegetic_pan_left.csv md_3.csv md_4.csv 
$BIN/IVAS_cod -ism +4 md_1.csv md_2_non_diegetic_pan_left_mixed.csv NULL md_4.csv $BR 48 test_4_ism_with_non_diegetic.wav bit_mixed

$BIN/IVAS_dec -render_config config_directivity.cfg -t head_tracking_move_forward.csv BINAURAL 48 bit out_with_non_diegetic.wav

$BIN/IVAS_dec -render_config config_directivity.cfg -t head_tracking_move_forward.csv BINAURAL 48 bit_mixed out_with_non_diegetic_mixed.wav

$BIN/IVAS_dec -render_config config_directivity.cfg  BINAURAL 48 bit out_with_non_diegetic_no_headtracking.wav

$BIN/IVAS_dec -render_config config_directivity.cfg  BINAURAL 48 bit_mixed out_with_non_diegetic_mixed_no_headtracking.wav

$BIN/IVAS_dec  EXT 48 bit out_ext_with_non_diegetic.wav

$BIN/IVAS_dec  EXT 48 bit_mixed out_ext_with_non_diegetic_mixed.wav

scripts/td_object_renderer/example_kit/md_2_non_diegetic_pan_left.csv

+2010 −2010

File changed.

Preview size limit exceeded, changes collapsed.

scripts/td_object_renderer/example_kit/md_2_non_diegetic_pan_left_mixed.csv

+1994 −1994

File changed.

Preview size limit exceeded, changes collapsed.