[Xcb-commit] xcb-proto/src/extensions xv.xml,1.7,1.8

[Jeremy Kolb]

Update of /cvs/xcb/xcb-proto/src/extensions
In directory gabe:/tmp/cvs-serv12669

Modified Files:
	xv.xml 
Log Message:
Fixed some types, finally got QueryEncodings right.


Index: xv.xml
===================================================================
RCS file: /cvs/xcb/xcb-proto/src/extensions/xv.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- xv.xml	17 Dec 2005 19:37:25 -0000	1.7
+++ xv.xml	30 Dec 2005 21:11:43 -0000	1.8
@@ -44,6 +44,16 @@
         <item name="ImageMask"><value>0x00000010</value></item>
     </enum>
 
+    <enum name="ImageFormatInfoType">
+        <item name="RGB" />
+        <item name="YUV" />
+    </enum>
+
+    <enum name="ImageFormatInfoFormat">
+        <item name="Packed" />
+        <item name="Planar" />
+    </enum>
+
     <enum name="AttributeFlag">
         <item name="Gettable"><value>0x01</value></item>
         <item name="Settable"><value>0x02</value></item>
@@ -55,7 +65,7 @@
     </struct>
 
     <struct name="AdaptorInfo">
-        <field type="CARD32" name="base" />
+        <field type="PORT" name="base_id" />
         <field type="CARD16" name="name_size" />
         <field type="CARD16" name="num_ports" />
         <field type="CARD16" name="num_formats" />
@@ -76,7 +86,10 @@
         <field type="CARD16" name="width" />
         <field type="CARD16" name="height" />
         <field type="Rational" name="rate" />
-        <field type="CARD16" name="pad" />
+        <!--
+        Xvproto.h has a padding CARD16 here but the name
+        overlaps.
+        -->
         <list type="char" name="name">
             <fieldref>name_size</fieldref>
         </list>
@@ -198,7 +211,11 @@
         <reply>
             <pad bytes="1" />
             <field type="CARD16" name="num_encodings" />
-            <pad bytes="24" />
+            <!--
+            In Xvproto.h this padding is 24 bytes
+            in actuality it is 22 bytes
+            -->
+            <pad bytes="22" />
             <list type="EncodingInfo" name="info">
                 <fieldref>num_encodings</fieldref>
             </list>