[PATCH v2 4/4] venus: venc: Add support for AUD NALU control

[Stanimir Varbanov]

Add support for Access Unit Delimiter control into encoder.

Signed-off-by: Stanimir Varbanov <stanimir.varba...@linaro.org>
---
 drivers/media/platform/qcom/venus/core.h       |  1 +
 drivers/media/platform/qcom/venus/venc.c       | 14 ++++++++++++++
 drivers/media/platform/qcom/venus/venc_ctrls.c |  8 +++++++-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/drivers/media/platform/qcom/venus/core.h 
b/drivers/media/platform/qcom/venus/core.h
index 097fca39eb79..f105a34ded5a 100644
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -243,6 +243,7 @@ struct venc_controls {
 
        u32 header_mode;
        u32 intra_refresh_period;
+       bool aud_enable;
 
        struct {
                u32 h264;
diff --git a/drivers/media/platform/qcom/venus/venc.c 
b/drivers/media/platform/qcom/venus/venc.c
index 615d90612ebc..99e0a82a31e0 100644
--- a/drivers/media/platform/qcom/venus/venc.c
+++ b/drivers/media/platform/qcom/venus/venc.c
@@ -745,6 +745,20 @@ static int venc_set_properties(struct venus_inst *inst)
                        return ret;
        }
 
+       if (inst->fmt_cap->pixfmt == V4L2_PIX_FMT_H264 ||
+           inst->fmt_cap->pixfmt == V4L2_PIX_FMT_HEVC) {
+               struct hfi_enable en = {};
+
+               ptype = HFI_PROPERTY_PARAM_VENC_H264_GENERATE_AUDNAL;
+
+               if (ctr->aud_enable)
+                       en.enable = 1;
+
+               ret = hfi_session_set_property(inst, ptype, &en);
+               if (ret)
+                       return ret;
+       }
+
        return 0;
 }
 
diff --git a/drivers/media/platform/qcom/venus/venc_ctrls.c 
b/drivers/media/platform/qcom/venus/venc_ctrls.c
index 801026fab89d..a1aa56c74bc5 100644
--- a/drivers/media/platform/qcom/venus/venc_ctrls.c
+++ b/drivers/media/platform/qcom/venus/venc_ctrls.c
@@ -211,6 +211,9 @@ static int venc_op_s_ctrl(struct v4l2_ctrl *ctrl)
        case V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD:
                ctr->intra_refresh_period = ctrl->val;
                break;
+       case V4L2_CID_MPEG_VIDEO_AU_DELIMITER:
+               ctr->aud_enable = ctrl->val;
+               break;
        default:
                return -EINVAL;
        }
@@ -226,7 +229,7 @@ int venc_ctrl_init(struct venus_inst *inst)
 {
        int ret;
 
-       ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 34);
+       ret = v4l2_ctrl_handler_init(&inst->ctrl_handler, 35);
        if (ret)
                return ret;
 
@@ -381,6 +384,9 @@ int venc_ctrl_init(struct venus_inst *inst)
                          V4L2_CID_MPEG_VIDEO_INTRA_REFRESH_PERIOD, 0,
                          ((4096 * 2304) >> 8), 1, 0);
 
+       v4l2_ctrl_new_std(&inst->ctrl_handler, &venc_ctrl_ops,
+                         V4L2_CID_MPEG_VIDEO_AU_DELIMITER, 0, 1, 1, 0);
+
        ret = inst->ctrl_handler.error;
        if (ret)
                goto err;
-- 
2.17.1