summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Kolb <jkolb@brandeis.edu>2005-12-30 21:11:43 +0000
committerJeremy Kolb <jkolb@brandeis.edu>2005-12-30 21:11:43 +0000
commit6e7084a9aa3ef00d549f60f5049bac91a6161d95 (patch)
treead612bec42581429d25c05aaf03ba16f7e3e3072
parent1230eaf2713be9047d48bc12973c5cebfc945682 (diff)
Fixed some types, finally got QueryEncodings right.
-rw-r--r--xcb-proto/src/extensions/xv.xml23
1 files changed, 20 insertions, 3 deletions
diff --git a/xcb-proto/src/extensions/xv.xml b/xcb-proto/src/extensions/xv.xml
index 6133f56..3fa1dd3 100644
--- a/xcb-proto/src/extensions/xv.xml
+++ b/xcb-proto/src/extensions/xv.xml
@@ -44,6 +44,16 @@ authorization from the authors.
<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 @@ authorization from the authors.
</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 @@ authorization from the authors.
<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 @@ authorization from the authors.
<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>