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

Commit 3b7705d6 authored by Praveen Chavan's avatar Praveen Chavan Committed by Gerrit - the friendly Code Review server
Browse files

msm: vidc: Fix instance formats initialization issue 



Currently, in instance init, CAPTURE and OUTPUT formats are copied
from fixed indices. When formats struct enhanced with new formats,
it is possible to assign CAPTURE format on OUTPUT port. Hence derive
the formats with fourcc.

CRs-Fixed: 2048564
Change-Id: I6c31b1c68797dec9c7fbe58afc10be1221a20a6d
Signed-off-by: default avatarPraneeth Paladugu <ppaladug@codeaurora.org>
Signed-off-by: default avatarSanthosh Behara <santhoshbehara@codeaurora.org>
Signed-off-by: default avatarPraveen Chavan <pchavan@codeaurora.org>
parent 11734d04

drivers/media/platform/msm/vidc/msm_vdec.c

+26 −2
Original line number Diff line number Diff line
@@ -1957,6 +1957,8 @@ const struct vb2_ops *msm_vdec_get_vb2q_ops(void) 
int msm_vdec_inst_init(struct msm_vidc_inst *inst)

{

	int rc = 0;

	struct msm_vidc_format *fmt = NULL;



	if (!inst) {

		dprintk(VIDC_ERR, "Invalid input = %pK\n", inst);

		return -EINVAL;
@@ -1964,12 +1966,34 @@ int msm_vdec_inst_init(struct msm_vidc_inst *inst) 
	inst->prop.height[CAPTURE_PORT] = DEFAULT_HEIGHT;

	inst->prop.width[CAPTURE_PORT] = DEFAULT_WIDTH;

	inst->prop.num_planes[CAPTURE_PORT] = 2;

	inst->fmts[CAPTURE_PORT] = vdec_formats[0];



	/* By default, initialize CAPTURE port to NV12 format */

	fmt = msm_comm_get_pixel_fmt_fourcc(vdec_formats,

		ARRAY_SIZE(vdec_formats), V4L2_PIX_FMT_NV12,

			CAPTURE_PORT);

	if (!fmt || fmt->type != CAPTURE_PORT) {

		dprintk(VIDC_ERR,

			"vdec_formats corrupted\n");

		return -EINVAL;

	}

	memcpy(&inst->fmts[fmt->type], fmt,

			sizeof(struct msm_vidc_format));



	inst->prop.height[OUTPUT_PORT] = DEFAULT_HEIGHT;

	inst->prop.width[OUTPUT_PORT] = DEFAULT_WIDTH;

	inst->prop.num_planes[OUTPUT_PORT] = 1;

	inst->fmts[OUTPUT_PORT] = vdec_formats[2];



	/* By default, initialize OUTPUT port to H264 decoder */

	fmt = msm_comm_get_pixel_fmt_fourcc(vdec_formats,

			ARRAY_SIZE(vdec_formats), V4L2_PIX_FMT_H264,

				OUTPUT_PORT);

	if (!fmt || fmt->type != OUTPUT_PORT) {

		dprintk(VIDC_ERR,

			"vdec_formats corrupted\n");

		return -EINVAL;

	}

	memcpy(&inst->fmts[fmt->type], fmt,

			sizeof(struct msm_vidc_format));



	inst->capability.height.min = MIN_SUPPORTED_HEIGHT;

	inst->capability.height.max = DEFAULT_HEIGHT;

drivers/media/platform/msm/vidc/msm_venc.c

+26 −2
Original line number Diff line number Diff line
@@ -4096,6 +4096,8 @@ const struct v4l2_ctrl_ops *msm_venc_get_ctrl_ops(void) 
int msm_venc_inst_init(struct msm_vidc_inst *inst)

{

	int rc = 0;

	struct msm_vidc_format *fmt = NULL;



	if (!inst) {

		dprintk(VIDC_ERR, "Invalid input = %pK\n", inst);

		return -EINVAL;
@@ -4103,12 +4105,34 @@ int msm_venc_inst_init(struct msm_vidc_inst *inst) 
	inst->prop.height[CAPTURE_PORT] = DEFAULT_HEIGHT;

	inst->prop.width[CAPTURE_PORT] = DEFAULT_WIDTH;

	inst->prop.num_planes[CAPTURE_PORT] = 1;

	inst->fmts[CAPTURE_PORT] = venc_formats[4];



	/* By default, initialize CAPTURE port to H264 encoder */

	fmt = msm_comm_get_pixel_fmt_fourcc(venc_formats,

		ARRAY_SIZE(venc_formats), V4L2_PIX_FMT_H264,

			CAPTURE_PORT);

	if (!fmt || fmt->type != CAPTURE_PORT) {

		dprintk(VIDC_ERR,

			"venc_formats corrupted\n");

		return -EINVAL;

	}

	memcpy(&inst->fmts[fmt->type], fmt,

			sizeof(struct msm_vidc_format));



	inst->prop.height[OUTPUT_PORT] = DEFAULT_HEIGHT;

	inst->prop.width[OUTPUT_PORT] = DEFAULT_WIDTH;

	inst->prop.num_planes[OUTPUT_PORT] = 1;

	inst->fmts[OUTPUT_PORT] = venc_formats[0];



	/* By default, initialize OUTPUT port to NV12 format */

	fmt = msm_comm_get_pixel_fmt_fourcc(venc_formats,

		ARRAY_SIZE(venc_formats), V4L2_PIX_FMT_NV12,

			OUTPUT_PORT);

	if (!fmt || fmt->type != OUTPUT_PORT) {

		dprintk(VIDC_ERR,

			"venc_formats corrupted\n");

		return -EINVAL;

	}

	memcpy(&inst->fmts[fmt->type], fmt,

			sizeof(struct msm_vidc_format));



	inst->capability.height.min = MIN_SUPPORTED_HEIGHT;

	inst->capability.height.max = DEFAULT_HEIGHT;