From 4977b0d9df37bec130931f039be4ac434a6ba0be Mon Sep 17 00:00:00 2001 From: "Xiang, Haihao" Date: Tue, 13 Oct 2015 13:45:39 +0800 Subject: Fix YUY2/UYVY info Signed-off-by: Xiang, Haihao --- src/i965_drv_video.c | 4 ++-- src/i965_fourcc.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c index cb950e1b..f16fb572 100644 --- a/src/i965_drv_video.c +++ b/src/i965_drv_video.c @@ -144,8 +144,8 @@ static int get_sampling_from_fourcc(unsigned int fourcc); #define I_422H 2, 1, 3, {I965_8BITS, I965_4BITS, I965_4BITS}, 3, { {PLANE_0, OFFSET_0}, {PLANE_1, OFFSET_0}, {PLANE_2, OFFSET_0} } #define I_422V 1, 2, 3, {I965_8BITS, I965_4BITS, I965_4BITS}, 3, { {PLANE_0, OFFSET_0}, {PLANE_1, OFFSET_0}, {PLANE_2, OFFSET_0} } #define I_YV16 2, 1, 3, {I965_8BITS, I965_4BITS, I965_4BITS}, 3, { {PLANE_0, OFFSET_0}, {PLANE_2, OFFSET_0}, {PLANE_1, OFFSET_0} } -#define I_YUY2 2, 1, 1, {I965_32BITS}, 3, { {PLANE_0, OFFSET_0}, {PLANE_0, OFFSET_8}, {PLANE_0, OFFSET_24} } -#define I_UYVY 2, 1, 1, {I965_32BITS}, 3, { {PLANE_0, OFFSET_0}, {PLANE_0, OFFSET_8}, {PLANE_0, OFFSET_16} } +#define I_YUY2 2, 1, 1, {I965_16BITS}, 3, { {PLANE_0, OFFSET_0}, {PLANE_0, OFFSET_8}, {PLANE_0, OFFSET_24} } +#define I_UYVY 2, 1, 1, {I965_16BITS}, 3, { {PLANE_0, OFFSET_8}, {PLANE_0, OFFSET_0}, {PLANE_0, OFFSET_16} } #define I_444P 1, 1, 3, {I965_8BITS, I965_8BITS, I965_8BITS}, 3, { {PLANE_0, OFFSET_0}, {PLANE_1, OFFSET_0}, {PLANE_2, OFFSET_0} } diff --git a/src/i965_fourcc.h b/src/i965_fourcc.h index 3a9f1206..55daf507 100644 --- a/src/i965_fourcc.h +++ b/src/i965_fourcc.h @@ -42,7 +42,7 @@ typedef struct { uint8_t plane; /* the plane which the pixel belongs to */ - uint8_t offset; /* bits offset within a pixel in the plane */ + uint8_t offset; /* bits offset within a macro-pixel for packed YUV formats or pixel for other formats in the plane */ } i965_component_info; typedef struct { -- cgit v1.2.1