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

Commit bacd63b5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Change enum values of V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_*"

parents ac17b267 45ad6579

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

+2 −2
Original line number Diff line number Diff line
@@ -652,9 +652,9 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
		.id = V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE,

		.name = "H.264 Loop Filter Mode",

		.type = V4L2_CTRL_TYPE_MENU,

		.minimum = V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED,

		.minimum = V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED,

		.maximum = L_MODE,

		.default_value = V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED,

		.default_value = V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED,

		.step = 1,

		.menu_skip_mask = ~(

		(1 << V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED) |

include/uapi/linux/v4l2-controls.h

+4 −3
Original line number Diff line number Diff line
@@ -413,9 +413,10 @@ enum v4l2_mpeg_video_h264_level { 
#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_BETA	(V4L2_CID_MPEG_BASE+361)

#define V4L2_CID_MPEG_VIDEO_H264_LOOP_FILTER_MODE	(V4L2_CID_MPEG_BASE+362)

enum v4l2_mpeg_video_h264_loop_filter_mode {

	V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED				= 0,

	V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED				= 1,

	V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY	= 2,

	V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED			= 0,

	V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED			= 1,

	V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED_AT_SLICE_BOUNDARY

									= 2,

};

#define V4L2_CID_MPEG_VIDEO_H264_PROFILE		(V4L2_CID_MPEG_BASE+363)

enum v4l2_mpeg_video_h264_profile {