| Message ID | 20241016034927.8181-5-yunfei.dong@mediatek.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | media: mediatek: vcodec: support h264 extend vsi | expand |
On Wed, Oct 16, 2024 at 11:49 AM Yunfei Dong <yunfei.dong@mediatek.com> wrote: > > Hardware can parse the slice syntax to get nal information in > scp for extend architecture, needn't to parse it again in > kernel. Squash this in with the other "add extended architecture" patches. You are removing code that you just added. So why add it in the first place? You can just mention in the commit message that the new architecture can parse the slice syntax directly. ChenYu > Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com> > --- > .../decoder/vdec/vdec_h264_req_multi_if.c | 24 +++---------------- > 1 file changed, 3 insertions(+), 21 deletions(-) > > diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c > index 69ca775bb3f1..c99a64384edf 100644 > --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c > +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c > @@ -802,11 +802,10 @@ static int vdec_h264_slice_lat_decode_ex(void *h_vdec, struct mtk_vcodec_mem *bs > struct vdec_h264_slice_inst *inst = h_vdec; > struct vdec_vpu_inst *vpu = &inst->vpu; > struct mtk_video_dec_buf *src_buf_info; > - int nal_start_idx, err, timeout = 0; > + int err, timeout = 0; > unsigned int data[2]; > struct vdec_lat_buf *lat_buf; > struct vdec_h264_slice_share_info *share_info; > - unsigned char *buf; > > if (vdec_msg_queue_init(&inst->ctx->msg_queue, inst->ctx, > vdec_h264_slice_core_decode_ex, > @@ -830,14 +829,6 @@ static int vdec_h264_slice_lat_decode_ex(void *h_vdec, struct mtk_vcodec_mem *bs > share_info = lat_buf->private_data; > src_buf_info = container_of(bs, struct mtk_video_dec_buf, bs_buffer); > > - buf = (unsigned char *)bs->va; > - nal_start_idx = mtk_vdec_h264_find_start_code(buf, bs->size); > - if (nal_start_idx < 0) { > - err = -EINVAL; > - goto err_free_fb_out; > - } > - > - inst->vsi->dec.nal_info = buf[nal_start_idx]; > lat_buf->vb2_v4l2_src = &src_buf_info->m2m_buf.vb; > v4l2_m2m_buf_copy_metadata(&src_buf_info->m2m_buf.vb, &lat_buf->ts_info, true); > > @@ -846,7 +837,7 @@ static int vdec_h264_slice_lat_decode_ex(void *h_vdec, struct mtk_vcodec_mem *bs > if (err) > goto err_free_fb_out; > > - vdec_h264_insert_startcode(inst->ctx->dev, buf, &bs->size, > + vdec_h264_insert_startcode(inst->ctx->dev, bs->va, &bs->size, > &share_info->h264_slice_params.pps); > > *res_chg = inst->resolution_changed; > @@ -1078,11 +1069,10 @@ static int vdec_h264_slice_single_decode_ex(void *h_vdec, struct mtk_vcodec_mem > struct vdec_vpu_inst *vpu = &inst->vpu; > struct mtk_video_dec_buf *src_buf_info, *dst_buf_info; > struct vdec_fb *fb; > - unsigned char *buf; > unsigned int data[2], i; > u64 y_fb_dma, c_fb_dma; > struct mtk_vcodec_mem *mem; > - int err, nal_start_idx; > + int err; > > /* bs NULL means flush decoder */ > if (!bs) > @@ -1117,14 +1107,6 @@ static int vdec_h264_slice_single_decode_ex(void *h_vdec, struct mtk_vcodec_mem > memcpy(&inst->vsi_ctx_ex.h264_slice_params, &inst->h264_slice_param, > sizeof(inst->vsi_ctx_ex.h264_slice_params)); > > - buf = (unsigned char *)bs->va; > - nal_start_idx = mtk_vdec_h264_find_start_code(buf, bs->size); > - if (nal_start_idx < 0) { > - err = -EINVAL; > - goto err_free_fb_out; > - } > - inst->vsi_ctx_ex.dec.nal_info = buf[nal_start_idx]; > - > *res_chg = inst->resolution_changed; > if (inst->resolution_changed) { > mtk_vdec_debug(inst->ctx, "- resolution changed -"); > -- > 2.46.0 >
diff --git a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c index 69ca775bb3f1..c99a64384edf 100644 --- a/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c +++ b/drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_h264_req_multi_if.c @@ -802,11 +802,10 @@ static int vdec_h264_slice_lat_decode_ex(void *h_vdec, struct mtk_vcodec_mem *bs struct vdec_h264_slice_inst *inst = h_vdec; struct vdec_vpu_inst *vpu = &inst->vpu; struct mtk_video_dec_buf *src_buf_info; - int nal_start_idx, err, timeout = 0; + int err, timeout = 0; unsigned int data[2]; struct vdec_lat_buf *lat_buf; struct vdec_h264_slice_share_info *share_info; - unsigned char *buf; if (vdec_msg_queue_init(&inst->ctx->msg_queue, inst->ctx, vdec_h264_slice_core_decode_ex, @@ -830,14 +829,6 @@ static int vdec_h264_slice_lat_decode_ex(void *h_vdec, struct mtk_vcodec_mem *bs share_info = lat_buf->private_data; src_buf_info = container_of(bs, struct mtk_video_dec_buf, bs_buffer); - buf = (unsigned char *)bs->va; - nal_start_idx = mtk_vdec_h264_find_start_code(buf, bs->size); - if (nal_start_idx < 0) { - err = -EINVAL; - goto err_free_fb_out; - } - - inst->vsi->dec.nal_info = buf[nal_start_idx]; lat_buf->vb2_v4l2_src = &src_buf_info->m2m_buf.vb; v4l2_m2m_buf_copy_metadata(&src_buf_info->m2m_buf.vb, &lat_buf->ts_info, true); @@ -846,7 +837,7 @@ static int vdec_h264_slice_lat_decode_ex(void *h_vdec, struct mtk_vcodec_mem *bs if (err) goto err_free_fb_out; - vdec_h264_insert_startcode(inst->ctx->dev, buf, &bs->size, + vdec_h264_insert_startcode(inst->ctx->dev, bs->va, &bs->size, &share_info->h264_slice_params.pps); *res_chg = inst->resolution_changed; @@ -1078,11 +1069,10 @@ static int vdec_h264_slice_single_decode_ex(void *h_vdec, struct mtk_vcodec_mem struct vdec_vpu_inst *vpu = &inst->vpu; struct mtk_video_dec_buf *src_buf_info, *dst_buf_info; struct vdec_fb *fb; - unsigned char *buf; unsigned int data[2], i; u64 y_fb_dma, c_fb_dma; struct mtk_vcodec_mem *mem; - int err, nal_start_idx; + int err; /* bs NULL means flush decoder */ if (!bs) @@ -1117,14 +1107,6 @@ static int vdec_h264_slice_single_decode_ex(void *h_vdec, struct mtk_vcodec_mem memcpy(&inst->vsi_ctx_ex.h264_slice_params, &inst->h264_slice_param, sizeof(inst->vsi_ctx_ex.h264_slice_params)); - buf = (unsigned char *)bs->va; - nal_start_idx = mtk_vdec_h264_find_start_code(buf, bs->size); - if (nal_start_idx < 0) { - err = -EINVAL; - goto err_free_fb_out; - } - inst->vsi_ctx_ex.dec.nal_info = buf[nal_start_idx]; - *res_chg = inst->resolution_changed; if (inst->resolution_changed) { mtk_vdec_debug(inst->ctx, "- resolution changed -");
Hardware can parse the slice syntax to get nal information in scp for extend architecture, needn't to parse it again in kernel. Signed-off-by: Yunfei Dong <yunfei.dong@mediatek.com> --- .../decoder/vdec/vdec_h264_req_multi_if.c | 24 +++---------------- 1 file changed, 3 insertions(+), 21 deletions(-)