Merge change I151016ed into eclairM76XXTSNCJNLYA52101017M76XXTSNCJNLYA52101016M76XXTSNCJNLYA52101014M76XXTSNCJNLYA52101013M76XXTSNCJNLYA52101012M76XXTSNCJNLYA52101011M76XXTSNCJNLYA52101009M76XXTSNCJNLYA52101007M76XXTSNCJNLYA52101006M76XXTSNCJNLYA52101005M76XXTSNCJNLYA52101004M76XXTSNCJNLYA52101003M76XXTSNCJNLYA52101002M76XXTSNCJNLYA52101001M76XXTSNCJNLYA5210

* changes:
  8x50: vdec: Implement new Scorpion/QDSP6 interface

1 files changed, 19 insertions, 2 deletions

diff --git a/libc/kernel/common/linux/msm_q6vdec.h b/libc/kernel/common/linux/msm_q6vdec.h
index 1a3626a78..ebcfc1bdb 100644
--- a/libc/kernel/common/linux/msm_q6vdec.h
+++ b/libc/kernel/common/linux/msm_q6vdec.h
@@ -57,7 +57,9 @@ enum {
  VDEC_BUFFER_TYPE_OUTPUT,
  VDEC_BUFFER_TYPE_INTERNAL1,
  VDEC_BUFFER_TYPE_INTERNAL2,
- VDEC_BUFFER_TYPE_INTERNAL
+ VDEC_BUFFER_TYPE_INTERNAL = VDEC_BUFFER_TYPE_INTERNAL1,
+ VDEC_BUFFER_TYPE_LUMA,
+ VDEC_BUFFER_TYPE_CHROMA
 };
 
 enum {
@@ -73,9 +75,15 @@ enum {
  VDEC_PROPERTY_DIMENSION,
  VDEC_PROPERTY_CWIN,
  VDEC_PROPERTY_INPUT_BUF_REQ,
- VDEC_PROPERTY_OUTPUT_BUF_REQ
+ VDEC_PROPERTY_OUTPUT_BUF_REQ,
+ VDEC_LUMA_CHROMA_STRIDE
 };
 
+enum{
+ VDEC_COLOR_FORMAT_NV21 = 0x01,
+ VDEC_COLOR_FORMAT_NV21_YAMOTO = 0x02
+ };
+
 struct vdec_input_buf_info {
  u32 offset;
  u32 data;
@@ -164,6 +172,11 @@ struct vdec_rectangle {
  u32 height;
 };
 
+struct vdec_stridetype {
+ u32 luma;
+ u32 chroma;
+};
+
 struct vdec_frame_info {
  u32 status;
  u32 offset;
@@ -190,6 +203,9 @@ struct vdec_frame_info {
  u32 flags;
  u32 performance_stats;
  u32 data3;
+ u32 chroma_addr;
+ struct vdec_stridetype stride;
+ u32 reserved;
 };
 
 struct vdec_buf_info {
@@ -295,6 +311,7 @@ union vdec_property {
  struct vdec_cropping_window cwin;
  struct vdec_buf_desc input;
  struct vdec_buf_desc output;
+ struct vdec_stridetype stride;
  u32 def_type;
 };