| -rw-r--r-- | drivers/amvdec_ports/aml_vcodec_dec.c | 17 | ||||
| -rw-r--r-- | drivers/amvdec_ports/aml_vcodec_dec.h | 14 | ||||
| -rw-r--r-- | drivers/amvdec_ports/aml_vcodec_dec_drv.c | 2 | ||||
| -rw-r--r-- | drivers/amvdec_ports/decoder/vdec_h264_if.c | 4 | ||||
| -rw-r--r-- | drivers/amvdec_ports/decoder/vdec_hevc_if.c | 4 | ||||
| -rw-r--r-- | drivers/amvdec_ports/decoder/vdec_vp9_if.c | 4 |
6 files changed, 20 insertions, 25 deletions
diff --git a/drivers/amvdec_ports/aml_vcodec_dec.h b/drivers/amvdec_ports/aml_vcodec_dec.h index 7ca3337..765b788 100644 --- a/drivers/amvdec_ports/aml_vcodec_dec.h +++ b/drivers/amvdec_ports/aml_vcodec_dec.h @@ -23,6 +23,7 @@ #include <media/videobuf2-core.h> #include <media/videobuf2-v4l2.h> #include <linux/amlogic/media/codec_mm/codec_mm.h> +#include <linux/amlogic/media/video_sink/v4lvideo_ext.h> #include "aml_vcodec_util.h" #define VCODEC_CAPABILITY_4K_DISABLED 0x10 @@ -39,16 +40,6 @@ #define AML_V4L2_SET_DECMODE (V4L2_CID_USER_AMLOGIC_BASE + 0) -/* for video composer metafd private_data struct */ -struct file_privdata { - struct vframe_s vf; - struct vframe_s *vf_p; - bool is_keep; - int keep_id; - int keep_head_id; - bool is_install; -}; - /** * struct vdec_fb - decoder frame buffer * @mem_type : gather or scatter memory. @@ -93,7 +84,7 @@ struct aml_video_dec_buf { struct list_head list; struct vdec_v4l2_buffer frame_buffer; - struct file_privdata privdata; + struct file_private_data privdata; struct codec_mm_s *mem[2]; char mem_onwer[32]; bool used; @@ -103,6 +94,7 @@ struct aml_video_dec_buf { bool queued_in_v4l2; bool lastframe; bool error; + bool is_install_privdata; }; extern const struct v4l2_ioctl_ops aml_vdec_ioctl_ops; |