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

Commit 894c416d 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 control type of ENABLE_INITIAL_QP"

parents ee1f7f28 49a810b7

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

+4 −2
Original line number Diff line number Diff line
@@ -853,9 +853,11 @@ static struct msm_vidc_ctrl msm_venc_ctrls[] = { 
	{

		.id = V4L2_CID_MPEG_VIDC_VIDEO_ENABLE_INITIAL_QP,

		.name = "Enable setting initial QP",

		.type = V4L2_CTRL_TYPE_BUTTON,

		.type = V4L2_CTRL_TYPE_BITMASK,

		.minimum = 0,

		.maximum = 0,

		.maximum = V4L2_CID_MPEG_VIDC_VIDEO_ENABLE_INITIAL_QP_IFRAME |

			V4L2_CID_MPEG_VIDC_VIDEO_ENABLE_INITIAL_QP_PFRAME |

			V4L2_CID_MPEG_VIDC_VIDEO_ENABLE_INITIAL_QP_BFRAME,

		.default_value = 0,

		.step = 0,

	},

include/uapi/linux/v4l2-controls.h

+5 −0
Original line number Diff line number Diff line
@@ -881,6 +881,11 @@ enum v4l2_mpeg_vidc_video_rate_control_timestamp_mode { 


#define V4L2_CID_MPEG_VIDC_VIDEO_ENABLE_INITIAL_QP \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 53)

enum vl42_mpeg_vidc_video_enable_initial_qp {

	V4L2_CID_MPEG_VIDC_VIDEO_ENABLE_INITIAL_QP_IFRAME = 0x1,

	V4L2_CID_MPEG_VIDC_VIDEO_ENABLE_INITIAL_QP_PFRAME = 0x2,

	V4L2_CID_MPEG_VIDC_VIDEO_ENABLE_INITIAL_QP_BFRAME = 0x4,

};



#define V4L2_CID_MPEG_VIDC_VIDEO_I_FRAME_QP \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 54)