Skip to content

L
linux
Commit 6166045e authored by Dave Stevenson's avatar Dave Stevenson Committed by Greg Kroah-Hartman
Browse files
Options

staging: bcm2835-camera: Fix indentation of tables 

As requested by Mauro Carvalho Chehab in review.
Signed-off-by: default avatarDave Stevenson <dave.stevenson@raspberrypi.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a9e14815
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 150 deletions
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
View file @ 6166045e
...@@ -79,145 +79,132 @@ static const struct v4l2_fract ...@@ -79,145 +79,132 @@ static const struct v4l2_fract
/* video formats */ /* video formats */
static struct mmal_fmt formats[] = { static struct mmal_fmt formats[] = {
{ {
.name = "4:2:0, planar, YUV", .name = "4:2:0, planar, YUV",
.fourcc = V4L2_PIX_FMT_YUV420, .fourcc = V4L2_PIX_FMT_YUV420,
.flags = 0, .flags = 0,
.mmal = MMAL_ENCODING_I420, .mmal = MMAL_ENCODING_I420,
.depth = 12, .depth = 12,
.mmal_component = MMAL_COMPONENT_CAMERA, .mmal_component = MMAL_COMPONENT_CAMERA,
.ybbp = 1, .ybbp = 1,
.remove_padding = 1, .remove_padding = 1,
}, }, {
{ .name = "4:2:2, packed, YUYV",
.name = "4:2:2, packed, YUYV", .fourcc = V4L2_PIX_FMT_YUYV,
.fourcc = V4L2_PIX_FMT_YUYV, .flags = 0,
.flags = 0, .mmal = MMAL_ENCODING_YUYV,
.mmal = MMAL_ENCODING_YUYV, .depth = 16,
.depth = 16, .mmal_component = MMAL_COMPONENT_CAMERA,
.mmal_component = MMAL_COMPONENT_CAMERA, .ybbp = 2,
.ybbp = 2, .remove_padding = 0,
.remove_padding = 0, }, {
}, .name = "RGB24 (LE)",
{ .fourcc = V4L2_PIX_FMT_RGB24,
.name = "RGB24 (LE)", .flags = 0,
.fourcc = V4L2_PIX_FMT_RGB24, .mmal = MMAL_ENCODING_RGB24,
.flags = 0, .depth = 24,
.mmal = MMAL_ENCODING_RGB24, .mmal_component = MMAL_COMPONENT_CAMERA,
.depth = 24, .ybbp = 3,
.mmal_component = MMAL_COMPONENT_CAMERA, .remove_padding = 0,
.ybbp = 3, }, {
.remove_padding = 0, .name = "JPEG",
}, .fourcc = V4L2_PIX_FMT_JPEG,
{ .flags = V4L2_FMT_FLAG_COMPRESSED,
.name = "JPEG", .mmal = MMAL_ENCODING_JPEG,
.fourcc = V4L2_PIX_FMT_JPEG, .depth = 8,
.flags = V4L2_FMT_FLAG_COMPRESSED, .mmal_component = MMAL_COMPONENT_IMAGE_ENCODE,
.mmal = MMAL_ENCODING_JPEG, .ybbp = 0,
.depth = 8, .remove_padding = 0,
.mmal_component = MMAL_COMPONENT_IMAGE_ENCODE, }, {
.ybbp = 0, .name = "H264",
.remove_padding = 0, .fourcc = V4L2_PIX_FMT_H264,
}, .flags = V4L2_FMT_FLAG_COMPRESSED,
{ .mmal = MMAL_ENCODING_H264,
.name = "H264", .depth = 8,
.fourcc = V4L2_PIX_FMT_H264, .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE,
.flags = V4L2_FMT_FLAG_COMPRESSED, .ybbp = 0,
.mmal = MMAL_ENCODING_H264, .remove_padding = 0,
.depth = 8, }, {
.mmal_component = MMAL_COMPONENT_VIDEO_ENCODE, .name = "MJPEG",
.ybbp = 0, .fourcc = V4L2_PIX_FMT_MJPEG,
.remove_padding = 0, .flags = V4L2_FMT_FLAG_COMPRESSED,
}, .mmal = MMAL_ENCODING_MJPEG,
{ .depth = 8,
.name = "MJPEG", .mmal_component = MMAL_COMPONENT_VIDEO_ENCODE,
.fourcc = V4L2_PIX_FMT_MJPEG, .ybbp = 0,
.flags = V4L2_FMT_FLAG_COMPRESSED, .remove_padding = 0,
.mmal = MMAL_ENCODING_MJPEG, }, {
.depth = 8, .name = "4:2:2, packed, YVYU",
.mmal_component = MMAL_COMPONENT_VIDEO_ENCODE, .fourcc = V4L2_PIX_FMT_YVYU,
.ybbp = 0, .flags = 0,
.remove_padding = 0, .mmal = MMAL_ENCODING_YVYU,
}, .depth = 16,
{ .mmal_component = MMAL_COMPONENT_CAMERA,
.name = "4:2:2, packed, YVYU", .ybbp = 2,
.fourcc = V4L2_PIX_FMT_YVYU, .remove_padding = 0,
.flags = 0, }, {
.mmal = MMAL_ENCODING_YVYU, .name = "4:2:2, packed, VYUY",
.depth = 16, .fourcc = V4L2_PIX_FMT_VYUY,
.mmal_component = MMAL_COMPONENT_CAMERA, .flags = 0,
.ybbp = 2, .mmal = MMAL_ENCODING_VYUY,
.remove_padding = 0, .depth = 16,
}, .mmal_component = MMAL_COMPONENT_CAMERA,
{ .ybbp = 2,
.name = "4:2:2, packed, VYUY", .remove_padding = 0,
.fourcc = V4L2_PIX_FMT_VYUY, }, {
.flags = 0, .name = "4:2:2, packed, UYVY",
.mmal = MMAL_ENCODING_VYUY, .fourcc = V4L2_PIX_FMT_UYVY,
.depth = 16, .flags = 0,
.mmal_component = MMAL_COMPONENT_CAMERA, .mmal = MMAL_ENCODING_UYVY,
.ybbp = 2, .depth = 16,
.remove_padding = 0, .mmal_component = MMAL_COMPONENT_CAMERA,
}, .ybbp = 2,
{ .remove_padding = 0,
.name = "4:2:2, packed, UYVY", }, {
.fourcc = V4L2_PIX_FMT_UYVY, .name = "4:2:0, planar, NV12",
.flags = 0, .fourcc = V4L2_PIX_FMT_NV12,
.mmal = MMAL_ENCODING_UYVY, .flags = 0,
.depth = 16, .mmal = MMAL_ENCODING_NV12,
.mmal_component = MMAL_COMPONENT_CAMERA, .depth = 12,
.ybbp = 2, .mmal_component = MMAL_COMPONENT_CAMERA,
.remove_padding = 0, .ybbp = 1,
}, .remove_padding = 1,
{ }, {
.name = "4:2:0, planar, NV12", .name = "RGB24 (BE)",
.fourcc = V4L2_PIX_FMT_NV12, .fourcc = V4L2_PIX_FMT_BGR24,
.flags = 0, .flags = 0,
.mmal = MMAL_ENCODING_NV12, .mmal = MMAL_ENCODING_BGR24,
.depth = 12, .depth = 24,
.mmal_component = MMAL_COMPONENT_CAMERA, .mmal_component = MMAL_COMPONENT_CAMERA,
.ybbp = 1, .ybbp = 3,
.remove_padding = 1, .remove_padding = 0,
}, }, {
{ .name = "4:2:0, planar, YVU",
.name = "RGB24 (BE)", .fourcc = V4L2_PIX_FMT_YVU420,
.fourcc = V4L2_PIX_FMT_BGR24, .flags = 0,
.flags = 0, .mmal = MMAL_ENCODING_YV12,
.mmal = MMAL_ENCODING_BGR24, .depth = 12,
.depth = 24, .mmal_component = MMAL_COMPONENT_CAMERA,
.mmal_component = MMAL_COMPONENT_CAMERA, .ybbp = 1,
.ybbp = 3, .remove_padding = 1,
.remove_padding = 0, }, {
}, .name = "4:2:0, planar, NV21",
{ .fourcc = V4L2_PIX_FMT_NV21,
.name = "4:2:0, planar, YVU", .flags = 0,
.fourcc = V4L2_PIX_FMT_YVU420, .mmal = MMAL_ENCODING_NV21,
.flags = 0, .depth = 12,
.mmal = MMAL_ENCODING_YV12, .mmal_component = MMAL_COMPONENT_CAMERA,
.depth = 12, .ybbp = 1,
.mmal_component = MMAL_COMPONENT_CAMERA, .remove_padding = 1,
.ybbp = 1, }, {
.remove_padding = 1, .name = "RGB32 (BE)",
}, .fourcc = V4L2_PIX_FMT_BGR32,
{ .flags = 0,
.name = "4:2:0, planar, NV21", .mmal = MMAL_ENCODING_BGRA,
.fourcc = V4L2_PIX_FMT_NV21, .depth = 32,
.flags = 0, .mmal_component = MMAL_COMPONENT_CAMERA,
.mmal = MMAL_ENCODING_NV21, .ybbp = 4,
.depth = 12, .remove_padding = 0,
.mmal_component = MMAL_COMPONENT_CAMERA, },
.ybbp = 1,
.remove_padding = 1,
},
{
.name = "RGB32 (BE)",
.fourcc = V4L2_PIX_FMT_BGR32,
.flags = 0,
.mmal = MMAL_ENCODING_BGRA,
.depth = 32,
.mmal_component = MMAL_COMPONENT_CAMERA,
.ybbp = 4,
.remove_padding = 0,
},
}; };
static struct mmal_fmt *get_format(struct v4l2_format *f) static struct mmal_fmt *get_format(struct v4l2_format *f)
...@@ -676,17 +663,19 @@ static int set_overlay_params(struct bm2835_mmal_dev *dev, ...@@ -676,17 +663,19 @@ static int set_overlay_params(struct bm2835_mmal_dev *dev,
struct vchiq_mmal_port *port) struct vchiq_mmal_port *port)
{ {
struct mmal_parameter_displayregion prev_config = { struct mmal_parameter_displayregion prev_config = {
.set = MMAL_DISPLAY_SET_LAYER | MMAL_DISPLAY_SET_ALPHA | .set = MMAL_DISPLAY_SET_LAYER |
MMAL_DISPLAY_SET_DEST_RECT | MMAL_DISPLAY_SET_FULLSCREEN, MMAL_DISPLAY_SET_ALPHA |
.layer = PREVIEW_LAYER, MMAL_DISPLAY_SET_DEST_RECT |
.alpha = dev->overlay.global_alpha, MMAL_DISPLAY_SET_FULLSCREEN,
.fullscreen = 0, .layer = PREVIEW_LAYER,
.dest_rect = { .alpha = dev->overlay.global_alpha,
.x = dev->overlay.w.left, .fullscreen = 0,
.y = dev->overlay.w.top, .dest_rect = {
.width = dev->overlay.w.width, .x = dev->overlay.w.left,
.height = dev->overlay.w.height, .y = dev->overlay.w.top,
}, .width = dev->overlay.w.width,
.height = dev->overlay.w.height,
},
}; };
return vchiq_mmal_port_parameter_set(dev->instance, port, return vchiq_mmal_port_parameter_set(dev->instance, port,
MMAL_PARAMETER_DISPLAYREGION, MMAL_PARAMETER_DISPLAYREGION,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7