提交 9fb10beb 编写于 作者: E Ezequiel Garcia 提交者: Mauro Carvalho Chehab

media: rockchip/vpu: Rename pixel format helpers

The rockchip VPU driver uses generic names for its pixel format
helpers. We want to use the same names for generic versions
of these helpers, so rename the rockchip ones.

The driver will be switched to the generic helpers later.
Signed-off-by: NEzequiel Garcia <ezequiel@collabora.com>
Signed-off-by: NHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: NMauro Carvalho Chehab <mchehab+samsung@kernel.org>
上级 e6c237ad
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
* @is_compressed: Is it a compressed format? * @is_compressed: Is it a compressed format?
* @multiplanar: Is it a multiplanar variant format? (e.g. NV12M) * @multiplanar: Is it a multiplanar variant format? (e.g. NV12M)
*/ */
struct v4l2_format_info { struct rockchip_vpu_v4l2_format_info {
u32 format; u32 format;
u32 header_size; u32 header_size;
u8 num_planes; u8 num_planes;
...@@ -52,10 +52,10 @@ struct v4l2_format_info { ...@@ -52,10 +52,10 @@ struct v4l2_format_info {
u8 multiplanar; u8 multiplanar;
}; };
static const struct v4l2_format_info * static const struct rockchip_vpu_v4l2_format_info *
v4l2_format_info(u32 format) rockchip_vpu_v4l2_format_info(u32 format)
{ {
static const struct v4l2_format_info formats[] = { static const struct rockchip_vpu_v4l2_format_info formats[] = {
{ .format = V4L2_PIX_FMT_YUV420M, .num_planes = 3, .cpp = { 1, 1, 1 }, .hsub = 2, .vsub = 2, .multiplanar = 1 }, { .format = V4L2_PIX_FMT_YUV420M, .num_planes = 3, .cpp = { 1, 1, 1 }, .hsub = 2, .vsub = 2, .multiplanar = 1 },
{ .format = V4L2_PIX_FMT_NV12M, .num_planes = 2, .cpp = { 1, 2, 0 }, .hsub = 2, .vsub = 2, .multiplanar = 1 }, { .format = V4L2_PIX_FMT_NV12M, .num_planes = 2, .cpp = { 1, 2, 0 }, .hsub = 2, .vsub = 2, .multiplanar = 1 },
{ .format = V4L2_PIX_FMT_YUYV, .num_planes = 1, .cpp = { 2, 0, 0 }, .hsub = 2, .vsub = 1 }, { .format = V4L2_PIX_FMT_YUYV, .num_planes = 1, .cpp = { 2, 0, 0 }, .hsub = 2, .vsub = 1 },
...@@ -76,11 +76,11 @@ static void ...@@ -76,11 +76,11 @@ static void
fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt, fill_pixfmt_mp(struct v4l2_pix_format_mplane *pixfmt,
int pixelformat, int width, int height) int pixelformat, int width, int height)
{ {
const struct v4l2_format_info *info; const struct rockchip_vpu_v4l2_format_info *info;
struct v4l2_plane_pix_format *plane; struct v4l2_plane_pix_format *plane;
int i; int i;
info = v4l2_format_info(pixelformat); info = rockchip_vpu_v4l2_format_info(pixelformat);
if (!info) if (!info)
return; return;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册