mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stanimir Varbanov <stanimir.varbanov@linaro.org>
To: Mansur Alisha Shaik <mansur@codeaurora.org>,
	linux-media@vger.kernel.org, stanimir.varbanov@linaro.org
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	vgarodia@codeaurora.org, dikshita@codeaurora.org
Subject: Re: [V2] venus: venc: add support for V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM control
Date: Thu, 29 Jul 2021 11:04:21 +0300	[thread overview]
Message-ID: <d43738a8-cc29-57c7-d9e4-bf8ee03bfe19@linaro.org> (raw)
In-Reply-To: <1626184787-25020-1-git-send-email-mansur@codeaurora.org>



On 7/13/21 4:59 PM, Mansur Alisha Shaik wrote:
> Add support for V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM control for
> H264 high profile and constrained high profile.
> 
> Signed-off-by: Mansur Alisha Shaik <mansur@codeaurora.org>
> ---
>  drivers/media/platform/qcom/venus/core.h       |  1 +
>  drivers/media/platform/qcom/venus/hfi_cmds.c   |  8 ++++++++
>  drivers/media/platform/qcom/venus/hfi_helper.h |  5 +++++
>  drivers/media/platform/qcom/venus/venc.c       | 11 +++++++++++
>  drivers/media/platform/qcom/venus/venc_ctrls.c | 15 ++++++++++++++-
>  5 files changed, 39 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
> index 8df2d49..39dfab4 100644
> --- a/drivers/media/platform/qcom/venus/core.h
> +++ b/drivers/media/platform/qcom/venus/core.h
> @@ -234,6 +234,7 @@ struct venc_controls {
>  	u32 h264_loop_filter_mode;
>  	s32 h264_loop_filter_alpha;
>  	s32 h264_loop_filter_beta;
> +	u32 h264_8x8_transform;
>  
>  	u32 hevc_i_qp;
>  	u32 hevc_p_qp;
> diff --git a/drivers/media/platform/qcom/venus/hfi_cmds.c b/drivers/media/platform/qcom/venus/hfi_cmds.c
> index f510247..d121dcb 100644
> --- a/drivers/media/platform/qcom/venus/hfi_cmds.c
> +++ b/drivers/media/platform/qcom/venus/hfi_cmds.c
> @@ -1239,6 +1239,14 @@ pkt_session_set_property_4xx(struct hfi_session_set_property_pkt *pkt,
>  		break;
>  	}
>  
> +	case HFI_PROPERTY_PARAM_VENC_H264_TRANSFORM_8X8: {
> +		struct hfi_h264_8x8x_transform *in = pdata, *tm = prop_data;
> +
> +		tm->enable_type = in->enable_type;
> +		pkt->shdr.hdr.size += sizeof(u32) + sizeof(*tm);
> +		break;
> +	}
> +
>  	case HFI_PROPERTY_CONFIG_VENC_MAX_BITRATE:
>  	case HFI_PROPERTY_CONFIG_VDEC_POST_LOOP_DEBLOCKER:
>  	case HFI_PROPERTY_PARAM_BUFFER_ALLOC_MODE:
> diff --git a/drivers/media/platform/qcom/venus/hfi_helper.h b/drivers/media/platform/qcom/venus/hfi_helper.h
> index b0a9beb..fe3e523 100644
> --- a/drivers/media/platform/qcom/venus/hfi_helper.h
> +++ b/drivers/media/platform/qcom/venus/hfi_helper.h
> @@ -507,6 +507,7 @@
>  #define HFI_PROPERTY_PARAM_VENC_MAX_NUM_B_FRAMES		0x2005020
>  #define HFI_PROPERTY_PARAM_VENC_H264_VUI_BITSTREAM_RESTRC	0x2005021
>  #define HFI_PROPERTY_PARAM_VENC_PRESERVE_TEXT_QUALITY		0x2005023
> +#define HFI_PROPERTY_PARAM_VENC_H264_TRANSFORM_8X8			0x2005025
>  #define HFI_PROPERTY_PARAM_VENC_HIER_P_MAX_NUM_ENH_LAYER	0x2005026
>  #define HFI_PROPERTY_PARAM_VENC_DISABLE_RC_TIMESTAMP		0x2005027
>  #define HFI_PROPERTY_PARAM_VENC_INITIAL_QP			0x2005028
> @@ -562,6 +563,10 @@ struct hfi_bitrate {
>  	u32 layer_id;
>  };
>  
> +struct hfi_h264_8x8x_transform {

s/hfi_h264_8x8x_transform/hfi_h264_8x8_transform

> +	u32 enable_type;
> +};
> +
>  #define HFI_CAPABILITY_FRAME_WIDTH			0x01
>  #define HFI_CAPABILITY_FRAME_HEIGHT			0x02
>  #define HFI_CAPABILITY_MBS_PER_FRAME			0x03
> diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
> index 8dd49d4..948369c 100644
> --- a/drivers/media/platform/qcom/venus/venc.c
> +++ b/drivers/media/platform/qcom/venus/venc.c
> @@ -567,6 +567,7 @@ static int venc_set_properties(struct venus_inst *inst)
>  		struct hfi_h264_vui_timing_info info;
>  		struct hfi_h264_entropy_control entropy;
>  		struct hfi_h264_db_control deblock;
> +		struct hfi_h264_8x8x_transform h264_transform;
>  
>  		ptype = HFI_PROPERTY_PARAM_VENC_H264_VUI_TIMING_INFO;
>  		info.enable = 1;
> @@ -597,6 +598,16 @@ static int venc_set_properties(struct venus_inst *inst)
>  		ret = hfi_session_set_property(inst, ptype, &deblock);
>  		if (ret)
>  			return ret;
> +
> +		ptype = HFI_PROPERTY_PARAM_VENC_H264_TRANSFORM_8X8;
> +		if (ctr->profile.h264 == HFI_H264_PROFILE_HIGH ||
> +		    ctr->profile.h264 == HFI_H264_PROFILE_CONSTRAINED_HIGH)
> +			h264_transform.enable_type = ctr->h264_8x8_transform;
> +
> +		ret = hfi_session_set_property(inst, ptype, &h264_transform);

h264_transform.enable_type is undefined for other profiles different
from HIGH and CONSTRAINED_HIGH.

> +		if (ret)
> +			return ret;
> +
>  	}
>  
>  	if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 ||
> diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c
> index 637c92f..62beba2 100644
> --- a/drivers/media/platform/qcom/venus/venc_ctrls.c
> +++ b/drivers/media/platform/qcom/venus/venc_ctrls.c
> @@ -319,6 +319,16 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
>  	case V4L2_CID_COLORIMETRY_HDR10_MASTERING_DISPLAY:
>  		ctr->mastering = *ctrl->p_new.p_hdr10_mastering;
>  		break;
> +	case V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM:
> +		if (ctr->profile.h264 != HFI_H264_PROFILE_HIGH &&
> +		    ctr->profile.h264 != HFI_H264_PROFILE_CONSTRAINED_HIGH)
> +			return -EINVAL;
> +
> +		if (ctrl->val == 0)
> +			return -EINVAL;

