Re: [PATCH 2/2] media: amphion: Report the average qp of current encoded frame

[Hans Verkuil]

On 29/03/2024 10:23, Ming Qian wrote:
> Report the average qp value of current encoded frame via the control
> V4L2_CID_MPEG_VIDEO_AVERAGE_QP
> 
> Signed-off-by: Ming Qian <ming.qian@xxxxxxx>
> ---
>  drivers/media/platform/amphion/venc.c        | 4 ++++
>  drivers/media/platform/amphion/vpu.h         | 2 ++
>  drivers/media/platform/amphion/vpu_defs.h    | 1 +
>  drivers/media/platform/amphion/vpu_helpers.c | 3 +++
>  drivers/media/platform/amphion/vpu_v4l2.c    | 9 +++++++++
>  drivers/media/platform/amphion/vpu_v4l2.h    | 1 +
>  drivers/media/platform/amphion/vpu_windsor.c | 2 ++
>  7 files changed, 22 insertions(+)
> 
> diff --git a/drivers/media/platform/amphion/venc.c b/drivers/media/platform/amphion/venc.c
> index 4eb57d793a9c..12cebafeaf3b 100644
> --- a/drivers/media/platform/amphion/venc.c
> +++ b/drivers/media/platform/amphion/venc.c
> @@ -680,6 +680,9 @@ static int venc_ctrl_init(struct vpu_inst *inst)
>  			       ~(1 << V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME),
>  			       V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME);
>  
> +	v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
> +			  V4L2_CID_MPEG_VIDEO_AVERAGE_QP, 0, 51, 1, 0);
> +
>  	if (inst->ctrl_handler.error) {
>  		ret = inst->ctrl_handler.error;
>  		v4l2_ctrl_handler_free(&inst->ctrl_handler);
> @@ -819,6 +822,7 @@ static int venc_get_one_encoded_frame(struct vpu_inst *inst,
>  	vbuf->field = inst->cap_format.field;
>  	vbuf->flags |= frame->info.pic_type;
>  	vpu_set_buffer_state(vbuf, VPU_BUF_STATE_IDLE);
> +	vpu_set_buffer_average_qp(vbuf, frame->info.average_qp);
>  	dev_dbg(inst->dev, "[%d][OUTPUT TS]%32lld\n", inst->id, vbuf->vb2_buf.timestamp);
>  	v4l2_m2m_buf_done(vbuf, VB2_BUF_STATE_DONE);
>  	venc->ready_count++;
> diff --git a/drivers/media/platform/amphion/vpu.h b/drivers/media/platform/amphion/vpu.h
> index 0246cf0ac3a8..d21ca6bf2459 100644
> --- a/drivers/media/platform/amphion/vpu.h
> +++ b/drivers/media/platform/amphion/vpu.h
> @@ -270,6 +270,7 @@ struct vpu_inst {
>  	u8 xfer_func;
>  	u32 sequence;
>  	u32 extra_size;
> +	u32 current_average_qp;
>  
>  	u32 flows[16];
>  	u32 flow_idx;
> @@ -306,6 +307,7 @@ struct vpu_vb2_buffer {
>  	dma_addr_t chroma_v;
>  	unsigned int state;
>  	u32 tag;
> +	u32 average_qp;
>  };
>  
>  void vpu_writel(struct vpu_dev *vpu, u32 reg, u32 val);
> diff --git a/drivers/media/platform/amphion/vpu_defs.h b/drivers/media/platform/amphion/vpu_defs.h
> index 7320852668d6..428d988cf2f7 100644
> --- a/drivers/media/platform/amphion/vpu_defs.h
> +++ b/drivers/media/platform/amphion/vpu_defs.h
> @@ -114,6 +114,7 @@ struct vpu_enc_pic_info {
>  	u32 wptr;
>  	u32 crc;
>  	s64 timestamp;
> +	u32 average_qp;
>  };
>  
>  struct vpu_dec_codec_info {
> diff --git a/drivers/media/platform/amphion/vpu_helpers.c b/drivers/media/platform/amphion/vpu_helpers.c
> index d12310af9ebc..59139302cb1d 100644
> --- a/drivers/media/platform/amphion/vpu_helpers.c
> +++ b/drivers/media/platform/amphion/vpu_helpers.c
> @@ -378,6 +378,9 @@ int vpu_helper_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
>  	case V4L2_CID_MIN_BUFFERS_FOR_OUTPUT:
>  		ctrl->val = inst->min_buffer_out;
>  		break;
> +	case V4L2_CID_MPEG_VIDEO_AVERAGE_QP:
> +		ctrl->val = inst->current_average_qp;
> +		break;

This is not a volatile control. Instead, the control should be updated
with the new average_qp in the vpu_vb2_buf_finish function.

Regards,

	Hans

>  	default:
>  		return -EINVAL;
>  	}
> diff --git a/drivers/media/platform/amphion/vpu_v4l2.c b/drivers/media/platform/amphion/vpu_v4l2.c
> index c88738e8fff7..893f494ffb0b 100644
> --- a/drivers/media/platform/amphion/vpu_v4l2.c
> +++ b/drivers/media/platform/amphion/vpu_v4l2.c
> @@ -63,6 +63,13 @@ unsigned int vpu_get_buffer_state(struct vb2_v4l2_buffer *vbuf)
>  	return vpu_buf->state;
>  }
>  
> +void vpu_set_buffer_average_qp(struct vb2_v4l2_buffer *vbuf, u32 qp)
> +{
> +	struct vpu_vb2_buffer *vpu_buf = to_vpu_vb2_buffer(vbuf);
> +
> +	vpu_buf->average_qp = qp;
> +}
> +
>  void vpu_v4l2_set_error(struct vpu_inst *inst)
>  {
>  	vpu_inst_lock(inst);
> @@ -536,9 +543,11 @@ static int vpu_vb2_buf_prepare(struct vb2_buffer *vb)
>  static void vpu_vb2_buf_finish(struct vb2_buffer *vb)
>  {
>  	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
> +	struct vpu_vb2_buffer *vpu_buf = to_vpu_vb2_buffer(vbuf);
>  	struct vpu_inst *inst = vb2_get_drv_priv(vb->vb2_queue);
>  	struct vb2_queue *q = vb->vb2_queue;
>  
> +	inst->current_average_qp = vpu_buf->average_qp;
>  	if (vbuf->flags & V4L2_BUF_FLAG_LAST)
>  		vpu_notify_eos(inst);
>  
> diff --git a/drivers/media/platform/amphion/vpu_v4l2.h b/drivers/media/platform/amphion/vpu_v4l2.h
> index 60f43056a7a2..56f2939fa84d 100644
> --- a/drivers/media/platform/amphion/vpu_v4l2.h
> +++ b/drivers/media/platform/amphion/vpu_v4l2.h
> @@ -12,6 +12,7 @@ void vpu_inst_lock(struct vpu_inst *inst);
>  void vpu_inst_unlock(struct vpu_inst *inst);
>  void vpu_set_buffer_state(struct vb2_v4l2_buffer *vbuf, unsigned int state);
>  unsigned int vpu_get_buffer_state(struct vb2_v4l2_buffer *vbuf);
> +void vpu_set_buffer_average_qp(struct vb2_v4l2_buffer *vbuf, u32 qp);
>  
>  int vpu_v4l2_open(struct file *file, struct vpu_inst *inst);
>  int vpu_v4l2_close(struct file *file);
> diff --git a/drivers/media/platform/amphion/vpu_windsor.c b/drivers/media/platform/amphion/vpu_windsor.c
> index 5f1101d7cf9e..e7d37aa4b826 100644
> --- a/drivers/media/platform/amphion/vpu_windsor.c
> +++ b/drivers/media/platform/amphion/vpu_windsor.c
> @@ -499,6 +499,7 @@ struct windsor_pic_info {
>  	u32 proc_dacc_rng_wr_cnt;
>  	s32 tv_s;
>  	u32 tv_ns;
> +	u32 average_qp;
>  };
>  
>  u32 vpu_windsor_get_data_size(void)
> @@ -734,6 +735,7 @@ static void vpu_windsor_unpack_pic_info(struct vpu_rpc_event *pkt, void *data)
>  	info->wptr = get_ptr(windsor->str_buff_wptr);
>  	info->crc = windsor->frame_crc;
>  	info->timestamp = timespec64_to_ns(&ts);
> +	info->average_qp = windsor->average_qp;
>  }
>  
>  static void vpu_windsor_unpack_mem_req(struct vpu_rpc_event *pkt, void *data)