8x50: vdec: Revert Scorpion/QDSP6 interface changesQ8650BSDCANLYA4065Q8650BSDCANLYA4060

Latest QDSP6 supports the backward compatibility with the old 2.0
Scorpion/QDSP6 interface hence reverting the version 3.1
interface changes.

1 files changed, 0 insertions, 117 deletions

diff --git a/libc/kernel/common/linux/msm_q6vdec.h b/libc/kernel/common/linux/msm_q6vdec.h
index ebcfc1b..b2f9f10 100644
--- a/libc/kernel/common/linux/msm_q6vdec.h
+++ b/libc/kernel/common/linux/msm_q6vdec.h
@@ -26,13 +26,6 @@
 #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_INITIALIZE_V3 _IOWR(VDEC_IOCTL_MAGIC, 11,   struct vdec_init_v3)
-#define VDEC_IOCTL_SETBUFFERS_V3 _IOW(VDEC_IOCTL_MAGIC, 12,  struct vdec_buffer_v3)
-#define VDEC_IOCTL_FREEBUFFERS_V3 _IOW(VDEC_IOCTL_MAGIC, 13,  struct vdec_buffer_v3)
-#define VDEC_IOCTL_GETDECATTRIBUTES_V3 _IOR(VDEC_IOCTL_MAGIC, 14,   struct vdec_dec_attributes)
-#define VDEC_IOCTL_GETINTERNALBUFREQ _IOWR(VDEC_IOCTL_MAGIC, 15,   struct vdec_intbuf_req)
-#define VDEC_IOCTL_GETPROPERTY _IOR(VDEC_IOCTL_MAGIC, 16,   union vdec_property)
-#define VDEC_IOCTL_SETPROPERTY _IOW(VDEC_IOCTL_MAGIC, 17,   union vdec_property)
 
 enum {
  VDEC_FRAME_DECODE_OK,
@@ -57,9 +50,6 @@ enum {
  VDEC_BUFFER_TYPE_OUTPUT,
  VDEC_BUFFER_TYPE_INTERNAL1,
  VDEC_BUFFER_TYPE_INTERNAL2,
- VDEC_BUFFER_TYPE_INTERNAL = VDEC_BUFFER_TYPE_INTERNAL1,
- VDEC_BUFFER_TYPE_LUMA,
- VDEC_BUFFER_TYPE_CHROMA
 };
 
 enum {
@@ -68,22 +58,6 @@ enum {
  VDEC_QUEUE_BADSTATE,
 };
 
-enum {
- VDEC_PROPERTY_FOURCC,
- VDEC_PROPERTY_PROFILE,
- VDEC_PROPERTY_LEVEL,
- VDEC_PROPERTY_DIMENSION,
- VDEC_PROPERTY_CWIN,
- VDEC_PROPERTY_INPUT_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;
@@ -108,13 +82,6 @@ struct vdec_buf_req {
  struct vdec_buf_desc dec_req2;
 };
 
-struct vdec_buf_req_v3 {
- u32 max_input_queue_size;
- struct vdec_buf_desc input;
- struct vdec_buf_desc output;
- u32 num_internal_buffers;
-};
-
 struct vdec_region_info {
  u32 src_id;
  u32 offset;
@@ -135,23 +102,6 @@ struct vdec_config {
  u32 reserved;
 };
 
-struct vdec_config_v3 {
- u32 fourcc;
- u32 width;
- u32 height;
- u32 order;
- u32 notify_enable;
- u32 vc1_rowbase;
- u32 h264_startcode_detect;
- u32 h264_nal_len_size;
- u32 postproc_flag;
- u32 fruc_enable;
- struct vdec_region_info seq_hdr;
- u32 seq_hdr_len;
- u32 color_format;
- u32 reserved;
-};
-
 struct vdec_vc1_panscan_regions {
  int num;
  int width[4];
@@ -167,16 +117,6 @@ struct vdec_cropping_window {
  u32 y2;
 };
 
-struct vdec_rectangle {
- u32 width;
- u32 height;
-};
-
-struct vdec_stridetype {
- u32 luma;
- u32 chroma;
-};
-
 struct vdec_frame_info {
  u32 status;
  u32 offset;
@@ -203,9 +143,6 @@ struct vdec_frame_info {
  u32 flags;
  u32 performance_stats;
  u32 data3;
- u32 chroma_addr;
- struct vdec_stridetype stride;
- u32 reserved;
 };
 
 struct vdec_buf_info {
@@ -215,24 +152,11 @@ struct vdec_buf_info {
  u32 islast;
 };
 
-struct vdec_buf_info_v3 {
- u32 buf_type;
- u32 index;
- struct vdec_region_info region;
- u32 num_buf;
- u32 islast;
-};
-
 struct vdec_buffer {
  u32 pmem_id;
  struct vdec_buf_info buf;
 };
 
-struct vdec_buffer_v3 {
- u32 pmem_id;
- struct vdec_buf_info_v3 buf;
-};
-
 struct vdec_sequence {
  u8 *header;
  u32 len;
@@ -242,10 +166,6 @@ struct vdec_config_sps {
  struct vdec_config cfg;
  struct vdec_sequence seq;
 };
-struct vdec_config_sps_v3 {
- struct vdec_config_v3 cfg;
- int seq_fd;
-};
 
 #define VDEC_MSG_REUSEINPUTBUFFER 1
 #define VDEC_MSG_FRAMEDONE 2
@@ -266,11 +186,6 @@ struct vdec_init {
  struct vdec_buf_req *buf_req;
 };
 
-struct vdec_init_v3 {
- struct vdec_config_sps_v3 sps_cfg;
- struct vdec_buf_req_v3 *buf_req;
-};
-
 struct vdec_input_buf {
  u32 pmem_id;
  struct vdec_input_buf_info buffer;
@@ -292,37 +207,5 @@ struct vdec_dec_attributes {
  struct vdec_buf_desc dec_req1;
  struct vdec_buf_desc dec_req2;
 };
-struct vdec_dec_attributes_v3 {
- u32 fourcc;
- u32 profile;
- u32 level;
- u32 dec_pic_width;
- u32 dec_pic_height;
- struct vdec_cropping_window cwin;
- struct vdec_buf_desc input;
- struct vdec_buf_desc output;
-};
-
-union vdec_property {
- u32 fourcc;
- u32 profile;
- u32 level;
- struct vdec_rectangle dim;
- struct vdec_cropping_window cwin;
- struct vdec_buf_desc input;
- struct vdec_buf_desc output;
- struct vdec_stridetype stride;
- u32 def_type;
-};
-
-struct vdec_intbuf_desc {
- u32 num_actual_internal_buf;
- u32 internal_buf_req_length;
-};
-struct vdec_intbuf_req {
- u32 num_internal_buf;
- struct vdec_intbuf_desc *buf_desc;
- struct vdec_buf_desc *internal_buf_req;
-};
 
 #endif