From 36e018e3ab660178d5ec096d333fa7c672da76ef Mon Sep 17 00:00:00 2001 From: Mihir Ganu Date: Mon, 18 Nov 2019 15:18:20 -0800 Subject: [PATCH] msm: vidc: Initialize port format type Initialize port format type to avoid failure when g_fmt is called before s_fmt. Change-Id: I37758f6d8be766c75cc8bc97147312b3b0bb0915 Signed-off-by: Mihir Ganu --- msm/vidc/msm_vdec.c | 2 ++ msm/vidc/msm_venc.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/msm/vidc/msm_vdec.c b/msm/vidc/msm_vdec.c index 2c168e6a2322..f423d9c6f288 100644 --- a/msm/vidc/msm_vdec.c +++ b/msm/vidc/msm_vdec.c @@ -746,6 +746,7 @@ int msm_vdec_inst_init(struct msm_vidc_inst *inst) inst->prop.extradata_ctrls = EXTRADATA_DEFAULT; f = &inst->fmts[OUTPUT_PORT].v4l2_fmt; + f->type = OUTPUT_MPLANE; f->fmt.pix_mp.height = DEFAULT_HEIGHT; f->fmt.pix_mp.width = DEFAULT_WIDTH; f->fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12_UBWC; @@ -767,6 +768,7 @@ int msm_vdec_inst_init(struct msm_vidc_inst *inst) strlcpy(inst->fmts[OUTPUT_PORT].description, fmt_desc->description, sizeof(inst->fmts[OUTPUT_PORT].description)); f = &inst->fmts[INPUT_PORT].v4l2_fmt; + f->type = INPUT_MPLANE; f->fmt.pix_mp.height = DEFAULT_HEIGHT; f->fmt.pix_mp.width = DEFAULT_WIDTH; f->fmt.pix_mp.pixelformat = V4L2_PIX_FMT_H264; diff --git a/msm/vidc/msm_venc.c b/msm/vidc/msm_venc.c index 832de37b9e07..6a6d52e9fb5f 100644 --- a/msm/vidc/msm_venc.c +++ b/msm/vidc/msm_venc.c @@ -1108,6 +1108,7 @@ int msm_venc_inst_init(struct msm_vidc_inst *inst) return -EINVAL; } f = &inst->fmts[OUTPUT_PORT].v4l2_fmt; + f->type = OUTPUT_MPLANE; f->fmt.pix_mp.height = DEFAULT_HEIGHT; f->fmt.pix_mp.width = DEFAULT_WIDTH; f->fmt.pix_mp.pixelformat = V4L2_PIX_FMT_H264; @@ -1127,6 +1128,7 @@ int msm_venc_inst_init(struct msm_vidc_inst *inst) strlcpy(inst->fmts[OUTPUT_PORT].description, fmt_desc->description, sizeof(inst->fmts[OUTPUT_PORT].description)); f = &inst->fmts[INPUT_PORT].v4l2_fmt; + f->type = INPUT_MPLANE; f->fmt.pix_mp.height = DEFAULT_HEIGHT; f->fmt.pix_mp.width = DEFAULT_WIDTH; f->fmt.pix_mp.pixelformat = V4L2_PIX_FMT_NV12_UBWC;