diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2014-11-17 07:10:33 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@osg.samsung.com> | 2014-12-01 12:34:55 -0500 |
commit | 11ff030c73655ecd7b153c6bd00d26d27e6cc199 (patch) | |
tree | 93043fe01401bf417a7c17d343e912034d7b4607 | |
parent | d5735d64e1cebb3748e64f926fa7c35ffabd7afa (diff) |
[media] v4l2-mediabus: improve colorspace support
Add and copy the new ycbcr_enc and quantization fields.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r-- | include/media/v4l2-mediabus.h | 4 | ||||
-rw-r--r-- | include/uapi/linux/v4l2-mediabus.h | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h index 59d7397fb0ea..38d960d8dccd 100644 --- a/include/media/v4l2-mediabus.h +++ b/include/media/v4l2-mediabus.h | |||
@@ -94,6 +94,8 @@ static inline void v4l2_fill_pix_format(struct v4l2_pix_format *pix_fmt, | |||
94 | pix_fmt->height = mbus_fmt->height; | 94 | pix_fmt->height = mbus_fmt->height; |
95 | pix_fmt->field = mbus_fmt->field; | 95 | pix_fmt->field = mbus_fmt->field; |
96 | pix_fmt->colorspace = mbus_fmt->colorspace; | 96 | pix_fmt->colorspace = mbus_fmt->colorspace; |
97 | pix_fmt->ycbcr_enc = mbus_fmt->ycbcr_enc; | ||
98 | pix_fmt->quantization = mbus_fmt->quantization; | ||
97 | } | 99 | } |
98 | 100 | ||
99 | static inline void v4l2_fill_mbus_format(struct v4l2_mbus_framefmt *mbus_fmt, | 101 | static inline void v4l2_fill_mbus_format(struct v4l2_mbus_framefmt *mbus_fmt, |
@@ -104,6 +106,8 @@ static inline void v4l2_fill_mbus_format(struct v4l2_mbus_framefmt *mbus_fmt, | |||
104 | mbus_fmt->height = pix_fmt->height; | 106 | mbus_fmt->height = pix_fmt->height; |
105 | mbus_fmt->field = pix_fmt->field; | 107 | mbus_fmt->field = pix_fmt->field; |
106 | mbus_fmt->colorspace = pix_fmt->colorspace; | 108 | mbus_fmt->colorspace = pix_fmt->colorspace; |
109 | mbus_fmt->ycbcr_enc = pix_fmt->ycbcr_enc; | ||
110 | mbus_fmt->quantization = pix_fmt->quantization; | ||
107 | mbus_fmt->code = code; | 111 | mbus_fmt->code = code; |
108 | } | 112 | } |
109 | 113 | ||
diff --git a/include/uapi/linux/v4l2-mediabus.h b/include/uapi/linux/v4l2-mediabus.h index b1934a3961e4..5a86d8ede09c 100644 --- a/include/uapi/linux/v4l2-mediabus.h +++ b/include/uapi/linux/v4l2-mediabus.h | |||
@@ -22,6 +22,8 @@ | |||
22 | * @code: data format code (from enum v4l2_mbus_pixelcode) | 22 | * @code: data format code (from enum v4l2_mbus_pixelcode) |
23 | * @field: used interlacing type (from enum v4l2_field) | 23 | * @field: used interlacing type (from enum v4l2_field) |
24 | * @colorspace: colorspace of the data (from enum v4l2_colorspace) | 24 | * @colorspace: colorspace of the data (from enum v4l2_colorspace) |
25 | * @ycbcr_enc: YCbCr encoding of the data (from enum v4l2_ycbcr_encoding) | ||
26 | * @quantization: quantization of the data (from enum v4l2_quantization) | ||
25 | */ | 27 | */ |
26 | struct v4l2_mbus_framefmt { | 28 | struct v4l2_mbus_framefmt { |
27 | __u32 width; | 29 | __u32 width; |
@@ -29,7 +31,9 @@ struct v4l2_mbus_framefmt { | |||
29 | __u32 code; | 31 | __u32 code; |
30 | __u32 field; | 32 | __u32 field; |
31 | __u32 colorspace; | 33 | __u32 colorspace; |
32 | __u32 reserved[7]; | 34 | __u32 ycbcr_enc; |
35 | __u32 quantization; | ||
36 | __u32 reserved[5]; | ||
33 | }; | 37 | }; |
34 | 38 | ||
35 | #ifndef __KERNEL__ | 39 | #ifndef __KERNEL__ |