diff options
| author | Arun Menon <avmenon@codeaurora.org> | 2016-03-16 18:37:22 -0700 |
|---|---|---|
| committer | Kyle Yan <kyan@codeaurora.org> | 2016-04-27 19:04:46 -0700 |
| commit | 757aff54fff783b881a4f3ed258db59f46bcf25e (patch) | |
| tree | fe805390e4bd96f83c55cf6afd30fc1202195349 /include | |
| parent | 81d9bef7e6c95d4be648e994de7960f46a23a078 (diff) | |
msm: vidc: Add support for output crop extra data
Venus firmware reports the crop dimensions for
each FBD in the extra data buffer. This change is
needed to support the new extra data type -
MSM_VIDC_EXTRADATA_OUTPUT_CROP.
CRs-Fixed: 999551
Change-Id: I3d1aa4a44701192e4bd85bdee29d6f2a49b9e5a7
Signed-off-by: Arun Menon <avmenon@codeaurora.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/v4l2-controls.h | 3 | ||||
| -rw-r--r-- | include/uapi/media/msm_vidc.h | 16 |
2 files changed, 19 insertions, 0 deletions
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h index af87e053ad8b..4d7f6f0d676a 100644 --- a/include/uapi/linux/v4l2-controls.h +++ b/include/uapi/linux/v4l2-controls.h @@ -797,6 +797,9 @@ enum v4l2_mpeg_vidc_extradata { V4L2_MPEG_VIDC_EXTRADATA_VQZIP_SEI = 22, V4L2_MPEG_VIDC_EXTRADATA_YUV_STATS = 23, V4L2_MPEG_VIDC_EXTRADATA_ROI_QP = 24, +#define V4L2_MPEG_VIDC_EXTRADATA_OUTPUT_CROP \ + V4L2_MPEG_VIDC_EXTRADATA_OUTPUT_CROP + V4L2_MPEG_VIDC_EXTRADATA_OUTPUT_CROP = 25, }; #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 7f8dc0195946..ac36b23bfa97 100644 --- a/include/uapi/media/msm_vidc.h +++ b/include/uapi/media/msm_vidc.h @@ -65,6 +65,19 @@ struct msm_vidc_input_crop_payload { unsigned int height; }; +struct msm_vidc_output_crop_payload { + unsigned int size; + unsigned int version; + unsigned int port_index; + unsigned int left; + unsigned int top; + unsigned int display_width; + unsigned int display_height; + unsigned int width; + unsigned int height; +}; + + struct msm_vidc_digital_zoom_payload { unsigned int size; unsigned int version; @@ -167,6 +180,9 @@ enum msm_vidc_extradata_type { MSM_VIDC_EXTRADATA_VQZIP_SEI = 0x00000011, MSM_VIDC_EXTRADATA_ROI_QP = 0x00000013, MSM_VIDC_EXTRADATA_INPUT_CROP = 0x0700000E, +#define MSM_VIDC_EXTRADATA_OUTPUT_CROP \ + MSM_VIDC_EXTRADATA_OUTPUT_CROP + MSM_VIDC_EXTRADATA_OUTPUT_CROP = 0x0700000F, MSM_VIDC_EXTRADATA_DIGITAL_ZOOM = 0x07000010, MSM_VIDC_EXTRADATA_MULTISLICE_INFO = 0x7F100000, MSM_VIDC_EXTRADATA_NUM_CONCEALED_MB = 0x7F100001, |