Merge "Enabling thumbnail mode in 8k video decoder." into froyo

1 files changed, 54 insertions, 1 deletions

diff --git a/libc/kernel/common/linux/msm_q6vdec.h b/libc/kernel/common/linux/msm_q6vdec.h
index ec2175c30..dc1a3888c 100644
--- a/libc/kernel/common/linux/msm_q6vdec.h
+++ b/libc/kernel/common/linux/msm_q6vdec.h
@@ -27,6 +27,8 @@
 #define VDEC_IOCTL_FREEBUFFERS _IOW(VDEC_IOCTL_MAGIC, 9, struct vdec_buf_info)
 #define VDEC_IOCTL_GETDECATTRIBUTES _IOR(VDEC_IOCTL_MAGIC, 10,   struct vdec_dec_attributes)
 #define VDEC_IOCTL_GETVERSION _IOR(VDEC_IOCTL_MAGIC, 11, struct vdec_version)
+#define VDEC_IOCTL_SETPROPERTY _IOW(VDEC_IOCTL_MAGIC, 12, struct vdec_property_info)
+#define VDEC_IOCTL_GETPROPERTY _IOR(VDEC_IOCTL_MAGIC, 13, struct vdec_property_info)
 
 enum {
  VDEC_FRAME_DECODE_OK,
@@ -64,6 +66,20 @@ enum {
  VDEC_COLOR_FORMAT_NV21_YAMOTO = 0x02
  };
 
+enum vdec_property_id {
+   VDEC_FOURCC,
+   VDEC_PROFILE,
+   VDEC_LEVEL,
+   VDEC_DIMENSIONS,
+   VDEC_CWIN,
+   VDEC_INPUT_BUF_REQ,
+   VDEC_OUTPUT_BUF_REQ,
+   VDEC_LUMA_CHROMA_STRIDE,
+   VDEC_NUM_DAL_PORTS,
+   VDEC_PRIORITY,
+   VDEC_FRAME_ALIGNMENT
+};
+
 struct vdec_input_buf_info {
  u32 offset;
  u32 data;
@@ -219,4 +235,41 @@ struct vdec_version {
  u32 minor;
 };
 
-#endif
+struct dal_vdec_rectangle {
+   u32 width;
+   u32 height;
+};
+
+struct stride_type {
+   u32 luma;
+   u32 chroma;
+};
+
+struct frame_alignment_type {
+   u32 luma_width;
+   u32 luma_height;
+   u32 chroma_width;
+   u32 chroma_height;
+   u32 chroma_offset;
+};
+
+union vdec_property {
+   u32 fourcc;
+   u32 profile;
+   u32 level;
+   struct dal_vdec_rectangle dim;
+   struct vdec_cropping_window cw;
+   struct vdec_buf_desc input_req;
+   struct vdec_buf_desc output_req;
+   struct stride_type stride;
+   u32 num_dal_ports;
+   u32 priority;
+   struct frame_alignment_type frame_alignment;
+   u32 def_type;
+};
+
+struct vdec_property_info {
+   enum vdec_property_id id;
+   union vdec_property property;
+};
+#endif /* _MSM_VDEC_H_ */