diff options
| author | Gwenole Beauchesne <gbeauchesne@splitted-desktop.com> | 2010-07-13 01:02:19 +0200 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2010-07-13 15:29:20 +0800 |
| commit | a02d3c7fa508a8ef4e08399170bba96dd0bf8b6e (patch) | |
| tree | 77331b75269628c219a92c315ab2af68a91b2253 | |
| parent | 558b07976c56ad73f3d6fb87aa925016edf4fa2b (diff) | |
| download | libva-a02d3c7fa508a8ef4e08399170bba96dd0bf8b6e.tar.gz | |
Fix vaGetImage() for YV12 format.
| -rw-r--r-- | i965_drv_video/i965_drv_video.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/i965_drv_video/i965_drv_video.c b/i965_drv_video/i965_drv_video.c index 87978a8..104c105 100644 --- a/i965_drv_video/i965_drv_video.c +++ b/i965_drv_video/i965_drv_video.c @@ -1489,6 +1489,9 @@ get_image_i420(struct object_image *obj_image, uint8_t *image_data, const VARectangle *rect) { uint8_t *dst[3], *src[3]; + const int Y = 0; + const int U = obj_image->image.format.fourcc == VA_FOURCC_YV12 ? 2 : 1; + const int V = obj_image->image.format.fourcc == VA_FOURCC_YV12 ? 1 : 2; if (!obj_surface->bo) return; @@ -1500,31 +1503,31 @@ get_image_i420(struct object_image *obj_image, uint8_t *image_data, /* Dest VA image has either I420 or YV12 format. Source VA surface alway has I420 format */ - dst[0] = image_data + obj_image->image.offsets[0]; + dst[Y] = image_data + obj_image->image.offsets[Y]; src[0] = (uint8_t *)obj_surface->bo->virtual; - dst[1] = image_data + obj_image->image.offsets[1]; + dst[U] = image_data + obj_image->image.offsets[U]; src[1] = src[0] + obj_surface->width * obj_surface->height; - dst[2] = image_data + obj_image->image.offsets[2]; + dst[V] = image_data + obj_image->image.offsets[V]; src[2] = src[1] + (obj_surface->width / 2) * (obj_surface->height / 2); /* Y plane */ - dst[0] += rect->y * obj_image->image.pitches[0] + rect->x; + dst[Y] += rect->y * obj_image->image.pitches[Y] + rect->x; src[0] += rect->y * obj_surface->width + rect->x; - memcpy_pic(dst[0], obj_image->image.pitches[0], + memcpy_pic(dst[Y], obj_image->image.pitches[Y], src[0], obj_surface->width, rect->width, rect->height); /* U plane */ - dst[1] += (rect->y / 2) * obj_image->image.pitches[1] + rect->x / 2; + dst[U] += (rect->y / 2) * obj_image->image.pitches[U] + rect->x / 2; src[1] += (rect->y / 2) * obj_surface->width / 2 + rect->x / 2; - memcpy_pic(dst[1], obj_image->image.pitches[1], + memcpy_pic(dst[U], obj_image->image.pitches[U], src[1], obj_surface->width / 2, rect->width / 2, rect->height / 2); /* V plane */ - dst[2] += (rect->y / 2) * obj_image->image.pitches[2] + rect->x / 2; + dst[V] += (rect->y / 2) * obj_image->image.pitches[V] + rect->x / 2; src[2] += (rect->y / 2) * obj_surface->width / 2 + rect->x / 2; - memcpy_pic(dst[2], obj_image->image.pitches[2], + memcpy_pic(dst[V], obj_image->image.pitches[V], src[2], obj_surface->width / 2, rect->width / 2, rect->height / 2); |