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

Commit 8076c7e3 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] coda: drop custom list of pixel format descriptions 



Since commit ba300204 ("[media] v4l2-ioctl: fill in the description
for VIDIOC_ENUM_FMT"), all pixel formats are assigned their description
in a central place. We can now drop the custom list.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent c1ae0b28

drivers/media/platform/coda/coda-common.c

+7 −68
Original line number Diff line number Diff line
@@ -61,11 +61,6 @@ int coda_debug; 
module_param(coda_debug, int, 0644);

MODULE_PARM_DESC(coda_debug, "Debug level (0-2)");



struct coda_fmt {

	char *name;

	u32 fourcc;

};



void coda_write(struct coda_dev *dev, u32 data, u32 reg)

{

	v4l2_dbg(2, coda_debug, &dev->v4l2_dev,
@@ -111,40 +106,6 @@ void coda_write_base(struct coda_ctx *ctx, struct coda_q_data *q_data, 
	coda_write(ctx->dev, base_cr, reg_y + 8);

}



/*

 * Array of all formats supported by any version of Coda:

 */

static const struct coda_fmt coda_formats[] = {

	{

		.name = "YUV 4:2:0 Planar, YCbCr",

		.fourcc = V4L2_PIX_FMT_YUV420,

	},

	{

		.name = "YUV 4:2:0 Planar, YCrCb",

		.fourcc = V4L2_PIX_FMT_YVU420,

	},

	{

		.name = "YUV 4:2:0 Partial interleaved Y/CbCr",

		.fourcc = V4L2_PIX_FMT_NV12,

	},

	{

		.name = "YUV 4:2:2 Planar, YCbCr",

		.fourcc = V4L2_PIX_FMT_YUV422P,

	},

	{

		.name = "H264 Encoded Stream",

		.fourcc = V4L2_PIX_FMT_H264,

	},

	{

		.name = "MPEG4 Encoded Stream",

		.fourcc = V4L2_PIX_FMT_MPEG4,

	},

	{

		.name = "JPEG Encoded Images",

		.fourcc = V4L2_PIX_FMT_JPEG,

	},

};



#define CODA_CODEC(mode, src_fourcc, dst_fourcc, max_w, max_h) \

	{ mode, src_fourcc, dst_fourcc, max_w, max_h }
@@ -261,40 +222,23 @@ static const struct coda_video_device *coda9_video_devices[] = { 
	&coda_bit_decoder,

};



static bool coda_format_is_yuv(u32 fourcc)

/*

 * Normalize all supported YUV 4:2:0 formats to the value used in the codec

 * tables.

 */

static u32 coda_format_normalize_yuv(u32 fourcc)

{

	switch (fourcc) {

	case V4L2_PIX_FMT_YUV420:

	case V4L2_PIX_FMT_YVU420:

	case V4L2_PIX_FMT_NV12:

	case V4L2_PIX_FMT_YUV422P:

		return true;

		return V4L2_PIX_FMT_YUV420;

	default:

		return false;

		return fourcc;

	}

}



static const char *coda_format_name(u32 fourcc)

{

	int i;



	for (i = 0; i < ARRAY_SIZE(coda_formats); i++) {

		if (coda_formats[i].fourcc == fourcc)

			return coda_formats[i].name;

	}



	return NULL;

}



/*

 * Normalize all supported YUV 4:2:0 formats to the value used in the codec

 * tables.

 */

static u32 coda_format_normalize_yuv(u32 fourcc)

{

	return coda_format_is_yuv(fourcc) ? V4L2_PIX_FMT_YUV420 : fourcc;

}



static const struct coda_codec *coda_find_codec(struct coda_dev *dev,

						int src_fourcc, int dst_fourcc)

{
@@ -396,7 +340,6 @@ static int coda_enum_fmt(struct file *file, void *priv, 
	struct video_device *vdev = video_devdata(file);

	const struct coda_video_device *cvd = to_coda_video_device(vdev);

	const u32 *formats;

	const char *name;



	if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT)

		formats = cvd->src_formats;
@@ -408,11 +351,7 @@ static int coda_enum_fmt(struct file *file, void *priv, 
	if (f->index >= CODA_MAX_FORMATS || formats[f->index] == 0)

		return -EINVAL;



	name = coda_format_name(formats[f->index]);

	strlcpy(f->description, name, sizeof(f->description));

	f->pixelformat = formats[f->index];

	if (!coda_format_is_yuv(formats[f->index]))

		f->flags |= V4L2_FMT_FLAG_COMPRESSED;



	return 0;

}