Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-01-13 13:41:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mkvinfo, tests: adjust for bugfixes in fmtlib 6.2.1

Browse Source
This commit is contained in:
Moritz Bunkus 2020-05-15 09:31:30 +02:00
parent af15777988
commit 11bc1ccf10
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/kax_info.cpp
View File

@ -86,11 +86,12 @@ using namespace mtx::kax_info;
namespace {
template<typename T>
std::string
normalize_fmt_double_output(double value) {
normalize_fmt_double_output(T value) {
// Some fmt library versions output a trailing ".0" even if the
// decimal part is zero, others don't. Normalize to not include it.
return std::regex_replace(fmt::format("{}", value), std::regex{"\\.0*$"}, "");
return std::regex_replace(fmt::format("{}", value), std::regex{"\\.?0*$"}, "");
}
}
@ -1170,7 +1171,7 @@ kax_info_c::display_track_info() {
track->tnum,
tinfo.m_blocks,
tinfo.m_size,
normalize_fmt_double_output(duration / 1000000000.0),
normalize_fmt_double_output(fmt::format("{0:.9f}", duration / 1000000000.0)),
static_cast<uint64_t>(duration == 0 ? 0 : tinfo.m_size * 8000000000.0 / duration)));
}
}

4
tests/results.txt
View File

@ -291,13 +291,13 @@ T_442ui_locale_ca_ES:b8b1ebb4a729cd34bac943b4a7eec4d5-efc218c7d73104f27e852a4d6b
T_443hevc_keep_user_data:e54e5818b706704405600359f573c9e6:passed:20141105-202533:1.308417598
T_444pcm_statistics_from_packaged_sources:775e1eee71d66a9f101e21948ab262e9-775e1eee71d66a9f101e21948ab262e9-2c5822721038b966c3e09e9ad0d44297-2c5822721038b966c3e09e9ad0d44297-+++:passed:20141205-220805:0.604375231
T_445teletext_subs_missing_second_line:89313de5f917c4168b8bc6ca06843ee5:passed:20141210-224823:5.420908642
T_446mkvinfo_output:03e90a0787a21032cdd5f1489bc6767d-4a7d72be565196a4a7a2c425384a6fa9-f7d41b44f42d6c97b906db3a4a26aa4c-9070ecf19b458814d76ffd21d794817f-611def24185a1936ec667886e5e6413b-a3695fbcdcd6f104ac95809c4c5a8ef7-6d456d8640de9f2335d5c7619e87f312-131db4e7dbfa080f36bc53c48d2da664-8de86be52537ec9f7482e192a22ad539-ebd05823bab23b01ec4a8fe51e4ba8b2-bd569be5e017124ce53596f6ace0b682-c4752d9c65cdb54e243ce18c6aced3c7-84aa737d3dc756565caae9a0b56ebfc9-8eb1b4c459a64601f21f11cd4db476ce-b2869c0b017a28ac2999f104b8cab91f-b6e946c3229627d31f75246559875bcc-457d18b25b2d8084dbdf7597b579f2d3-a9923b8cfeed255285385b188ab35506-74acd1bb1191bd0e55f092fa7bc7fac4-84a0de136c7956183120eabacbcd0917-0c04051ff82e590d488f920ac9da1ed5-e07d256f2ec4f8b84d91b802c48a4db2-082390f37932eab3e3183cdb9eba8ab9-c67664b4b54b8d241a684f9316668693:passed:20141216-165433:1.564089101
T_446mkvinfo_output:03e90a0787a21032cdd5f1489bc6767d-4a7d72be565196a4a7a2c425384a6fa9-f7d41b44f42d6c97b906db3a4a26aa4c-7a01d6443aeb4c2b47f7e5d7e84dec93-611def24185a1936ec667886e5e6413b-a3695fbcdcd6f104ac95809c4c5a8ef7-6d456d8640de9f2335d5c7619e87f312-131db4e7dbfa080f36bc53c48d2da664-8de86be52537ec9f7482e192a22ad539-ebd05823bab23b01ec4a8fe51e4ba8b2-bd569be5e017124ce53596f6ace0b682-ac5293a69a3e6b20d968ec58d87df5ae-84aa737d3dc756565caae9a0b56ebfc9-8eb1b4c459a64601f21f11cd4db476ce-b2869c0b017a28ac2999f104b8cab91f-b6e946c3229627d31f75246559875bcc-457d18b25b2d8084dbdf7597b579f2d3-a9923b8cfeed255285385b188ab35506-74acd1bb1191bd0e55f092fa7bc7fac4-84a0de136c7956183120eabacbcd0917-0c04051ff82e590d488f920ac9da1ed5-e07d256f2ec4f8b84d91b802c48a4db2-082390f37932eab3e3183cdb9eba8ab9-b4928d1b6883924051bac4bbe8687c4e:passed:20141216-165433:1.564089101
T_447mkvinfo_rounded_timecodes:409a5ad59ec67427b7983822a63ff0b7-24bfcda009b06fd3b6d90038227c5e88-1fcd406268dac205daa497b6692df4ce:passed:20141216-172642:1.712081143
T_448mpeg_ts_with_hevc:9c38022a0e4bd7b274bf9a7fce4e9fc8:passed:20141216-181650:1.133097273
T_449segfaults_assertions:error-2bacc50e6e28fb2a92d2abf2583405f5-ok-2684a2b671068c517bafd3a2cfb2aaca-844bf63953a1f092ccc04de6ad1d59d1-ad3a8bac157bf230bf305ba35f26650b-error-error-ok-74082d0c0a8dec7982380cf39891a782-8c3b7c54ad1ad9b18146845f77d1a3e4-2684a2b671068c517bafd3a2cfb2aaca-2684a2b671068c517bafd3a2cfb2aaca-0fcbd3964d934f3e6dbc194aabbca3ae-68015c77e684e0bc2d45361759a5de65-0fcbd3964d934f3e6dbc194aabbca3ae:passed:20141219-195127:0.830949441
T_450aac_loas_latm_in_mpeg_ts:ac9c9cceb789fb014838762b36cfec77:passed:20141229-210738:0.515183095
T_451aac_loas_latm_raw:327f97ea43eea8b4319dc250a5b5ed13:passed:20141230-155351:0.589778873
T_452mkvinfo_track_statistics_frame_order:2d51f5fb8b45d7e17dc27c15777aca23-276508cc2b7dba79af787aec05f45b64:passed:20141230-182428:1.579605124
T_452mkvinfo_track_statistics_frame_order:2d51f5fb8b45d7e17dc27c15777aca23-26be493b592b30cd4696d1fd15a1fe05:passed:20141230-182428:1.579605124
T_453mp4_with_hevc:b94a01a67d8b2a13abe2c6c90dc94d27:passed:20141231-125834:0.046223562
T_454mp4_dash:7b6363c7711024e28b7521c0d86ad29e-9148a92d6f109183b287a6459b76f9fa:passed:20141231-214733:0.429881173
T_455he_aacv2_ps:b17a776dc794868e5592e81ac08cd4e7:passed:20150101-152553:0.075964546