[FFmpeg-devel] [PATCH] doc/ffprobe.xsd: regroup and sort elements, realign

Stefano Sabatini stefasab at gmail.com
Tue Jul 31 15:33:12 CEST 2012


Improve readability?
---
 doc/ffprobe.xsd |  149 +++++++++++++++++++++++++++----------------------------
 1 files changed, 74 insertions(+), 75 deletions(-)

diff --git a/doc/ffprobe.xsd b/doc/ffprobe.xsd
index 13c0d02..e1a0506 100644
--- a/doc/ffprobe.xsd
+++ b/doc/ffprobe.xsd
@@ -8,13 +8,13 @@
 
     <xsd:complexType name="ffprobeType">
         <xsd:sequence>
-            <xsd:element name="packets"  type="ffprobe:packetsType" minOccurs="0" maxOccurs="1" />
-            <xsd:element name="frames"   type="ffprobe:framesType"  minOccurs="0" maxOccurs="1" />
-            <xsd:element name="streams"  type="ffprobe:streamsType" minOccurs="0" maxOccurs="1" />
-            <xsd:element name="format"   type="ffprobe:formatType"  minOccurs="0" maxOccurs="1" />
-            <xsd:element name="error"    type="ffprobe:errorType"   minOccurs="0" maxOccurs="1" />
-            <xsd:element name="program_version"  type="ffprobe:programVersionType"  minOccurs="0" maxOccurs="1" />
-            <xsd:element name="library_versions" type="ffprobe:libraryVersionsType" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="error"            type="ffprobe:errorType"   minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="format"           type="ffprobe:formatType"  minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="frames"           type="ffprobe:framesType"  minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="library_versions" type="ffprobe:libraryVersionsType" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="packets"          type="ffprobe:packetsType" minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="program_version"  type="ffprobe:programVersionType"  minOccurs="0" maxOccurs="1"/>
+            <xsd:element name="streams"          type="ffprobe:streamsType" minOccurs="0" maxOccurs="1"/>
         </xsd:sequence>
     </xsd:complexType>
 
@@ -31,52 +31,52 @@
     </xsd:complexType>
 
     <xsd:complexType name="packetType">
-      <xsd:attribute name="codec_type"    type="xsd:string" use="required" />
-      <xsd:attribute name="stream_index"  type="xsd:int" use="required" />
-      <xsd:attribute name="pts"           type="xsd:long"  />
-      <xsd:attribute name="pts_time"      type="xsd:float" />
-      <xsd:attribute name="dts"           type="xsd:long"  />
-      <xsd:attribute name="dts_time"      type="xsd:float" />
-      <xsd:attribute name="duration"      type="xsd:long"  />
-      <xsd:attribute name="duration_time" type="xsd:float" />
-      <xsd:attribute name="convergence_duration"      type="xsd:long"  />
-      <xsd:attribute name="convergence_duration_time" type="xsd:float" />
-      <xsd:attribute name="size"          type="xsd:long" use="required" />
-      <xsd:attribute name="pos"           type="xsd:long"  />
-      <xsd:attribute name="flags"         type="xsd:string" use="required" />
+      <xsd:attribute name="codec_type"                type="xsd:string" use="required"/>
+      <xsd:attribute name="convergence_duration"      type="xsd:long" />
+      <xsd:attribute name="convergence_duration_time" type="xsd:float"/>
+      <xsd:attribute name="dts"                       type="xsd:long" />
+      <xsd:attribute name="dts_time"                  type="xsd:float"/>
+      <xsd:attribute name="duration"                  type="xsd:long" />
+      <xsd:attribute name="duration_time"             type="xsd:float"/>
+      <xsd:attribute name="flags"                     type="xsd:string" use="required"/>
+      <xsd:attribute name="pos"                       type="xsd:long" />
+      <xsd:attribute name="pts"                       type="xsd:long" />
+      <xsd:attribute name="pts_time"                  type="xsd:float"/>
+      <xsd:attribute name="size"                      type="xsd:long"   use="required"/>
+      <xsd:attribute name="stream_index"              type="xsd:int"    use="required"/>
     </xsd:complexType>
 
     <xsd:complexType name="frameType">
-      <xsd:attribute name="media_type"    type="xsd:string" use="required"/>
-      <xsd:attribute name="key_frame"     type="xsd:int"    use="required"/>
-      <xsd:attribute name="pts"           type="xsd:long" />
-      <xsd:attribute name="pts_time"      type="xsd:float"/>
-      <xsd:attribute name="pkt_pts"       type="xsd:long" />
-      <xsd:attribute name="pkt_pts_time"  type="xsd:float"/>
-      <xsd:attribute name="pkt_dts"       type="xsd:long" />
-      <xsd:attribute name="pkt_dts_time"  type="xsd:float"/>
-      <xsd:attribute name="pkt_duration"  type="xsd:long" />
+      <xsd:attribute name="key_frame"         type="xsd:int"    use="required"/>
+      <xsd:attribute name="media_type"        type="xsd:string" use="required"/>
+      <xsd:attribute name="pkt_dts"           type="xsd:long" />
+      <xsd:attribute name="pkt_dts_time"      type="xsd:float"/>
+      <xsd:attribute name="pkt_duration"      type="xsd:long" />
       <xsd:attribute name="pkt_duration_time" type="xsd:float"/>
