diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-01-25 21:33:36 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2012-01-25 21:33:36 +0000 |
| commit | 46e73e726a6a3567a4bb19b06c59826b9c6767d1 (patch) | |
| tree | 8df52bebcc8ecbe55a8f8be1afae536b5fb46319 /driver/xf86-video-ati/src/radeon_video.h | |
| parent | ee1cf1e0a2b9e0f7070a4d1efa6b426373e8ba67 (diff) | |
Update to xf86-video-ati 6.14.3. Tested by many.
Diffstat (limited to 'driver/xf86-video-ati/src/radeon_video.h')
| -rw-r--r-- | driver/xf86-video-ati/src/radeon_video.h | 36 |
1 files changed, 29 insertions, 7 deletions
diff --git a/driver/xf86-video-ati/src/radeon_video.h b/driver/xf86-video-ati/src/radeon_video.h index 449800254..684cb9e7e 100644 --- a/driver/xf86-video-ati/src/radeon_video.h +++ b/driver/xf86-video-ati/src/radeon_video.h @@ -15,6 +15,8 @@ #include "bicubic_table.h" +#include <xf86xvmc.h> + #define ClipValue(v,min,max) ((v) < (min) ? (min) : (v) > (max) ? (max) : (v)) /* Xvideo port struct */ @@ -90,14 +92,10 @@ typedef struct { void *video_memory; int video_offset; - Bool planar_hw; - Bool planar_state; int planeu_offset; int planev_offset; /* bicubic filtering */ - void *bicubic_memory; - int bicubic_offset; Bool bicubic_enabled; uint32_t bicubic_src_offset; int bicubic_state; @@ -120,12 +118,32 @@ typedef struct { int src_w, src_h, dst_w, dst_h; int w, h; int drw_x, drw_y; + int src_x, src_y; int vsync; + Bool is_planar; + int vtx_count; + int hw_align; + + struct radeon_bo *src_bo[2]; } RADEONPortPrivRec, *RADEONPortPrivPtr; -xf86CrtcPtr -radeon_xv_pick_best_crtc(ScrnInfoPtr pScrn, - int x1, int x2, int y1, int y2); +/* Reference color space transform data */ +typedef struct tagREF_TRANSFORM +{ + float RefLuma; + float RefRCb; + float RefRCr; + float RefGCb; + float RefGCr; + float RefBCb; + float RefBCr; +} REF_TRANSFORM; + +#define RTFSaturation(a) (1.0 + ((a)*1.0)/1000.0) +#define RTFBrightness(a) (((a)*1.0)/2000.0) +#define RTFIntensity(a) (((a)*1.0)/2000.0) +#define RTFContrast(a) (1.0 + ((a)*1.0)/1000.0) +#define RTFHue(a) (((a)*3.1416)/1000.0) void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv); void RADEONResetI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv); @@ -135,6 +153,7 @@ void RADEONVIP_reset(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv); int RADEONSetPortAttribute(ScrnInfoPtr, Atom, INT32, pointer); int RADEONGetPortAttribute(ScrnInfoPtr, Atom ,INT32 *, pointer); +void RADEONFreeVideoMemory(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv); void RADEONStopVideo(ScrnInfoPtr, pointer, Bool); void RADEONQueryBestSize(ScrnInfoPtr, Bool, short, short, short, short, unsigned int *, unsigned int *, pointer); @@ -144,6 +163,9 @@ int RADEONQueryImageAttributes(ScrnInfoPtr, int, unsigned short *, XF86VideoAdaptorPtr RADEONSetupImageTexturedVideo(ScreenPtr pScreen); +XF86MCAdaptorPtr +RADEONCreateAdaptorXvMC(ScreenPtr pScreen, char *xv_adaptor_name); + void RADEONCopyData(ScrnInfoPtr pScrn, unsigned char *src, unsigned char *dst, |