Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <1610090618-30070-1-git-send-email-dikshita@codeaurora.org>
In-Reply-To: <1610090618-30070-1-git-send-email-dikshita@codeaurora.org>
From:   Fritz Koenig <frkoenig@chromium.org>
Date:   Tue, 12 Jan 2021 09:33:52 -0800
Message-ID: <CAMfZQbyBXt2A=yRNd7j-qTTrs8VKkciEknbCLkS+H1MEh4PisQ@mail.gmail.com>
Subject: Re: [PATCH RESEND v3] venus: venc: set inband mode property to FW.
To:     Dikshita Agarwal <dikshita@codeaurora.org>
Cc:     Linux Media Mailing List <linux-media@vger.kernel.org>,
        Stanimir Varbanov <stanimir.varbanov@linaro.org>,
        LKML <linux-kernel@vger.kernel.org>,
        linux-arm-msm@vger.kernel.org,
        Vikash Garodia <vgarodia@codeaurora.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Thu, Jan 7, 2021 at 11:26 PM Dikshita Agarwal
<dikshita@codeaurora.org> wrote:
>
> set HFI_PROPERTY_CONFIG_VENC_SYNC_FRAME_SEQUENCE_HEADER to FW
> to support inband sequence header mode.
>
> Signed-off-by: Dikshita Agarwal <dikshita@codeaurora.org>
>
> 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(-)
>
> diff --git a/drivers/media/platform/qcom/venus/venc.c b/drivers/media/platform/qcom/venus/venc.c
> index 3a2e449..ae21a7c 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_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) {

nit: declare |struct hfi_enable en| in this scope

Reviewed-by: Fritz Koenig <frkoenig@chromium.org>

> +               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
> diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c b/drivers/media/platform/qcom/venus/venc_ctrls.c
> index cf860e6..3ce02ad 100644
> --- a/drivers/media/platform/qcom/venus/venc_ctrls.c
> +++ b/drivers/media/platform/qcom/venus/venc_ctrls.c
> @@ -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
>