-      <xsd:attribute name="pkt_pos"       type="xsd:long" />
+      <xsd:attribute name="pkt_pos"           type="xsd:long" />
+      <xsd:attribute name="pkt_pts"           type="xsd:long" />
+      <xsd:attribute name="pkt_pts_time"      type="xsd:float"/>
+      <xsd:attribute name="pts"               type="xsd:long" />
+      <xsd:attribute name="pts_time"          type="xsd:float"/>
 
       <!-- audio attributes -->
-      <xsd:attribute name="sample_fmt"             type="xsd:string"/>
-      <xsd:attribute name="nb_samples"             type="xsd:long"  />
-      <xsd:attribute name="channels"               type="xsd:int"   />
       <xsd:attribute name="channel_layout"         type="xsd:string"/>
+      <xsd:attribute name="channels"               type="xsd:int"   />
+      <xsd:attribute name="nb_samples"             type="xsd:long"  />
+      <xsd:attribute name="sample_fmt"             type="xsd:string"/>
 
       <!-- video attributes -->
-      <xsd:attribute name="width"                  type="xsd:long"  />
-      <xsd:attribute name="height"                 type="xsd:long"  />
-      <xsd:attribute name="pix_fmt"                type="xsd:string"/>
-      <xsd:attribute name="sample_aspect_ratio"    type="xsd:string"/>
-      <xsd:attribute name="pict_type"              type="xsd:string"/>
       <xsd:attribute name="coded_picture_number"   type="xsd:long"  />
       <xsd:attribute name="display_picture_number" type="xsd:long"  />
+      <xsd:attribute name="height"                 type="xsd:long"  />
       <xsd:attribute name="interlaced_frame"       type="xsd:int"   />
-      <xsd:attribute name="top_field_first"        type="xsd:int"   />
-      <xsd:attribute name="repeat_pict"            type="xsd:int"   />
+      <xsd:attribute name="pict_type"              type="xsd:string"/>
+      <xsd:attribute name="pix_fmt"                type="xsd:string"/>
       <xsd:attribute name="reference"              type="xsd:int"   />
+      <xsd:attribute name="repeat_pict"            type="xsd:int"   />
+      <xsd:attribute name="sample_aspect_ratio"    type="xsd:string"/>
+      <xsd:attribute name="top_field_first"        type="xsd:int"   />
+      <xsd:attribute name="width"                  type="xsd:long"  />
     </xsd:complexType>
 
     <xsd:complexType name="streamsType">
@@ -86,41 +86,40 @@
     </xsd:complexType>
 
     <xsd:complexType name="streamType">
-      <xsd:attribute name="index"            type="xsd:int" use="required"/>
-      <xsd:attribute name="codec_name"       type="xsd:string" />
-      <xsd:attribute name="codec_long_name"  type="xsd:string" />
-      <xsd:attribute name="profile"          type="xsd:string" />
-      <xsd:attribute name="codec_type"       type="xsd:string" />
-      <xsd:attribute name="codec_time_base"  type="xsd:string" use="required"/>
+      <xsd:attribute name="avg_frame_rate"   type="xsd:string" use="required"/>
+      <xsd:attribute name="bit_rate"         type="xsd:int"   />
+      <xsd:attribute name="codec_long_name"  type="xsd:string"/>
+      <xsd:attribute name="codec_name"       type="xsd:string"/>
       <xsd:attribute name="codec_tag"        type="xsd:string" use="required"/>
       <xsd:attribute name="codec_tag_string" type="xsd:string" use="required"/>
+      <xsd:attribute name="codec_time_base"  type="xsd:string" use="required"/>
+      <xsd:attribute name="codec_type"       type="xsd:string"/>
+      <xsd:attribute name="duration"         type="xsd:float" />
+      <xsd:attribute name="id"               type="xsd:string"/>
+      <xsd:attribute name="index"            type="xsd:int"    use="required"/>
+      <xsd:attribute name="nb_frames"        type="xsd:int"   />
+      <xsd:attribute name="nb_read_frames"   type="xsd:int"   />
+      <xsd:attribute name="nb_read_packets"  type="xsd:int"   />
+      <xsd:attribute name="profile"          type="xsd:string"/>
+      <xsd:attribute name="r_frame_rate"     type="xsd:string" use="required"/>
+      <xsd:attribute name="start_time"       type="xsd:float" />
+      <xsd:attribute name="time_base"        type="xsd:string" use="required"/>
 
       <!-- video attributes -->
-      <xsd:attribute name="width"                type="xsd:int"/>
-      <xsd:attribute name="height"               type="xsd:int"/>
-      <xsd:attribute name="has_b_frames"         type="xsd:int"/>
-      <xsd:attribute name="sample_aspect_ratio"  type="xsd:string"/>
       <xsd:attribute name="display_aspect_ratio" type="xsd:string"/>
