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

Support for the elements dealing with attachments.

Browse Source
This commit is contained in:
Moritz Bunkus 2003-07-14 07:22:26 +00:00
parent 80546f6ea8
commit b890fe6ff0
2 changed files with 114 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ChangeLog
View File

@ -1,3 +1,19 @@
2003-07-14 Moritz Bunkus <moritz@bunkus.org>
* mkvinfo: Support for the elements dealing with attachments
(KaxAttachments, KaxAttached, KaxFileDescription, KaxFileName,
KaxMimeType, KaxFileData).
2003-07-13 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: Changed the RealVideo packaging method: Subpackets are
assembled into complete packets so the demuxer does not have to do
that anymore.
* mkvmerge: DisplayWidth and DisplayHeight, which form the display
aspect ratio, are now always written to ease changing them later
without having to completely remux the file.
2003-07-08 Moritz Bunkus <moritz@bunkus.org>
* mkvmerge: Fixed some infinite-reading-from-a-file bug that

98
src/mkvinfo.cpp
View File

@ -49,6 +49,7 @@ extern "C" {
#include <ebml/EbmlVoid.h>
#include <matroska/FileKax.h>
#include <matroska/KaxAttached.h>
#include <matroska/KaxAttachements.h>
#include <matroska/KaxBlock.h>
#include <matroska/KaxBlockData.h>
@ -1342,6 +1343,103 @@ bool process_file(const char *file_name) {
} // while (l2 != NULL)
// Weee! Attachments!
} else if (EbmlId(*l1) == KaxAttachements::ClassInfos.GlobalId) {
show_element(l1, 1, "Attachements");
upper_lvl_el = 0;
l2 = es->FindNextElement(l1->Generic().Context, upper_lvl_el,
0xFFFFFFFFL, true);
while (l2 != NULL) {
if (upper_lvl_el > 0)
break;
if ((upper_lvl_el < 0) && !fits_parent(l2, l1))
break;
if (EbmlId(*l2) == KaxAttached::ClassInfos.GlobalId) {
show_element(l2, 2, "Attached");
upper_lvl_el = 0;
l3 = es->FindNextElement(l2->Generic().Context, upper_lvl_el,
0xFFFFFFFFL, true);
while (l3 != NULL) {
if (upper_lvl_el > 0)
break;
if ((upper_lvl_el < 0) && !fits_parent(l3, l2))
break;
if (EbmlId(*l3) == KaxFileDescription::ClassInfos.GlobalId) {
KaxFileDescription &f_desc =
*static_cast<KaxFileDescription *>(l3);
f_desc.ReadData(es->I_O());
str = UTFstring_to_cstr(UTFstring(f_desc));
show_element(l3, 3, "File description: %s", str);
safefree(str);
} else if (EbmlId(*l3) == KaxFileName::ClassInfos.GlobalId) {
KaxFileName &f_name =
*static_cast<KaxFileName *>(l3);
f_name.ReadData(es->I_O());
str = UTFstring_to_cstr(UTFstring(f_name));
show_element(l3, 3, "File name: %s", str);
safefree(str);
} else if (EbmlId(*l3) == KaxMimeType::ClassInfos.GlobalId) {
KaxMimeType &mime_type =
*static_cast<KaxMimeType *>(l3);
mime_type.ReadData(es->I_O());
show_element(l3, 3, "Mime type: %s",
string(mime_type).c_str());
} else if (EbmlId(*l3) == KaxFileData::ClassInfos.GlobalId) {
KaxFileData &f_data =
*static_cast<KaxFileData *>(l3);
f_data.ReadData(es->I_O());
show_element(l3, 3, "File data, size: %u", f_data.GetSize());
} else if (!is_ebmlvoid(l3, 3, upper_lvl_el))
show_unknown_element(l3, 3);
if (upper_lvl_el > 0) { // we're coming from l4
assert(1 == 0);
} else if (upper_lvl_el == 0) {
l3->SkipData(*es, l3->Generic().Context);
delete l3;
upper_lvl_el = 0;
l3 = es->FindNextElement(l2->Generic().Context, upper_lvl_el,
0xFFFFFFFFL, true);
} else {
delete l3;
l3 = l4;
}
} // while (l3 != NULL)
} else if (!is_ebmlvoid(l2, 2, upper_lvl_el))
show_unknown_element(l2, 2);
if (upper_lvl_el > 0) { // we're coming from l3
upper_lvl_el--;
delete l2;
l2 = l3;
if (upper_lvl_el > 0)
break;
} else if (upper_lvl_el == 0) {
l2->SkipData(*es,
l2->Generic().Context);
delete l2;
upper_lvl_el = 0;
l2 = es->FindNextElement(l1->Generic().Context, upper_lvl_el,
0xFFFFFFFFL, true);
} else {
delete l2;
l2 = l3;
}
} // while (l2 != NULL)
// Let's handle some TAGS.
} else if (EbmlId(*l1) == KaxTags::ClassInfos.GlobalId) {
show_element(l1, 1, "Tags");