| Message ID | 20240228132350.21002-2-ffmpeg@haasn.xyz |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,1/2] doc/ffprobe.xsd: add frameSideDatumType entry | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On Wed, 28 Feb 2024 14:23:50 +0100 Niklas Haas <ffmpeg@haasn.xyz> wrote: > + <xsd:complexType name="frameSideDataPieceList"> > + <xsd:sequence> > + <xsd:element name="component" type="ffprobe:frameSideDataPieceType" minOccurs="0" maxOccurs="unbounded"/> > + </xsd:sequence> > + </xsd:complexType> Typo, should be "piece". Fixed locally.
On date Wednesday 2024-02-28 14:23:50 +0100, Niklas Haas wrote: > From: Niklas Haas <git@haasn.dev> > > Originally introduced for dovi side data printing, but not properly > reflected in the xsd. > --- > doc/ffprobe.xsd | 26 ++++++++++++++++++++++++++ > 1 file changed, 26 insertions(+) > > diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd > index 5d17b5d9b90..49771dd1482 100644 > --- a/doc/ffprobe.xsd > +++ b/doc/ffprobe.xsd > @@ -162,6 +162,7 @@ > <xsd:complexType name="frameSideDataType"> > <xsd:sequence> > <xsd:element name="timecodes" type="ffprobe:frameSideDataTimecodeList" minOccurs="0" maxOccurs="1"/> > + <xsd:element name="components" type="ffprobe:frameSideDataComponentList" minOccurs="0" maxOccurs="1"/> > <xsd:element name="side_datum" type="ffprobe:frameSideDatumType" minOccurs="0" maxOccurs="unbounded"/> > </xsd:sequence> > > @@ -185,6 +186,31 @@ > <xsd:attribute name="value" type="xsd:string"/> > </xsd:complexType> > > + <xsd:complexType name="frameSideDataComponentList"> > + <xsd:sequence> > + <xsd:element name="component" type="ffprobe:frameSideDataComponentType" minOccurs="0" maxOccurs="unbounded"/> > + </xsd:sequence> > + </xsd:complexType> > + > + <xsd:complexType name="frameSideDataComponentType"> > + <xsd:sequence> > + <xsd:element name="pieces" type="ffprobe:frameSideDataPieceList" minOccurs="0" maxOccurs="1"/> > + <xsd:element name="side_datum" type="ffprobe:frameSideDatumType" minOccurs="0" maxOccurs="unbounded"/> > + </xsd:sequence> > + </xsd:complexType> > + > + <xsd:complexType name="frameSideDataPieceList"> > + <xsd:sequence> > + <xsd:element name="component" type="ffprobe:frameSideDataPieceType" minOccurs="0" maxOccurs="unbounded"/> ^^^^^^^^^^^^^^^^ as you already spotted, this should be name="piece" > + </xsd:sequence> > + </xsd:complexType> > + > + <xsd:complexType name="frameSideDataPieceType"> > + <xsd:sequence> > + <xsd:element name="side_datum" type="ffprobe:frameSideDatumType" minOccurs="0" maxOccurs="unbounded"/> > + </xsd:sequence> > + </xsd:complexType> > + > <xsd:complexType name="subtitleType"> > <xsd:attribute name="media_type" type="xsd:string" fixed="subtitle" use="required"/> > <xsd:attribute name="pts" type="xsd:long" /> Looks good to me otherwise, thanks. Unrelated note: we should add an xmllint test to spot all these kind of issues.
diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd index 5d17b5d9b90..49771dd1482 100644 --- a/doc/ffprobe.xsd +++ b/doc/ffprobe.xsd @@ -162,6 +162,7 @@ <xsd:complexType name="frameSideDataType"> <xsd:sequence> <xsd:element name="timecodes" type="ffprobe:frameSideDataTimecodeList" minOccurs="0" maxOccurs="1"/> + <xsd:element name="components" type="ffprobe:frameSideDataComponentList" minOccurs="0" maxOccurs="1"/> <xsd:element name="side_datum" type="ffprobe:frameSideDatumType" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> @@ -185,6 +186,31 @@ <xsd:attribute name="value" type="xsd:string"/> </xsd:complexType> + <xsd:complexType name="frameSideDataComponentList"> + <xsd:sequence> + <xsd:element name="component" type="ffprobe:frameSideDataComponentType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="frameSideDataComponentType"> + <xsd:sequence> + <xsd:element name="pieces" type="ffprobe:frameSideDataPieceList" minOccurs="0" maxOccurs="1"/> + <xsd:element name="side_datum" type="ffprobe:frameSideDatumType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="frameSideDataPieceList"> + <xsd:sequence> + <xsd:element name="component" type="ffprobe:frameSideDataPieceType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + + <xsd:complexType name="frameSideDataPieceType"> + <xsd:sequence> + <xsd:element name="side_datum" type="ffprobe:frameSideDatumType" minOccurs="0" maxOccurs="unbounded"/> + </xsd:sequence> + </xsd:complexType> + <xsd:complexType name="subtitleType"> <xsd:attribute name="media_type" type="xsd:string" fixed="subtitle" use="required"/> <xsd:attribute name="pts" type="xsd:long" />
From: Niklas Haas <git@haasn.dev> Originally introduced for dovi side data printing, but not properly reflected in the xsd. --- doc/ffprobe.xsd | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)