summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuIC Gerrit Code Review <gerrit@quicinc.com>2010-03-01 15:08:35 -0800
committerQuIC Gerrit Code Review <gerrit@quicinc.com>2010-03-01 15:08:35 -0800
commit794fee8bb9f3bd8a41ab80639a32bf3ed7ef09a3 (patch)
tree7e4273d0370f4893db08fb591af6434def31e918
parentc28a311340a5eaeb4815d64a110e9ce2b4e112ad (diff)
parenta42fac1169339e1f6b54c5231beacec351c28f6f (diff)
downloadbionic-794fee8bb9f3bd8a41ab80639a32bf3ed7ef09a3.zip
bionic-794fee8bb9f3bd8a41ab80639a32bf3ed7ef09a3.tar.gz
bionic-794fee8bb9f3bd8a41ab80639a32bf3ed7ef09a3.tar.bz2
Merge change I64d25a83 into eclair
* changes: 8x50: vdec: Add support for NV21 yamato color format
-rw-r--r--libc/kernel/common/linux/msm_q6vdec.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/libc/kernel/common/linux/msm_q6vdec.h b/libc/kernel/common/linux/msm_q6vdec.h
index b2f9f10..ec2175c 100644
--- a/libc/kernel/common/linux/msm_q6vdec.h
+++ b/libc/kernel/common/linux/msm_q6vdec.h
@@ -26,6 +26,7 @@
#define VDEC_IOCTL_CLOSE _IO(VDEC_IOCTL_MAGIC, 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)
enum {
VDEC_FRAME_DECODE_OK,
@@ -58,6 +59,11 @@ enum {
VDEC_QUEUE_BADSTATE,
};
+enum {
+ VDEC_COLOR_FORMAT_NV21 = 0x01,
+ VDEC_COLOR_FORMAT_NV21_YAMOTO = 0x02
+ };
+
struct vdec_input_buf_info {
u32 offset;
u32 data;
@@ -99,7 +105,7 @@ struct vdec_config {
u32 h264_nal_len_size;
u32 postproc_flag;
u32 fruc_enable;
- u32 reserved;
+ u32 color_format;
};
struct vdec_vc1_panscan_regions {
@@ -208,4 +214,9 @@ struct vdec_dec_attributes {
struct vdec_buf_desc dec_req2;
};
+struct vdec_version {
+ u32 major;
+ u32 minor;
+};
+
#endif