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

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

Merge "[media] msm: vidc: Add H.264 MVC layout control and codec enum"

parents fd70d551 e0e1ffd6

include/uapi/linux/msm_vidc_dec.h

+1 −0
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ enum vdec_codec { 
	VDEC_CODECTYPE_VC1 = 0xb,

	VDEC_CODECTYPE_VC1_RCV = 0xc,

	VDEC_CODECTYPE_HEVC = 0xd,

	VDEC_CODECTYPE_MVC = 0xe,

};



enum vdec_mpeg2_profile {

include/uapi/linux/v4l2-controls.h

+6 −1
Original line number Diff line number Diff line
@@ -833,10 +833,15 @@ enum v4l2_mpeg_vidc_video_mpeg2_profile { 
	V4L2_MPEG_VIDC_VIDEO_MPEG2_PROFILE_SPATIAL_SCALABLE	= 4,

	V4L2_MPEG_VIDC_VIDEO_MPEG2_PROFILE_HIGH			= 5,

};



#define V4L2_CID_MPEG_VIDC_VIDEO_REQUEST_SEQ_HEADER \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 42)



#define V4L2_CID_MPEG_VIDC_VIDEO_MVC_BUFFER_LAYOUT \

		(V4L2_CID_MPEG_MSM_VIDC_BASE + 43)

enum v4l2_mpeg_vidc_video_mvc_layout {

	V4L2_MPEG_VIDC_VIDEO_MVC_SEQUENTIAL = 0,

	V4L2_MPEG_VIDC_VIDEO_MVC_TOP_BOTTOM = 1

};

/*  Camera class control IDs */



#define V4L2_CID_CAMERA_CLASS_BASE 	(V4L2_CTRL_CLASS_CAMERA | 0x900)