diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-07 23:22:43 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-07 23:22:42 -0700 |
| commit | a010a65c23553c67dee5fbdb89bc15851927f8b1 (patch) | |
| tree | f72675270ecf220add6308f80d8e77e217e7cde8 /include/uapi | |
| parent | 2b3049ef40e6e79af889d3d3eb92cd9797558ed3 (diff) | |
| parent | aabfefbfafeace3468a6dd6401f4cf76700918de (diff) | |
Merge "msm: vidc: Add Override QP extradata support"
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/v4l2-controls.h | 3 | ||||
| -rw-r--r-- | include/uapi/media/msm_vidc.h | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index fe19c7596f8c..2cf0469712b6 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -812,6 +812,9 @@ enum v4l2_mpeg_vidc_extradata { #define V4L2_MPEG_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI \ V4L2_MPEG_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI V4L2_MPEG_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI = 27, +#define V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO \ + V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO + V4L2_MPEG_VIDC_EXTRADATA_PQ_INFO = 28, }; #define V4L2_CID_MPEG_VIDC_SET_PERF_LEVEL (V4L2_CID_MPEG_MSM_VIDC_BASE + 26) diff --git a/include/uapi/media/msm_vidc.h b/include/uapi/media/msm_vidc.h index 40cd867a9b7b..45cc81aaaf17 100644 --- a/include/uapi/media/msm_vidc.h +++ b/include/uapi/media/msm_vidc.h @@ -199,6 +199,9 @@ enum msm_vidc_extradata_type { #define MSM_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI \ MSM_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI MSM_VIDC_EXTRADATA_CONTENT_LIGHT_LEVEL_SEI = 0x00000016, +#define MSM_VIDC_EXTRADATA_PQ_INFO \ + MSM_VIDC_EXTRADATA_PQ_INFO + MSM_VIDC_EXTRADATA_PQ_INFO = 0x00000017, MSM_VIDC_EXTRADATA_INPUT_CROP = 0x0700000E, #define MSM_VIDC_EXTRADATA_OUTPUT_CROP \ MSM_VIDC_EXTRADATA_OUTPUT_CROP |