venus: vdec: return parsed crop information from stream
Subsystems (4)
PATCH 1/1 venus: vdec: return parsed crop information from stream
Per the stateful codec specification, VIDIOC_G_SELECTION with a target of V4L2_SEL_TGT_COMPOSE is supposed to return the crop area of capture buffers containing the decoded frame. Until now the driver did not get that information from the firmware and just returned the dimensions of CAPTURE buffers.
--- drivers/media/platform/qcom/venus/core.h | 1 + drivers/media/platform/qcom/venus/vdec.c | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-)
drivers/media/platform/qcom/venus/core.h +1 -0
@@ -361,6 +361,7 @@ struct venus_inst {unsigned int streamon_cap, streamon_out;u32 width;u32 height; +struct v4l2_rect crop;u32 out_width;u32 out_height;u32 colorspace;
drivers/media/platform/qcom/venus/vdec.c +16 -5
@@ -325,6 +325,10 @@ static int vdec_s_fmt(struct file *file, void *fh, struct v4l2_format *f) inst->width = format.fmt.pix_mp.width; inst->height = format.fmt.pix_mp.height; + inst->crop.top =0 ; + inst->crop.left =0 ; + inst->crop.width = inst->width; + inst->crop.height = inst->height;if (f->type ==V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ) inst->fmt_out = fmt;
@@ -343,6 +347,9 @@ vdec_g_selection(struct file *file, void *fh, struct v4l2_selection *s) s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)return -EINVAL ; + s->r.top =0 ; + s->r.left =0 ; +switch (s->target) {case V4L2_SEL_TGT_CROP_BOUNDS :case V4L2_SEL_TGT_CROP_DEFAULT :
@@ -363,16 +370,12 @@ vdec_g_selection(struct file *file, void *fh, struct v4l2_selection *s)case V4L2_SEL_TGT_COMPOSE :if (s->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE )return -EINVAL ; - s->r.width = inst->out_width; - s->r.height = inst->out_height; + s->r = inst->crop;break ;default :return -EINVAL ; } - s->r.top =0 ; - s->r.left =0 ; -return 0 ; }
@@ -1309,6 +1312,10 @@ static void vdec_event_change(struct venus_inst *inst, inst->width = format.fmt.pix_mp.width; inst->height = format.fmt.pix_mp.height; + inst->crop.left = ev_data->input_crop.left; + inst->crop.top = ev_data->input_crop.top; + inst->crop.width = ev_data->input_crop.width; + inst->crop.height = ev_data->input_crop.height; inst->out_width = ev_data->width; inst->out_height = ev_data->height;
@@ -1412,6 +1419,10 @@ static void vdec_inst_init(struct venus_inst *inst) inst->fmt_cap = &vdec_formats[0 ]; inst->width =frame_width_min (inst); inst->height =ALIGN (frame_height_min (inst),32 ); + inst->crop.left =0 ; + inst->crop.top =0 ; + inst->crop.width = inst->width; + inst->crop.height = inst->height; inst->out_width =frame_width_min (inst); inst->out_height =frame_height_min (inst); inst->fps =30 ;
Signature · 1 line
2.28.0.1011.ga647a8990f-goog
It looks like only h.264 streams are populating the event.input_crop struct when receiving the HFI_INDEX_EXTRADATA_INPUT_CROP message in event_seq_changed(). vp8/vp9 streams end up with the struct filled with 0.
Quoted 93 lines · Alexandre Courbot
Per the stateful codec specification,
VIDIOC_G_SELECTIONwith a target ofV4L2_SEL_TGT_COMPOSEis supposed to return the crop area of capture buffers containing the decoded frame. Until now the driver did not get that information from the firmware and just returned the dimensions of CAPTURE buffers.Signed-off-by Alexandre Courbot <[email protected]>--- drivers/media/platform/qcom/venus/core.h | 1 + drivers/media/platform/qcom/venus/vdec.c | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-)drivers/media/platform/qcom/venus/core.h +1
-0@@ -361,6 +361,7 @@ struct venus_inst {unsigned int streamon_cap, streamon_out;u32 width;u32 height; +struct v4l2_rect crop;u32 out_width;u32 out_height;u32 colorspace;drivers/media/platform/qcom/venus/vdec.c +16
-6@@ -325,6 +325,10 @@ static int vdec_s_fmt(struct file *file, void *fh, struct v4l2_format *f) inst->width = format.fmt.pix_mp.width; inst->height = format.fmt.pix_mp.height; + inst->crop.top =0 ; + inst->crop.left =0 ; + inst->crop.width = inst->width; + inst->crop.height = inst->height;if (f->type ==V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ) inst->fmt_out = fmt;@@ -343,6 +347,9 @@ vdec_g_selection(struct file *file, void *fh, struct v4l2_selection *s) s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)return -EINVAL ; + s->r.top =0 ; + s->r.left =0 ; +switch (s->target) {case V4L2_SEL_TGT_CROP_BOUNDS :case V4L2_SEL_TGT_CROP_DEFAULT :@@ -363,16 +370,12 @@ vdec_g_selection(struct file *file, void *fh, struct v4l2_selection *s)case V4L2_SEL_TGT_COMPOSE :if (s->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE )return -EINVAL ; - s->r.width = inst->out_width; - s->r.height = inst->out_height; + s->r = inst->crop;break ;default :return -EINVAL ; } - s->r.top =0 ; - s->r.left =0 ; -return 0 ; }@@ -1309,6 +1312,10 @@ static void vdec_event_change(struct venus_inst *inst, inst->width = format.fmt.pix_mp.width; inst->height = format.fmt.pix_mp.height; + inst->crop.left = ev_data->input_crop.left; + inst->crop.top = ev_data->input_crop.top; + inst->crop.width = ev_data->input_crop.width; + inst->crop.height = ev_data->input_crop.height; inst->out_width = ev_data->width; inst->out_height = ev_data->height;@@ -1412,6 +1419,10 @@ static void vdec_inst_init(struct venus_inst *inst) inst->fmt_cap = &vdec_formats[0 ]; inst->width =frame_width_min (inst); inst->height =ALIGN (frame_height_min (inst),32 ); + inst->crop.left =0 ; + inst->crop.top =0 ; + inst->crop.width = inst->width; + inst->crop.height = inst->height; inst->out_width =frame_width_min (inst); inst->out_height =frame_height_min (inst); inst->fps =30 ; --2.28.0.1011.ga647a8990f-goog
Quoted 5 lines · Fritz Koenig
It looks like only h.264 streams are populating the event.input_crop struct when receiving the
HFI_INDEX_EXTRADATA_INPUT_CROPmessage inevent_seq_changed(). vp8/vp9 streams end up with the struct filled with 0.
Indeed. :( I guess we can fallback to the previous behavior of using the coded resolution as visible rect when the reported visible rect's area is 0. That will preserve the previous behavior until the firmware starts reporting this information for all encoded streams.
Quoted 95 lines · Alexandre Courbot
Quoted 93 lines
Per the stateful codec specification,
VIDIOC_G_SELECTIONwith a target ofV4L2_SEL_TGT_COMPOSEis supposed to return the crop area of capture buffers containing the decoded frame. Until now the driver did not get that information from the firmware and just returned the dimensions of CAPTURE buffers.Signed-off-by Alexandre Courbot <[email protected]>--- drivers/media/platform/qcom/venus/core.h | 1 + drivers/media/platform/qcom/venus/vdec.c | 21 ++++++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-)drivers/media/platform/qcom/venus/core.h +1
-0@@ -361,6 +361,7 @@ struct venus_inst {unsigned int streamon_cap, streamon_out;u32 width;u32 height; +struct v4l2_rect crop;u32 out_width;u32 out_height;u32 colorspace;drivers/media/platform/qcom/venus/vdec.c +16
-6@@ -325,6 +325,10 @@ static int vdec_s_fmt(struct file *file, void *fh, struct v4l2_format *f) inst->width = format.fmt.pix_mp.width; inst->height = format.fmt.pix_mp.height; + inst->crop.top =0 ; + inst->crop.left =0 ; + inst->crop.width = inst->width; + inst->crop.height = inst->height;if (f->type ==V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE ) inst->fmt_out = fmt;@@ -343,6 +347,9 @@ vdec_g_selection(struct file *file, void *fh, struct v4l2_selection *s) s->type != V4L2_BUF_TYPE_VIDEO_OUTPUT)return -EINVAL ; + s->r.top =0 ; + s->r.left =0 ; +switch (s->target) {case V4L2_SEL_TGT_CROP_BOUNDS :case V4L2_SEL_TGT_CROP_DEFAULT :@@ -363,16 +370,12 @@ vdec_g_selection(struct file *file, void *fh, struct v4l2_selection *s)case V4L2_SEL_TGT_COMPOSE :if (s->type !=V4L2_BUF_TYPE_VIDEO_CAPTURE )return -EINVAL ; - s->r.width = inst->out_width; - s->r.height = inst->out_height; + s->r = inst->crop;break ;default :return -EINVAL ; } - s->r.top =0 ; - s->r.left =0 ; -return 0 ; }@@ -1309,6 +1312,10 @@ static void vdec_event_change(struct venus_inst *inst, inst->width = format.fmt.pix_mp.width; inst->height = format.fmt.pix_mp.height; + inst->crop.left = ev_data->input_crop.left; + inst->crop.top = ev_data->input_crop.top; + inst->crop.width = ev_data->input_crop.width; + inst->crop.height = ev_data->input_crop.height; inst->out_width = ev_data->width; inst->out_height = ev_data->height;@@ -1412,6 +1419,10 @@ static void vdec_inst_init(struct venus_inst *inst) inst->fmt_cap = &vdec_formats[0 ]; inst->width =frame_width_min (inst); inst->height =ALIGN (frame_height_min (inst),32 ); + inst->crop.left =0 ; + inst->crop.top =0 ; + inst->crop.width = inst->width; + inst->crop.height = inst->height; inst->out_width =frame_width_min (inst); inst->out_height =frame_height_min (inst); inst->fps =30 ; --2.28.0.1011.ga647a8990f-goog