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

Commit 2f9a4a4b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: support setting enc_chroma_qp_offset"

parents ea468111 05e4b3b2

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

+2 −0
Original line number Diff line number Diff line
@@ -836,6 +836,8 @@ const char *v4l2_ctrl_get_name(u32 id) 
	case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER:return "H264 Number of HC Layers";

	case V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER_QP:

								return "H264 Set QP Value for HC Layers";

	case V4L2_CID_MPEG_VIDEO_H264_CHROMA_QP_INDEX_OFFSET:

					return "H264 Chroma QP Index Offset";

	case V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP:		return "MPEG4 I-Frame QP Value";

	case V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP:		return "MPEG4 P-Frame QP Value";

	case V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP:		return "MPEG4 B-Frame QP Value";

include/uapi/linux/v4l2-controls.h

+1 −3
Original line number Diff line number Diff line
@@ -543,6 +543,7 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type { 
};

#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER	(V4L2_CID_MPEG_BASE+381)

#define V4L2_CID_MPEG_VIDEO_H264_HIERARCHICAL_CODING_LAYER_QP	(V4L2_CID_MPEG_BASE+382)

#define V4L2_CID_MPEG_VIDEO_H264_CHROMA_QP_INDEX_OFFSET	(V4L2_CID_MPEG_BASE+384)

#define V4L2_CID_MPEG_VIDEO_MPEG4_I_FRAME_QP	(V4L2_CID_MPEG_BASE+400)

#define V4L2_CID_MPEG_VIDEO_MPEG4_P_FRAME_QP	(V4L2_CID_MPEG_BASE+401)

#define V4L2_CID_MPEG_VIDEO_MPEG4_B_FRAME_QP	(V4L2_CID_MPEG_BASE+402)
@@ -1002,9 +1003,6 @@ enum v4l2_mpeg_vidc_video_roi_type { 
	V4L2_CID_MPEG_VIDC_VIDEO_ROI_TYPE_2BYTE = 2,

};



#define V4L2_CID_MPEG_VIDC_VENC_CHROMA_QP_OFFSET \

	(V4L2_CID_MPEG_MSM_VIDC_BASE + 132)



/*  Camera class control IDs */



#define V4L2_CID_CAMERA_CLASS_BASE	(V4L2_CTRL_CLASS_CAMERA | 0x900)