* [PATCH 1/3] media: mtk-vcodec: enc: add vp8 profile ctrl
2021-10-22 15:04 [PATCH 0/3] media: mtk-vcodec: few fixes Dafna Hirschfeld
@ 2021-10-22 15:04 ` Dafna Hirschfeld
2021-10-28 14:18 ` Nicolas Dufresne
2021-10-22 15:04 ` [PATCH 2/3] media: mtk-vcodec: enc: use "stream_started" flag for "stop/start_streaming" Dafna Hirschfeld
2021-10-22 15:04 ` [PATCH 3/3] meida: mtk-vcodec: remove unused func parameter Dafna Hirschfeld
2 siblings, 1 reply; 6+ messages in thread
From: Dafna Hirschfeld @ 2021-10-22 15:04 UTC (permalink / raw)
To: linux-media
Cc: Dafna Hirschfeld, kernel, acourbot, andrew-ct.chen, courbot,
dafna3, eizan, houlong.wei, hsinyi, hverkuil, irui.wang,
linux-kernel, linux-mediatek, maoguang.meng, matthias.bgg,
mchehab, minghsiu.tsai, tfiga, tiffany.lin
In order for the encoder to work with gstreamer
it needs to have the V4L2_CID_MPEG_VIDEO_VP8_PROFILE
ctrl. This patch adds that ctrl with only profile 0
supported.
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
index 8998244ea671..87a5114bf680 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
@@ -103,6 +103,13 @@ static int vidioc_venc_s_ctrl(struct v4l2_ctrl *ctrl)
p->gop_size = ctrl->val;
ctx->param_change |= MTK_ENCODE_PARAM_GOP_SIZE;
break;
+ case V4L2_CID_MPEG_VIDEO_VP8_PROFILE:
+ /*
+ * FIXME - what vp8 profiles are actually supported?
+ * The ctrl is added (with only profile 0 supported) for now.
+ */
+ mtk_v4l2_debug(2, "V4L2_CID_MPEG_VIDEO_VP8_PROFILE val = %d", ctrl->val);
+ break;
case V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME:
mtk_v4l2_debug(2, "V4L2_CID_MPEG_VIDEO_FORCE_KEY_FRAME");
p->force_intra = 1;
@@ -1394,6 +1401,9 @@ int mtk_vcodec_enc_ctrls_setup(struct mtk_vcodec_ctx *ctx)
v4l2_ctrl_new_std_menu(handler, ops, V4L2_CID_MPEG_VIDEO_H264_LEVEL,
h264_max_level,
0, V4L2_MPEG_VIDEO_H264_LEVEL_4_0);
+ v4l2_ctrl_new_std_menu(handler, ops, V4L2_CID_MPEG_VIDEO_VP8_PROFILE,
+ V4L2_MPEG_VIDEO_VP8_PROFILE_0, 0, V4L2_MPEG_VIDEO_VP8_PROFILE_0);
+
if (handler->error) {
mtk_v4l2_err("Init control handler fail %d",
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] media: mtk-vcodec: enc: use "stream_started" flag for "stop/start_streaming"
2021-10-22 15:04 [PATCH 0/3] media: mtk-vcodec: few fixes Dafna Hirschfeld
2021-10-22 15:04 ` [PATCH 1/3] media: mtk-vcodec: enc: add vp8 profile ctrl Dafna Hirschfeld
@ 2021-10-22 15:04 ` Dafna Hirschfeld
2021-11-15 13:45 ` Hans Verkuil
2021-10-22 15:04 ` [PATCH 3/3] meida: mtk-vcodec: remove unused func parameter Dafna Hirschfeld
2 siblings, 1 reply; 6+ messages in thread
From: Dafna Hirschfeld @ 2021-10-22 15:04 UTC (permalink / raw)
To: linux-media
Cc: Dafna Hirschfeld, kernel, acourbot, andrew-ct.chen, courbot,
dafna3, eizan, houlong.wei, hsinyi, hverkuil, irui.wang,
linux-kernel, linux-mediatek, maoguang.meng, matthias.bgg,
mchehab, minghsiu.tsai, tfiga, tiffany.lin
Currently the mtk-vcodec encoder init the hardware
upon "start_streaming" cb when both queues are streaming and turns off
the hardware upon "stop_streaming" when both queues stop
streaming. This is wrong since the same queue might be started and
then stopped causing the driver to turn off the hardware without
turning it on. This cause for example unbalanced
calls to pm_runtime_*
Fixes: 4e855a6efa547 ("[media] vcodec: mediatek: Add Mediatek V4L2 Video Encoder Driver")
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 4 ++++
drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 8 ++++++++
2 files changed, 12 insertions(+)
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
index 9d36e3d27369..84c5289f872b 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
@@ -259,6 +259,9 @@ struct vdec_pic_info {
* @decoded_frame_cnt: number of decoded frames
* @lock: protect variables accessed by V4L2 threads and worker thread such as
* mtk_video_dec_buf.
+ * @stream_started: this flag is turned on when both queues (cap and out) starts streaming
+ * and it is turned off once both queues stop streaming. It is used for a correct
+ * setup and set-down of the hardware when starting and stopping streaming.
*/
struct mtk_vcodec_ctx {
enum mtk_instance_type type;
@@ -301,6 +304,7 @@ struct mtk_vcodec_ctx {
int decoded_frame_cnt;
struct mutex lock;
+ bool stream_started;
};
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
index 87a5114bf680..fb3cf804c96a 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c
@@ -890,6 +890,9 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count)
goto err_start_stream;
}
+ if (ctx->stream_started)
+ return 0;
+
/* Do the initialization when both start_streaming have been called */
if (V4L2_TYPE_IS_OUTPUT(q->type)) {
if (!vb2_start_streaming_called(&ctx->m2m_ctx->cap_q_ctx.q))
@@ -928,6 +931,7 @@ static int vb2ops_venc_start_streaming(struct vb2_queue *q, unsigned int count)
ctx->state = MTK_STATE_HEADER;
}
+ ctx->stream_started = true;
return 0;
err_set_param:
@@ -1002,6 +1006,9 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q)
}
}
+ if (!ctx->stream_started)
+ return;
+
if ((q->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE &&
vb2_is_streaming(&ctx->m2m_ctx->out_q_ctx.q)) ||
(q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE &&
@@ -1023,6 +1030,7 @@ static void vb2ops_venc_stop_streaming(struct vb2_queue *q)
mtk_v4l2_err("pm_runtime_put fail %d", ret);
ctx->state = MTK_STATE_FREE;
+ ctx->stream_started = false;
}
static int vb2ops_venc_buf_out_validate(struct vb2_buffer *vb)
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] meida: mtk-vcodec: remove unused func parameter
2021-10-22 15:04 [PATCH 0/3] media: mtk-vcodec: few fixes Dafna Hirschfeld
2021-10-22 15:04 ` [PATCH 1/3] media: mtk-vcodec: enc: add vp8 profile ctrl Dafna Hirschfeld
2021-10-22 15:04 ` [PATCH 2/3] media: mtk-vcodec: enc: use "stream_started" flag for "stop/start_streaming" Dafna Hirschfeld
@ 2021-10-22 15:04 ` Dafna Hirschfeld
2 siblings, 0 replies; 6+ messages in thread
From: Dafna Hirschfeld @ 2021-10-22 15:04 UTC (permalink / raw)
To: linux-media
Cc: Dafna Hirschfeld, kernel, acourbot, andrew-ct.chen, courbot,
dafna3, eizan, houlong.wei, hsinyi, hverkuil, irui.wang,
linux-kernel, linux-mediatek, maoguang.meng, matthias.bgg,
mchehab, minghsiu.tsai, tfiga, tiffany.lin
The prarameter bs_size to function vpu_enc_encode
is not used. Remove it.
Signed-off-by: Dafna Hirschfeld <dafna.hirschfeld@collabora.com>
---
drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c | 9 +++------
drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c | 3 +--
drivers/media/platform/mtk-vcodec/venc_vpu_if.c | 1 -
drivers/media/platform/mtk-vcodec/venc_vpu_if.h | 1 -
4 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c b/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
index b6a4f2074fa5..bf03888a824f 100644
--- a/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
+++ b/drivers/media/platform/mtk-vcodec/venc/venc_h264_if.c
@@ -367,8 +367,7 @@ static int h264_encode_sps(struct venc_h264_inst *inst,
mtk_vcodec_debug_enter(inst);
- ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_SPS, NULL,
- bs_buf, bs_size, NULL);
+ ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_SPS, NULL, bs_buf, NULL);
if (ret)
return ret;
@@ -394,8 +393,7 @@ static int h264_encode_pps(struct venc_h264_inst *inst,
mtk_vcodec_debug_enter(inst);
- ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_PPS, NULL,
- bs_buf, bs_size, NULL);
+ ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_PPS, NULL, bs_buf, NULL);
if (ret)
return ret;
@@ -451,8 +449,7 @@ static int h264_encode_frame(struct venc_h264_inst *inst,
mtk_vcodec_debug(inst, "frm_count = %d,skip_frm_count =%d,frm_type=%d.\n",
frame_info.frm_count, frame_info.skip_frm_count,
frame_info.frm_type);
- ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_FRAME, frm_buf,
- bs_buf, bs_size, &frame_info);
+ ret = vpu_enc_encode(&inst->vpu_inst, H264_BS_MODE_FRAME, frm_buf, bs_buf, &frame_info);
if (ret)
return ret;
diff --git a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
index 8267a9c4fd25..6b66957d5192 100644
--- a/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
+++ b/drivers/media/platform/mtk-vcodec/venc/venc_vp8_if.c
@@ -302,8 +302,7 @@ static int vp8_enc_encode_frame(struct venc_vp8_inst *inst,
mtk_vcodec_debug(inst, "->frm_cnt=%d", inst->frm_cnt);
- ret = vpu_enc_encode(&inst->vpu_inst, 0, frm_buf, bs_buf, bs_size,
- NULL);
+ ret = vpu_enc_encode(&inst->vpu_inst, 0, frm_buf, bs_buf, NULL);
if (ret)
return ret;
diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c b/drivers/media/platform/mtk-vcodec/venc_vpu_if.c
index be6d8790a41e..e7899d8a3e4e 100644
--- a/drivers/media/platform/mtk-vcodec/venc_vpu_if.c
+++ b/drivers/media/platform/mtk-vcodec/venc_vpu_if.c
@@ -225,7 +225,6 @@ int vpu_enc_set_param(struct venc_vpu_inst *vpu,
int vpu_enc_encode(struct venc_vpu_inst *vpu, unsigned int bs_mode,
struct venc_frm_buf *frm_buf,
struct mtk_vcodec_mem *bs_buf,
- unsigned int *bs_size,
struct venc_frame_info *frame_info)
{
const bool is_ext = MTK_ENC_CTX_IS_EXT(vpu->ctx);
diff --git a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h b/drivers/media/platform/mtk-vcodec/venc_vpu_if.h
index f9be9cab7ff7..f83bc1b3f2bf 100644
--- a/drivers/media/platform/mtk-vcodec/venc_vpu_if.h
+++ b/drivers/media/platform/mtk-vcodec/venc_vpu_if.h
@@ -45,7 +45,6 @@ int vpu_enc_set_param(struct venc_vpu_inst *vpu,
int vpu_enc_encode(struct venc_vpu_inst *vpu, unsigned int bs_mode,
struct venc_frm_buf *frm_buf,
struct mtk_vcodec_mem *bs_buf,
- unsigned int *bs_size,
struct venc_frame_info *frame_info);
int vpu_enc_deinit(struct venc_vpu_inst *vpu);
--
2.17.1
^ permalink raw reply related [flat|nested] 6+ messages in thread