diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/via_video.c | 8 | ||||
| -rw-r--r-- | src/via_xvmc.c | 7 |
3 files changed, 16 insertions, 6 deletions
@@ -1,3 +1,10 @@ +2006-04-07 Aaron Plattner <aplattner@nvidia.com> + + * src/via_video.c: (viaReputImage), (viaPutImage): + * src/via_xvmc.c: (viaXvMCInterceptPutImage): + Add a DrawablePtr argument to the XV functions to pave the way for + redirected video. + 2006-04-07 Adam Jackson <ajax@freedesktop.org> * configure.ac: diff --git a/src/via_video.c b/src/via_video.c index 2fde828..5e9568a 100644 --- a/src/via_video.c +++ b/src/via_video.c @@ -113,7 +113,7 @@ static int viaGetPortAttribute(ScrnInfoPtr, Atom, INT32 *, pointer); static int viaSetPortAttribute(ScrnInfoPtr, Atom, INT32, pointer); static int viaPutImage(ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char *, short, short, Bool, - RegionPtr, pointer); + RegionPtr, pointer, DrawablePtr); static void nv12Blit(unsigned char *nv12Chroma, const unsigned char *uBuffer, const unsigned char *vBuffer, @@ -634,7 +634,8 @@ RegionsEqual(RegionPtr A, RegionPtr B) static int viaReputImage(ScrnInfoPtr pScrn, - short drw_x, short drw_y, RegionPtr clipBoxes, pointer data) + short drw_x, short drw_y, RegionPtr clipBoxes, pointer data, + DrawablePtr pDraw) { DDUPDATEOVERLAY UpdateOverlay_Video; @@ -1137,7 +1138,8 @@ viaPutImage(ScrnInfoPtr pScrn, short src_w, short src_h, short drw_w, short drw_h, int id, unsigned char *buf, - short width, short height, Bool sync, RegionPtr clipBoxes, pointer data) + short width, short height, Bool sync, RegionPtr clipBoxes, pointer data, + DrawablePtr pDraw) { VIAPtr pVia = VIAPTR(pScrn); viaPortPrivPtr pPriv = (viaPortPrivPtr) data; diff --git a/src/via_xvmc.c b/src/via_xvmc.c index a09b848..3ae58e8 100644 --- a/src/via_xvmc.c +++ b/src/via_xvmc.c @@ -121,7 +121,7 @@ static int viaXvMCInterceptXvAttribute(ScrnInfoPtr pScrn, Atom attribute, INT32 value, pointer data); static int viaXvMCInterceptPutImage(ScrnInfoPtr, short, short, short, short, short, short, short, short, int, unsigned char *, short, short, Bool, - RegionPtr, pointer); + RegionPtr, pointer, DrawablePtr); static int viaXvMCInterceptXvGetAttribute(ScrnInfoPtr pScrn, Atom attribute, INT32 * value, pointer data); /* @@ -939,7 +939,8 @@ viaXvMCInterceptPutImage(ScrnInfoPtr pScrn, short src_x, short src_y, short drw_x, short drw_y, short src_w, short src_h, short drw_w, short drw_h, int id, unsigned char *buf, short width, - short height, Bool sync, RegionPtr clipBoxes, pointer data) + short height, Bool sync, RegionPtr clipBoxes, pointer data, + DrawablePtr pDraw) { viaPortPrivPtr pPriv = (viaPortPrivPtr) data; ViaXvMCXVPriv *vx = (ViaXvMCXVPriv *) pPriv->xvmc_priv; @@ -996,7 +997,7 @@ viaXvMCInterceptPutImage(ScrnInfoPtr pScrn, short src_x, short src_y, } } return vx->PutImage(pScrn, src_x, src_y, drw_x, drw_y, src_w, src_h, - drw_w, drw_h, id, buf, width, height, sync, clipBoxes, data); + drw_w, drw_h, id, buf, width, height, sync, clipBoxes, data, pDraw); } unsigned long |