UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: rockchip/vpu: Provide a helper to reset both src and dst formats 

When initializing a context, the core wants to reset both src and dst
formats. Right now the order doesn't matter, but if we want to have a
valid default width/height on the non-coded/raw format side (src in
case of encoders, dst in case of decoders), we need to reset those
formats in the right order: first the coded-format side, then the other,
such that width and height on the raw format side can be taken from
the coded format.

Let's provide a helper that will reset both formats and make sure this
is done in the right order.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Boris Brezillon 2019-05-28 13:02:25 -04:00 committed by Mauro Carvalho Chehab
parent c65227fd2a
commit 4aa807ef41
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/staging/media/rockchip/vpu/rockchip_vpu_drv.c
View File

@ -273,8 +273,7 @@ static int rockchip_vpu_open(struct file *filp)
filp->private_data = &ctx->fh; filp->private_data = &ctx->fh;
v4l2_fh_add(&ctx->fh); v4l2_fh_add(&ctx->fh);
rockchip_vpu_reset_dst_fmt(vpu, ctx); rockchip_vpu_reset_fmts(ctx);
rockchip_vpu_reset_src_fmt(vpu, ctx);
ret = rockchip_vpu_ctrls_setup(vpu, ctx); ret = rockchip_vpu_ctrls_setup(vpu, ctx);
if (ret) { if (ret) {

14
drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.c
View File

@ -250,8 +250,8 @@ vidioc_try_fmt_out_mplane(struct file *file, void *priv, struct v4l2_format *f)
return 0; return 0;
} }
void rockchip_vpu_reset_dst_fmt(struct rockchip_vpu_dev *vpu, static void rockchip_vpu_reset_dst_fmt(struct rockchip_vpu_dev *vpu,
struct rockchip_vpu_ctx *ctx) struct rockchip_vpu_ctx *ctx)
{ {
struct v4l2_pix_format_mplane *fmt = &ctx->dst_fmt; struct v4l2_pix_format_mplane *fmt = &ctx->dst_fmt;
@ -273,8 +273,8 @@ void rockchip_vpu_reset_dst_fmt(struct rockchip_vpu_dev *vpu,
fmt->width * fmt->height * ctx->vpu_dst_fmt->max_depth; fmt->width * fmt->height * ctx->vpu_dst_fmt->max_depth;
} }
void rockchip_vpu_reset_src_fmt(struct rockchip_vpu_dev *vpu, static void rockchip_vpu_reset_src_fmt(struct rockchip_vpu_dev *vpu,
struct rockchip_vpu_ctx *ctx) struct rockchip_vpu_ctx *ctx)
{ {
struct v4l2_pix_format_mplane *fmt = &ctx->src_fmt; struct v4l2_pix_format_mplane *fmt = &ctx->src_fmt;
@ -294,6 +294,12 @@ void rockchip_vpu_reset_src_fmt(struct rockchip_vpu_dev *vpu,
fmt->height); fmt->height);
} }
void rockchip_vpu_reset_fmts(struct rockchip_vpu_ctx *ctx)
{
rockchip_vpu_reset_dst_fmt(ctx->dev, ctx);
rockchip_vpu_reset_src_fmt(ctx->dev, ctx);
}
static int static int
vidioc_s_fmt_out_mplane(struct file *file, void *priv, struct v4l2_format *f) vidioc_s_fmt_out_mplane(struct file *file, void *priv, struct v4l2_format *f)
{ {

5
drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.h
View File

@ -21,9 +21,6 @@
extern const struct v4l2_ioctl_ops rockchip_vpu_ioctl_ops; extern const struct v4l2_ioctl_ops rockchip_vpu_ioctl_ops;
extern const struct vb2_ops rockchip_vpu_queue_ops; extern const struct vb2_ops rockchip_vpu_queue_ops;
void rockchip_vpu_reset_src_fmt(struct rockchip_vpu_dev *vpu, void rockchip_vpu_reset_fmts(struct rockchip_vpu_ctx *ctx);
struct rockchip_vpu_ctx *ctx);
void rockchip_vpu_reset_dst_fmt(struct rockchip_vpu_dev *vpu,
struct rockchip_vpu_ctx *ctx);
#endif /* ROCKCHIP_VPU_V4L2_H_ */ #endif /* ROCKCHIP_VPU_V4L2_H_ */