49f77fff14
Save in a few special cases, _X_EXPORT should not be used in C source files. Instead, it should be used in headers, and the proper C source include that header. Some special cases are symbols that need to be shared between modules, but not expected to be used by external drivers, and symbols that are accessible via LoaderSymbol/dlopen. This patch also adds conditionally some new sdk header files, depending on extensions enabled. These files were added to match pattern for other extensions/modules, that is, have the headers "deciding" symbol visibility in the sdk. These headers are: o Xext/panoramiXsrv.h, Xext/panoramiX.h o fbpict.h (unconditionally) o vidmodeproc.h o mioverlay.h (unconditionally, used only by xaa) o xfixes.h (unconditionally, symbols required by dri2) LoaderSymbol and similar functions now don't have different prototypes, in loaderProcs.h and xf86Module.h, so that both headers can be included, without the need of defining IN_LOADER. xf86NewInputDevice() device prototype readded to xf86Xinput.h, but not exported (and with a comment about it).
118 lines
2.6 KiB
C
118 lines
2.6 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;
|
|
|
|
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 /* _XVMC_H */
|