+      <xsd:attribute name="has_b_frames"         type="xsd:int"   />
+      <xsd:attribute name="height"               type="xsd:int"   />
+      <xsd:attribute name="level"                type="xsd:int"   />
       <xsd:attribute name="pix_fmt"              type="xsd:string"/>
-      <xsd:attribute name="level"                type="xsd:int"/>
+      <xsd:attribute name="sample_aspect_ratio"  type="xsd:string"/>
       <xsd:attribute name="timecode"             type="xsd:string"/>
+      <xsd:attribute name="width"                type="xsd:int"   />
 
       <!-- audio attributes -->
+      <xsd:attribute name="bits_per_sample"  type="xsd:int"   />
+      <xsd:attribute name="channels"         type="xsd:int"   />
       <xsd:attribute name="sample_fmt"       type="xsd:string"/>
-      <xsd:attribute name="sample_rate"      type="xsd:int"/>
-      <xsd:attribute name="channels"         type="xsd:int"/>
-      <xsd:attribute name="bits_per_sample"  type="xsd:int"/>
-
-      <xsd:attribute name="id"               type="xsd:string"/>
-      <xsd:attribute name="r_frame_rate"     type="xsd:string" use="required"/>
-      <xsd:attribute name="avg_frame_rate"   type="xsd:string" use="required"/>
-      <xsd:attribute name="time_base"        type="xsd:string" use="required"/>
-      <xsd:attribute name="start_time"       type="xsd:float"/>
-      <xsd:attribute name="duration"         type="xsd:float"/>
-      <xsd:attribute name="bit_rate"         type="xsd:int"/>
-      <xsd:attribute name="nb_frames"        type="xsd:int"/>
-      <xsd:attribute name="nb_read_frames"   type="xsd:int"/>
-      <xsd:attribute name="nb_read_packets"  type="xsd:int"/>
+      <xsd:attribute name="sample_rate"      type="xsd:int"   />
     </xsd:complexType>
 
     <xsd:complexType name="formatType">
@@ -128,14 +127,14 @@
         <xsd:element name="tag" type="ffprobe:tagType" minOccurs="0" maxOccurs="unbounded"/>
       </xsd:sequence>
 
+      <xsd:attribute name="bit_rate"         type="xsd:long"  />
+      <xsd:attribute name="duration"         type="xsd:float" />
       <xsd:attribute name="filename"         type="xsd:string" use="required"/>
-      <xsd:attribute name="nb_streams"       type="xsd:int"    use="required"/>
-      <xsd:attribute name="format_name"      type="xsd:string" use="required"/>
       <xsd:attribute name="format_long_name" type="xsd:string" use="required"/>
-      <xsd:attribute name="start_time"       type="xsd:float"/>
-      <xsd:attribute name="duration"         type="xsd:float"/>
-      <xsd:attribute name="size"             type="xsd:long"/>
-      <xsd:attribute name="bit_rate"         type="xsd:long"/>
+      <xsd:attribute name="format_name"      type="xsd:string" use="required"/>
+      <xsd:attribute name="nb_streams"       type="xsd:int"    use="required"/>
+      <xsd:attribute name="size"             type="xsd:long"  />
+      <xsd:attribute name="start_time"       type="xsd:float" />
     </xsd:complexType>
 
     <xsd:complexType name="tagType">
@@ -149,20 +148,20 @@
     </xsd:complexType>
 
     <xsd:complexType name="programVersionType">
-      <xsd:attribute name="version"          type="xsd:string" use="required"/>
-      <xsd:attribute name="copyright"        type="xsd:string" use="required"/>
       <xsd:attribute name="build_date"       type="xsd:string" use="required"/>
       <xsd:attribute name="build_time"       type="xsd:string" use="required"/>
       <xsd:attribute name="compiler_type"    type="xsd:string" use="required"/>
       <xsd:attribute name="compiler_version" type="xsd:string" use="required"/>
       <xsd:attribute name="configuration"    type="xsd:string" use="required"/>
+      <xsd:attribute name="copyright"        type="xsd:string" use="required"/>
+      <xsd:attribute name="version"          type="xsd:string" use="required"/>
     </xsd:complexType>
 
     <xsd:complexType name="libraryVersionType">
-      <xsd:attribute name="name"        type="xsd:string" use="required"/>
       <xsd:attribute name="major"       type="xsd:int"    use="required"/>
-      <xsd:attribute name="minor"       type="xsd:int"    use="required"/>
       <xsd:attribute name="micro"       type="xsd:int"    use="required"/>
+      <xsd:attribute name="minor"       type="xsd:int"    use="required"/>
+      <xsd:attribute name="name"        type="xsd:string" use="required"/>
       <xsd:attribute name="version"     type="xsd:int"    use="required"/>
     </xsd:complexType>
 
-- 
1.7.5.4



More information about the ffmpeg-devel mailing list