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

Commit ad3b81fa authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] soc-camera: Add plane layout information to struct soc_mbus_pixelfmt 



To compute the value of the v4l2_pix_format::bytesperline field, we need
information about planes layout for planar formats. The new enum
soc_mbus_layout conveys that information.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1c0f95ee

drivers/media/video/atmel-isi.c

+1 −0
Original line number Diff line number Diff line
@@ -627,6 +627,7 @@ static const struct soc_mbus_pixelfmt isi_camera_formats[] = { 
		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_2X8_PADHI,

		.order			= SOC_MBUS_ORDER_LE,

		.layout			= SOC_MBUS_LAYOUT_PACKED,

	},

};

drivers/media/video/mx3_camera.c

+2 −0
Original line number Diff line number Diff line
@@ -637,12 +637,14 @@ static const struct soc_mbus_pixelfmt mx3_camera_formats[] = { 
		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_NONE,

		.order			= SOC_MBUS_ORDER_LE,

		.layout			= SOC_MBUS_LAYOUT_PACKED,

	}, {

		.fourcc			= V4L2_PIX_FMT_GREY,

		.name			= "Monochrome 8 bit",

		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_NONE,

		.order			= SOC_MBUS_ORDER_LE,

		.layout			= SOC_MBUS_LAYOUT_PACKED,

	},

};

drivers/media/video/omap1_camera.c

+8 −0
Original line number Diff line number Diff line
@@ -989,6 +989,7 @@ static const struct soc_mbus_lookup omap1_cam_formats[] = { 
		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_2X8_PADHI,

		.order			= SOC_MBUS_ORDER_BE,

		.layout			= SOC_MBUS_LAYOUT_PACKED,

	},

}, {

	.code = V4L2_MBUS_FMT_VYUY8_2X8,
@@ -998,6 +999,7 @@ static const struct soc_mbus_lookup omap1_cam_formats[] = { 
		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_2X8_PADHI,

		.order			= SOC_MBUS_ORDER_BE,

		.layout			= SOC_MBUS_LAYOUT_PACKED,

	},

}, {

	.code = V4L2_MBUS_FMT_YUYV8_2X8,
@@ -1007,6 +1009,7 @@ static const struct soc_mbus_lookup omap1_cam_formats[] = { 
		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_2X8_PADHI,

		.order			= SOC_MBUS_ORDER_BE,

		.layout			= SOC_MBUS_LAYOUT_PACKED,

	},

}, {

	.code = V4L2_MBUS_FMT_YVYU8_2X8,
@@ -1016,6 +1019,7 @@ static const struct soc_mbus_lookup omap1_cam_formats[] = { 
		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_2X8_PADHI,

		.order			= SOC_MBUS_ORDER_BE,

		.layout			= SOC_MBUS_LAYOUT_PACKED,

	},

}, {

	.code = V4L2_MBUS_FMT_RGB555_2X8_PADHI_BE,
@@ -1025,6 +1029,7 @@ static const struct soc_mbus_lookup omap1_cam_formats[] = { 
		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_2X8_PADHI,

		.order			= SOC_MBUS_ORDER_BE,

		.layout			= SOC_MBUS_LAYOUT_PACKED,

	},

}, {

	.code = V4L2_MBUS_FMT_RGB555_2X8_PADHI_LE,
@@ -1034,6 +1039,7 @@ static const struct soc_mbus_lookup omap1_cam_formats[] = { 
		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_2X8_PADHI,

		.order			= SOC_MBUS_ORDER_BE,

		.layout			= SOC_MBUS_LAYOUT_PACKED,

	},

}, {

	.code = V4L2_MBUS_FMT_RGB565_2X8_BE,
@@ -1043,6 +1049,7 @@ static const struct soc_mbus_lookup omap1_cam_formats[] = { 
		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_2X8_PADHI,

		.order			= SOC_MBUS_ORDER_BE,

		.layout			= SOC_MBUS_LAYOUT_PACKED,

	},

}, {

	.code = V4L2_MBUS_FMT_RGB565_2X8_LE,
@@ -1052,6 +1059,7 @@ static const struct soc_mbus_lookup omap1_cam_formats[] = { 
		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_2X8_PADHI,

		.order			= SOC_MBUS_ORDER_BE,

		.layout			= SOC_MBUS_LAYOUT_PACKED,

	},

},

};

drivers/media/video/pxa_camera.c

+1 −0
Original line number Diff line number Diff line
@@ -1234,6 +1234,7 @@ static const struct soc_mbus_pixelfmt pxa_camera_formats[] = { 
		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_2X8_PADHI,

		.order			= SOC_MBUS_ORDER_LE,

		.layout			= SOC_MBUS_LAYOUT_PLANAR_2Y_U_V,

	},

};

drivers/media/video/sh_mobile_ceu_camera.c

+4 −0
Original line number Diff line number Diff line
@@ -955,24 +955,28 @@ static const struct soc_mbus_pixelfmt sh_mobile_ceu_formats[] = { 
		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_1_5X8,

		.order			= SOC_MBUS_ORDER_LE,

		.layout			= SOC_MBUS_LAYOUT_PLANAR_2Y_C,

	}, {

		.fourcc			= V4L2_PIX_FMT_NV21,

		.name			= "NV21",

		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_1_5X8,

		.order			= SOC_MBUS_ORDER_LE,

		.layout			= SOC_MBUS_LAYOUT_PLANAR_2Y_C,

	}, {

		.fourcc			= V4L2_PIX_FMT_NV16,

		.name			= "NV16",

		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_2X8_PADHI,

		.order			= SOC_MBUS_ORDER_LE,

		.layout			= SOC_MBUS_LAYOUT_PLANAR_Y_C,

	}, {

		.fourcc			= V4L2_PIX_FMT_NV61,

		.name			= "NV61",

		.bits_per_sample	= 8,

		.packing		= SOC_MBUS_PACKING_2X8_PADHI,

		.order			= SOC_MBUS_ORDER_LE,

		.layout			= SOC_MBUS_LAYOUT_PLANAR_Y_C,

	},

};