aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/sh_vou.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <lyakh@axis700.grange>2010-07-22 15:52:51 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-08-02 15:43:36 -0400
commitace6e9799f585994c92ac3c0696bc336e50077e6 (patch)
treeb271f7c965f66d8180109ca223b129a868829001 /drivers/media/video/sh_vou.c
parent0f9313ad068af4156109661fb8e94ee7fcb79001 (diff)
V4L/DVB: mediabus: fix ambiguous pixel code names
Endianness notation is meaningless for 8 bit YUYV codes. Switch pixel code names to explicitly state the order of colour components in the data stream. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/sh_vou.c')
-rw-r--r--drivers/media/video/sh_vou.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/sh_vou.c b/drivers/media/video/sh_vou.c
index 5f73a017961..3869d515feb 100644
--- a/drivers/media/video/sh_vou.c
+++ b/drivers/media/video/sh_vou.c
@@ -678,7 +678,7 @@ static int sh_vou_s_fmt_vid_out(struct file *file, void *priv,
678 struct sh_vou_geometry geo; 678 struct sh_vou_geometry geo;
679 struct v4l2_mbus_framefmt mbfmt = { 679 struct v4l2_mbus_framefmt mbfmt = {
680 /* Revisit: is this the correct code? */ 680 /* Revisit: is this the correct code? */
681 .code = V4L2_MBUS_FMT_YUYV8_2X8_LE, 681 .code = V4L2_MBUS_FMT_YUYV8_2X8,
682 .field = V4L2_FIELD_INTERLACED, 682 .field = V4L2_FIELD_INTERLACED,
683 .colorspace = V4L2_COLORSPACE_SMPTE170M, 683 .colorspace = V4L2_COLORSPACE_SMPTE170M,
684 }; 684 };
@@ -726,7 +726,7 @@ static int sh_vou_s_fmt_vid_out(struct file *file, void *priv,
726 /* Sanity checks */ 726 /* Sanity checks */
727 if ((unsigned)mbfmt.width > VOU_MAX_IMAGE_WIDTH || 727 if ((unsigned)mbfmt.width > VOU_MAX_IMAGE_WIDTH ||
728 (unsigned)mbfmt.height > VOU_MAX_IMAGE_HEIGHT || 728 (unsigned)mbfmt.height > VOU_MAX_IMAGE_HEIGHT ||
729 mbfmt.code != V4L2_MBUS_FMT_YUYV8_2X8_LE) 729 mbfmt.code != V4L2_MBUS_FMT_YUYV8_2X8)
730 return -EIO; 730 return -EIO;
731 731
732 if (mbfmt.width != geo.output.width || 732 if (mbfmt.width != geo.output.width ||
@@ -937,7 +937,7 @@ static int sh_vou_s_crop(struct file *file, void *fh, struct v4l2_crop *a)
937 struct sh_vou_geometry geo; 937 struct sh_vou_geometry geo;
938 struct v4l2_mbus_framefmt mbfmt = { 938 struct v4l2_mbus_framefmt mbfmt = {
939 /* Revisit: is this the correct code? */ 939 /* Revisit: is this the correct code? */
940 .code = V4L2_MBUS_FMT_YUYV8_2X8_LE, 940 .code = V4L2_MBUS_FMT_YUYV8_2X8,
941 .field = V4L2_FIELD_INTERLACED, 941 .field = V4L2_FIELD_INTERLACED,
942 .colorspace = V4L2_COLORSPACE_SMPTE170M, 942 .colorspace = V4L2_COLORSPACE_SMPTE170M,
943 }; 943 };
@@ -982,7 +982,7 @@ static int sh_vou_s_crop(struct file *file, void *fh, struct v4l2_crop *a)
982 /* Sanity checks */ 982 /* Sanity checks */
983 if ((unsigned)mbfmt.width > VOU_MAX_IMAGE_WIDTH || 983 if ((unsigned)mbfmt.width > VOU_MAX_IMAGE_WIDTH ||
984 (unsigned)mbfmt.height > VOU_MAX_IMAGE_HEIGHT || 984 (unsigned)mbfmt.height > VOU_MAX_IMAGE_HEIGHT ||
985 mbfmt.code != V4L2_MBUS_FMT_YUYV8_2X8_LE) 985 mbfmt.code != V4L2_MBUS_FMT_YUYV8_2X8)
986 return -EIO; 986 return -EIO;
987 987
988 geo.output.width = mbfmt.width; 988 geo.output.width = mbfmt.width;