Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update spectools to libmatroska2 #158

Merged
merged 2 commits into from
Dec 26, 2024
+22 −27
Merged

Update spectools to libmatroska2 #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2514a50
spectool: match libmatroska2 semantic with recent code changes
robUx4 Dec 26, 2024
a08ba1a
libmatroska2: regenerate matroska_sem
robUx4 Dec 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions libmatroska2/matroska2/matroska_sem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,8 +412,10 @@ typedef enum {
} MatroskaVideoStereoMode;

/**
*Indicates whether the `BlockAdditional` element with `BlockAddID` of "1" contains Alpha data as defined by the Codec Mapping for the `CodecID`.
Undefined values (i.e., values other than 0 or 1) **SHOULD NOT** be used, as the behavior of known implementations is different.
*Indicates whether the `BlockAdditional` element with `BlockAddID` of "1"
contains Alpha data as defined by the Codec Mapping for the `CodecID`.
Undefined values (i.e., values other than 0 or 1) **SHOULD NOT** be used, as the
behavior of known implementations is different.
*/
typedef enum {
MATROSKA_VIDEO_ALPHAMODE_NONE = 0, // The `BlockAdditional` element with `BlockAddID` of "1" does not exist or **SHOULD NOT** be considered as containing such data.
Expand Down Expand Up @@ -586,8 +588,7 @@ typedef enum {
} MatroskaTrackPlaneType;

/**
*A bit field that describes which elements have been modified in this way.
Values (big-endian) can be OR'ed.
*A bit field that describes which elements have been modified in this way. Values (big-endian) can be OR'ed.
*/
typedef enum {
MATROSKA_CONTENTENCODINGSCOPE_BLOCK = 0x1, // All frame contents, excluding lacing data.
Expand Down Expand Up @@ -641,10 +642,12 @@ typedef enum {
} MatroskaContentSigHashAlgo;

/**
*Indicates what type of content the `ChapterAtom` contains and might be skipped. It can be used to automatically skip content based on the type.
If a `ChapterAtom` is inside a `ChapterAtom` that has a `ChapterSkipType` set, it **MUST NOT** have a `ChapterSkipType` or have a `ChapterSkipType` with the same value as it's parent `ChapterAtom`.
*Indicates what type of content the `ChapterAtom` contains and might be skipped.
It can be used to automatically skip content based on the type.
If a `ChapterAtom` is inside a `ChapterAtom` that has a `ChapterSkipType` set, it
**MUST NOT** have a `ChapterSkipType` or have a `ChapterSkipType` with the same value as it's parent `ChapterAtom`.
If the `ChapterAtom` doesn't contain a `ChapterTimeEnd`, the value of the `ChapterSkipType` is only valid until the next `ChapterAtom` with a `ChapterSkipType` value or the end of the file.
*/
typedef enum {
MATROSKA_CHAPTERSKIPTYPE_NO_SKIPPING = 0, // Content which should not be skipped.
Expand Down
28 changes: 10 additions & 18 deletions spectool/schema_2_matroska_sem_c.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<xsl:call-template name="output-element-semantic">
<xsl:with-param name="node" select="ebml:element[@path='\Segment']"/>
</xsl:call-template>
<xsl:text>&#10;void MATROSKA_InitSemantic()&#10;</xsl:text>
<xsl:text>&#10;void MATROSKA_InitSemantic(void)&#10;</xsl:text>
<xsl:text>{&#10;</xsl:text>
<xsl:call-template name="output-element-definition">
<xsl:with-param name="node" select="ebml:element[@path='\Segment']"/>
Expand Down Expand Up @@ -85,7 +85,7 @@
<xsl:text>;&#10;</xsl:text>
<xsl:text>const ebml_context *MATROSKA_getContext</xsl:text>
<xsl:value-of select="$lib2Name" />
<xsl:text>() { return &amp;MATROSKA_Context</xsl:text>
<xsl:text>(void) { return &amp;MATROSKA_Context</xsl:text>
<xsl:value-of select="$lib2Name" />
<xsl:text>; }&#10;</xsl:text>
</xsl:template>
Expand Down Expand Up @@ -181,8 +181,7 @@
<xsl:text>EBML_Semantic</xsl:text>
<xsl:value-of select="$node/@name" />
<xsl:text>, </xsl:text>
<xsl:text>EBML_getSemanticGlobals(), </xsl:text>
<xsl:text>NULL</xsl:text>
<xsl:text>EBML_getSemanticGlobals()</xsl:text>
<xsl:text>};&#10;</xsl:text>

</xsl:when>
Expand All @@ -203,8 +202,7 @@
<xsl:text>0, </xsl:text>
<xsl:text>"</xsl:text><xsl:value-of select="$lib2Name" /><xsl:text>", </xsl:text>
<xsl:text>NULL, </xsl:text>
<xsl:text>EBML_getSemanticGlobals(), </xsl:text>
<xsl:text>NULL</xsl:text>
<xsl:text>EBML_getSemanticGlobals()</xsl:text>
<xsl:text>};&#10;</xsl:text>
</xsl:when>
<xsl:when test="$node/@type='uinteger'">
Expand All @@ -223,8 +221,7 @@
</xsl:choose>
<xsl:text>"</xsl:text><xsl:value-of select="$lib2Name" /><xsl:text>", </xsl:text>
<xsl:text>NULL, </xsl:text>
<xsl:text>EBML_getSemanticGlobals(), </xsl:text>
<xsl:text>NULL</xsl:text>
<xsl:text>EBML_getSemanticGlobals()</xsl:text>
<xsl:text>};&#10;</xsl:text>

</xsl:when>
Expand All @@ -241,8 +238,7 @@
</xsl:choose>
<xsl:text>"</xsl:text><xsl:value-of select="$lib2Name" /><xsl:text>", </xsl:text>
<xsl:text>NULL, </xsl:text>
<xsl:text>EBML_getSemanticGlobals(), </xsl:text>
<xsl:text>NULL</xsl:text>
<xsl:text>EBML_getSemanticGlobals()</xsl:text>
<xsl:text>};&#10;</xsl:text>

</xsl:when>
Expand All @@ -259,8 +255,7 @@
</xsl:choose>
<xsl:text>"</xsl:text><xsl:value-of select="$lib2Name" /><xsl:text>", </xsl:text>
<xsl:text>NULL, </xsl:text>
<xsl:text>EBML_getSemanticGlobals(), </xsl:text>
<xsl:text>NULL</xsl:text>
<xsl:text>EBML_getSemanticGlobals()</xsl:text>
<xsl:text>};&#10;</xsl:text>

