Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-02-26 08:22:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mkvinfo: add support for CodecDelay, SeekPreRoll, DiscardPadding

Browse Source
This commit is contained in:
Moritz Bunkus 2013-07-02 22:34:55 +02:00
parent a03ab1e3e4
commit ba1258fdd3
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2013-07-02 Moritz Bunkus <moritz@bunkus.org> 2013-07-02 Moritz Bunkus <moritz@bunkus.org>
* mkvinfo: new feature: Added support for the new Matroska
elements DiscardPadding, CodecDelay and SeekPreRoll.
* build system: libMatroska 1.4.1 is now required for building. * build system: libMatroska 1.4.1 is now required for building.
2013-06-27 Moritz Bunkus <moritz@bunkus.org> 2013-06-27 Moritz Bunkus <moritz@bunkus.org>

17
src/info/mkvinfo.cpp
View File

@ -181,6 +181,7 @@ size_t s_mkvmerge_track_id = 0;
#define BF_CODEC_STATE BF_DO(30) #define BF_CODEC_STATE BF_DO(30)
#define BF_AT BF_DO(31) #define BF_AT BF_DO(31)
#define BF_SIZE BF_DO(32) #define BF_SIZE BF_DO(32)
#define BF_BLOCK_GROUP_DISCARD_PADDING BF_DO(33)
void void
init_common_boost_formats() { init_common_boost_formats() {
@ -217,6 +218,7 @@ init_common_boost_formats() {
BF_ADD(Y("Codec state: %1%")); // 30 -- BF_CODEC_STATE BF_ADD(Y("Codec state: %1%")); // 30 -- BF_CODEC_STATE
BF_ADD(Y(" at %1%")); // 31 -- BF_AT BF_ADD(Y(" at %1%")); // 31 -- BF_AT
BF_ADD(Y(" size %1%")); // 32 -- BF_SIZE BF_ADD(Y(" size %1%")); // 32 -- BF_SIZE
BF_ADD(Y("Discard padding: %|1$.3f|ms (%2%ns)")); // 33 -- BF_BLOCK_GROUP_DISCARD_PADDING
} }
std::string std::string
@ -920,7 +922,15 @@ handle_tracks(EbmlStream *&es,
else if (is_id(l3, KaxContentEncodings)) else if (is_id(l3, KaxContentEncodings))
handle_content_encodings(es, l3); handle_content_encodings(es, l3);
else if (!is_global(es, l3, 3)) else if (is_id(l3, KaxCodecDelay)) {
auto value = static_cast<KaxCodecDelay *>(l3)->GetValue();
show_element(l3, 3, boost::format(Y("Codec delay: %|1$.3f|ms (%2%ns)")) % (static_cast<double>(value) / 1000000.0) % value);
} else if (is_id(l3, KaxSeekPreRoll)) {
auto value = static_cast<KaxSeekPreRoll *>(l3)->GetValue();
show_element(l3, 3, boost::format(Y("Seek pre-roll: %|1$.3f|ms (%2%ns)")) % (static_cast<double>(value) / 1000000.0) % value);
} else if (!is_global(es, l3, 3))
show_unknown_element(l3, 3); show_unknown_element(l3, 3);
if (g_options.m_show_summary) if (g_options.m_show_summary)
@ -1203,6 +1213,11 @@ handle_block_group(EbmlStream *&es,
else if (is_id(l3, KaxCodecState)) else if (is_id(l3, KaxCodecState))
show_element(l3, 3, BF_CODEC_STATE % format_binary(static_cast<KaxCodecState *>(l3))); show_element(l3, 3, BF_CODEC_STATE % format_binary(static_cast<KaxCodecState *>(l3)));
else if (is_id(l3, KaxDiscardPadding)) {
auto value = static_cast<KaxDiscardPadding *>(l3)->GetValue();
show_element(l3, 3, BF_BLOCK_GROUP_DISCARD_PADDING % (static_cast<double>(value) / 1000000.0) % value);
}
#endif // MATROSKA_VERSION >= 2 #endif // MATROSKA_VERSION >= 2
else if (is_id(l3, KaxBlockAdditions)) { else if (is_id(l3, KaxBlockAdditions)) {
show_element(l3, 3, Y("Additions")); show_element(l3, 3, Y("Additions"));