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

[Jeremy Kolb]

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

Modified Files:
	xv.xml 
Log Message:
Fixed PutImage and Image struct.  Should now work fully with Xv 2.2.


Index: xv.xml
===================================================================
RCS file: /cvs/xcb/xcb-proto/src/extensions/xv.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- xv.xml	30 Dec 2005 21:11:43 -0000	1.8
+++ xv.xml	12 Jan 2006 15:25:34 -0000	1.9
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-Copyright (C) 2005 Jeremy Kolb.
+Copyright (C) 2006 Jeremy Kolb.
 All Rights Reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -28,9 +28,7 @@
 
 <xcb header="xv" extension-xname="XVideo" extension-name="Xv">
     <import>shm</import>
-    <!-- Probably doesn't work yet.  So far untested.  Target version is 2.2.  The docs suck. 6/5/2005 -->
-
-    <!-- Implements version 2.0 of XV -->	
+    <!-- Implements version 2.2 of XV -->
 
     <!-- XIDs -->
     <xidtype name="PORT" />
@@ -106,11 +104,16 @@
         <field type="CARD16" name="height" />
         <field type="CARD32" name="data_size" />
         <field type="CARD32" name="num_planes" />
-        <!-- <field type="int" name="pitches" /> --> <!-- int* -->
-        <!-- <field type="int" name="offsets" /> --> <!-- int* -->
-        <!-- <field type="CARD8" name="data" /> --> <!-- char* -->
-        -->
-        <!-- Some XPointer "obdata" -->
+        <list type="CARD32" name="pitches">
+            <fieldref>num_planes</fieldref>
+        </list>
+        <list type="CARD32" name="offsets">
+            <fieldref>num_planes</fieldref>
+        </list>
+        <list type="CARD8" name="data">
+            <fieldref>data_size</fieldref>
+        </list>
+        <!-- Some XPointer "obdata" for SHM use-->
     </struct>
     
     <struct name="AttributeInfo">
@@ -374,9 +377,12 @@
             <field type="CARD16" name="width" />
             <field type="CARD16" name="height" />
             <pad bytes="12" />
-            <!-- An XvImage struct comes after this.  But it's
-            currently broken. -->
-            <field type="Image" name="image" />
+            <list type="CARD32" name="pitches">
+                <fieldref>num_planes</fieldref>
+            </list>
+            <list type="CARD32" name="offsets">
+                <fieldref>num_planes</fieldref>
+            </list>
         </reply>
     </request>
 
@@ -395,9 +401,9 @@
         <field type="CARD16" name="drw_h" />
         <field type="CARD16" name="width" />
         <field type="CARD16" name="height" />
-        <localfield type="CARD32" name="data_len" />
-        <list type="BYTE" name="data">
-            <value>data_len</value>
+        <localfield type="CARD32" name="data_size" />
+        <list type="CARD8" name="data">
+            <fieldref>data_size</fieldref>
         </list>
     </request>
 
@@ -419,6 +425,5 @@
         <field type="CARD16" name="width" />
         <field type="CARD16" name="height" />
         <field type="CARD8" name="send_event" />
-        <pad bytes="3" />
     </request>
 </xcb>