Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c

+139 −150
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ static struct mmal_fmt formats[] = { 
		.mmal_component = MMAL_COMPONENT_CAMERA,

		.ybbp = 1,

		.remove_padding = 1,

	 },

	{

	}, {

		.name = "4:2:2, packed, YUYV",

		.fourcc = V4L2_PIX_FMT_YUYV,

		.flags = 0,
@@ -97,8 +96,7 @@ static struct mmal_fmt formats[] = { 
		.mmal_component = MMAL_COMPONENT_CAMERA,

		.ybbp = 2,

		.remove_padding = 0,

	 },

	{

	}, {

		.name = "RGB24 (LE)",

		.fourcc = V4L2_PIX_FMT_RGB24,

		.flags = 0,
@@ -107,8 +105,7 @@ static struct mmal_fmt formats[] = { 
		.mmal_component = MMAL_COMPONENT_CAMERA,

		.ybbp = 3,

		.remove_padding = 0,

	 },

	{

	}, {

		.name = "JPEG",

		.fourcc = V4L2_PIX_FMT_JPEG,

		.flags = V4L2_FMT_FLAG_COMPRESSED,
@@ -117,8 +114,7 @@ static struct mmal_fmt formats[] = { 
		.mmal_component = MMAL_COMPONENT_IMAGE_ENCODE,

		.ybbp = 0,

		.remove_padding = 0,

	 },

	{

	}, {

		.name = "H264",

		.fourcc = V4L2_PIX_FMT_H264,

		.flags = V4L2_FMT_FLAG_COMPRESSED,
@@ -127,8 +123,7 @@ static struct mmal_fmt formats[] = { 
		.mmal_component = MMAL_COMPONENT_VIDEO_ENCODE,

		.ybbp = 0,

		.remove_padding = 0,

	 },

	{

	}, {

		.name = "MJPEG",

		.fourcc = V4L2_PIX_FMT_MJPEG,

		.flags = V4L2_FMT_FLAG_COMPRESSED,
@@ -137,8 +132,7 @@ static struct mmal_fmt formats[] = { 
		.mmal_component = MMAL_COMPONENT_VIDEO_ENCODE,

		.ybbp = 0,

		.remove_padding = 0,

	 },

	{

	}, {

		.name = "4:2:2, packed, YVYU",

		.fourcc = V4L2_PIX_FMT_YVYU,

		.flags = 0,
@@ -147,8 +141,7 @@ static struct mmal_fmt formats[] = { 
		.mmal_component = MMAL_COMPONENT_CAMERA,

		.ybbp = 2,

		.remove_padding = 0,

	 },

	{

	}, {

		.name = "4:2:2, packed, VYUY",

		.fourcc = V4L2_PIX_FMT_VYUY,

		.flags = 0,
@@ -157,8 +150,7 @@ static struct mmal_fmt formats[] = { 
		.mmal_component = MMAL_COMPONENT_CAMERA,

		.ybbp = 2,

		.remove_padding = 0,

	 },

	{

	}, {

		.name = "4:2:2, packed, UYVY",

		.fourcc = V4L2_PIX_FMT_UYVY,

		.flags = 0,
@@ -167,8 +159,7 @@ static struct mmal_fmt formats[] = { 
		.mmal_component = MMAL_COMPONENT_CAMERA,

		.ybbp = 2,

		.remove_padding = 0,

	 },

	{

	}, {

		.name = "4:2:0, planar, NV12",

		.fourcc = V4L2_PIX_FMT_NV12,

		.flags = 0,
@@ -177,8 +168,7 @@ static struct mmal_fmt formats[] = { 
		.mmal_component = MMAL_COMPONENT_CAMERA,

		.ybbp = 1,

		.remove_padding = 1,

	 },

	{

	}, {

		.name = "RGB24 (BE)",

		.fourcc = V4L2_PIX_FMT_BGR24,

		.flags = 0,
@@ -187,8 +177,7 @@ static struct mmal_fmt formats[] = { 
		.mmal_component = MMAL_COMPONENT_CAMERA,

		.ybbp = 3,

		.remove_padding = 0,

	 },

	{

	}, {

		.name = "4:2:0, planar, YVU",

		.fourcc = V4L2_PIX_FMT_YVU420,

		.flags = 0,
@@ -197,8 +186,7 @@ static struct mmal_fmt formats[] = { 
		.mmal_component = MMAL_COMPONENT_CAMERA,

		.ybbp = 1,

		.remove_padding = 1,

	 },

	{

	}, {

		.name = "4:2:0, planar, NV21",

		.fourcc = V4L2_PIX_FMT_NV21,

		.flags = 0,
@@ -207,8 +195,7 @@ static struct mmal_fmt formats[] = { 
		.mmal_component = MMAL_COMPONENT_CAMERA,

		.ybbp = 1,

		.remove_padding = 1,

	 },

	{

	}, {

		.name = "RGB32 (BE)",

		.fourcc = V4L2_PIX_FMT_BGR32,

		.flags = 0,
@@ -676,8 +663,10 @@ static int set_overlay_params(struct bm2835_mmal_dev *dev, 
			      struct vchiq_mmal_port *port)

{

	struct mmal_parameter_displayregion prev_config = {

	.set = MMAL_DISPLAY_SET_LAYER | MMAL_DISPLAY_SET_ALPHA |

	    MMAL_DISPLAY_SET_DEST_RECT | MMAL_DISPLAY_SET_FULLSCREEN,

		.set =	MMAL_DISPLAY_SET_LAYER |

			MMAL_DISPLAY_SET_ALPHA |

			MMAL_DISPLAY_SET_DEST_RECT |

			MMAL_DISPLAY_SET_FULLSCREEN,

		.layer = PREVIEW_LAYER,

		.alpha = dev->overlay.global_alpha,

		.fullscreen = 0,