Hi,
Le mercredi 31 janvier 2024 à 10:30 +0900, jackson.lee a écrit :
> S_FMT/G_FMT should report the buffer size based on aligned width and height.
> And, Host can set the real encoding size through s_selection and g_selection.
> So, Driver should use the conf_win information for encoding size instead of size of S_FMT/G_FMT.
This patch will go away as soon as you have ported to v4l2-common as requested
in patch 1/5. It will also make future addition of pixel formats less tedious.
regards,
Nicolas
>
> Signed-off-by: Nas Chung <nas.chung@xxxxxxxxxxxxxxx>
> Signed-off-by: Jackson Lee <jackson.lee@xxxxxxxxxxxxxxx>
> ---
> .../chips-media/wave5/wave5-vpu-dec.c | 77 +++++++------------
> .../chips-media/wave5/wave5-vpu-enc.c | 77 +++++++++++--------
> 2 files changed, 72 insertions(+), 82 deletions(-)
>
> diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
> index 328a7a8f26c5..fb9449908ebd 100644
> --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
> +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-dec.c
> @@ -243,54 +243,54 @@ static void wave5_update_pix_fmt(struct v4l2_pix_format_mplane *pix_mp, unsigned
> case V4L2_PIX_FMT_NV21:
> pix_mp->width = round_up(width, 32);
> pix_mp->height = round_up(height, 16);
> - pix_mp->plane_fmt[0].bytesperline = round_up(width, 32);
> - pix_mp->plane_fmt[0].sizeimage = width * height * 3 / 2;
> + pix_mp->plane_fmt[0].bytesperline = pix_mp->width;
> + pix_mp->plane_fmt[0].sizeimage = pix_mp->width * pix_mp->height * 3 / 2;
> break;
> case V4L2_PIX_FMT_YUV422P:
> case V4L2_PIX_FMT_NV16:
> case V4L2_PIX_FMT_NV61:
> pix_mp->width = round_up(width, 32);
> pix_mp->height = round_up(height, 16);
> - pix_mp->plane_fmt[0].bytesperline = round_up(width, 32);
> - pix_mp->plane_fmt[0].sizeimage = width * height * 2;
> + pix_mp->plane_fmt[0].bytesperline = pix_mp->width;
> + pix_mp->plane_fmt[0].sizeimage = pix_mp->width * pix_mp->height * 2;
> break;
> case V4L2_PIX_FMT_YUV420M:
> pix_mp->width = round_up(width, 32);
> pix_mp->height = round_up(height, 16);
> - pix_mp->plane_fmt[0].bytesperline = round_up(width, 32);
> - pix_mp->plane_fmt[0].sizeimage = width * height;
> - pix_mp->plane_fmt[1].bytesperline = round_up(width, 32) / 2;
> - pix_mp->plane_fmt[1].sizeimage = width * height / 4;
> - pix_mp->plane_fmt[2].bytesperline = round_up(width, 32) / 2;
> - pix_mp->plane_fmt[2].sizeimage = width * height / 4;
> + pix_mp->plane_fmt[0].bytesperline = pix_mp->width;
> + pix_mp->plane_fmt[0].sizeimage = pix_mp->width * pix_mp->height;
> + pix_mp->plane_fmt[1].bytesperline = pix_mp->width / 2;
> + pix_mp->plane_fmt[1].sizeimage = pix_mp->width * pix_mp->height / 4;
> + pix_mp->plane_fmt[2].bytesperline = pix_mp->width / 2;
> + pix_mp->plane_fmt[2].sizeimage = pix_mp->width * pix_mp->height / 4;
> break;
> case V4L2_PIX_FMT_NV12M:
> case V4L2_PIX_FMT_NV21M:
> pix_mp->width = round_up(width, 32);
> pix_mp->height = round_up(height, 16);
> - pix_mp->plane_fmt[0].bytesperline = round_up(width, 32);
> - pix_mp->plane_fmt[0].sizeimage = width * height;
> - pix_mp->plane_fmt[1].bytesperline = round_up(width, 32);
> - pix_mp->plane_fmt[1].sizeimage = width * height / 2;
> + pix_mp->plane_fmt[0].bytesperline = pix_mp->width;
> + pix_mp->plane_fmt[0].sizeimage = pix_mp->width * pix_mp->height;
> + pix_mp->plane_fmt[1].bytesperline = pix_mp->width;
> + pix_mp->plane_fmt[1].sizeimage = pix_mp->width * pix_mp->height / 2;
> break;
> case V4L2_PIX_FMT_YUV422M:
> pix_mp->width = round_up(width, 32);
> pix_mp->height = round_up(height, 16);
> - pix_mp->plane_fmt[0].bytesperline = round_up(width, 32);
> - pix_mp->plane_fmt[0].sizeimage = width * height;
> - pix_mp->plane_fmt[1].bytesperline = round_up(width, 32) / 2;
> - pix_mp->plane_fmt[1].sizeimage = width * height / 2;
> - pix_mp->plane_fmt[2].bytesperline = round_up(width, 32) / 2;
> - pix_mp->plane_fmt[2].sizeimage = width * height / 2;
> + pix_mp->plane_fmt[0].bytesperline = pix_mp->width;
> + pix_mp->plane_fmt[0].sizeimage = pix_mp->width * pix_mp->height;
> + pix_mp->plane_fmt[1].bytesperline = pix_mp->width / 2;
> + pix_mp->plane_fmt[1].sizeimage = pix_mp->width * pix_mp->height / 2;
> + pix_mp->plane_fmt[2].bytesperline = pix_mp->width / 2;
> + pix_mp->plane_fmt[2].sizeimage = pix_mp->width * pix_mp->height / 2;
> break;
> case V4L2_PIX_FMT_NV16M:
> case V4L2_PIX_FMT_NV61M:
> pix_mp->width = round_up(width, 32);
> pix_mp->height = round_up(height, 16);
> - pix_mp->plane_fmt[0].bytesperline = round_up(width, 32);
> - pix_mp->plane_fmt[0].sizeimage = width * height;
> - pix_mp->plane_fmt[1].bytesperline = round_up(width, 32);
> - pix_mp->plane_fmt[1].sizeimage = width * height;
> + pix_mp->plane_fmt[0].bytesperline = pix_mp->width;
> + pix_mp->plane_fmt[0].sizeimage = pix_mp->width * pix_mp->height;
> + pix_mp->plane_fmt[1].bytesperline = pix_mp->width;
> + pix_mp->plane_fmt[1].sizeimage = pix_mp->width * pix_mp->height;
> break;
> default:
> pix_mp->width = width;
> @@ -1003,6 +1003,7 @@ static int wave5_vpu_dec_queue_setup(struct vb2_queue *q, unsigned int *num_buff
> struct vpu_instance *inst = vb2_get_drv_priv(q);
> struct v4l2_pix_format_mplane inst_format =
> (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) ? inst->src_fmt : inst->dst_fmt;
> + unsigned int i;
>
> dev_dbg(inst->dev->dev, "%s: num_buffers: %u | num_planes: %u | type: %u\n", __func__,
> *num_buffers, *num_planes, q->type);
> @@ -1016,31 +1017,9 @@ static int wave5_vpu_dec_queue_setup(struct vb2_queue *q, unsigned int *num_buff
> if (*num_buffers < inst->fbc_buf_count)
> *num_buffers = inst->fbc_buf_count;
>
> - if (*num_planes == 1) {
> - if (inst->output_format == FORMAT_422)
> - sizes[0] = inst_format.width * inst_format.height * 2;
> - else
> - sizes[0] = inst_format.width * inst_format.height * 3 / 2;
> - dev_dbg(inst->dev->dev, "%s: size[0]: %u\n", __func__, sizes[0]);
> - } else if (*num_planes == 2) {
> - sizes[0] = inst_format.width * inst_format.height;
> - if (inst->output_format == FORMAT_422)
> - sizes[1] = inst_format.width * inst_format.height;
> - else
> - sizes[1] = inst_format.width * inst_format.height / 2;
> - dev_dbg(inst->dev->dev, "%s: size[0]: %u | size[1]: %u\n",
> - __func__, sizes[0], sizes[1]);
> - } else if (*num_planes == 3) {
> - sizes[0] = inst_format.width * inst_format.height;
> - if (inst->output_format == FORMAT_422) {
> - sizes[1] = inst_format.width * inst_format.height / 2;
> - sizes[2] = inst_format.width * inst_format.height / 2;
> - } else {
> - sizes[1] = inst_format.width * inst_format.height / 4;
> - sizes[2] = inst_format.width * inst_format.height / 4;
> - }
> - dev_dbg(inst->dev->dev, "%s: size[0]: %u | size[1]: %u | size[2]: %u\n",
> - __func__, sizes[0], sizes[1], sizes[2]);
> + for (i = 0; i < *num_planes; i++) {
> + sizes[i] = inst_format.plane_fmt[i].sizeimage;
> + dev_dbg(inst->dev->dev, "%s: size[%u]: %u\n", __func__, i, sizes[i]);
> }
> }
>
> diff --git a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
> index 19018ace41b6..762973d0677b 100644
> --- a/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
> +++ b/drivers/media/platform/chips-media/wave5/wave5-vpu-enc.c
> @@ -152,46 +152,46 @@ static void wave5_update_pix_fmt(struct v4l2_pix_format_mplane *pix_mp, unsigned
> case V4L2_PIX_FMT_YUV420:
> case V4L2_PIX_FMT_NV12:
> case V4L2_PIX_FMT_NV21:
> - pix_mp->width = width;
> - pix_mp->height = height;
> - pix_mp->plane_fmt[0].bytesperline = round_up(width, 32);
> - pix_mp->plane_fmt[0].sizeimage = round_up(width, 32) * height * 3 / 2;
> + pix_mp->width = round_up(width, 32);
> + pix_mp->height = round_up(height, 16);
> + pix_mp->plane_fmt[0].bytesperline = pix_mp->width;
> + pix_mp->plane_fmt[0].sizeimage = pix_mp->width * pix_mp->height * 3 / 2;
> break;
> case V4L2_PIX_FMT_YUV420M:
> - pix_mp->width = width;
> - pix_mp->height = height;
> - pix_mp->plane_fmt[0].bytesperline = round_up(width, 32);
> - pix_mp->plane_fmt[0].sizeimage = round_up(width, 32) * height;
> - pix_mp->plane_fmt[1].bytesperline = round_up(width, 32) / 2;
> - pix_mp->plane_fmt[1].sizeimage = round_up(width, 32) * height / 4;
> - pix_mp->plane_fmt[2].bytesperline = round_up(width, 32) / 2;
> - pix_mp->plane_fmt[2].sizeimage = round_up(width, 32) * height / 4;
> + pix_mp->width = round_up(width, 32);
> + pix_mp->height = round_up(height, 16);
> + pix_mp->plane_fmt[0].bytesperline = pix_mp->width;
> + pix_mp->plane_fmt[0].sizeimage = pix_mp->width * pix_mp->height;
> + pix_mp->plane_fmt[1].bytesperline = pix_mp->width / 2;
> + pix_mp->plane_fmt[1].sizeimage = pix_mp->width * pix_mp->height / 4;
> + pix_mp->plane_fmt[2].bytesperline = pix_mp->width / 2;
> + pix_mp->plane_fmt[2].sizeimage = pix_mp->width * pix_mp->height / 4;
> break;
> case V4L2_PIX_FMT_NV12M:
> case V4L2_PIX_FMT_NV21M:
> - pix_mp->width = width;
> - pix_mp->height = height;
> - pix_mp->plane_fmt[0].bytesperline = round_up(width, 32);
> - pix_mp->plane_fmt[0].sizeimage = round_up(width, 32) * height;
> - pix_mp->plane_fmt[1].bytesperline = round_up(width, 32);
> - pix_mp->plane_fmt[1].sizeimage = round_up(width, 32) * height / 2;
> + pix_mp->width = round_up(width, 32);
> + pix_mp->height = round_up(height, 16);
> + pix_mp->plane_fmt[0].bytesperline = pix_mp->width;
> + pix_mp->plane_fmt[0].sizeimage = pix_mp->width * pix_mp->height;
> + pix_mp->plane_fmt[1].bytesperline = pix_mp->width;
> + pix_mp->plane_fmt[1].sizeimage = pix_mp->width * pix_mp->height / 2;
> break;
> case V4L2_PIX_FMT_YUV422P:
> case V4L2_PIX_FMT_NV16:
> case V4L2_PIX_FMT_NV61:
> - pix_mp->width = width;
> - pix_mp->height = height;
> - pix_mp->plane_fmt[0].bytesperline = round_up(width, 32);
> - pix_mp->plane_fmt[0].sizeimage = round_up(width, 32) * height * 2;
> + pix_mp->width = round_up(width, 32);
> + pix_mp->height = round_up(height, 16);
> + pix_mp->plane_fmt[0].bytesperline = pix_mp->width;
> + pix_mp->plane_fmt[0].sizeimage = pix_mp->width * pix_mp->height * 2;
> break;
> case V4L2_PIX_FMT_NV16M:
> case V4L2_PIX_FMT_NV61M:
> - pix_mp->width = width;
> - pix_mp->height = height;
> - pix_mp->plane_fmt[0].bytesperline = round_up(width, 32);
> - pix_mp->plane_fmt[0].sizeimage = round_up(width, 32) * height;
> - pix_mp->plane_fmt[1].bytesperline = round_up(width, 32);
> - pix_mp->plane_fmt[1].sizeimage = round_up(width, 32) * height;
> + pix_mp->width = round_up(width, 32);
> + pix_mp->height = round_up(height, 16);
> + pix_mp->plane_fmt[0].bytesperline = pix_mp->width;
> + pix_mp->plane_fmt[0].sizeimage = pix_mp->width * pix_mp->height;
> + pix_mp->plane_fmt[1].bytesperline = pix_mp->width;
> + pix_mp->plane_fmt[1].sizeimage = pix_mp->width * pix_mp->height;
> break;
> default:
> pix_mp->width = width;
> @@ -638,6 +638,8 @@ static int wave5_vpu_enc_s_fmt_out(struct file *file, void *fh, struct v4l2_form
> inst->xfer_func = f->fmt.pix_mp.xfer_func;
>
> wave5_update_pix_fmt(&inst->dst_fmt, f->fmt.pix_mp.width, f->fmt.pix_mp.height);
> + inst->conf_win.width = inst->dst_fmt.width;
> + inst->conf_win.height = inst->dst_fmt.height;
>
> return 0;
> }
> @@ -653,12 +655,17 @@ static int wave5_vpu_enc_g_selection(struct file *file, void *fh, struct v4l2_se
> switch (s->target) {
> case V4L2_SEL_TGT_CROP_DEFAULT:
> case V4L2_SEL_TGT_CROP_BOUNDS:
> - case V4L2_SEL_TGT_CROP:
> s->r.left = 0;
> s->r.top = 0;
> s->r.width = inst->dst_fmt.width;
> s->r.height = inst->dst_fmt.height;
> break;
> + case V4L2_SEL_TGT_CROP:
> + s->r.left = 0;
> + s->r.top = 0;
> + s->r.width = inst->conf_win.width;
> + s->r.height = inst->conf_win.height;
> + break;
> default:
> return -EINVAL;
> }
> @@ -681,8 +688,10 @@ static int wave5_vpu_enc_s_selection(struct file *file, void *fh, struct v4l2_se
>
> s->r.left = 0;
> s->r.top = 0;
> - s->r.width = inst->src_fmt.width;
> - s->r.height = inst->src_fmt.height;
> + s->r.width = min(s->r.width, inst->dst_fmt.width);
> + s->r.height = min(s->r.height, inst->dst_fmt.height);
> +
> + inst->conf_win = s->r;
>
> return 0;
> }
> @@ -1229,8 +1238,8 @@ static void wave5_set_enc_openparam(struct enc_open_param *open_param,
> open_param->wave_param.lambda_scaling_enable = 1;
>
> open_param->line_buf_int_en = true;
> - open_param->pic_width = inst->dst_fmt.width;
> - open_param->pic_height = inst->dst_fmt.height;
> + open_param->pic_width = inst->conf_win.width;
> + open_param->pic_height = inst->conf_win.height;
> open_param->frame_rate_info = inst->frame_rate;
> open_param->rc_enable = inst->rc_enable;
> if (inst->rc_enable) {
> @@ -1806,6 +1815,8 @@ static int wave5_vpu_open_enc(struct file *filp)
> v4l2_ctrl_handler_setup(v4l2_ctrl_hdl);
>
> wave5_set_default_format(&inst->src_fmt, &inst->dst_fmt);
> + inst->conf_win.width = inst->dst_fmt.width;
> + inst->conf_win.height = inst->dst_fmt.height;
> inst->colorspace = V4L2_COLORSPACE_REC709;
> inst->ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT;
> inst->quantization = V4L2_QUANTIZATION_DEFAULT;
