lkml.org 
[lkml]   [2020]   [Nov]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/4] venus: venc: Add support for intra-refresh modes
Date
Add support for random intra-refresh mode and number of macroblocks.

Signed-off-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
---
drivers/media/platform/qcom/venus/core.h | 2 ++
drivers/media/platform/qcom/venus/venc.c | 12 ++++++++++++
drivers/media/platform/qcom/venus/venc_ctrls.c | 10 +++++++++-
3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index 3bc129a4f817..52df8b3ea438 100644
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -242,6 +242,8 @@ struct venc_controls {
u32 multi_slice_max_mb;

u32 header_mode;
+ u32 intra_refresh_mode;
+ u32 intra_refresh_mbs;

u32 profile;
u32 level;
diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
index 0bf92cc21f3a..71b525099e45 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -536,6 +536,7 @@ static int venc_set_properties(struct venus_inst *inst)
struct hfi_idr_period idrp;
struct hfi_quantization quant;
struct hfi_quantization_range quant_range;
+ struct hfi_intra_refresh intra_refresh = {};
u32 ptype, rate_control, bitrate;
int ret;

@@ -684,6 +685,17 @@ static int venc_set_properties(struct venus_inst *inst)
if (ret)
return ret;

+ if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 ||
+ inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) {
+ ptype = HFI_PROPERTY_PARAM_VENC_INTRA_REFRESH;
+ intra_refresh.mode = ctr->intra_refresh_mode;
+ intra_refresh.cir_mbs = ctr->intra_refresh_mbs;
+
+ ret = hfi_session_set_property(inst, ptype, &intra_refresh);
+ if (ret)
+ return ret;
+ }
+
ret = venus_helper_set_profile_level(inst, ctr->profile, ctr->level);
if (ret)
return ret;
diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c
index 0708b3b89d0c..74b4269e2e9c 100644
--- a/drivers/media/platform/qcom/venus/venc_ctrls.c
+++ b/drivers/media/platform/qcom/venus/venc_ctrls.c
@@ -198,6 +198,10 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
case V4L2_CID_MPEG_VIDEO_FRAME_SKIP_MODE:
ctr->frame_skip_mode = ctrl->val;
break;
+ case V4L2_CID_MPEG_VIDEO_RANDOM_INTRA_REFRESH_MB:
+ ctr->intra_refresh_mbs = ctrl->val;
+ ctr->intra_refresh_mode = HFI_INTRA_REFRESH_RANDOM;
+ break;
default:
return -EINVAL;
}
@@ -213,7 +217,7 @@ int venc_ctrl_init(struct venus_inst *inst)
{
int ret;

- ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 33);
+ ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 34);
if (ret)
return ret;

@@ -364,6 +368,10 @@ int venc_ctrl_init(struct venus_inst *inst)
(1 << V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_BUF_LIMIT)),
V4L2_MPEG_VIDEO_FRAME_SKIP_MODE_DISABLED);

+ v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+ V4L2_CID_MPEG_VIDEO_RANDOM_INTRA_REFRESH_MB, 0,
+ ((7680 * 4320) >> 8), 1, 0);
+
ret = inst->ctrl_handler.error;
if (ret)
goto err;
--
2.17.1
\
 
 \ /
  Last update: 2020-11-30 10:12    [W:0.705 / U:0.044 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site