1 files changed, 13 insertions, 8 deletions
diff --git a/TOOLS/matroska.py b/TOOLS/matroska.py
index 6e843560da..cf55db42a4 100755
--- a/TOOLS/matroska.py
+++ b/TOOLS/matroska.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Generate C definitions for parsing Matroska files.
 Can also be used to directly parse Matroska files and display their contents.
@@ -69,6 +69,12 @@ elements_matroska = (
                 'BlockDuration, 9b, uint',
                 'ReferenceBlock*, fb, sint',
                 'DiscardPadding,  75A2, sint',
+                'BlockAdditions, 75A1, sub', (
+                    'BlockMore*, A6, sub', (
+                        'BlockAddID, EE, uint',
+                        'BlockAdditional, A5, binary',
+                    ),
+                ),
             ),
             'SimpleBlock*, a3, binary',
         ),
@@ -271,6 +277,7 @@ def parse_elems(l, namespace):
     for el in l:
         if isinstance(el, str):
             name, hexid, eltype = [x.strip() for x in el.split(',')]
+            hexid = hexid.lower()
             multiple = name.endswith('*')
             name = name.strip('*')
             new = MatroskaElement(name, hexid, eltype, namespace)
@@ -285,8 +292,8 @@ parse_elems(elements_ebml, 'EBML')
 parse_elems(elements_matroska, 'MATROSKA')
 
 def printf(out, *args):
-    out.write(' '.join([str(x) for x in args]))
-    out.write('\n')
+    out.write(u' '.join([str(x) for x in args]))
+    out.write(u'\n')
 
 def generate_C_header(out):
     printf(out, '// Generated by TOOLS/matroska.py, do not edit manually')
@@ -400,10 +407,6 @@ def read_float(s, length):
 def parse_one(s, depth, parent, maxlen):
     elid = hexlify(read_id(s)).decode('ascii')
     elem = elementd.get(elid)
-    if parent is not None and elid not in parent.subids and elid not in ('ec', 'bf'):
-        print('Unexpected:', elid)
-        if 1:
-            raise NotImplementedError
     size, length = read_vint(s)
     this_length = len(elid) / 2 + size + length
     if elem is not None:
@@ -442,7 +445,7 @@ def parse_one(s, depth, parent, maxlen):
         else:
             raise NotImplementedError
     else:
-        print(depth, 'Unknown element:', elid, 'size:', length)
+        print("    " * depth, '[' + elid + '] Unknown element! size:', length)
         read(s, length)
     return this_length
 
@@ -455,6 +458,8 @@ if __name__ == "__main__":
     elif sys.argv[1] == '--generate-definitions':
         generate_C_definitions(sys.stdout)
     else:
+        if sys.version_info.major < 3:
+            raise Exception("Dumping requires Python 3.")
         s = open(sys.argv[1], "rb")
         while 1:
             start = s.tell()