Merge "[media] v4l2: Add controls for setting H263 attributes" into msm-3.4

This commit is contained in:
Linux Build Service Account 2012-07-20 07:31:55 -07:00 committed by QuIC Gerrit Code Review
commit 08c89865bd
1 changed files with 25 additions and 0 deletions

View File

@ -1751,6 +1751,31 @@ enum v4l2_mpeg_vidc_video_intra_refresh_mode {
#define V4L2_CID_MPEG_VIDC_VIDEO_AIR_REF (V4L2_CID_MPEG_MSM_VIDC_BASE+18)
#define V4L2_CID_MPEG_VIDC_VIDEO_CIR_MBS (V4L2_CID_MPEG_MSM_VIDC_BASE+19)
#define V4L2_CID_MPEG_VIDC_VIDEO_H263_PROFILE (V4L2_CID_MPEG_MSM_VIDC_BASE+20)
enum v4l2_mpeg_vidc_video_h263_profile {
V4L2_MPEG_VIDC_VIDEO_H263_PROFILE_BASELINE = 0,
V4L2_MPEG_VIDC_VIDEO_H263_PROFILE_H320CODING = 1,
V4L2_MPEG_VIDC_VIDEO_H263_PROFILE_BACKWARDCOMPATIBLE = 2,
V4L2_MPEG_VIDC_VIDEO_H263_PROFILE_ISWV2 = 3,
V4L2_MPEG_VIDC_VIDEO_H263_PROFILE_ISWV3 = 4,
V4L2_MPEG_VIDC_VIDEO_H263_PROFILE_HIGHCOMPRESSION = 5,
V4L2_MPEG_VIDC_VIDEO_H263_PROFILE_INTERNET = 6,
V4L2_MPEG_VIDC_VIDEO_H263_PROFILE_INTERLACE = 7,
V4L2_MPEG_VIDC_VIDEO_H263_PROFILE_HIGHLATENCY = 8,
};
#define V4L2_CID_MPEG_VIDC_VIDEO_H263_LEVEL (V4L2_CID_MPEG_MSM_VIDC_BASE+21)
enum v4l2_mpeg_vidc_video_h263_level {
V4L2_MPEG_VIDC_VIDEO_H263_LEVEL_1_0 = 0,
V4L2_MPEG_VIDC_VIDEO_H263_LEVEL_2_0 = 1,
V4L2_MPEG_VIDC_VIDEO_H263_LEVEL_3_0 = 2,
V4L2_MPEG_VIDC_VIDEO_H263_LEVEL_4_0 = 3,
V4L2_MPEG_VIDC_VIDEO_H263_LEVEL_4_5 = 4,
V4L2_MPEG_VIDC_VIDEO_H263_LEVEL_5_0 = 5,
V4L2_MPEG_VIDC_VIDEO_H263_LEVEL_6_0 = 6,
V4L2_MPEG_VIDC_VIDEO_H263_LEVEL_7_0 = 7,
};
/* Camera class control IDs */
#define V4L2_CID_CAMERA_CLASS_BASE (V4L2_CTRL_CLASS_CAMERA | 0x900)
#define V4L2_CID_CAMERA_CLASS (V4L2_CTRL_CLASS_CAMERA | 1)