x11proto-video: Changes to 'debian-unstable'
COPYING | 8 -
ChangeLog | 88 +++++++++++++++++++++
Xv.h | 12 +-
XvMC.h | 10 +-
XvMCproto.h | 10 +-
Xvproto.h | 26 +++---
autogen.sh | 4
configure.ac | 11 ++
debian/changelog | 11 ++
debian/compat | 2
debian/control | 6 -
debian/rules | 11 --
videoproto.pc.in | 2
vldXvMC.h | 34 ++++----
xv-protocol-v2.txt | 216 ++++++++++++++++++++++++++---------------------------
15 files changed, 277 insertions(+), 174 deletions(-)
New commits:
commit 855fd271102c24cb10bfee1c650df079ca7aff6a
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 8 17:16:41 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 0607806..ff157f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-x11proto-video (2.3.2-1) UNRELEASED; urgency=low
+x11proto-video (2.3.2-1) unstable; urgency=low
* New upstream release
+ correct sizeof(xvEncodingInfo) (closes: #657215)
@@ -7,7 +7,7 @@ x11proto-video (2.3.2-1) UNRELEASED; urgency=low
* Bump standards-version to 3.9.3 (no changes needed).
* Remove Andres and David from Uploaders.
- -- Julien Cristau <jcristau@debian.org> Sun, 08 Sep 2013 16:41:34 +0200
+ -- Julien Cristau <jcristau@debian.org> Sun, 08 Sep 2013 17:16:24 +0200
x11proto-video (2.3.1-2) unstable; urgency=low
commit 3144d9359f688e153fef4537bcc71b6e68eaf7a6
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 8 17:14:24 2013 +0200
Remove Andres and David from Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 70dda03..0607806 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ x11proto-video (2.3.2-1) UNRELEASED; urgency=low
* Bump debhelper compat level to 7, use dh_prep.
* Don't require fakeroot for d/rules clean.
* Bump standards-version to 3.9.3 (no changes needed).
+ * Remove Andres and David from Uploaders.
-- Julien Cristau <jcristau@debian.org> Sun, 08 Sep 2013 16:41:34 +0200
diff --git a/debian/control b/debian/control
index 368f953..f4e5eab 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: x11proto-video
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Cyril Brulebois <kibi@debian.org>
+Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
debhelper (>= 7),
automake,
commit 6c5aceef097bd934c779a0d46f53788eb285929f
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 8 17:12:44 2013 +0200
Bump standards-version to 3.9.3 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index 2dd8ecc..70dda03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ x11proto-video (2.3.2-1) UNRELEASED; urgency=low
+ correct sizeof(xvEncodingInfo) (closes: #657215)
* Bump debhelper compat level to 7, use dh_prep.
* Don't require fakeroot for d/rules clean.
+ * Bump standards-version to 3.9.3 (no changes needed).
-- Julien Cristau <jcristau@debian.org> Sun, 08 Sep 2013 16:41:34 +0200
diff --git a/debian/control b/debian/control
index c0fb321..368f953 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Build-Depends:
automake,
xutils-dev (>= 1:7.5~1),
pkg-config,
-Standards-Version: 3.8.3
+Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-video
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-video.git
commit 357c1656699743ff299da53fce88580457fea152
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 8 17:04:21 2013 +0200
Don't require fakeroot for d/rules clean.
diff --git a/debian/changelog b/debian/changelog
index fc4846c..2dd8ecc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ x11proto-video (2.3.2-1) UNRELEASED; urgency=low
* New upstream release
+ correct sizeof(xvEncodingInfo) (closes: #657215)
* Bump debhelper compat level to 7, use dh_prep.
+ * Don't require fakeroot for d/rules clean.
-- Julien Cristau <jcristau@debian.org> Sun, 08 Sep 2013 16:41:34 +0200
diff --git a/debian/rules b/debian/rules
index e043381..ca5107e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,9 +46,8 @@ build-stamp:
clean:
dh_testdir
- dh_testroot
rm -f build-stamp
- rm -f config.cache config.log config.status
+ rm -f compile config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
commit 79c44d730a7b6250d87a1ae1847ffc90af46e2ef
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 8 16:55:41 2013 +0200
Bump debhelper compat level to 7, use dh_prep.
diff --git a/debian/changelog b/debian/changelog
index 34e43ed..fc4846c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ x11proto-video (2.3.2-1) UNRELEASED; urgency=low
* New upstream release
+ correct sizeof(xvEncodingInfo) (closes: #657215)
+ * Bump debhelper compat level to 7, use dh_prep.
-- Julien Cristau <jcristau@debian.org> Sun, 08 Sep 2013 16:41:34 +0200
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index ee97b55..c0fb321 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 7),
automake,
xutils-dev (>= 1:7.5~1),
pkg-config,
diff --git a/debian/rules b/debian/rules
index 38ee5b9..e043381 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,6 @@ clean:
dh_testdir
dh_testroot
rm -f build-stamp
-
rm -f config.cache config.log config.status
rm -f */config.cache */config.log */config.status
rm -f conftest* */conftest*
@@ -57,25 +56,22 @@ clean:
rm -f aclocal.m4 configure install-sh missing mkinstalldirs
rm -f config.guess config.sub
find -name Makefile.in -delete
-
dh_clean
install: build
dh_testdir
dh_testroot
- dh_clean -k
+ dh_prep
dh_installdirs
-
cd build && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
# Build architecture-independent files here.
binary-indep: build install
dh_testdir
dh_testroot
-
dh_installdocs
dh_installman
- dh_install --sourcedir=debian/tmp --fail-missing
+ dh_install --fail-missing
dh_installchangelogs
dh_link
dh_strip
commit 353744b64b0f846f857e1bd3457d5127b1a9aeb4
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Sep 8 16:44:52 2013 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index ebba71d..ccf461c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,91 @@
+commit 4d26102ace67377e88ba087e52ca894e0ffd2ebf
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jul 22 21:40:14 2013 -0700
+
+ videoproto 2.3.2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 665f990f72b0518d7ea604affd935c6a2297058a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Jul 22 21:36:29 2013 -0700
+
+ config: Add missing AC_CONFIG_SRCDIR
+
+ Regroup AC statements under the Autoconf initialization section.
+ Regroup AM statements under the Automake initialization section.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 77d5c8d90e81139391a57710095784cde0476b9c
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Jun 27 22:14:36 2013 -0700
+
+ Trim trailing whitespace
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1a96222d64cde75e20fd9bb7a717cf269c7e9a59
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Jun 23 00:34:52 2013 -0700
+
+ Xvproto.h: fix xvQueryEncodingsReply to match actual wire protocol
+
+ padl3 was declared as CARD32, which for proper alignment, got two
+ additional bytes of padding silently inserted before it. Declaring
+ it as CARD16 aligns it properly after the CARD16 num_encodings.
+
+ Fixes clang warning:
+ Xvproto.h:462:10: warning: padding struct 'struct _QueryEncodingsReply' with 2 bytes to align 'padl3' [-Wpadded]
+ CARD32 padl3 B32;
+ ^
+ This makes sizeof(xvQueryEncodingsReply) match the sz_xvQueryEncodingsReply
+ which is used in libXv & the X server for the size sent over the wire.
+
+ Reported-by: Daniel Martin <consume.noise@gmail.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit d97051236bba088688681f348086feb733cbdd08
+Author: Julien Cristau <jcristau@debian.org>
+Date: Sun Jun 9 19:00:29 2013 +0200
+
+ Xvproto: fix xvEncodingInfo to match actual wire protocol
+
+ The padding is *before* the rate field, so the rate is placed on a 32bit
+ boundary. This change adds explicit padding between height and rate,
+ and removes extraneous padding after the rate field, which the server
+ never sent and xlib never read.
+
+ This changes sizeof(xvEncodingInfo). Hopefully that's not a big deal as
+ clients only see the Xlib structure XvEncodingInfo.
+
+ Debian bug#657215
+
+ Reported-by: Kevin Ryde <user42@zip.com.au>
+ Signed-off-by: Julien Cristau <jcristau@debian.org>
+ Reviewed-by: Daniel Martin <consume.noise@gmail.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit e42cf822e230cff5c6550ca2c050dfa27d2c9611
+Author: Colin Walters <walters@verbum.org>
+Date: Wed Jan 4 17:37:06 2012 -0500
+
+ autogen.sh: Implement GNOME Build API
+
+ http://people.gnome.org/~walters/docs/build-api.txt
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+commit fa26f1cc56909b55bb7b2d31c56f66af48cad0af
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jan 15 14:01:10 2013 -0500
+
+ configure: Remove AM_MAINTAINER_MODE
+
+ Signed-off-by: Adam Jackson <ajax@redhat.com>
+
commit b994209d8559a0d0802487ed53585404b398a707
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 10 10:17:10 2010 -0400
diff --git a/debian/changelog b/debian/changelog
index 854dc1a..34e43ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+x11proto-video (2.3.2-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ + correct sizeof(xvEncodingInfo) (closes: #657215)
+
+ -- Julien Cristau <jcristau@debian.org> Sun, 08 Sep 2013 16:41:34 +0200
+
x11proto-video (2.3.1-2) unstable; urgency=low
* Mark x11proto-video-dev Multi-Arch: foreign.
commit 4d26102ace67377e88ba087e52ca894e0ffd2ebf
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 22 21:40:14 2013 -0700
videoproto 2.3.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index d4b5e65..cc0c203 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,8 @@ dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([VideoProto], [2.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([VideoProto], [2.3.2],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AC_CONFIG_SRCDIR([Makefile.am])
# Initialize Automake
commit 665f990f72b0518d7ea604affd935c6a2297058a
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Jul 22 21:36:29 2013 -0700
config: Add missing AC_CONFIG_SRCDIR
Regroup AC statements under the Autoconf initialization section.
Regroup AM statements under the Automake initialization section.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 617cf59..d4b5e65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,12 @@
+dnl
+dnl Process this file with autoconf to create configure.
+
+# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([VideoProto], [2.3.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_CONFIG_SRCDIR([Makefile.am])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
# Require xorg-macros: XORG_DEFAULT_OPTIONS
commit 77d5c8d90e81139391a57710095784cde0476b9c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Jun 27 22:14:36 2013 -0700
Trim trailing whitespace
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/COPYING b/COPYING
index cfa79e7..28dd80b 100644
--- a/COPYING
+++ b/COPYING
@@ -3,13 +3,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Digital or MIT not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
diff --git a/Xv.h b/Xv.h
index 985653c..ef3f786 100644
--- a/Xv.h
+++ b/Xv.h
@@ -4,13 +4,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Digital or MIT not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -25,11 +25,11 @@ SOFTWARE.
#ifndef XV_H
#define XV_H
/*
-** File:
+** File:
**
** Xv.h --- Xv shared library and server header file
**
-** Author:
+** Author:
**
** David Carver (Digital Workstation Engineering/Project Athena)
**
diff --git a/XvMC.h b/XvMC.h
index 2690be8..47cc6db 100644
--- a/XvMC.h
+++ b/XvMC.h
@@ -42,7 +42,7 @@
#define XVMC_PREDICTION_FIELD 0x01
#define XVMC_PREDICTION_FRAME 0x02
#define XVMC_PREDICTION_DUAL_PRIME 0x03
-#define XVMC_PREDICTION_16x8 0x02
+#define XVMC_PREDICTION_16x8 0x02
#define XVMC_PREDICTION_4MV 0x04
#define XVMC_SELECT_FIRST_FORWARD 0x01
@@ -68,11 +68,11 @@
typedef struct {
int surface_type_id;
int chroma_format;
- unsigned short max_width;
- unsigned short max_height;
+ unsigned short max_width;
+ unsigned short max_height;
unsigned short subpicture_max_width;
unsigned short subpicture_max_height;
- int mc_type;
+ int mc_type;
int flags;
} XvMCSurfaceInfo;
@@ -118,7 +118,7 @@ typedef struct {
unsigned short x;
unsigned short y;
unsigned char macroblock_type;
- unsigned char motion_type;
+ unsigned char motion_type;
unsigned char motion_vertical_field_select;
unsigned char dct_type;
short PMV[2][2][2];
diff --git a/XvMCproto.h b/XvMCproto.h
index 8e80f17..43ec688 100644
--- a/XvMCproto.h
+++ b/XvMCproto.h
@@ -89,7 +89,7 @@ typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD32 length B32;
CARD16 width_actual B16;
CARD16 height_actual B16;
CARD32 flags_return B32;
@@ -121,7 +121,7 @@ typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD32 length B32;
CARD32 padl2 B32;
CARD32 padl3 B32;
CARD32 padl4 B32;
@@ -156,7 +156,7 @@ typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
CARD16 sequenceNumber B16;
- CARD32 length B32;
+ CARD32 length B32;
CARD16 width_actual B16;
CARD16 height_actual B16;
CARD16 num_palette_entries B16;
@@ -213,8 +213,8 @@ typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 major B32;
+ CARD32 length B32;
+ CARD32 major B32;
CARD32 minor B32;
CARD32 patchLevel B32;
CARD32 nameLen B32;
diff --git a/Xvproto.h b/Xvproto.h
index f501566..94bd9cc 100644
--- a/Xvproto.h
+++ b/Xvproto.h
@@ -4,13 +4,13 @@ and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Digital or MIT not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
@@ -25,11 +25,11 @@ SOFTWARE.
#ifndef XVPROTO_H
#define XVPROTO_H
/*
-** File:
+** File:
**
** Xvproto.h --- Xv protocol header file
**
-** Author:
+** Author:
**
** David Carver (Digital Workstation Engineering/Project Athena)
**
@@ -125,7 +125,7 @@ typedef struct {
CARD16 pad6 B16;
CARD32 y_sample_bits B32;
CARD32 u_sample_bits B32;
- CARD32 v_sample_bits B32;
+ CARD32 v_sample_bits B32;
CARD32 horz_y_period B32;
CARD32 horz_u_period B32;
CARD32 horz_v_period B32;
@@ -516,7 +516,7 @@ typedef struct {
BYTE padb1;
CARD16 sequenceNumber B16;
CARD32 length B32; /* 0 */
- CARD32 num_attributes B32;
+ CARD32 num_attributes B32;
CARD32 text_size B32;
CARD32 padl5 B32;
CARD32 padl6 B32;
@@ -530,7 +530,7 @@ typedef struct {
BYTE padb1;
CARD16 sequenceNumber B16;
CARD32 length B32;
- CARD32 num_formats B32;
+ CARD32 num_formats B32;
CARD32 padl4 B32;
CARD32 padl5 B32;
CARD32 padl6 B32;
@@ -543,8 +543,8 @@ typedef struct {
BYTE type; /* X_Reply */
BYTE padb1;
CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 num_planes B32;
+ CARD32 length B32;
+ CARD32 num_planes B32;
CARD32 data_size B32;
CARD16 width B16;
CARD16 height B16;
diff --git a/videoproto.pc.in b/videoproto.pc.in
index 5840540..4aa7516 100644
--- a/videoproto.pc.in
+++ b/videoproto.pc.in
@@ -2,7 +2,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-
+
Name: VideoProto
Description: Video extension headers
Version: @PACKAGE_VERSION@
diff --git a/vldXvMC.h b/vldXvMC.h
index 5c66ceb..fbd251e 100644
--- a/vldXvMC.h
+++ b/vldXvMC.h
@@ -20,7 +20,7 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
- *
+ *
* Author: Thomas Hellström, 2004.
*/
@@ -31,7 +31,7 @@
#include <X11/Xlib.h>
#include <X11/extensions/XvMC.h>
-/*
+/*
* New "Motion compensation type".
*/
@@ -74,7 +74,7 @@
/*
* Which of two mappings between quantiser_scale_code
* and quantiser_scale shall apply.
- */
+ */
#define XVMC_Q_SCALE_TYPE 0x00000400
@@ -86,20 +86,20 @@
#define XVMC_INTRA_VLC_FORMAT 0x00000800
/*
- * Also XVMC_SECOND_FIELD should be set in flags if active.
- */
+ * Also XVMC_SECOND_FIELD should be set in flags if active.
+ */
#define XVMC_I_PICTURE 1
#define XVMC_P_PICTURE 2
#define XVMC_B_PICTURE 3
typedef struct _XvMCMpegControl{
- unsigned
+ unsigned
BVMV_range, /* Backward vertical motion vector range */
BHMV_range, /* Backward horizontal motion vector range */
FVMV_range, /* Forward vertical motion vector range */
FHMV_range, /* Forward horizontal motion vector range */
- picture_structure, /* XVMC_TOP_FIELD, XVMC_BOTTOM_FIELD,
+ picture_structure, /* XVMC_TOP_FIELD, XVMC_BOTTOM_FIELD,
* XVMC_FRAME_PICTURE
*/
intra_dc_precision, /* 0x00 - 0x03 corresponds to 8 to 11 bits prec. */
@@ -126,13 +126,13 @@ extern Status XvMCBeginSurface(Display *display,
/*
* The quantizer matrix structure. This should be filled in by the user and
- * uploaded whenever a change is needed. The lib initializes with
+ * uploaded whenever a change is needed. The lib initializes with
* default matrices and will automatically load the hardware with new matrices
* on decoder context switches. To load data, set the corresponding load flag
* to true and fill in the values. The VIA MPEG2 engine only uses the
- * intra_quantiser_matrix and the non_intra_quantiser_matrix.
+ * intra_quantiser_matrix and the non_intra_quantiser_matrix.
*/
-
+
typedef struct _XvMCQMatrix {
int load_intra_quantiser_matrix;
int load_non_intra_quantiser_matrix;
@@ -145,7 +145,7 @@ typedef struct _XvMCQMatrix {
} XvMCQMatrix;
/*
- * Upload a XvMCQMatrix structure to the clientlib.
+ * Upload a XvMCQMatrix structure to the clientlib.
* The hardware will start using it the next XvMCBeginSurface.
*/
@@ -154,21 +154,21 @@ extern Status XvMCLoadQMatrix(Display *display, XvMCContext *context,
/*
- * Put a slice to the decoder. The hardware will start processing it
+ * Put a slice to the decoder. The hardware will start processing it
* immediately.
*/
-extern Status XvMCPutSlice(Display *display,XvMCContext *context,
+extern Status XvMCPutSlice(Display *display,XvMCContext *context,
char *slice, int nBytes);
/*
- * Put a slice without the slice start code to the decoder.
- * The hardware will start processing it
- * immediately. This function is for client optimization.
+ * Put a slice without the slice start code to the decoder.
+ * The hardware will start processing it
+ * immediately. This function is for client optimization.
* XvMCPutSlice(display,context,slice,nBytes) is equivalent to
* XvMCPutSlice2(display,context,slice+4,nBytes-4,slice[3]);
*/
-extern Status XvMCPutSlice2(Display *display,XvMCContext *context,
+extern Status XvMCPutSlice2(Display *display,XvMCContext *context,
char *slice, int nBytes, int sliceCode);
#endif
diff --git a/xv-protocol-v2.txt b/xv-protocol-v2.txt
index 31e2013..d018184 100644
--- a/xv-protocol-v2.txt
+++ b/xv-protocol-v2.txt
@@ -41,8 +41,8 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
+ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ Copyright 1991 by Digital Equipment Corporation, Maynard, Massachusetts,
and the Massachusetts Institute of Technology, Cambridge, Massachusetts.
All Rights Reserved
@@ -55,24 +55,24 @@
advertising or publicity pertaining to distribution of the software
without specific, written prior permission.
- DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
+ ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
+ DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
+ ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
+ IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Preface
-------
-
+
The following is an outline for an X video extension protocol. It
is preliminary and subject to change. My goal in writing this was
to fix some the shortcomings of existing overly simplistic
extensions while avoiding pitfalls in an overly complex extension.
-
+
Your feedback is desired, and since the major design directions
have been stable for some time, feel free to hammer on the details
of the protocol.
@@ -95,10 +95,10 @@
with several groups, including
Project Athena's Visual Computing Group
- The MIT X Consortium
+ The MIT X Consortium
The MIT Media Lab's Interactive Cinema Group
-
-
+
+
Changes
-------
@@ -139,7 +139,7 @@
Introduction
------------
-
+
Video technology is moving very quickly. Standards for processing
high resolution video are currently a hot topic of discussion
internationally, and it will soon be possible to process video
@@ -147,47 +147,47 @@
does not attempt to address issues of digital video. Its purpose
is to provide a mechanism for support of current and near term
interactive video technology.
-
+
It is somewhat ironic that Xv contains nothing particularly
innovative. It takes a minimalistic approach, and without a doubt
it could have been defined years ago, and with several revisions.
So, the life expectancy of Xv is not long. Nevertheless, it may
undergo further revision and experimentation that will help our
progress towards digital video systems.
-
+
One premise of the Xv extension is that the X server is not alone.
A separate video server is often used to manage other aspects of
video processing, though the partition between what the X server
does and what a video server does is a matter of great debate.
-
+
Model
-----
-
+
This extension models video monitor capabilities in the X Window
System. Some advanced monitors support the simultaneous display
of multiple video signals (into separate windows), and that is
prepresented here through the ability to display video from
multiple video input adaptors into X drawables.
-
+
Some monitors support multiple video encodings (mostly for
internationalization purposes) either through switches or
automatic detection, thus each video adaptor specifies the set of
encodings it supports.
-
+
The requests to display video from an adaptor into a drawable are
modeled after the core PutImage request, though extended to
support scaling and source clipping.
-
+
Video output is also supported and is symmetric with the video
input function, though fewer GC components are used.
-
-
+
+
Mechanism
---------
-
+
The Xv extension does the following:
-
+
-- lists available video adaptors
-- identifies the number of ports each adaptor supports
-- describes what drawable formats each adaptor supports
@@ -197,35 +197,35 @@
-- grabs and ungrabs ports
-- sets and gets port attributes
-- delivers event notification
-
+
-
+
Adaptors
--------
-
+
A display may have multiple video input and output adaptors. An
adaptor may support multiple simultaneously active ports, and in
some cases the number of ports has no fixed limit.
-
+
An input port receives encoded video data and converts it to a
stream of data used to update a drawable. An output port samples
data from a drawable and produces a stream of encoded video data.
-
+
The ADAPTORINFO structure is used to describe a video adaptor.
-
+
ADAPTORINFO:
[base-id: PORT
num-ports: CARD16
type: SETofADAPTORTYPE
formats: LISTofFORMAT
name: STRING]
-
+
ADAPTORTYPE: {Input, Output}
FORMAT:
[depth: CARD8
visual: VISUALID]
-
+
The base-id field specifies the XID of the first port of the
adaptor. The `num-ports' field specifies how many ports the
adaptor supports. The ports of the adaptor have XIDs in the range
@@ -248,24 +248,24 @@
necessarily imply that simultaneous operation is supported.
-
+
Errors
------
-
+
Port
-
+
A Port error is returned if any request names a PORT that does not
exist.
-
+
Encoding
-
+
An Encoding error is returned if any request names an ENCODINGID
that does not exist.
-
+
Query Requests
-------------------
@@ -277,19 +277,19 @@
The QueryExtension request returns the extension version and
revision numbers.
-
+
QueryAdaptors
win: WINDOW
==>
adaptors: LISTofADAPTORINFO
-
+
The QueryAdaptors request returns the video adaptor information for
the screen of the specified window.
-
+
Errors: {Window}
- QueryEncodings
+ QueryEncodings
port: PORT
==>
encodings: LISTofENCODINGINFO
@@ -304,28 +304,28 @@
name: STRING
width, height: CARD16
rate: FRACTION]
-
+
The `encoding' field identifies an encoding supported by a port.
Its value is unique for a screen. Width and height specify the
size of the video image and rate specifies the rate at which
fields of image information are encoded.
-
+
An encoding is identified by a string that names the encoding.
Encoding naming conventions need to be established (i.e.,
something along the lines of font naming, but simpler)
-
+
FRACTION
[numerator, denominator: INT32]
-
+
The FRACTION structure is used to specify a fractional number.
Errors: {Port}
-
+
Put Video Requests
------------------
-
+
PutVideo
port: PORT
drawable: DRAWABLE
@@ -334,12 +334,12 @@
vid-w, vid-h: CARD16
drw-x, drw-y: INT16
Reply to: