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

Commit a1eb8e9d authored by Deva Ramasubramanian's avatar Deva Ramasubramanian Committed by Matt Wagantall
Browse files

msm: vidc: Mark certain decoder controls as read-only 



Several of the controls cannot be modified.  Today attempting to set
these controls is a silent NOOP.  This commit causes clients attempting
to modify these controls to fail with -EPERM.

Change-Id: I175e8e1372dc60bf6f0e8527a20f5959d3728f3c
Signed-off-by: default avatarDeva Ramasubramanian <dramasub@codeaurora.org>
parent ffb93c15

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

+10 −10
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		V4L2_MPEG_VIDEO_MPEG4_PROFILE_ADVANCED_CODING_EFFICIENCY,

		.default_value = V4L2_MPEG_VIDEO_MPEG4_PROFILE_SIMPLE,

		.menu_skip_mask = 0,

		.flags = V4L2_CTRL_FLAG_VOLATILE,

		.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_MPEG4_LEVEL,
@@ -377,7 +377,7 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		.maximum = V4L2_MPEG_VIDEO_MPEG4_LEVEL_5,

		.default_value = V4L2_MPEG_VIDEO_MPEG4_LEVEL_0,

		.menu_skip_mask = 0,

		.flags = V4L2_CTRL_FLAG_VOLATILE,

		.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,

	},

	{

		.id = V4L2_CID_MPEG_VIDEO_H264_PROFILE,
@@ -386,7 +386,7 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		.maximum = V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH,

		.default_value = V4L2_MPEG_VIDEO_H264_PROFILE_BASELINE,

		.menu_skip_mask = 0,

		.flags = V4L2_CTRL_FLAG_VOLATILE,

		.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,

		.qmenu = NULL,

	},

	{
@@ -396,7 +396,7 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		.maximum = V4L2_MPEG_VIDEO_H264_LEVEL_5_2,

		.default_value = V4L2_MPEG_VIDEO_H264_LEVEL_1_0,

		.menu_skip_mask = 0,

		.flags = V4L2_CTRL_FLAG_VOLATILE,

		.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,

		.qmenu = NULL,

	},

	{
@@ -418,7 +418,7 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		(1 << V4L2_MPEG_VIDC_VIDEO_H263_PROFILE_HIGHLATENCY)

		),

		.qmenu = h263_profile,

		.flags = V4L2_CTRL_FLAG_VOLATILE,

		.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_H263_LEVEL,
@@ -437,7 +437,7 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		(1 << V4L2_MPEG_VIDC_VIDEO_H263_LEVEL_7_0)

		),

		.qmenu = h263_level,

		.flags = V4L2_CTRL_FLAG_VOLATILE,

		.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_VP8_PROFILE_LEVEL,
@@ -452,7 +452,7 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_1)

		),

		.qmenu = vp8_profile_level,

		.flags = V4L2_CTRL_FLAG_VOLATILE,

		.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_MPEG2_PROFILE,
@@ -470,7 +470,7 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		(1 << V4L2_MPEG_VIDC_VIDEO_MPEG2_PROFILE_HIGH)

		),

		.qmenu = mpeg2_profile,

		.flags = V4L2_CTRL_FLAG_VOLATILE,

		.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_MPEG2_LEVEL,
@@ -486,7 +486,7 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
			(1 << V4L2_MPEG_VIDC_VIDEO_MPEG2_LEVEL_3)

		),

		.qmenu = mpeg2_level,

		.flags = V4L2_CTRL_FLAG_VOLATILE,

		.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_SCS_THRESHOLD,
@@ -541,7 +541,7 @@ static struct msm_vidc_ctrl msm_vdec_ctrls[] = { 
		.step = 1,

		.menu_skip_mask = 0,

		.qmenu = NULL,

		.flags = V4L2_CTRL_FLAG_VOLATILE,

		.flags = V4L2_CTRL_FLAG_VOLATILE | V4L2_CTRL_FLAG_READ_ONLY,

	},

	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_NON_SECURE_OUTPUT2,