Can you add a comment why 8x8 transform cannot be disabled for HIGH and
CONSTRAINED_HIGH profiles.

> +
> +		ctr->h264_8x8_transform = ctrl->val;
> +		break;
>  	default:
>  		return -EINVAL;
>  	}
> @@ -334,7 +344,7 @@ int venc_ctrl_init(struct venus_inst *inst)
>  {
>  	int ret;
>  
> -	ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 57);
> +	ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 58);
>  	if (ret)
>  		return ret;
>  
> @@ -438,6 +448,9 @@ int venc_ctrl_init(struct venus_inst *inst)
>  			  V4L2_CID_MPEG_VIDEO_H264_I_FRAME_MIN_QP, 1, 51, 1, 1);
>  
>  	v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
> +		V4L2_CID_MPEG_VIDEO_H264_8X8_TRANSFORM, 0, 1, 1, 0);
> +
> +	v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
>  			  V4L2_CID_MPEG_VIDEO_H264_P_FRAME_MIN_QP, 1, 51, 1, 1);
>  
>  	v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
> 

-- 
regards,
Stan

      reply	other threads:[~2021-07-29  8:05 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-13 13:59 Mansur Alisha Shaik
2021-07-29  8:04 ` Stanimir Varbanov [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d43738a8-cc29-57c7-d9e4-bf8ee03bfe19@linaro.org \
    --to=stanimir.varbanov@linaro.org \
    --cc=dikshita@codeaurora.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=mansur@codeaurora.org \
    --cc=vgarodia@codeaurora.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®