Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5dc9576c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: initialize port format type"

parents c9574afd f1a4dfc1

msm/vidc/msm_vdec.c

+2 −0
Original line number Diff line number Diff line
@@ -761,6 +761,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 = V4L2_BUF_TYPE_VIDEO_CAPTURE_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;
@@ -782,6 +783,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 = V4L2_BUF_TYPE_VIDEO_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;

msm/vidc/msm_venc.c

+2 −0
Original line number Diff line number Diff line
@@ -1138,6 +1138,7 @@ int msm_venc_inst_init(struct msm_vidc_inst *inst) 
		return -EINVAL;

	}

	f = &inst->fmts[OUTPUT_PORT].v4l2_fmt;

	f->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;

	f->fmt.pix_mp.height = DEFAULT_HEIGHT;

	f->fmt.pix_mp.width = DEFAULT_WIDTH;

	f->fmt.pix_mp.pixelformat = V4L2_PIX_FMT_H264;
@@ -1157,6 +1158,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 = V4L2_BUF_TYPE_VIDEO_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;