diff --git a/ChangeLog b/ChangeLog index dc2bb23c2..9272ab1ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2015-09-06 Moritz Bunkus + * mkvmerge: the verbose identification result for the MPEG program + stream, MPEG transport stream and WAV readers has been changed for + audio tracks in order to match the Matroska reader's result. The + old keys »channels«, »sample_rate« and »bits_per_sample« have been + replaced by »audio_channels«, »audio_sampling_frequency« and + »audio_bits_per_sample«. + * mkvmerge: enhancement: the pixel width/height will be reported in verbose identification mode for all video tracks. diff --git a/src/input/r_mpeg_ps.cpp b/src/input/r_mpeg_ps.cpp index c273000f1..6061c05f1 100644 --- a/src/input/r_mpeg_ps.cpp +++ b/src/input/r_mpeg_ps.cpp @@ -1384,12 +1384,9 @@ mpeg_ps_reader_c::identify() { info.add(mtx::id::display_dimensions, boost::format("%1%x%2%") % track->v_dwidth % track->v_dheight); if ('a' == track->type) { - // info.add(mtx::id::audio_channels, track->a_channels); - // info.add(mtx::id::audio_sampling_frequency, track->a_sample_rate); - // info.add(mtx::id::audio_bits_per_sample, track->a_bits_per_sample); - info.add("channels", track->a_channels); - info.add("sample_rate", track->a_sample_rate); - info.add("bits_per_sample", track->a_bits_per_sample); + info.add(mtx::id::audio_channels, track->a_channels); + info.add(mtx::id::audio_sampling_frequency, track->a_sample_rate); + info.add(mtx::id::audio_bits_per_sample, track->a_bits_per_sample); } else if ('v' == track->type) info.add(mtx::id::pixel_dimensions, boost::format("%1%x%2%") % track->v_width % track->v_height); diff --git a/src/input/r_mpeg_ts.cpp b/src/input/r_mpeg_ts.cpp index 880a2661f..57b1fa8fe 100644 --- a/src/input/r_mpeg_ts.cpp +++ b/src/input/r_mpeg_ts.cpp @@ -808,12 +808,9 @@ mpeg_ts_reader_c::identify() { info.add(mtx::id::ts_pid, track->pid); if (ES_AUDIO_TYPE == track->type) { - // info.add(mtx::id::audio_channels, track->a_channels); - // info.add(mtx::id::audio_sampling_frequency, track->a_sample_rate); - // info.add(mtx::id::audio_bits_per_sample, track->a_bits_per_sample); - info.add("channels", track->a_channels); - info.add("sample_rate", track->a_sample_rate); - info.add("bits_per_sample", track->a_bits_per_sample); + info.add(mtx::id::audio_channels, track->a_channels); + info.add(mtx::id::audio_sampling_frequency, track->a_sample_rate); + info.add(mtx::id::audio_bits_per_sample, track->a_bits_per_sample); } else if (ES_VIDEO_TYPE == track->type) info.add(mtx::id::pixel_dimensions, boost::format("%1%x%2%") % track->v_width % track->v_height); diff --git a/src/input/r_wav.cpp b/src/input/r_wav.cpp index 3f88e4303..810f2e6f2 100644 --- a/src/input/r_wav.cpp +++ b/src/input/r_wav.cpp @@ -672,12 +672,9 @@ wav_reader_c::identify() { } auto info = mtx::id::info_c{}; - // info.add(mtx::id::audio_channels, get_uint16_le(&m_wheader.common.wChannels)); - // info.add(mtx::id::audio_sampling_frequency, get_uint32_le(&m_wheader.common.dwSamplesPerSec)); - // info.add(mtx::id::audio_bits_per_sample, get_uint16_le(&m_wheader.common.wBitsPerSample)); - info.add("channels", get_uint16_le(&m_wheader.common.wChannels)); - info.add("sample_rate", get_uint32_le(&m_wheader.common.dwSamplesPerSec)); - info.add("bits_per_sample", get_uint16_le(&m_wheader.common.wBitsPerSample)); + info.add(mtx::id::audio_channels, get_uint16_le(&m_wheader.common.wChannels)); + info.add(mtx::id::audio_sampling_frequency, get_uint32_le(&m_wheader.common.dwSamplesPerSec)); + info.add(mtx::id::audio_bits_per_sample, get_uint16_le(&m_wheader.common.wBitsPerSample)); id_result_container(); id_result_track(0, ID_RESULT_TRACK_AUDIO, m_demuxer->m_codec.get_name(), info.get()); diff --git a/tests/results.txt b/tests/results.txt index fc4f83bab..0467a8ad0 100644 --- a/tests/results.txt +++ b/tests/results.txt @@ -63,7 +63,7 @@ T_213mp4_broken_pixel_dimensions:b0ffac7af09e87a2e4c7ace7b09b1b46:passed:2005091 T_214one_frame_avi:a4b223e7f22b5e3c2bcf70e455188f79:passed:20051004-192755:0.039489971 T_215X_codec_extradata_avi:6d668338e66c695c72098902b0ce513c-74ac799ad899f703cbb6c6654e5f9f51:passed:20051004-194707:0.052219855 T_216mp4_editlists:adabd9fc8f7f51f4915ecdc634a0c59b:passed:20051118-191453:0.106975045 -T_217file_identification:e48810e0917f18b1b365eb86466b7200-d0691156d05198daa6e73a6f6b72bf27-704c3b79cbaa9190da4269b2bbb70e3f-6b94e7dd74ed76b330b142bda764af13-c5ae18058e900a096ea883da34e67e07-e072597b076f7681ed2347f0f4392a3f-cc776b264a807578cfe4e53c11dfd282-f373c7c424a2adafd93571e50b75560b-5b48e11d8e1f4018d2d2ade84f045f43-dccb1fa27b93cd03576ca2521e61135e-e0ad71242d5d7a2169afb1d6ccc2e52d-d3f955116c2ce4d377e8c013d291f0de-2034222e42be24e76bea74bff369d4bf-fc7b27d058917c14c0a79b032ce7526e-3ab5398e4f3ddc065b4a2b0a5704cb78-d00c5c1641ab36e84a6e5c0d08447717-da9feea1e6ba428eafaa3ba3ed23b176-2000bb80eaecc682af955c3d64847fc8-3b9e8de7136f2fffa4e2bbf1b4aa38e0-db05f705a1e059b29f4db1ea3ee9d59e-2544133f68c1b6b010d07e415acda553-f1c5e44505df7a7fe91d0a2da94f5e03:passed:20051209-180815:1.882517588 +T_217file_identification:e48810e0917f18b1b365eb86466b7200-d0691156d05198daa6e73a6f6b72bf27-704c3b79cbaa9190da4269b2bbb70e3f-6b94e7dd74ed76b330b142bda764af13-c5ae18058e900a096ea883da34e67e07-e072597b076f7681ed2347f0f4392a3f-cc776b264a807578cfe4e53c11dfd282-f373c7c424a2adafd93571e50b75560b-5b48e11d8e1f4018d2d2ade84f045f43-dccb1fa27b93cd03576ca2521e61135e-e0ad71242d5d7a2169afb1d6ccc2e52d-d3f955116c2ce4d377e8c013d291f0de-2034222e42be24e76bea74bff369d4bf-fc7b27d058917c14c0a79b032ce7526e-3ab5398e4f3ddc065b4a2b0a5704cb78-d00c5c1641ab36e84a6e5c0d08447717-5cd29b331b7993d36db69364ce9df816-2000bb80eaecc682af955c3d64847fc8-3b9e8de7136f2fffa4e2bbf1b4aa38e0-db05f705a1e059b29f4db1ea3ee9d59e-2544133f68c1b6b010d07e415acda553-f1c5e44505df7a7fe91d0a2da94f5e03:passed:20051209-180815:1.882517588 T_218theora:76f31a635d611bf81c076284decfbcb8-902b1d711e150c3e923aa43a88970ff4:passed:20060428-105054:0.392912102 T_219srt_short_timecodes:f8b1180415ea2b5dd7b08b0dac9d5bfd:passed:20060926-112658:0.117747192 T_220ass_with_comments_at_start:bd1ab3d2901f808a3baf21f21acb033b:passed:20060926-120101:0.382410266 @@ -206,7 +206,7 @@ T_357segment_info:c734542adcdeca270db3b6e41fd85ffc-61d4730547bcd79e9a692caa4c214 T_358usf:13cc323a8e690b4e1c236010938e1ee3:passed:20120329-142144:0.051754089 T_359split_parts:bc2ff718d54847937b9f6b4f2e38036d+49341e4669faff0225236af4eda8eb09+ok-5efda882c230b3ff5a044af4148f8d1c+ok-b1619e39ba9194cf2ef3187991f6ed18+ok-497448adf872f4050f5e34d9aacf5fa0+4f25451d573042cfdff4809a28638e93+782db07154db9054ff9f0ef3bf1235c6+f129ab41e298b6358fc0197c92c3da5f+91120826bea5d0462090d54416a571b1+4e8b657d7e371b84a7d89232e5c9fb3f+1586ba9b356c823bd58566c58e635889+ok-32b1d647cec6dc843b31f3030daf9ee7+ok-a72d22cdc1ab54c605930259a9953aff+ok:passed:20120331-133448:2.321768368 T_360X_chapters_hex_format:87a60c81c05fb0a153a2e041485ae2cb-3853793b0d88fc10efadb146ca948833:passed:20120404-152038:0.047282116 -T_361file_concatenation:7f2bdb89768656202e8c9f5a436fc440-ed5c6fbaedc5f24c2a8321c306baff41-ed5c6fbaedc5f24c2a8321c306baff41-98fd5ee77c40d1de6244c7afca3cfa15-98fd5ee77c40d1de6244c7afca3cfa15-98fd5ee77c40d1de6244c7afca3cfa15-2b0cde47d9cff1d464c78f2e158582f1-b5ee6eb2b6a40cd9abd703d2abd847bb-740607972d7bb60c595835efdb9d880d-740607972d7bb60c595835efdb9d880d-740607972d7bb60c595835efdb9d880d-740607972d7bb60c595835efdb9d880d-09ffbb6cd3ce4f4947f1f2e782be6cdd-d7039c2d63d417c29d4ba7bf623563e5-80e456901895bd509cc8f2f6ed10d587-80e456901895bd509cc8f2f6ed10d587:passed:20120406-144928:18.646532342 +T_361file_concatenation:cbef31006a0b966594c9463b7e48e1fb-ed5c6fbaedc5f24c2a8321c306baff41-ed5c6fbaedc5f24c2a8321c306baff41-98fd5ee77c40d1de6244c7afca3cfa15-98fd5ee77c40d1de6244c7afca3cfa15-98fd5ee77c40d1de6244c7afca3cfa15-2b0cde47d9cff1d464c78f2e158582f1-d2611c87ad194facc8aa1544249c8c71-740607972d7bb60c595835efdb9d880d-740607972d7bb60c595835efdb9d880d-740607972d7bb60c595835efdb9d880d-740607972d7bb60c595835efdb9d880d-09ffbb6cd3ce4f4947f1f2e782be6cdd-d7039c2d63d417c29d4ba7bf623563e5-80e456901895bd509cc8f2f6ed10d587-80e456901895bd509cc8f2f6ed10d587:passed:20120406-144928:18.646532342 T_362xtr_avc:abc9dd7b4579a2e14783271d1d64d486-49ae33bdb1e43de90886bc2ac6410c35:passed:20120416-153515:1.811589633 T_363srt_colon_decimal_separator:d75be97f27797c8b3fc62e5d39a8d7ea:passed:20120520-180625:0.032379535 T_364qtmp4_track_with_empty_chunkmap_table:f7837ed142ed9a5cca5d2fbc5788d597:passed:20120605-223925:0.168392001 @@ -334,7 +334,7 @@ T_485dtshd_file_format:577be0cf2bffc155aacd74a7bc2619dd:passed:20150329-085728:1 T_486m2ts_eac3_with_extension_in_own_packet:265d8436497eb50f49b24805a08cd39a:passed:20150329-193642:0.518299841 T_487matroska_version_and_read_version_with_opus:4+2-4+2-4+2-4+1-4+2-4+1-4+1-4+1:passed:20150329-213811:0.670610463 T_488hevc_conformance_window_with_cropping:71d84f56384c2d25fe55477766b7604d:passed:20150329-220212:0.705828455 -T_489dts_es:ce04cea6cc265a640a9c5e1cbe5657bf-29df5987271c9b138411bdaf2b92deca-e1e330c4fd7b466436d1e920bed6b685:passed:20150403-115948:1.604769748 +T_489dts_es:ce04cea6cc265a640a9c5e1cbe5657bf-775b6a14f5bf190668310508f84b301f-a65f23c3e6915091241d773fb86b034e:passed:20150403-115948:1.604769748 T_490sequence_numbers_no_0_in_first_gop:10a0cc2f79acd8cb520661b45721e652:passed:20150411-142423:0.832402022 T_491auto_additional_files_only_with_vts_prefix:98fd5ee77c40d1de6244c7afca3cfa15:passed:20150413-202924:0.904251401 T_492truehd_ac3_setting_track_properties:076b157723cf84fa785130f4f87f15ab-cf8baeb632991b669c172fa96278d11a-5eb0ff15ecb155e7828f6724a60b77d1-ec21ebdd433ed1a6f9d25a337323045b-ab9b806b3de4e93c52e767f925111834-c1644709f2dd31bb03e3555e96ad12f3:passed:20150413-211600:9.416716642 @@ -343,8 +343,8 @@ T_494dont_abort_with_aac_error_proection_specific_config:5a711a4c515b656e9418e34 T_495default_durataion_and_sync:b360d52e56d8d291a7dc24ecd2b63c18-0a38dc656269f588fc4228d50e930d12-8f3d5eeacee5a77075eed0e7ae0d882a:passed:20150417-213623:0.894261521 T_496segment_size_0:9fd6d5e57b47693a483f9aad112a6a15-ed68216741f23c974bf72dcfe9470595:passed:20150530-180226:0.051304978 T_497crash_in_base64_decoder:f6526cfaaef01627c52ee2ba25f03255:passed:20150601-192215:0.02848152 -T_498mp2_misidentification:07537c22e2a53e96a1ad9581cc12d5f2-24320202782fd1360b79873060fcd06c:passed:20150610-111131:0.763502595 +T_498mp2_misidentification:a3485c8e04e5b43842d403e983d7a8ff-35d4c8f43b4e1b5449e67a1c2b586b40:passed:20150610-111131:0.763502595 T_499propedit_tags_and_track_properties:0075366ca11568fbb5c77c55298d0068:passed:20150621-111029:0.162830224 T_500mp4_eac3_fourcc_ec_3:ceb9015450fa8322f6ad308a7b852c41:passed:20150621-224248:0.192381554 -T_501mpeg_ts_pat_and_pmt_crc_errors:46ff1ad8d3dc9954605120fb8939fb64:passed:20150704-110859:0.857051787 +T_501mpeg_ts_pat_and_pmt_crc_errors:4deaac8f5e917ddf33115fa1c0fcec5b:passed:20150704-110859:0.857051787 T_502ui_locale_sr_RS:650e05c9c091234882980f4c1da05dc4-25fa402006e7971d8e5a2b1139a4c4d8:passed:20150829-213708:0.062939538