9838b7032e
This is strictly the application of the script 'x-indent-all.sh' from util/modular. Compared to the patch that Daniel posted in January, I've added a few indent flags: -bap -psl -T PrivatePtr -T pmWait -T _XFUNCPROTOBEGIN -T _XFUNCPROTOEND -T _X_EXPORT The typedefs were needed to make the output of sdksyms.sh match the previous output, otherwise, the code is formatted badly enough that sdksyms.sh generates incorrect output. The generated code was compared with the previous version and found to be essentially identical -- "assert" line numbers and BUILD_TIME were the only differences found. The comparison was done with this script: dir1=$1 dir2=$2 for dir in $dir1 $dir2; do (cd $dir && find . -name '*.o' | while read file; do dir=`dirname $file` base=`basename $file .o` dump=$dir/$base.dump objdump -d $file > $dump done) done find $dir1 -name '*.dump' | while read dump; do otherdump=`echo $dump | sed "s;$dir1;$dir2;"` diff -u $dump $otherdump done Signed-off-by: Keith Packard <keithp@keithp.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
101 lines
2.9 KiB
C
101 lines
2.9 KiB
C
|
|
#ifndef _XVMC_H
|
|
#define _XVMC_H
|
|
#include <X11/extensions/Xv.h>
|
|
#include "xvdix.h"
|
|
|
|
typedef struct {
|
|
int num_xvimages;
|
|
int *xvimage_ids;
|
|
} XvMCImageIDList;
|
|
|
|
typedef struct {
|
|
int surface_type_id;
|
|
int chroma_format;
|
|
int color_description;
|
|
unsigned short max_width;
|
|
unsigned short max_height;
|
|
unsigned short subpicture_max_width;
|
|
unsigned short subpicture_max_height;
|
|
int mc_type;
|
|
int flags;
|
|
XvMCImageIDList *compatible_subpictures;
|
|
} XvMCSurfaceInfoRec, *XvMCSurfaceInfoPtr;
|
|
|
|
typedef struct {
|
|
XID context_id;
|
|
ScreenPtr pScreen;
|
|
int adapt_num;
|
|
int surface_type_id;
|
|
unsigned short width;
|
|
unsigned short height;
|
|
CARD32 flags;
|
|
int refcnt;
|
|
pointer port_priv;
|
|
pointer driver_priv;
|
|
} XvMCContextRec, *XvMCContextPtr;
|
|
|
|
typedef struct {
|
|
XID surface_id;
|
|
int surface_type_id;
|
|
XvMCContextPtr context;
|
|
pointer driver_priv;
|
|
} XvMCSurfaceRec, *XvMCSurfacePtr;
|
|
|
|
typedef struct {
|
|
XID subpicture_id;
|
|
int xvimage_id;
|
|
unsigned short width;
|
|
unsigned short height;
|
|
int num_palette_entries;
|
|
int entry_bytes;
|
|
char component_order[4];
|
|
XvMCContextPtr context;
|
|
pointer driver_priv;
|
|
} XvMCSubpictureRec, *XvMCSubpicturePtr;
|
|
|
|
typedef int (*XvMCCreateContextProcPtr) (XvPortPtr port,
|
|
XvMCContextPtr context,
|
|
int *num_priv, CARD32 **priv);
|
|
|
|
typedef void (*XvMCDestroyContextProcPtr) (XvMCContextPtr context);
|
|
|
|
typedef int (*XvMCCreateSurfaceProcPtr) (XvMCSurfacePtr surface,
|
|
int *num_priv, CARD32 **priv);
|
|
|
|
typedef void (*XvMCDestroySurfaceProcPtr) (XvMCSurfacePtr surface);
|
|
|
|
typedef int (*XvMCCreateSubpictureProcPtr) (XvMCSubpicturePtr subpicture,
|
|
int *num_priv, CARD32 **priv);
|
|
|
|
typedef void (*XvMCDestroySubpictureProcPtr) (XvMCSubpicturePtr subpicture);
|
|
|
|
typedef struct {
|
|
XvAdaptorPtr xv_adaptor;
|
|
int num_surfaces;
|
|
XvMCSurfaceInfoPtr *surfaces;
|
|
int num_subpictures;
|
|
XvImagePtr *subpictures;
|
|
XvMCCreateContextProcPtr CreateContext;
|
|
XvMCDestroyContextProcPtr DestroyContext;
|
|
XvMCCreateSurfaceProcPtr CreateSurface;
|
|
XvMCDestroySurfaceProcPtr DestroySurface;
|
|
XvMCCreateSubpictureProcPtr CreateSubpicture;
|
|
XvMCDestroySubpictureProcPtr DestroySubpicture;
|
|
} XvMCAdaptorRec, *XvMCAdaptorPtr;
|
|
|
|
#ifndef XorgLoader
|
|
extern _X_EXPORT void XvMCExtensionInit(void);
|
|
|
|
extern _X_EXPORT int XvMCScreenInit(ScreenPtr pScreen,
|
|
int num, XvMCAdaptorPtr adapt);
|
|
|
|
extern _X_EXPORT XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id);
|
|
|
|
extern _X_EXPORT int xf86XvMCRegisterDRInfo(ScreenPtr pScreen, char *name,
|
|
char *busID, int major, int minor,
|
|
int patchLevel);
|
|
#endif
|
|
|
|
#endif /* _XVMC_H */
|