media: venus: dynamic handling of bitrate
Subsystems (4)
PATCH 1/1 media: venus: dynamic handling of bitrate
Any request for a change in bitrate after both planes are streamed on is handled by setting the target bitrate property to hardware.
--- drivers/media/platform/qcom/venus/venc_ctrls.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/media/platform/qcom/venus/venc_ctrls.c +11 -0
@@ -79,7 +79,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) {struct venus_inst *inst =ctrl_to_inst (ctrl);struct venc_controls *ctr = &inst->controls.enc; +struct hfi_bitrate brate;u32 bframes; +u32 ptype;int ret;switch (ctrl->id) {
@@ -88,6 +90,15 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)break ;case V4L2_CID_MPEG_VIDEO_BITRATE : ctr->bitrate = ctrl->val; +if (inst->streamon_out && inst->streamon_cap) { + ptype =HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE ; + brate.bitrate = ctr->bitrate; + brate.layer_id =0 ; + + ret =hfi_session_set_property (inst, ptype, &brate); +if (ret) +return ret; + }break ;case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK : ctr->bitrate_peak = ctrl->val;
Signature · 1 line
1.9.1
Hi Malathi,
Thanks for the patch!
Quoted 24 lines · Malathi Gottam
Any request for a change in bitrate after both planes are streamed on is handled by setting the target bitrate property to hardware.
Signed-off-by Malathi Gottam <[email protected]>--- drivers/media/platform/qcom/venus/venc_ctrls.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/media/platform/qcom/venus/venc_ctrls.c +2
-0@@ -79,7 +79,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) {struct venus_inst *inst =ctrl_to_inst (ctrl);struct venc_controls *ctr = &inst->controls.enc; +struct hfi_bitrate brate;u32 bframes; +u32 ptype;int ret;switch (ctrl->id) {
drivers/media/platform/qcom/venus/venc_ctrls.c static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) · line 93
Quoted 4 lines
drivers/media/platform/qcom/venus/venc_ctrls.c +1
-0@@ -88,6 +90,15 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)break ;case V4L2_CID_MPEG_VIDEO_BITRATE : ctr->bitrate = ctrl->val; +if (inst->streamon_out && inst->streamon_cap) {
Hmm, hfi_session_set_property already checks the instance state so I don't think those checks are needed. Another thing is that we need to take the instance mutex to check the instance state.
Quoted 12 lines
drivers/media/platform/qcom/venus/venc_ctrls.c +8
-0+ ptype =HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE ; + brate.bitrate = ctr->bitrate; + brate.layer_id =0 ; + + ret =hfi_session_set_property (inst, ptype, &brate); +if (ret) +return ret; + }break ;case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK : ctr->bitrate_peak = ctrl->val;
Signature · 2 lines
regards, Stan
Quoted 27 lines · Stanimir Varbanov
Hi Malathi,
Thanks for the patch!
Quoted 22 lines · Malathi Gottam
Any request for a change in bitrate after both planes are streamed on is handled by setting the target bitrate property to hardware.
Signed-off-by Malathi Gottam <[email protected]>--- drivers/media/platform/qcom/venus/venc_ctrls.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/media/platform/qcom/venus/venc_ctrls.c +2
-0@@ -79,7 +79,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) {struct venus_inst *inst =ctrl_to_inst (ctrl);struct venc_controls *ctr = &inst->controls.enc; +struct hfi_bitrate brate;u32 bframes; +u32 ptype;int ret;
Quoted 10 lines
drivers/media/platform/qcom/venus/venc_ctrls.c static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) · line 93
Quoted 6 lines
drivers/media/platform/qcom/venus/venc_ctrls.c +1
-0switch (ctrl->id) {@@ -88,6 +90,15 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)break ;case V4L2_CID_MPEG_VIDEO_BITRATE : ctr->bitrate = ctrl->val; +if (inst->streamon_out && inst->streamon_cap) {Hmm,
hfi_session_set_propertyalready checks the instance state so I don't think those checks are needed. Another thing is that we need to take the instance mutex to check the instance state.
Yes Stan, "hfi_session_set_property" this property check the instance state, but returns EINVAL if this is set at UNINIT instance state.
Controls initialization happens much earlier than session init and instance init. So the instance is still in UNINIT state which causes failure while setting.
Through this patch we try to meet the client request of changing bitrate only when both planes are streamed on.
We have two ways to handle it
1. The way in this patch checks the planes state which will definitely ensure instance is in START state.
2. Have a check to ensure that instance is atleast Initialized.
I hope the first proposal is good enough for meeting requirement.
Quoted 13 lines
Quoted 13 lines
drivers/media/platform/qcom/venus/venc_ctrls.c +8
-0+ ptype =HFI_PROPERTY_CONFIG_VENC_TARGET_BITRATE ; + brate.bitrate = ctr->bitrate; + brate.layer_id =0 ; + + ret =hfi_session_set_property (inst, ptype, &brate); +if (ret) +return ret; + }break ;case V4L2_CID_MPEG_VIDEO_BITRATE_PEAK : ctr->bitrate_peak = ctrl->val;
Quoted 45 lines · On Thu, Nov 1, 2018 at 10:01 PM <[email protected]> wrote:
Quoted 28 lines · Stanimir Varbanov
Hi Malathi,
Thanks for the patch!
Quoted 23 lines · Malathi Gottam
Any request for a change in bitrate after both planes are streamed on is handled by setting the target bitrate property to hardware.
Signed-off-by Malathi Gottam <[email protected]>--- drivers/media/platform/qcom/venus/venc_ctrls.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/media/platform/qcom/venus/venc_ctrls.c +2
-0@@ -79,7 +79,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) {struct venus_inst *inst =ctrl_to_inst (ctrl);struct venc_controls *ctr = &inst->controls.enc; +struct hfi_bitrate brate;u32 bframes; +u32 ptype;int ret;Quoted 10 lines
drivers/media/platform/qcom/venus/venc_ctrls.c static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) · line 93
Quoted 6 lines
drivers/media/platform/qcom/venus/venc_ctrls.c +1
-0switch (ctrl->id) {@@ -88,6 +90,15 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)break ;case V4L2_CID_MPEG_VIDEO_BITRATE : ctr->bitrate = ctrl->val; +if (inst->streamon_out && inst->streamon_cap) {Hmm,
hfi_session_set_propertyalready checks the instance state so I don't think those checks are needed. Another thing is that we need to take the instance mutex to check the instance state.Yes Stan, "
hfi_session_set_property" this property check the instance state,
but returns EINVAL if this is set at UNINIT instance state.
Quoted 8 lines
Controls initialization happens much earlier than session init and instance init.
So the instance is still in UNINIT state which causes failure while setting.Through this patch we try to meet the client request of changing bitrate only
when both planes are streamed on.
Where does this requirement come from? It should be possible to set the control at any time and it should apply to any encoding happening after the control is set.
Best regards,
Tomasz
Quoted 51 lines · Tomasz Figa
Quoted 50 lines · On Thu, Nov 1, 2018 at 10:01 PM <[email protected]> wrote:
Quoted 28 lines · Stanimir Varbanov
Hi Malathi,
Thanks for the patch!
Quoted 23 lines · Malathi Gottam
Any request for a change in bitrate after both planes are streamed on is handled by setting the target bitrate property to hardware.
Signed-off-by Malathi Gottam <[email protected]>--- drivers/media/platform/qcom/venus/venc_ctrls.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/media/platform/qcom/venus/venc_ctrls.c +2
-0@@ -79,7 +79,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) {struct venus_inst *inst =ctrl_to_inst (ctrl);struct venc_controls *ctr = &inst->controls.enc; +struct hfi_bitrate brate;u32 bframes; +u32 ptype;int ret;Quoted 10 lines
drivers/media/platform/qcom/venus/venc_ctrls.c static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) · line 93
Quoted 6 lines
drivers/media/platform/qcom/venus/venc_ctrls.c +1
-0switch (ctrl->id) {@@ -88,6 +90,15 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)break ;case V4L2_CID_MPEG_VIDEO_BITRATE : ctr->bitrate = ctrl->val; +if (inst->streamon_out && inst->streamon_cap) {Hmm,
hfi_session_set_propertyalready checks the instance state so I don't think those checks are needed. Another thing is that we need to take the instance mutex to check the instance state.Yes Stan, "
hfi_session_set_property" this property check the instance state,
but returns EINVAL if this is set at UNINIT instance state.Controls initialization happens much earlier than session init and instance init.
So the instance is still in UNINIT state which causes failure while setting.
Quoted 8 lines
Quoted 3 lines
Through this patch we try to meet the client request of changing bitrate only
when both planes are streamed on.Where does this requirement come from? It should be possible to set the control at any time and it should apply to any encoding happening after the control is set.
With the patch, now video driver will set the control whenever client sets and will apply to encoder.
Thanks,
Vikash
Quoted 58 lines · Vikash Garodia
Quoted 56 lines · Tomasz Figa
Quoted 54 lines · On Thu, Nov 1, 2018 at 10:01 PM <[email protected]> wrote:
Quoted 28 lines · Stanimir Varbanov
Hi Malathi,
Thanks for the patch!
Quoted 23 lines · Malathi Gottam
Any request for a change in bitrate after both planes are streamed on is handled by setting the target bitrate property to hardware.
Signed-off-by Malathi Gottam <[email protected]>--- drivers/media/platform/qcom/venus/venc_ctrls.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/media/platform/qcom/venus/venc_ctrls.c +2
-0@@ -79,7 +79,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) {struct venus_inst *inst =ctrl_to_inst (ctrl);struct venc_controls *ctr = &inst->controls.enc; +struct hfi_bitrate brate;u32 bframes; +u32 ptype;int ret;Quoted 10 lines
drivers/media/platform/qcom/venus/venc_ctrls.c static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) · line 93
Quoted 6 lines
drivers/media/platform/qcom/venus/venc_ctrls.c +1
-0switch (ctrl->id) {@@ -88,6 +90,15 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)break ;case V4L2_CID_MPEG_VIDEO_BITRATE : ctr->bitrate = ctrl->val; +if (inst->streamon_out && inst->streamon_cap) {Hmm,
hfi_session_set_propertyalready checks the instance state so I don't think those checks are needed. Another thing is that we need to take the instance mutex to check the instance state.Yes Stan, "
hfi_session_set_property" this property check the instance state,
but returns EINVAL if this is set at UNINIT instance state.Controls initialization happens much earlier than session init and instance init.
So the instance is still in UNINIT state which causes failure while setting.Through this patch we try to meet the client request of changing bitrate
only
when both planes are streamed on.
Quoted 7 lines
Quoted 4 lines
Where does this requirement come from? It should be possible to set the control at any time and it should apply to any encoding happening after the control is set.
With the patch, now video driver will set the control whenever client sets
and will apply to encoder.
That's good, thanks for clarifying. I guess I misunderstood Malathi's comment.
Best regards,
Tomasz
Quoted 63 lines · Tomasz Figa
Quoted 62 lines · Vikash Garodia
Quoted 60 lines · Tomasz Figa
Quoted 50 lines · On Thu, Nov 1, 2018 at 10:01 PM <[email protected]> wrote:
Quoted 28 lines · Stanimir Varbanov
Hi Malathi,
Thanks for the patch!
Quoted 23 lines · Malathi Gottam
Any request for a change in bitrate after both planes are streamed on is handled by setting the target bitrate property to hardware.
Signed-off-by Malathi Gottam <[email protected]>--- drivers/media/platform/qcom/venus/venc_ctrls.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/media/platform/qcom/venus/venc_ctrls.c +2
-0@@ -79,7 +79,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) {struct venus_inst *inst =ctrl_to_inst (ctrl);struct venc_controls *ctr = &inst->controls.enc; +struct hfi_bitrate brate;u32 bframes; +u32 ptype;int ret;Quoted 10 lines
drivers/media/platform/qcom/venus/venc_ctrls.c static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) · line 93
Quoted 6 lines
drivers/media/platform/qcom/venus/venc_ctrls.c +1
-0switch (ctrl->id) {@@ -88,6 +90,15 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)break ;case V4L2_CID_MPEG_VIDEO_BITRATE : ctr->bitrate = ctrl->val; +if (inst->streamon_out && inst->streamon_cap) {Hmm,
hfi_session_set_propertyalready checks the instance state so I don't think those checks are needed. Another thing is that we need to take the instance mutex to check the instance state.Yes Stan, "
hfi_session_set_property" this property check the instance state,
but returns EINVAL if this is set at UNINIT instance state.Controls initialization happens much earlier than session init and instance init.
So the instance is still in UNINIT state which causes failure while setting.Quoted 4 lines
Through this patch we try to meet the client request of changing bitrate
only
when both planes are streamed on.Where does this requirement come from? It should be possible to set the control at any time and it should apply to any encoding happening after the control is set.
Quoted 5 lines
Quoted 3 lines
With the patch, now video driver will set the control whenever client sets
and will apply to encoder.That's good, thanks for clarifying. I guess I misunderstood Malathi's comment.
OK, just wonder about locking when we check streamon_out/cap flags?
Signature · 2 lines
regards, Stan
Quoted 66 lines · Stanimir Varbanov
Quoted 65 lines · Tomasz Figa
Quoted 64 lines · Vikash Garodia
Quoted 62 lines · Tomasz Figa
Quoted 52 lines · On Thu, Nov 1, 2018 at 10:01 PM <[email protected]> wrote:
Quoted 29 lines · Stanimir Varbanov
Hi Malathi,
Thanks for the patch!
Quoted 24 lines · Malathi Gottam
Any request for a change in bitrate after both planes are streamed on is handled by setting the target bitrate property to hardware.
Signed-off-by Malathi Gottam <[email protected]>--- drivers/media/platform/qcom/venus/venc_ctrls.c | 11 +++++++++++ 1 file changed, 11 insertions(+)drivers/media/platform/qcom/venus/venc_ctrls.c +2
-0@@ -79,7 +79,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl) {struct venus_inst *inst =ctrl_to_inst (ctrl);struct venc_controls *ctr = &inst->controls.enc; +struct hfi_bitrate brate;u32 bframes; +u32 ptype;int ret;Quoted 11 lines
drivers/media/platform/qcom/venus/venc_ctrls.c static int venc_op_s_ctrl(struct v4l2_ctrl · line 94
Quoted 7 lines
switch (ctrl->id) {drivers/media/platform/qcom/venus/venc_ctrls.c +1
-0@@ -88,6 +90,15 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)break ;case V4L2_CID_MPEG_VIDEO_BITRATE : ctr->bitrate = ctrl->val; +if (inst->streamon_out && inst->streamon_cap) {Hmm,
hfi_session_set_propertyalready checks the instance state so I don't think those checks are needed. Another thing is that we need to take the instance mutex to check the instance state.Yes Stan, "
hfi_session_set_property" this property check the instance state,
but returns EINVAL if this is set at UNINIT instance state.Controls initialization happens much earlier than session init and instance init.
So the instance is still in UNINIT state which causes failure while setting.Quoted 4 lines
Through this patch we try to meet the client request of changing bitrate
only
when both planes are streamed on.Where does this requirement come from? It should be possible to set the control at any time and it should apply to any encoding happening after the control is set.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
With the patch, now video driver will set the control whenever client sets
and will apply to encoder.That's good, thanks for clarifying. I guess I misunderstood Malathi's comment.
OK, just wonder about locking when we check streamon_out/cap flags?
Yes Stan, I agree that we should add an instance lock for these flags check. Posting the updated patch. Please review.