Skip to contentSkip to conversation

venus: venc: set inband mode property to FW.

PATCH RESEND Applied Dikshita Agarwal 3 participants 3 messages Jan 8, 2021 – Mar 1, 2021

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND v3 1/1 venus: venc: set inband mode property to FW.

set HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER to FW to support inband sequence header mode.

Changes since v2:
- fixed Null pointer dereference (Stanimir, Fritz)
- added set property call at correct place.

---
 drivers/media/platform/qcom/venus/venc.c       | 14 ++++++++++++++
 drivers/media/platform/qcom/venus/venc_ctrls.c | 17 ++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/venus/venc.c +14 -0
index 3a2e449..ae21a7c 100644
@@ -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_enable en;
 	u32 ptype, rate_control, bitrate;
 	u32 profile, level;
 	int ret;
@@ -655,6 +656,19 @@ 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_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER;
+		if (ctr->header_mode == V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE)
+			en.enable = 0;
+		else
+			en.enable = 1;
+
+		ret = hfi_session_set_property(inst, ptype, &en);
+		if (ret)
+			return ret;
+	}
+
 	if (!ctr->bitrate_peak)
 		bitrate *= 2;
 	else
drivers/media/platform/qcom/venus/venc_ctrls.c +16 -1
index cf860e6..3ce02ad 100644
@@ -158,6 +158,20 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
 		break;
 	case V4L2_CID_MPEG_VIDEO_HEADER_MODE:
 		ctr->header_mode = ctrl->val;
+		mutex_lock(&inst->lock);
+		if (inst->streamon_out && inst->streamon_cap) {
+			if (ctrl->val == V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE)
+				en.enable = 0;
+			else
+				en.enable = 1;
+			ptype = HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER;
+			ret = hfi_session_set_property(inst, ptype, &en);
+			if (ret) {
+				mutex_unlock(&inst->lock);
+				return ret;
+			}
+		}
+		mutex_unlock(&inst->lock);
 		break;
 	case V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB:
 		break;
@@ -289,7 +303,8 @@ int venc_ctrl_init(struct venus_inst *inst)
 	v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops,
 		V4L2_CID_MPEG_VIDEO_HEADER_MODE,
 		V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME,
-		1 << V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME,
+		~((1 << V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE) |
+		(1 << V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME)),
 		V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE);
 
 	v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops,
Signature · 1 line
2.7.4
Reviewed-by on v3 1/1
#1 lore raw
Quoted 27 lines · Dikshita Agarwal

set HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER to FW to support inband sequence header mode.

Changes since v2:
- fixed Null pointer dereference (Stanimir, Fritz)
- added set property call at correct place.

---
 drivers/media/platform/qcom/venus/venc.c       | 14 ++++++++++++++
 drivers/media/platform/qcom/venus/venc_ctrls.c | 17 ++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
drivers/media/platform/qcom/venus/venc.c +1 -0
index 3a2e449..ae21a7c 100644
@@ -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_enable en;
        u32 ptype, rate_control, bitrate;
        u32 profile, level;
        int ret;

drivers/media/platform/qcom/venus/venc.c static int venc_set_properties(struct venus_inst *inst) · line 660

Quoted 5 lines
drivers/media/platform/qcom/venus/venc.c +2 -0
@@ -655,6 +656,19 @@ 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) {

nit: declare |struct hfi_enable en| in this scope

Quoted 52 lines
drivers/media/platform/qcom/venus/venc.c +11 -0
+               ptype = HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER;
+               if (ctr->header_mode == V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE)
+                       en.enable = 0;
+               else
+                       en.enable = 1;
+
+               ret = hfi_session_set_property(inst, ptype, &en);
+               if (ret)
+                       return ret;
+       }
+
        if (!ctr->bitrate_peak)
                bitrate *= 2;
        else
drivers/media/platform/qcom/venus/venc_ctrls.c +16 -2
index cf860e6..3ce02ad 100644
@@ -158,6 +158,20 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
                break;
        case V4L2_CID_MPEG_VIDEO_HEADER_MODE:
                ctr->header_mode = ctrl->val;
+               mutex_lock(&inst->lock);
+               if (inst->streamon_out && inst->streamon_cap) {
+                       if (ctrl->val == V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE)
+                               en.enable = 0;
+                       else
+                               en.enable = 1;
+                       ptype = HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER;
+                       ret = hfi_session_set_property(inst, ptype, &en);
+                       if (ret) {
+                               mutex_unlock(&inst->lock);
+                               return ret;
+                       }
+               }
+               mutex_unlock(&inst->lock);
                break;
        case V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB:
                break;
@@ -289,7 +303,8 @@ int venc_ctrl_init(struct venus_inst *inst)
        v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops,
                V4L2_CID_MPEG_VIDEO_HEADER_MODE,
                V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME,
-               1 << V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME,
+               ~((1 << V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE) |
+               (1 << V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME)),
                V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE);
 
        v4l2_ctrl_new_std_menu(&inst->ctrl_handler, &venc_ctrl_ops,
--

2.7.4

#2 lore raw
In reply to Dikshita Agarwal
This patch was applied to qcom/linux.git (refs/heads/for-next):

Hello:

This patch was applied to qcom/linux.git (refs/heads/for-next):

Quoted 10 lines · On Fri, 8 Jan 2021 12:53:37 +0530 you wrote:

set HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER to FW to support inband sequence header mode.

Changes since v2:
- fixed Null pointer dereference (Stanimir, Fritz)
- added set property call at correct place.

[...]

Here is the summary with links:
- [RESEND,v3] venus: venc: set inband mode property to FW.

    https://git.kernel.org/qcom/c/002c22bd360e

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html