Consolidate fourcc.h
Move the copy in hw/xfree86/common to include/, and remove the one in hw/kdrive/src/. Fixes DIX glamor code including an xfree86 DDX header.
This commit is contained in:
parent
62d8c1cc69
commit
add3df2001
|
@ -41,7 +41,7 @@
|
||||||
#include "glamor_transfer.h"
|
#include "glamor_transfer.h"
|
||||||
|
|
||||||
#include <X11/extensions/Xv.h>
|
#include <X11/extensions/Xv.h>
|
||||||
#include "../hw/xfree86/common/fourcc.h"
|
#include <fourcc.h>
|
||||||
/* Reference color space transform data */
|
/* Reference color space transform data */
|
||||||
typedef struct tagREF_TRANSFORM {
|
typedef struct tagREF_TRANSFORM {
|
||||||
float RefLuma;
|
float RefLuma;
|
||||||
|
|
|
@ -13,7 +13,6 @@ KDRIVE_XV_SOURCES = \
|
||||||
endif
|
endif
|
||||||
|
|
||||||
libkdrive_la_SOURCES = \
|
libkdrive_la_SOURCES = \
|
||||||
fourcc.h \
|
|
||||||
kcmap.c \
|
kcmap.c \
|
||||||
kdrive.c \
|
kdrive.c \
|
||||||
kdrive.h \
|
kdrive.h \
|
||||||
|
|
|
@ -1,132 +0,0 @@
|
||||||
|
|
||||||
/*
|
|
||||||
This header file contains listings of STANDARD guids for video formats.
|
|
||||||
Please do not place non-registered, or incomplete entries in this file.
|
|
||||||
A list of some popular fourcc's are at: http://www.webartz.com/fourcc/
|
|
||||||
For an explanation of fourcc <-> guid mappings see RFC2361.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _XF86_FOURCC_H_
|
|
||||||
#define _XF86_FOURCC_H_ 1
|
|
||||||
|
|
||||||
#define FOURCC_YUY2 0x32595559
|
|
||||||
#define XVIMAGE_YUY2 \
|
|
||||||
{ \
|
|
||||||
FOURCC_YUY2, \
|
|
||||||
XvYUV, \
|
|
||||||
LSBFirst, \
|
|
||||||
{'Y','U','Y','2', \
|
|
||||||
0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
|
|
||||||
16, \
|
|
||||||
XvPacked, \
|
|
||||||
1, \
|
|
||||||
0, 0, 0, 0, \
|
|
||||||
8, 8, 8, \
|
|
||||||
1, 2, 2, \
|
|
||||||
1, 1, 1, \
|
|
||||||
{'Y','U','Y','V', \
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
|
|
||||||
XvTopToBottom \
|
|
||||||
}
|
|
||||||
|
|
||||||
#define FOURCC_YV12 0x32315659
|
|
||||||
#define XVIMAGE_YV12 \
|
|
||||||
{ \
|
|
||||||
FOURCC_YV12, \
|
|
||||||
XvYUV, \
|
|
||||||
LSBFirst, \
|
|
||||||
{'Y','V','1','2', \
|
|
||||||
0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
|
|
||||||
12, \
|
|
||||||
XvPlanar, \
|
|
||||||
3, \
|
|
||||||
0, 0, 0, 0, \
|
|
||||||
8, 8, 8, \
|
|
||||||
1, 2, 2, \
|
|
||||||
1, 2, 2, \
|
|
||||||
{'Y','V','U', \
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
|
|
||||||
XvTopToBottom \
|
|
||||||
}
|
|
||||||
|
|
||||||
#define FOURCC_I420 0x30323449
|
|
||||||
#define XVIMAGE_I420 \
|
|
||||||
{ \
|
|
||||||
FOURCC_I420, \
|
|
||||||
XvYUV, \
|
|
||||||
LSBFirst, \
|
|
||||||
{'I','4','2','0', \
|
|
||||||
0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
|
|
||||||
12, \
|
|
||||||
XvPlanar, \
|
|
||||||
3, \
|
|
||||||
0, 0, 0, 0, \
|
|
||||||
8, 8, 8, \
|
|
||||||
1, 2, 2, \
|
|
||||||
1, 2, 2, \
|
|
||||||
{'Y','U','V', \
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
|
|
||||||
XvTopToBottom \
|
|
||||||
}
|
|
||||||
|
|
||||||
#define FOURCC_UYVY 0x59565955
|
|
||||||
#define XVIMAGE_UYVY \
|
|
||||||
{ \
|
|
||||||
FOURCC_UYVY, \
|
|
||||||
XvYUV, \
|
|
||||||
LSBFirst, \
|
|
||||||
{'U','Y','V','Y', \
|
|
||||||
0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
|
|
||||||
16, \
|
|
||||||
XvPacked, \
|
|
||||||
1, \
|
|
||||||
0, 0, 0, 0, \
|
|
||||||
8, 8, 8, \
|
|
||||||
1, 2, 2, \
|
|
||||||
1, 1, 1, \
|
|
||||||
{'U','Y','V','Y', \
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
|
|
||||||
XvTopToBottom \
|
|
||||||
}
|
|
||||||
|
|
||||||
#define FOURCC_IA44 0x34344149
|
|
||||||
#define XVIMAGE_IA44 \
|
|
||||||
{ \
|
|
||||||
FOURCC_IA44, \
|
|
||||||
XvYUV, \
|
|
||||||
LSBFirst, \
|
|
||||||
{'I','A','4','4', \
|
|
||||||
0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
|
|
||||||
8, \
|
|
||||||
XvPacked, \
|
|
||||||
1, \
|
|
||||||
0, 0, 0, 0, \
|
|
||||||
8, 8, 8, \
|
|
||||||
1, 1, 1, \
|
|
||||||
1, 1, 1, \
|
|
||||||
{'A','I', \
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
|
|
||||||
XvTopToBottom \
|
|
||||||
}
|
|
||||||
|
|
||||||
#define FOURCC_AI44 0x34344941
|
|
||||||
#define XVIMAGE_AI44 \
|
|
||||||
{ \
|
|
||||||
FOURCC_AI44, \
|
|
||||||
XvYUV, \
|
|
||||||
LSBFirst, \
|
|
||||||
{'A','I','4','4', \
|
|
||||||
0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
|
|
||||||
8, \
|
|
||||||
XvPacked, \
|
|
||||||
1, \
|
|
||||||
0, 0, 0, 0, \
|
|
||||||
8, 8, 8, \
|
|
||||||
1, 1, 1, \
|
|
||||||
1, 1, 1, \
|
|
||||||
{'I','A', \
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}, \
|
|
||||||
XvTopToBottom \
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* _XF86_FOURCC_H_ */
|
|
|
@ -55,7 +55,7 @@ AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
|
||||||
-I$(srcdir)/../modes -I$(srcdir)/../ramdac -I$(srcdir)/../dri2 \
|
-I$(srcdir)/../modes -I$(srcdir)/../ramdac -I$(srcdir)/../dri2 \
|
||||||
-I$(top_builddir)
|
-I$(top_builddir)
|
||||||
|
|
||||||
sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
|
sdk_HEADERS = compiler.h xf86.h xf86Module.h xf86Opt.h \
|
||||||
xf86PciInfo.h xf86Priv.h xf86Privstr.h \
|
xf86PciInfo.h xf86Priv.h xf86Privstr.h \
|
||||||
xf86cmap.h xf86fbman.h xf86str.h xf86Xinput.h xisb.h \
|
xf86cmap.h xf86fbman.h xf86str.h xf86Xinput.h xisb.h \
|
||||||
$(XVSDKINCS) $(XF86VMODE_SDK) $(DGA_SDK) xorgVersion.h \
|
$(XVSDKINCS) $(XF86VMODE_SDK) $(DGA_SDK) xorgVersion.h \
|
||||||
|
@ -67,7 +67,6 @@ CLEANFILES = $(BUILT_SOURCES)
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
compiler.h \
|
compiler.h \
|
||||||
fourcc.h \
|
|
||||||
xf86.h \
|
xf86.h \
|
||||||
xf86Bus.h \
|
xf86Bus.h \
|
||||||
xf86Config.h \
|
xf86Config.h \
|
||||||
|
|
|
@ -26,7 +26,6 @@ srcs_xorg_common = [
|
||||||
|
|
||||||
xorg_sdk_headers = [
|
xorg_sdk_headers = [
|
||||||
'compiler.h',
|
'compiler.h',
|
||||||
'fourcc.h',
|
|
||||||
'xf86.h',
|
'xf86.h',
|
||||||
'xf86Module.h',
|
'xf86Module.h',
|
||||||
'xf86Opt.h',
|
'xf86Opt.h',
|
||||||
|
|
|
@ -123,7 +123,6 @@ cat > sdksyms.c << EOF
|
||||||
|
|
||||||
/* hw/xfree86/common/Makefile.am */
|
/* hw/xfree86/common/Makefile.am */
|
||||||
#include "compiler.h"
|
#include "compiler.h"
|
||||||
#include "fourcc.h"
|
|
||||||
#include "xf86.h"
|
#include "xf86.h"
|
||||||
#include "xf86Module.h"
|
#include "xf86Module.h"
|
||||||
#include "xf86Opt.h"
|
#include "xf86Opt.h"
|
||||||
|
@ -251,6 +250,7 @@ cat > sdksyms.c << EOF
|
||||||
#include "exevents.h"
|
#include "exevents.h"
|
||||||
#include "extension.h"
|
#include "extension.h"
|
||||||
#include "extnsionst.h"
|
#include "extnsionst.h"
|
||||||
|
#include "fourcc.h"
|
||||||
#include "gc.h"
|
#include "gc.h"
|
||||||
#include "gcstruct.h"
|
#include "gcstruct.h"
|
||||||
#include "globals.h"
|
#include "globals.h"
|
||||||
|
|
|
@ -23,6 +23,7 @@ sdk_HEADERS = \
|
||||||
extension.h \
|
extension.h \
|
||||||
extinit.h \
|
extinit.h \
|
||||||
extnsionst.h \
|
extnsionst.h \
|
||||||
|
fourcc.h \
|
||||||
gc.h \
|
gc.h \
|
||||||
gcstruct.h \
|
gcstruct.h \
|
||||||
globals.h \
|
globals.h \
|
||||||
|
|
|
@ -445,6 +445,7 @@ if build_xorg
|
||||||
'extension.h',
|
'extension.h',
|
||||||
'extinit.h',
|
'extinit.h',
|
||||||
'extnsionst.h',
|
'extnsionst.h',
|
||||||
|
'fourcc.h',
|
||||||
'gc.h',
|
'gc.h',
|
||||||
'gcstruct.h',
|
'gcstruct.h',
|
||||||
'globals.h',
|
'globals.h',
|
||||||
|
|
Loading…
Reference in New Issue