Merge pull request #777 from g-maxime/mkv-blockadditions

Add BlockAdditionalMapping to matroska shema

Source/Common/generated/ImplementationReportMatroskaSchema.h

@@ -102,6 +102,11 @@ const char xsl_schema_matroska_schema[] = {
 ,'\x20','\x20','\x3c','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x54','\x72','\x61','\x63','\x6b','\x54','\x69','\x6d','\x65','\x63','\x6f','\x64','\x65','\x53','\x63','\x61','\x6c','\x65','\x22','\x20','\x69','\x64','\x3d','\x22','\x30','\x78','\x32','\x33','\x33','\x31','\x34','\x46','\x22','\x20','\x74','\x79','\x70','\x65','\x3d','\x22','\x66','\x6c','\x6f','\x61','\x74','\x22','\x20','\x72','\x61','\x6e','\x67','\x65','\x3d','\x22','\x26','\x67','\x74','\x3b','\x20','\x30','\x78','\x30','\x70','\x2b','\x30','\x22','\x20','\x64','\x65','\x66','\x61','\x75','\x6c','\x74','\x3d','\x22','\x30','\x78','\x31','\x70','\x2b','\x30','\x22','\x20','\x6d','\x69','\x6e','\x76','\x65','\x72','\x3d','\x22','\x30','\x22','\x20','\x6d','\x61','\x78','\x76','\x65','\x72','\x3d','\x22','\x30','\x22','\x20','\x6d','\x69','\x6e','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x31','\x22','\x20','\x6d','\x61','\x78','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x31','\x22','\x20','\x72','\x65','\x63','\x75','\x72','\x73','\x69','\x76','\x65','\x3d','\x22','\x66','\x61','\x6c','\x73','\x65','\x22','\x20','\x70','\x61','\x72','\x65','\x6e','\x74','\x3d','\x22','\x54','\x72','\x61','\x63','\x6b','\x45','\x6e','\x74','\x72','\x79','\x22','\x2f','\x3e','\x0a'
 ,'\x20','\x20','\x3c','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x54','\x72','\x61','\x63','\x6b','\x4f','\x66','\x66','\x73','\x65','\x74','\x22','\x20','\x69','\x64','\x3d','\x22','\x30','\x78','\x35','\x33','\x37','\x46','\x22','\x20','\x74','\x79','\x70','\x65','\x3d','\x22','\x69','\x6e','\x74','\x65','\x67','\x65','\x72','\x22','\x20','\x64','\x65','\x66','\x61','\x75','\x6c','\x74','\x3d','\x22','\x30','\x22','\x20','\x6d','\x69','\x6e','\x76','\x65','\x72','\x3d','\x22','\x30','\x22','\x20','\x6d','\x61','\x78','\x76','\x65','\x72','\x3d','\x22','\x30','\x22','\x20','\x6d','\x69','\x6e','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x30','\x22','\x20','\x6d','\x61','\x78','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x31','\x22','\x20','\x72','\x65','\x63','\x75','\x72','\x73','\x69','\x76','\x65','\x3d','\x22','\x66','\x61','\x6c','\x73','\x65','\x22','\x20','\x70','\x61','\x72','\x65','\x6e','\x74','\x3d','\x22','\x54','\x72','\x61','\x63','\x6b','\x45','\x6e','\x74','\x72','\x79','\x22','\x2f','\x3e','\x0a'
 ,'\x20','\x20','\x3c','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x4d','\x61','\x78','\x42','\x6c','\x6f','\x63','\x6b','\x41','\x64','\x64','\x69','\x74','\x69','\x6f','\x6e','\x49','\x44','\x22','\x20','\x69','\x64','\x3d','\x22','\x30','\x78','\x35','\x35','\x45','\x45','\x22','\x20','\x74','\x79','\x70','\x65','\x3d','\x22','\x75','\x69','\x6e','\x74','\x65','\x67','\x65','\x72','\x22','\x20','\x64','\x65','\x66','\x61','\x75','\x6c','\x74','\x3d','\x22','\x30','\x22','\x20','\x6d','\x69','\x6e','\x76','\x65','\x72','\x3d','\x22','\x31','\x22','\x20','\x6d','\x69','\x6e','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x31','\x22','\x20','\x6d','\x61','\x78','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x31','\x22','\x20','\x72','\x65','\x63','\x75','\x72','\x73','\x69','\x76','\x65','\x3d','\x22','\x66','\x61','\x6c','\x73','\x65','\x22','\x20','\x70','\x61','\x72','\x65','\x6e','\x74','\x3d','\x22','\x54','\x72','\x61','\x63','\x6b','\x45','\x6e','\x74','\x72','\x79','\x22','\x2f','\x3e','\x0a'
+,'\x20','\x20','\x3c','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x42','\x6c','\x6f','\x63','\x6b','\x41','\x64','\x64','\x69','\x74','\x69','\x6f','\x6e','\x4d','\x61','\x70','\x70','\x69','\x6e','\x67','\x22','\x20','\x69','\x64','\x3d','\x22','\x30','\x78','\x34','\x31','\x45','\x34','\x22','\x20','\x74','\x79','\x70','\x65','\x3d','\x22','\x6d','\x61','\x73','\x74','\x65','\x72','\x22','\x20','\x6d','\x69','\x6e','\x76','\x65','\x72','\x3d','\x22','\x34','\x22','\x20','\x6d','\x69','\x6e','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x30','\x22','\x20','\x6d','\x61','\x78','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x75','\x6e','\x62','\x6f','\x75','\x6e','\x64','\x65','\x64','\x22','\x20','\x72','\x65','\x63','\x75','\x72','\x73','\x69','\x76','\x65','\x3d','\x22','\x66','\x61','\x6c','\x73','\x65','\x22','\x20','\x70','\x61','\x72','\x65','\x6e','\x74','\x3d','\x22','\x54','\x72','\x61','\x63','\x6b','\x45','\x6e','\x74','\x72','\x79','\x22','\x2f','\x3e','\x0a'
+,'\x20','\x20','\x3c','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x42','\x6c','\x6f','\x63','\x6b','\x41','\x64','\x64','\x49','\x44','\x56','\x61','\x6c','\x75','\x65','\x22','\x20','\x69','\x64','\x3d','\x22','\x30','\x78','\x34','\x31','\x46','\x30','\x22','\x20','\x74','\x79','\x70','\x65','\x3d','\x22','\x75','\x69','\x6e','\x74','\x65','\x67','\x65','\x72','\x22','\x20','\x72','\x61','\x6e','\x67','\x65','\x3d','\x22','\x26','\x67','\x74','\x3b','\x3d','\x32','\x22','\x20','\x6d','\x69','\x6e','\x76','\x65','\x72','\x3d','\x22','\x34','\x22','\x20','\x6d','\x69','\x6e','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x30','\x22','\x20','\x6d','\x61','\x78','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x31','\x22','\x20','\x72','\x65','\x63','\x75','\x72','\x73','\x69','\x76','\x65','\x3d','\x22','\x66','\x61','\x6c','\x73','\x65','\x22','\x20','\x70','\x61','\x72','\x65','\x6e','\x74','\x3d','\x22','\x42','\x6c','\x6f','\x63','\x6b','\x41','\x64','\x64','\x69','\x74','\x69','\x6f','\x6e','\x4d','\x61','\x70','\x70','\x69','\x6e','\x67','\x22','\x2f','\x3e','\x0a'
+,'\x20','\x20','\x3c','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x42','\x6c','\x6f','\x63','\x6b','\x41','\x64','\x64','\x49','\x44','\x4e','\x61','\x6d','\x65','\x22','\x20','\x69','\x64','\x3d','\x22','\x30','\x78','\x34','\x31','\x41','\x34','\x22','\x20','\x74','\x79','\x70','\x65','\x3d','\x22','\x73','\x74','\x72','\x69','\x6e','\x67','\x22','\x20','\x6d','\x69','\x6e','\x76','\x65','\x72','\x3d','\x22','\x34','\x22','\x20','\x6d','\x69','\x6e','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x30','\x22','\x20','\x6d','\x61','\x78','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x31','\x22','\x20','\x72','\x65','\x63','\x75','\x72','\x73','\x69','\x76','\x65','\x3d','\x22','\x66','\x61','\x6c','\x73','\x65','\x22','\x20','\x70','\x61','\x72','\x65','\x6e','\x74','\x3d','\x22','\x42','\x6c','\x6f','\x63','\x6b','\x41','\x64','\x64','\x69','\x74','\x69','\x6f','\x6e','\x4d','\x61','\x70','\x70','\x69','\x6e','\x67','\x22','\x2f','\x3e','\x0a'
+,'\x20','\x20','\x3c','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x42','\x6c','\x6f','\x63','\x6b','\x41','\x64','\x64','\x49','\x44','\x54','\x79','\x70','\x65','\x22','\x20','\x69','\x64','\x3d','\x22','\x30','\x78','\x34','\x31','\x45','\x37','\x22','\x20','\x74','\x79','\x70','\x65','\x3d','\x22','\x75','\x69','\x6e','\x74','\x65','\x67','\x65','\x72','\x22','\x20','\x64','\x65','\x66','\x61','\x75','\x6c','\x74','\x3d','\x22','\x30','\x22','\x20','\x6d','\x69','\x6e','\x76','\x65','\x72','\x3d','\x22','\x34','\x22','\x20','\x6d','\x69','\x6e','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x31','\x22','\x20','\x6d','\x61','\x78','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x31','\x22','\x20','\x72','\x65','\x63','\x75','\x72','\x73','\x69','\x76','\x65','\x3d','\x22','\x66','\x61','\x6c','\x73','\x65','\x22','\x20','\x70','\x61','\x72','\x65','\x6e','\x74','\x3d','\x22','\x42','\x6c','\x6f','\x63','\x6b','\x41','\x64','\x64','\x69','\x74','\x69','\x6f','\x6e','\x4d','\x61','\x70','\x70','\x69','\x6e','\x67','\x22','\x2f','\x3e','\x0a'
+,'\x20','\x20','\x3c','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x42','\x6c','\x6f','\x63','\x6b','\x41','\x64','\x64','\x49','\x44','\x45','\x78','\x74','\x72','\x61','\x44','\x61','\x74','\x61','\x22','\x20','\x69','\x64','\x3d','\x22','\x30','\x78','\x34','\x31','\x45','\x44','\x22','\x20','\x74','\x79','\x70','\x65','\x3d','\x22','\x62','\x69','\x6e','\x61','\x72','\x79','\x22','\x20','\x6d','\x69','\x6e','\x76','\x65','\x72','\x3d','\x22','\x34','\x22','\x20','\x6d','\x69','\x6e','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x30','\x22','\x20','\x6d','\x61','\x78','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x31','\x22','\x20','\x72','\x65','\x63','\x75','\x72','\x73','\x69','\x76','\x65','\x3d','\x22','\x66','\x61','\x6c','\x73','\x65','\x22','\x20','\x70','\x61','\x72','\x65','\x6e','\x74','\x3d','\x22','\x42','\x6c','\x6f','\x63','\x6b','\x41','\x64','\x64','\x69','\x74','\x69','\x6f','\x6e','\x4d','\x61','\x70','\x70','\x69','\x6e','\x67','\x22','\x2f','\x3e','\x0a'
 ,'\x20','\x20','\x3c','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x4e','\x61','\x6d','\x65','\x22','\x20','\x69','\x64','\x3d','\x22','\x30','\x78','\x35','\x33','\x36','\x45','\x22','\x20','\x74','\x79','\x70','\x65','\x3d','\x22','\x75','\x74','\x66','\x2d','\x38','\x22','\x20','\x6d','\x69','\x6e','\x76','\x65','\x72','\x3d','\x22','\x31','\x22','\x20','\x6d','\x69','\x6e','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x30','\x22','\x20','\x6d','\x61','\x78','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x31','\x22','\x20','\x72','\x65','\x63','\x75','\x72','\x73','\x69','\x76','\x65','\x3d','\x22','\x66','\x61','\x6c','\x73','\x65','\x22','\x20','\x70','\x61','\x72','\x65','\x6e','\x74','\x3d','\x22','\x54','\x72','\x61','\x63','\x6b','\x45','\x6e','\x74','\x72','\x79','\x22','\x2f','\x3e','\x0a'
 ,'\x20','\x20','\x3c','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x4c','\x61','\x6e','\x67','\x75','\x61','\x67','\x65','\x22','\x20','\x69','\x64','\x3d','\x22','\x30','\x78','\x32','\x32','\x42','\x35','\x39','\x43','\x22','\x20','\x74','\x79','\x70','\x65','\x3d','\x22','\x73','\x74','\x72','\x69','\x6e','\x67','\x22','\x20','\x64','\x65','\x66','\x61','\x75','\x6c','\x74','\x3d','\x22','\x65','\x6e','\x67','\x22','\x20','\x6d','\x69','\x6e','\x76','\x65','\x72','\x3d','\x22','\x31','\x22','\x20','\x6d','\x69','\x6e','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x30','\x22','\x20','\x6d','\x61','\x78','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x31','\x22','\x20','\x72','\x65','\x63','\x75','\x72','\x73','\x69','\x76','\x65','\x3d','\x22','\x66','\x61','\x6c','\x73','\x65','\x22','\x20','\x70','\x61','\x72','\x65','\x6e','\x74','\x3d','\x22','\x54','\x72','\x61','\x63','\x6b','\x45','\x6e','\x74','\x72','\x79','\x22','\x2f','\x3e','\x0a'
 ,'\x20','\x20','\x3c','\x65','\x6c','\x65','\x6d','\x65','\x6e','\x74','\x20','\x6e','\x61','\x6d','\x65','\x3d','\x22','\x43','\x6f','\x64','\x65','\x63','\x49','\x44','\x22','\x20','\x69','\x64','\x3d','\x22','\x30','\x78','\x38','\x36','\x22','\x20','\x74','\x79','\x70','\x65','\x3d','\x22','\x73','\x74','\x72','\x69','\x6e','\x67','\x22','\x20','\x6d','\x69','\x6e','\x76','\x65','\x72','\x3d','\x22','\x31','\x22','\x20','\x6d','\x69','\x6e','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x31','\x22','\x20','\x6d','\x61','\x78','\x4f','\x63','\x63','\x75','\x72','\x73','\x3d','\x22','\x31','\x22','\x20','\x72','\x65','\x63','\x75','\x72','\x73','\x69','\x76','\x65','\x3d','\x22','\x66','\x61','\x6c','\x73','\x65','\x22','\x20','\x70','\x61','\x72','\x65','\x6e','\x74','\x3d','\x22','\x54','\x72','\x61','\x63','\x6b','\x45','\x6e','\x74','\x72','\x79','\x22','\x2f','\x3e','\x0a'

Source/Resource/schema/MatroskaSchema.xml

@@ -262,6 +262,21 @@
                 <element name="MaxBlockAdditionID" level="3" id="0x55EE" type="uinteger" minOccurs="1" minver="1" webm="0" default="0">
                     <documentation>The maximum value of <a href="http://www.matroska.org/technical/specs/index.html#BlockAddID">BlockAddID</a>. A value 0 means there is no <a href="http://www.matroska.org/technical/specs/index.html#BlockAdditions">BlockAdditions</a> for this track.</documentation>
                 </element>
+                <element name="BlockAdditionMapping" level="3" id="0x41E4" type="master" minver="4">
+                    <documentation>Contains elements that extend the track format, by adding content either to each frame, with BlockAddID, or to the track as a whole with BlockAddIDExtraData.</documentation>
+                    <element name="BlockAddIDValue" level="4" id="0x41F0" type="uinteger" minver="4" range="&gt;= 2" maxOccurs="1">
+                        <documentation>If the track format extension needs content beside frames, the value refers to the BlockAddID, value being described.</documentation>
+                    </element>
+                    <element name="BlockAddIDName" level="4" id="0x41A4" type="string" minver="4" maxOccurs="1">
+                        <documentation>A human-friendly name describing the type of BlockAdditional data, as defined by the associated Block Additional Mapping.</documentation>
+                    </element>
+                    <element name="BlockAddIDType" level="4" id="0x41E7" type="uinteger" minver="4" default="0" minOccurs="1" maxOccurs="1">
+                        <documentation>Stores the registered identifier of the Block Additional Mapping to define how the BlockAdditional data should be handled.</documentation>
+                    </element>
+                    <element name="BlockAddIDExtraData" level="4" id="0x41ED" type="binary" minver="4" maxOccurs="1">
+                        <documentation>Extra binary data that the BlockAddIDType can use to interpret the BlockAdditional data. The interpretation of the binary data depends on the BlockAddIDType value and the corresponding Block Additional Mapping.</documentation>
+                    </element>
+                </element>
                 <element name="Name" cppname="TrackName" level="3" id="0x536E" type="utf-8" minver="1">
                     <documentation>A human-readable track name.</documentation>
                 </element>