* [FFmpeg-devel] [PATCH 1/2] doc/ffprobe.xsd: add frameSideDatumType entry
@ 2024-02-28 13:23 Niklas Haas
2024-02-28 13:23 ` [FFmpeg-devel] [PATCH 2/2] doc/ffprobe.xsd: add <components> and <pieces> Niklas Haas
2024-03-03 16:47 ` [FFmpeg-devel] [PATCH 1/2] doc/ffprobe.xsd: add frameSideDatumType entry Stefano Sabatini
0 siblings, 2 replies; 5+ messages in thread
From: Niklas Haas @ 2024-02-28 13:23 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Niklas Haas
From: Niklas Haas <git@haasn.dev>
Frame-level side data attributes are printed with the same key/value
structure as packet-level side data attributes, but this is not
reflected in the XSD.
---
doc/ffprobe.xsd | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
index 23d97ed11ab..5d17b5d9b90 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="side_datum" type="ffprobe:frameSideDatumType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="side_data_type" type="xsd:string"/>
@@ -169,6 +170,11 @@
<xsd:attribute name="timecode" type="xsd:string"/>
</xsd:complexType>
+ <xsd:complexType name="frameSideDatumType">
+ <xsd:attribute name="key" type="xsd:string"/>
+ <xsd:attribute name="value" type="xsd:string"/>
+ </xsd:complexType>
+
<xsd:complexType name="frameSideDataTimecodeList">
<xsd:sequence>
<xsd:element name="timecode" type="ffprobe:frameSideDataTimecodeType" minOccurs="0" maxOccurs="unbounded"/>
--
2.43.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread
* [FFmpeg-devel] [PATCH 2/2] doc/ffprobe.xsd: add <components> and <pieces>
2024-02-28 13:23 [FFmpeg-devel] [PATCH 1/2] doc/ffprobe.xsd: add frameSideDatumType entry Niklas Haas
@ 2024-02-28 13:23 ` Niklas Haas
2024-02-28 13:25 ` Niklas Haas
2024-03-03 16:55 ` Stefano Sabatini
2024-03-03 16:47 ` [FFmpeg-devel] [PATCH 1/2] doc/ffprobe.xsd: add frameSideDatumType entry Stefano Sabatini
1 sibling, 2 replies; 5+ messages in thread
From: Niklas Haas @ 2024-02-28 13:23 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Niklas Haas
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"/>
+ </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" />
--
2.43.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] doc/ffprobe.xsd: add <components> and <pieces>
2024-02-28 13:23 ` [FFmpeg-devel] [PATCH 2/2] doc/ffprobe.xsd: add <components> and <pieces> Niklas Haas
@ 2024-02-28 13:25 ` Niklas Haas
2024-03-03 16:55 ` Stefano Sabatini
1 sibling, 0 replies; 5+ messages in thread
From: Niklas Haas @ 2024-02-28 13:25 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Niklas Haas
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.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/2] doc/ffprobe.xsd: add frameSideDatumType entry
2024-02-28 13:23 [FFmpeg-devel] [PATCH 1/2] doc/ffprobe.xsd: add frameSideDatumType entry Niklas Haas
2024-02-28 13:23 ` [FFmpeg-devel] [PATCH 2/2] doc/ffprobe.xsd: add <components> and <pieces> Niklas Haas
@ 2024-03-03 16:47 ` Stefano Sabatini
1 sibling, 0 replies; 5+ messages in thread
From: Stefano Sabatini @ 2024-03-03 16:47 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Niklas Haas
On date Wednesday 2024-02-28 14:23:49 +0100, Niklas Haas wrote:
> From: Niklas Haas <git@haasn.dev>
>
> Frame-level side data attributes are printed with the same key/value
> structure as packet-level side data attributes, but this is not
> reflected in the XSD.
> ---
> doc/ffprobe.xsd | 6 ++++++
> 1 file changed, 6 insertions(+)
>
> diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
> index 23d97ed11ab..5d17b5d9b90 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="side_datum" type="ffprobe:frameSideDatumType" minOccurs="0" maxOccurs="unbounded"/>
> </xsd:sequence>
>
> <xsd:attribute name="side_data_type" type="xsd:string"/>
> @@ -169,6 +170,11 @@
> <xsd:attribute name="timecode" type="xsd:string"/>
> </xsd:complexType>
>
> + <xsd:complexType name="frameSideDatumType">
> + <xsd:attribute name="key" type="xsd:string"/>
> + <xsd:attribute name="value" type="xsd:string"/>
> + </xsd:complexType>
> +
> <xsd:complexType name="frameSideDataTimecodeList">
> <xsd:sequence>
> <xsd:element name="timecode" type="ffprobe:frameSideDataTimecodeType" minOccurs="0" maxOccurs="unbounded"/>
LGTM, thanks.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] doc/ffprobe.xsd: add <components> and <pieces>
2024-02-28 13:23 ` [FFmpeg-devel] [PATCH 2/2] doc/ffprobe.xsd: add <components> and <pieces> Niklas Haas
2024-02-28 13:25 ` Niklas Haas
@ 2024-03-03 16:55 ` Stefano Sabatini
1 sibling, 0 replies; 5+ messages in thread
From: Stefano Sabatini @ 2024-03-03 16:55 UTC (permalink / raw)
To: FFmpeg development discussions and patches; +Cc: Niklas Haas
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.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-03-03 16:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-28 13:23 [FFmpeg-devel] [PATCH 1/2] doc/ffprobe.xsd: add frameSideDatumType entry Niklas Haas
2024-02-28 13:23 ` [FFmpeg-devel] [PATCH 2/2] doc/ffprobe.xsd: add <components> and <pieces> Niklas Haas
2024-02-28 13:25 ` Niklas Haas
2024-03-03 16:55 ` Stefano Sabatini
2024-03-03 16:47 ` [FFmpeg-devel] [PATCH 1/2] doc/ffprobe.xsd: add frameSideDatumType entry Stefano Sabatini
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git