diff options
| author | Vineeta Srivastava <vsrivastava@google.com> | 2013-09-18 00:11:45 -0700 |
|---|---|---|
| committer | Vineeta Srivastava <vsrivastava@google.com> | 2013-09-20 15:32:58 -0700 |
| commit | 321b2ae98077a39b9a97d4dcbe4de82083b2ab56 (patch) | |
| tree | 807af9a9265c53c561e0ade23f4bfe4afac7ccc7 /original-kernel-headers | |
| parent | d1d83fe741fda73cc77dca3112b8e2c1034ba98d (diff) | |
| download | msm8x74-321b2ae98077a39b9a97d4dcbe4de82083b2ab56.tar.gz | |
msm8x74: update videodev2 kernel headers
Bug: 10193101
Change-Id: I0563e1c57f29860670019b53683824aa7a51e72d
Diffstat (limited to 'original-kernel-headers')
| -rw-r--r-- | original-kernel-headers/linux/videodev2.h | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/original-kernel-headers/linux/videodev2.h b/original-kernel-headers/linux/videodev2.h index 2902b87..25dc267 100644 --- a/original-kernel-headers/linux/videodev2.h +++ b/original-kernel-headers/linux/videodev2.h @@ -705,6 +705,7 @@ struct v4l2_buffer { #define V4L2_QCOM_BUF_DATA_CORRUPT 0x80000 #define V4L2_QCOM_BUF_DROP_FRAME 0x100000 #define V4L2_QCOM_BUF_INPUT_UNSUPPORTED 0x200000 +#define V4L2_QCOM_BUF_FLAG_READONLY 0x400000 /* * O V E R L A Y P R E V I E W @@ -1578,6 +1579,7 @@ enum v4l2_mpeg_video_h264_profile { V4L2_MPEG_VIDEO_H264_PROFILE_SCALABLE_HIGH_INTRA = 14, V4L2_MPEG_VIDEO_H264_PROFILE_STEREO_HIGH = 15, V4L2_MPEG_VIDEO_H264_PROFILE_MULTIVIEW_HIGH = 16, + V4L2_MPEG_VIDEO_H264_PROFILE_CONSTRAINED_HIGH = 17, }; #define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_HEIGHT (V4L2_CID_MPEG_BASE+364) #define V4L2_CID_MPEG_VIDEO_H264_VUI_EXT_SAR_WIDTH (V4L2_CID_MPEG_BASE+365) @@ -1858,22 +1860,25 @@ enum v4l2_mpeg_vidc_video_h264_vui_timing_info { V4L2_MPEG_VIDC_VIDEO_H264_VUI_TIMING_INFO_ENABLED = 1 }; -#define V4L2_CID_MPEG_VIDC_VIDEO_ALLOC_MODE \ - (V4L2_CID_MPEG_MSM_VIDC_BASE+30) +#define V4L2_CID_MPEG_VIDC_VIDEO_ALLOC_MODE_INPUT \ + (V4L2_CID_MPEG_MSM_VIDC_BASE + 30) +#define V4L2_CID_MPEG_VIDC_VIDEO_ALLOC_MODE_OUTPUT \ + (V4L2_CID_MPEG_MSM_VIDC_BASE + 31) enum v4l2_mpeg_vidc_video_alloc_mode_type { V4L2_MPEG_VIDC_VIDEO_STATIC = 0, V4L2_MPEG_VIDC_VIDEO_RING = 1, + V4L2_MPEG_VIDC_VIDEO_DYNAMIC = 2, }; #define V4L2_CID_MPEG_VIDC_VIDEO_FRAME_ASSEMBLY \ - (V4L2_CID_MPEG_MSM_VIDC_BASE+31) + (V4L2_CID_MPEG_MSM_VIDC_BASE + 32) enum v4l2_mpeg_vidc_video_assembly { V4L2_MPEG_VIDC_FRAME_ASSEMBLY_DISABLE = 0, V4L2_MPEG_VIDC_FRAME_ASSEMBLY_ENABLE = 1, }; #define V4L2_CID_MPEG_VIDC_VIDEO_VP8_PROFILE_LEVEL \ - (V4L2_CID_MPEG_MSM_VIDC_BASE+32) + (V4L2_CID_MPEG_MSM_VIDC_BASE + 33) enum v4l2_mpeg_vidc_video_vp8_profile_level { V4L2_MPEG_VIDC_VIDEO_VP8_UNUSED, V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_0, @@ -1882,6 +1887,20 @@ enum v4l2_mpeg_vidc_video_vp8_profile_level { V4L2_MPEG_VIDC_VIDEO_VP8_VERSION_3, }; +#define V4L2_CID_MPEG_VIDC_VIDEO_H264_VUI_BITSTREAM_RESTRICT \ + (V4L2_CID_MPEG_MSM_VIDC_BASE + 34) +enum v4l2_mpeg_vidc_video_h264_vui_bitstream_restrict { + V4L2_MPEG_VIDC_VIDEO_H264_VUI_BITSTREAM_RESTRICT_DISABLED = 0, + V4L2_MPEG_VIDC_VIDEO_H264_VUI_BITSTREAM_RESTRICT_ENABLED = 1 +}; + +#define V4L2_CID_MPEG_VIDC_VIDEO_PRESERVE_TEXT_QUALITY \ + (V4L2_CID_MPEG_MSM_VIDC_BASE + 35) +enum v4l2_mpeg_vidc_video_preserve_text_quality { + V4L2_MPEG_VIDC_VIDEO_PRESERVE_TEXT_QUALITY_DISABLED = 0, + V4L2_MPEG_VIDC_VIDEO_PRESERVE_TEXT_QUALITY_ENABLED = 1 +}; + /* 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) @@ -2443,7 +2462,10 @@ struct v4l2_streamparm { (V4L2_EVENT_MSM_VIDC_START + 3) #define V4L2_EVENT_MSM_VIDC_CLOSE_DONE (V4L2_EVENT_MSM_VIDC_START + 4) #define V4L2_EVENT_MSM_VIDC_SYS_ERROR (V4L2_EVENT_MSM_VIDC_START + 5) - +#define V4L2_EVENT_MSM_VIDC_RELEASE_BUFFER_REFERENCE \ + (V4L2_EVENT_MSM_VIDC_START + 6) +#define V4L2_EVENT_MSM_VIDC_RELEASE_UNQUEUED_BUFFER \ + (V4L2_EVENT_MSM_VIDC_START + 7) /* Payload for V4L2_EVENT_VSYNC */ struct v4l2_event_vsync { |