</xsl:when>
Expand All @@ -277,8 +272,7 @@
</xsl:choose>
<xsl:text>"</xsl:text><xsl:value-of select="$lib2Name" /><xsl:text>", </xsl:text>
<xsl:text>NULL, </xsl:text>
<xsl:text>EBML_getSemanticGlobals(), </xsl:text>
<xsl:text>NULL</xsl:text>
<xsl:text>EBML_getSemanticGlobals()</xsl:text>
<xsl:text>};&#10;</xsl:text>

</xsl:when>
Expand All @@ -303,8 +297,7 @@
</xsl:choose>
<xsl:text>"</xsl:text><xsl:value-of select="$lib2Name" /><xsl:text>", </xsl:text>
<xsl:text>NULL, </xsl:text>
<xsl:text>EBML_getSemanticGlobals(), </xsl:text>
<xsl:text>NULL</xsl:text>
<xsl:text>EBML_getSemanticGlobals()</xsl:text>
<xsl:text>};&#10;</xsl:text>

</xsl:when>
Expand All @@ -318,8 +311,7 @@
<xsl:text>0, </xsl:text>
<xsl:text>"</xsl:text><xsl:value-of select="$lib2Name" /><xsl:text>", </xsl:text>
<xsl:text>NULL, </xsl:text>
<xsl:text>EBML_getSemanticGlobals(), </xsl:text>
<xsl:text>NULL</xsl:text>
<xsl:text>EBML_getSemanticGlobals()</xsl:text>
<xsl:text>};&#10;</xsl:text>
</xsl:when>
</xsl:choose>
Expand Down
4 changes: 2 additions & 2 deletions spectool/schema_2_matroska_sem_h.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
#ifndef MATROSKA_SEMANTIC_H
#define MATROSKA_SEMANTIC_H

void MATROSKA_InitSemantic();
void MATROSKA_InitSemantic(void);

<xsl:call-template name="output-element-definition">
<xsl:with-param name="node" select="ebml:element[@path='\Segment']"/>
Expand Down Expand Up @@ -82,7 +82,7 @@ void MATROSKA_InitSemantic();

<xsl:text>MATROSKA_DLL const ebml_context *MATROSKA_getContext</xsl:text>
<xsl:value-of select="$lib2Name" />
<xsl:text>();&#10;</xsl:text>
<xsl:text>(void);&#10;</xsl:text>
<xsl:if test="$node/@type='master'"><xsl:text>&#10;</xsl:text></xsl:if>
</xsl:template>
<xsl:template match="documentation">
Expand Down
Loading