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

Commit c566c789 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[media] media: coda: add byte size slice limit control 



Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Tested-by: default avatarJavier Martin <javier.martin@vista-silicon.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 8f35c7bc

drivers/media/platform/coda.c

+23 −6
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ struct coda_params { 
	enum v4l2_mpeg_video_multi_slice_mode slice_mode;

	u32			framerate;

	u16			bitrate;

	u32			slice_max_bits;

	u32			slice_max_mb;

};
@@ -1061,10 +1062,21 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count) 
		return -EINVAL;

	}



	switch (ctx->params.slice_mode) {

	case V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE:

		value = 0;

		break;

	case V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB:

		value  = (ctx->params.slice_max_mb & CODA_SLICING_SIZE_MASK) << CODA_SLICING_SIZE_OFFSET;

		value |= (1 & CODA_SLICING_UNIT_MASK) << CODA_SLICING_UNIT_OFFSET;

	if (ctx->params.slice_mode == V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB)

		value |=  1 & CODA_SLICING_MODE_MASK;

		break;

	case V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES:

		value  = (ctx->params.slice_max_bits & CODA_SLICING_SIZE_MASK) << CODA_SLICING_SIZE_OFFSET;

		value |= (0 & CODA_SLICING_UNIT_MASK) << CODA_SLICING_UNIT_OFFSET;

		value |=  1 & CODA_SLICING_MODE_MASK;

		break;

	}

	coda_write(dev, value, CODA_CMD_ENC_SEQ_SLICE_MODE);

	value = ctx->params.gop_size & CODA_GOP_SIZE_MASK;

	coda_write(dev, value, CODA_CMD_ENC_SEQ_GOP_SIZE);
@@ -1313,6 +1325,9 @@ static int coda_s_ctrl(struct v4l2_ctrl *ctrl) 
	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB:

		ctx->params.slice_max_mb = ctrl->val;

		break;

	case V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES:

		ctx->params.slice_max_bits = ctrl->val * 8;

		break;

	case V4L2_CID_MPEG_VIDEO_HEADER_MODE:

		break;

	default:
@@ -1351,10 +1366,12 @@ static int coda_ctrls_setup(struct coda_ctx *ctx) 
		V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP, 1, 31, 1, 2);

	v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,

		V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MODE,

		V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB, 0,

		V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_MB);

		V4L2_MPEG_VIDEO_MULTI_SICE_MODE_MAX_BYTES, 0x0,

		V4L2_MPEG_VIDEO_MULTI_SLICE_MODE_SINGLE);

	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,

		V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_MB, 1, 0x3fffffff, 1, 1);

	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,

		V4L2_CID_MPEG_VIDEO_MULTI_SLICE_MAX_BYTES, 1, 0x3fffffff, 1, 500);

	v4l2_ctrl_new_std_menu(&ctx->ctrls, &coda_ctrl_ops,

		V4L2_CID_MPEG_VIDEO_HEADER_MODE,

		V4L2_MPEG_VIDEO_HEADER_MODE_JOINED_WITH_1ST_FRAME,