summaryrefslogtreecommitdiff
path: root/include/X11
diff options
context:
space:
mode:
Diffstat (limited to 'include/X11')
-rw-r--r--include/X11/extensions/XvMClib.h305
-rw-r--r--include/X11/extensions/vldXvMC.h50
2 files changed, 155 insertions, 200 deletions
diff --git a/include/X11/extensions/XvMClib.h b/include/X11/extensions/XvMClib.h
index b0e6c8b..fc59b44 100644
--- a/include/X11/extensions/XvMClib.h
+++ b/include/X11/extensions/XvMClib.h
@@ -6,209 +6,168 @@
#include <X11/extensions/XvMC.h>
_XFUNCPROTOBEGIN
-
-Bool XvMCQueryExtension (Display *display, int *eventBase, int *errBase);
-Status XvMCQueryVersion (Display *display, int *major_versionp,
- int *minor_versionp);
+Bool XvMCQueryExtension(Display *display, int *eventBase, int *errBase);
+Status XvMCQueryVersion(Display *display, int *major_versionp,
+ int *minor_versionp);
Status XvMCGetDRInfo(Display *dpy, XvPortID port,
- char **name, char **busID,
- int *major, int *minor,
- int *patchLevel,
- int *isLocal);
-
+ char **name, char **busID,
+ int *major, int *minor,
+ int *patchLevel,
+ int *isLocal);
-XvMCSurfaceInfo * XvMCListSurfaceTypes(Display *dpy, XvPortID port, int *num);
+XvMCSurfaceInfo *XvMCListSurfaceTypes(Display *dpy, XvPortID port, int *num);
-Status XvMCCreateContext (
- Display *display,
- XvPortID port,
- int surface_type_id,
- int width,
- int height,
- int flags,
- XvMCContext * context
-);
+Status XvMCCreateContext(Display *display,
+ XvPortID port,
+ int surface_type_id,
+ int width,
+ int height,
+ int flags,
+ XvMCContext *context);
-Status XvMCDestroyContext (Display *display, XvMCContext * context);
+Status XvMCDestroyContext(Display *display, XvMCContext *context);
Status
-XvMCCreateSurface(
- Display *display,
- XvMCContext * context,
- XvMCSurface * surface
-);
+XvMCCreateSurface(Display *display,
+ XvMCContext *context,
+ XvMCSurface *surface);
Status XvMCDestroySurface(Display *display, XvMCSurface *surface);
-XvImageFormatValues * XvMCListSubpictureTypes (
- Display * display,
- XvPortID port,
- int surface_type_id,
- int *count_return
-);
+XvImageFormatValues *XvMCListSubpictureTypes(Display *display,
+ XvPortID port,
+ int surface_type_id,
+ int *count_return);
Status
-XvMCPutSurface(
- Display *display,
- XvMCSurface *surface,
- Drawable draw,
- short srcx,
- short srcy,
- unsigned short srcw,
- unsigned short srch,
- short destx,
- short desty,
- unsigned short destw,
- unsigned short desth,
- int flags
-);
+XvMCPutSurface(Display *display,
+ XvMCSurface *surface,
+ Drawable draw,
+ short srcx,
+ short srcy,
+ unsigned short srcw,
+ unsigned short srch,
+ short destx,
+ short desty,
+ unsigned short destw,
+ unsigned short desth,
+ int flags);
Status XvMCHideSurface(Display *display, XvMCSurface *surface);
Status
-XvMCCreateSubpicture (
- Display *display,
- XvMCContext *context,
- XvMCSubpicture *subpicture,
- unsigned short width,
- unsigned short height,
- int xvimage_id
-);
-
-
-Status
-XvMCClearSubpicture (
- Display *display,
- XvMCSubpicture *subpicture,
- short x,
- short y,
- unsigned short width,
- unsigned short height,
- unsigned int color
-);
+XvMCCreateSubpicture(Display *display,
+ XvMCContext *context,
+ XvMCSubpicture *subpicture,
+ unsigned short width,
+ unsigned short height,
+ int xvimage_id);
Status
-XvMCCompositeSubpicture (
- Display *display,
- XvMCSubpicture *subpicture,
- XvImage *image,
- short srcx,
- short srcy,
- unsigned short width,
- unsigned short height,
- short dstx,
- short dsty
-);
+XvMCClearSubpicture(Display *display,
+ XvMCSubpicture *subpicture,
+ short x,
+ short y,
+ unsigned short width,
+ unsigned short height,
+ unsigned int color);
Status
-XvMCDestroySubpicture (Display *display, XvMCSubpicture *subpicture);
+XvMCCompositeSubpicture(Display *display,
+ XvMCSubpicture *subpicture,
+ XvImage *image,
+ short srcx,
+ short srcy,
+ unsigned short width,
+ unsigned short height,
+ short dstx,
+ short dsty);
+
+Status XvMCDestroySubpicture(Display *display, XvMCSubpicture *subpicture);
Status
-XvMCSetSubpicturePalette (
- Display *display,
- XvMCSubpicture *subpicture,
- unsigned char *palette
-);
+XvMCSetSubpicturePalette(Display *display,
+ XvMCSubpicture *subpicture,
+ unsigned char *palette);
Status
-XvMCBlendSubpicture (
- Display *display,
- XvMCSurface *target_surface,
- XvMCSubpicture *subpicture,
- short subx,
- short suby,
- unsigned short subw,
- unsigned short subh,
- short surfx,
- short surfy,
- unsigned short surfw,
- unsigned short surfh
-);
+XvMCBlendSubpicture(Display *display,
+ XvMCSurface *target_surface,
+ XvMCSubpicture *subpicture,
+ short subx,
+ short suby,
+ unsigned short subw,
+ unsigned short subh,
+ short surfx,
+ short surfy,
+ unsigned short surfw,
+ unsigned short surfh);
Status
-XvMCBlendSubpicture2 (
- Display *display,
- XvMCSurface *source_surface,
- XvMCSurface *target_surface,
- XvMCSubpicture *subpicture,
- short subx,
- short suby,
- unsigned short subw,
- unsigned short subh,
- short surfx,
- short surfy,
- unsigned short surfw,
- unsigned short surfh
-);
-
-Status XvMCSyncSurface (Display *display, XvMCSurface *surface);
-Status XvMCFlushSurface (Display *display, XvMCSurface *surface);
-Status XvMCGetSurfaceStatus (Display *display, XvMCSurface *surface, int *stat);
-
-Status XvMCRenderSurface (
- Display *display,
- XvMCContext *context,
- unsigned int picture_structure,
- XvMCSurface *target_surface,
- XvMCSurface *past_surface,
- XvMCSurface *future_surface,
- unsigned int flags,
- unsigned int num_macroblocks,
- unsigned int first_macroblock,
- XvMCMacroBlockArray *macroblock_array,
- XvMCBlockArray *blocks
-);
-
-
-Status XvMCSyncSubpicture (Display *display, XvMCSubpicture *subpicture);
-Status XvMCFlushSubpicture (Display *display, XvMCSubpicture *subpicture);
+XvMCBlendSubpicture2(Display *display,
+ XvMCSurface *source_surface,
+ XvMCSurface *target_surface,
+ XvMCSubpicture *subpicture,
+ short subx,
+ short suby,
+ unsigned short subw,
+ unsigned short subh,
+ short surfx,
+ short surfy,
+ unsigned short surfw,
+ unsigned short surfh);
+
+Status XvMCSyncSurface(Display *display, XvMCSurface *surface);
+Status XvMCFlushSurface(Display *display, XvMCSurface *surface);
+Status XvMCGetSurfaceStatus(Display *display, XvMCSurface *surface, int *stat);
+
+Status XvMCRenderSurface(Display *display,
+ XvMCContext *context,
+ unsigned int picture_structure,
+ XvMCSurface *target_surface,
+ XvMCSurface *past_surface,
+ XvMCSurface *future_surface,
+ unsigned int flags,
+ unsigned int num_macroblocks,
+ unsigned int first_macroblock,
+ XvMCMacroBlockArray *macroblock_array,
+ XvMCBlockArray *blocks);
+
+Status XvMCSyncSubpicture(Display *display, XvMCSubpicture *subpicture);
+Status XvMCFlushSubpicture(Display *display, XvMCSubpicture *subpicture);
Status
-XvMCGetSubpictureStatus (Display *display, XvMCSubpicture *subpic, int *stat);
-
-Status XvMCCreateBlocks (
- Display *display,
- XvMCContext *context,
- unsigned int num_blocks,
- XvMCBlockArray *block
-);
-
-Status XvMCDestroyBlocks (Display *display,XvMCBlockArray *block);
-
-Status XvMCCreateMacroBlocks (
- Display *display,
- XvMCContext *context,
- unsigned int num_blocks,
- XvMCMacroBlockArray *blocks
-);
-
-Status XvMCDestroyMacroBlocks (
- Display *display,
- XvMCMacroBlockArray *block
-);
-
-XvAttribute *
-XvMCQueryAttributes (
- Display *display,
- XvMCContext *context,
- int *number
-);
+XvMCGetSubpictureStatus(Display *display, XvMCSubpicture *subpic, int *stat);
+
+Status XvMCCreateBlocks(Display *display,
+ XvMCContext *context,
+ unsigned int num_blocks,
+ XvMCBlockArray *block);
+
+Status XvMCDestroyBlocks(Display *display, XvMCBlockArray *block);
+
+Status XvMCCreateMacroBlocks(Display *display,
+ XvMCContext *context,
+ unsigned int num_blocks,
+ XvMCMacroBlockArray *blocks);
+
+Status XvMCDestroyMacroBlocks(Display *display,
+ XvMCMacroBlockArray *block);
+
+XvAttribute *XvMCQueryAttributes(Display *display,
+ XvMCContext *context,
+ int *number);
Status
-XvMCSetAttribute (
- Display *display,
- XvMCContext *context,
- Atom attribute,
- int value
-);
+XvMCSetAttribute(Display *display,
+ XvMCContext *context,
+ Atom attribute,
+ int value);
Status
-XvMCGetAttribute (
- Display *display,
- XvMCContext *context,
- Atom attribute,
- int *value
-);
+XvMCGetAttribute(Display *display,
+ XvMCContext *context,
+ Atom attribute,
+ int *value);
_XFUNCPROTOEND
-
#endif
diff --git a/include/X11/extensions/vldXvMC.h b/include/X11/extensions/vldXvMC.h
index fbd251e..53fb58f 100644
--- a/include/X11/extensions/vldXvMC.h
+++ b/include/X11/extensions/vldXvMC.h
@@ -24,7 +24,6 @@
* Author: Thomas Hellström, 2004.
*/
-
#ifndef _VLDXVMC_H
#define _VLDXVMC_H
@@ -93,21 +92,20 @@
#define XVMC_P_PICTURE 2
#define XVMC_B_PICTURE 3
-typedef struct _XvMCMpegControl{
+typedef struct _XvMCMpegControl {
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,
- * XVMC_FRAME_PICTURE
- */
- intra_dc_precision, /* 0x00 - 0x03 corresponds to 8 to 11 bits prec. */
- picture_coding_type,/* XVMC_X_PICTURE */
- mpeg_coding, /* XVMC_MPEG_2 */
- flags; /* See above */
-}XvMCMpegControl;
-
+ 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,
+ * XVMC_FRAME_PICTURE
+ */
+ intra_dc_precision, /* 0x00 - 0x03 corresponds to 8 to 11 bits prec. */
+ picture_coding_type, /* XVMC_X_PICTURE */
+ mpeg_coding, /* XVMC_MPEG_2 */
+ flags; /* See above */
+} XvMCMpegControl;
/*
* The following function is called BEFORE starting sending slices to the
@@ -117,12 +115,11 @@ typedef struct _XvMCMpegControl{
*/
extern Status XvMCBeginSurface(Display *display,
- XvMCContext *context,
- XvMCSurface *target_surface,
- XvMCSurface *past_surface,
- XvMCSurface *future_surface,
- const XvMCMpegControl *control);
-
+ XvMCContext *context,
+ XvMCSurface *target_surface,
+ XvMCSurface *past_surface,
+ XvMCSurface *future_surface,
+ const XvMCMpegControl *control);
/*
* The quantizer matrix structure. This should be filled in by the user and
@@ -150,16 +147,15 @@ typedef struct _XvMCQMatrix {
*/
extern Status XvMCLoadQMatrix(Display *display, XvMCContext *context,
- const XvMCQMatrix *qmx);
-
+ const XvMCQMatrix *qmx);
/*
* Put a slice to the decoder. The hardware will start processing it
* immediately.
*/
-extern Status XvMCPutSlice(Display *display,XvMCContext *context,
- char *slice, int nBytes);
+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
@@ -168,7 +164,7 @@ extern Status XvMCPutSlice(Display *display,XvMCContext *context,
* XvMCPutSlice2(display,context,slice+4,nBytes-4,slice[3]);
*/
-extern Status XvMCPutSlice2(Display *display,XvMCContext *context,
- char *slice, int nBytes, int sliceCode);
+extern Status XvMCPutSlice2(Display *display, XvMCContext *context,
+ char *slice, int nBytes, int sliceCode);
#endif