diff options
| author | Ming Qian <ming.qian@nxp.com> | 2020-08-14 14:04:30 +0800 |
|---|---|---|
| committer | Ming Qian <ming.qian@nxp.com> | 2020-08-19 13:30:29 +0800 |
| commit | 5e629abba00f086b3c5036b4808a3a1643925b8d (patch) | |
| tree | 412591266cefb319e7ce5c15f6838cced5904898 /drivers/mxc | |
| parent | ac222f5e1bfef0fc4ef3efa40fcb7ef181e3a1b2 (diff) | |
MLK-24499: [8QM_MEK/8QXP_MEK]mxc:vpu_windsor: set low latency mode through set bframe
use bframe to control low latency mode by default
deprecate the ctrl V4L2_CID_MPEG_VIDEO_H264_ASO
Signed-off-by: Ming Qian <ming.qian@nxp.com>
Reviewed-by: Shijie Qin <shijie.qin@nxp.com>
Diffstat (limited to 'drivers/mxc')
| -rw-r--r-- | drivers/mxc/vpu_windsor/vpu_encoder_b0.c | 2 | ||||
| -rw-r--r-- | drivers/mxc/vpu_windsor/vpu_encoder_b0.h | 2 | ||||
| -rw-r--r-- | drivers/mxc/vpu_windsor/vpu_encoder_ctrl.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/drivers/mxc/vpu_windsor/vpu_encoder_b0.c b/drivers/mxc/vpu_windsor/vpu_encoder_b0.c index 432031d67246..d1227440f7d8 100644 --- a/drivers/mxc/vpu_windsor/vpu_encoder_b0.c +++ b/drivers/mxc/vpu_windsor/vpu_encoder_b0.c @@ -2176,6 +2176,8 @@ static int do_configure_codec(struct vpu_ctx *ctx) show_firmware_version(ctx->core_dev, LVL_INFO); clear_stop_status(ctx); memcpy(enc_param, &attr->param, sizeof(attr->param)); + if (!enc_param->uGopBLength) + enc_param->uLowLatencyMode = 1; vpu_ctx_send_cmd(ctx, GTB_ENC_CMD_CONFIGURE_CODEC, 0, NULL); show_codec_configure(enc_param, pEncExpertModeParam); diff --git a/drivers/mxc/vpu_windsor/vpu_encoder_b0.h b/drivers/mxc/vpu_windsor/vpu_encoder_b0.h index 664d074704f8..7d6beeacaa60 100644 --- a/drivers/mxc/vpu_windsor/vpu_encoder_b0.h +++ b/drivers/mxc/vpu_windsor/vpu_encoder_b0.h @@ -74,7 +74,7 @@ extern unsigned int vpu_dbg_level_encoder; #define GOP_DEFAULT 30 #define BFRAMES_H_THRESHOLD 4 #define BFRAMES_L_THRESHOLD 0 -#define BFRAMES_DEFAULT 2 +#define BFRAMES_DEFAULT 0 #define QP_MAX 51 #define QP_MIN 0 #define QP_DEFAULT 25 diff --git a/drivers/mxc/vpu_windsor/vpu_encoder_ctrl.c b/drivers/mxc/vpu_windsor/vpu_encoder_ctrl.c index fc7f0ce126ec..eafe5314f9ee 100644 --- a/drivers/mxc/vpu_windsor/vpu_encoder_ctrl.c +++ b/drivers/mxc/vpu_windsor/vpu_encoder_ctrl.c @@ -605,7 +605,7 @@ static int add_ctrl_display_re_ordering(struct vpu_ctx *ctx) ctrl = v4l2_ctrl_new_std(&ctx->ctrl_handler, &re_ordering_ops, V4L2_CID_MPEG_VIDEO_H264_ASO, - 0, 1, 1, 1); + 0, 1, 1, 0); if (!ctrl) { vpu_err("add ctrl display re ordering fail\n"); return -EINVAL; |