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

Commit f4317033 authored by Arun Menon's avatar Arun Menon Committed by Matt Wagantall
Browse files

[media] Add missing qmenu entries for MPEG ctrls 



V4l2 control framework mandates a qmenu entry for each control item.
Validate_new() function accesses the qmenu entry for control item,
and any missing qmenu entries causes a crash within this function.
This patch fixes those crashes.

Change-Id: Ie507b1de9ce08221678a730146164d6e970aac8a
Signed-off-by: default avatarArun Menon <avmenon@codeaurora.org>
parent 4795758f

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

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ 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_DISABLED,

		.minimum = V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED,

		.maximum = L_MODE,

		.default_value = V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_DISABLED,

		.step = 1,

drivers/media/v4l2-core/v4l2-ctrls.c

+5 −0
Original line number Diff line number Diff line
@@ -307,12 +307,14 @@ const char * const *v4l2_ctrl_get_menu(u32 id) 
	static const char * const header_mode[] = {

		"Separate Buffer",

		"Joined With 1st Frame",

		"Joined With I frame",

		NULL,

	};

	static const char * const multi_slice[] = {

		"Single",

		"Max Macroblocks",

		"Max Bytes",

		"GOB",

		NULL,

	};

	static const char * const entropy_mode[] = {
@@ -337,6 +339,7 @@ const char * const *v4l2_ctrl_get_menu(u32 id) 
		"4.2",

		"5",

		"5.1",

		"5.2",

		NULL,

	};

	static const char * const h264_loop_filter[] = {
@@ -361,7 +364,9 @@ const char * const *v4l2_ctrl_get_menu(u32 id) 
		"Scalable Baseline",

		"Scalable High",

		"Scalable High Intra",

		"Stereo High",

		"Multiview High",

		"Constrained High",

		NULL,

	};

	static const char * const vui_sar_idc[] = {

include/uapi/linux/v4l2-controls.h

+2 −2
Original line number Diff line number Diff line
@@ -425,8 +425,8 @@ 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_DISABLED			= 0,

	V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED			= 1,

	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,

};