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

Commit 0f44a070 authored by Arun Menon's avatar Arun Menon Committed by Kyle Yan
Browse files

msm: vidc: 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.

CRs-Fixed: 1031156
Change-Id: Ie507b1de9ce08221678a730146164d6e970aac8a
Signed-off-by: default avatarArun Menon <avmenon@codeaurora.org>
Signed-off-by: default avatarAmit Shekhar <ashekhar@codeaurora.org>
parent ad4a2b53

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[] = {