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

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

[media] coda: split out encoder control setup to specify controls per video device 



This patch splits the encoder specific controls out of the main control setup
function. This way each video device registers only relevant controls.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarKamil Debski <k.debski@samsung.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent 2c11d1bd

drivers/media/platform/coda/coda-common.c

+13 −7
Original line number Diff line number Diff line
@@ -1334,14 +1334,8 @@ static const struct v4l2_ctrl_ops coda_ctrl_ops = { 
	.s_ctrl = coda_s_ctrl,

};



static int coda_ctrls_setup(struct coda_ctx *ctx)

static void coda_encode_ctrls(struct coda_ctx *ctx)

{

	v4l2_ctrl_handler_init(&ctx->ctrls, 9);



	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,

		V4L2_CID_HFLIP, 0, 1, 1, 0);

	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,

		V4L2_CID_VFLIP, 0, 1, 1, 0);

	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,

		V4L2_CID_MPEG_VIDEO_BITRATE, 0, 32767000, 1, 0);

	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,
@@ -1385,6 +1379,18 @@ static int coda_ctrls_setup(struct coda_ctx *ctx) 
	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,

		V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB, 0,

		1920 * 1088 / 256, 1, 0);

}



static int coda_ctrls_setup(struct coda_ctx *ctx)

{

	v4l2_ctrl_handler_init(&ctx->ctrls, 2);



	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,

		V4L2_CID_HFLIP, 0, 1, 1, 0);

	v4l2_ctrl_new_std(&ctx->ctrls, &coda_ctrl_ops,

		V4L2_CID_VFLIP, 0, 1, 1, 0);

	if (ctx->inst_type == CODA_INST_ENCODER)

		coda_encode_ctrls(ctx);



	if (ctx->ctrls.error) {

		v4l2_err(&ctx->dev->v4l2_dev,