Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-26 04:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Pass found element from read_master() to calling function

Browse Source 
Fixes handling of clusters with an unknown size.
This commit is contained in:
Moritz Bunkus 2010-05-22 21:38:12 +02:00
parent 5f14cede6f
commit 17e180370a
4 changed files with 63 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2010-05-22 Moritz Bunkus <moritz@bunkus.org>
* mkvinfo: bug fix: Fixed handling clusters with an unknown size.
* mkvinfo: new feature: Added an option ("-z" / "--size") for
displaying each element's size property. Elements with an
unknown/infinite size are shown as "size is unknown".

72
src/info/mkvinfo.cpp
View File

@ -543,9 +543,10 @@ def_handle(info) {
// General info about this Matroska file
show_element(l1, 1, Y("Segment information"));
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, l3);
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
EbmlElement *element_found = NULL;
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, element_found);
int i1;
for (i1 = 0; i1 < m1->ListSize(); i1++) {
@ -622,6 +623,8 @@ def_handle(info) {
}
}
l2 = element_found;
}
void
@ -917,9 +920,10 @@ def_handle(tracks) {
// contained in this segment.
show_element(l1, 1, Y("Segment tracks"));
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, l3);
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
EbmlElement *element_found = NULL;
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, element_found);
int i1;
for (i1 = 0; i1 < m1->ListSize(); i1++) {
@ -1125,6 +1129,8 @@ def_handle(tracks) {
} else if (!is_global(es, l2, 2))
show_unknown_element(l2, 2);
}
l2 = element_found;
}
void
@ -1136,9 +1142,10 @@ def_handle(seek_head) {
show_element(l1, 1, Y("Seek head"));
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, l3);
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
EbmlElement *element_found = NULL;
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, element_found);
int i1;
for (i1 = 0; i1 < m1->ListSize(); i1++) {
@ -1182,6 +1189,8 @@ def_handle(seek_head) {
show_unknown_element(l2, 2);
} // while (l2 != NULL)
l2 = element_found;
}
void
@ -1193,9 +1202,10 @@ def_handle(cues) {
show_element(l1, 1, "Cues");
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, l3);
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
EbmlElement *element_found = NULL;
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, element_found);
int i1;
for (i1 = 0; i1 < m1->ListSize(); i1++) {
@ -1282,15 +1292,18 @@ def_handle(cues) {
show_unknown_element(l2, 2);
} // while (l2 != NULL)
l2 = element_found;
}
void
def_handle(attachments) {
show_element(l1, 1, Y("Attachments"));
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, l3);
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
EbmlElement *element_found = NULL;
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, element_found);
int i1;
for (i1 = 0; i1 < m1->ListSize(); i1++) {
@ -1333,6 +1346,8 @@ def_handle(attachments) {
show_unknown_element(l2, 2);
} // while (l2 != NULL)
l2 = element_found;
}
void
@ -1660,9 +1675,10 @@ def_handle3(cluster,
if (g_use_gui)
ui_show_progress(100 * cluster->GetElementPosition() / file_size, Y("Parsing file"));
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, l3);
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
EbmlElement *element_found = NULL;
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, element_found);
int i1;
for (i1 = 0; i1 < m1->ListSize(); i1++) {
@ -1697,7 +1713,7 @@ def_handle3(cluster,
} // while (l2 != NULL)
// mxinfo(boost::format("cluster done.... l3 is %|1$p| name %3% at %4% upper %2%\n") % reinterpret_cast<void *>(l3) % upper_lvl_el % typeid(*l3).name() % l1->GetElementPosition());
l2 = element_found;
}
void
@ -1765,26 +1781,32 @@ void
def_handle(chapters) {
show_element(l1, 1, Y("Chapters"));
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, l3);
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
EbmlElement *element_found = NULL;
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, element_found);
int i1;
for (i1 = 0; i1 < m1->ListSize(); i1++)
handle_elements_rec(es, 2, 0, (*m1)[i1], chapter_elements);
l2 = element_found;
}
void
def_handle(tags) {
show_element(l1, 1, Y("Tags"));
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, l3);
upper_lvl_el = 0;
EbmlMaster *m1 = static_cast<EbmlMaster *>(l1);
EbmlElement *element_found = NULL;
read_master(m1, es, EBML_CONTEXT(l1), upper_lvl_el, element_found);
int i1;
for (i1 = 0; i1 < m1->ListSize(); i1++)
handle_elements_rec(es, 2, 0, (*m1)[i1], tag_elements);
l2 = element_found;
}
void

1
tests/results.txt
View File

@ -112,3 +112,4 @@ T_261line_endings_in_text_files:2f152fbb4f34a2430c055280175d4bda-2f152fbb4f34a24
T_262level1_with_size_0:74891137adb818a1092ead13ed53b6ad:passed:20100407-131350
T_263ass_missing_text_in_format:2640dcc0b1ae1e80baf05e17abfab5ca-273e8eb33584686874e52a94a0304cf7:passed:20100411-181436
T_264avc_es_from_lavf_with_native_codecid:558b41f9b3193232b91370337e9c3ae8:passed:20100427-123025
T_265mkvinfo_clusters_with_unknown_size:467baa73e7db0768896c2bb55fc313cb:passed:20100522-213708

13
tests/test-265mkvinfo_clusters_with_unknown_size.rb Normal file
View File

@ -0,0 +1,13 @@
#!/usr/bin/ruby -w
class T_265mkvinfo_clusters_with_unknown_size < Test
def description
return "mkvinfo / Clusters with an unknown size"
end
def run
sys "../src/mkvinfo -v -v -z --ui-language en_US data/webm/live-stream.webm > #{tmp}"
return hash_tmp
end
end