diff options
Diffstat (limited to 'original-kernel-headers/media/msm_vidc.h')
-rw-r--r-- | original-kernel-headers/media/msm_vidc.h | 130 |
1 files changed, 102 insertions, 28 deletions
diff --git a/original-kernel-headers/media/msm_vidc.h b/original-kernel-headers/media/msm_vidc.h index 2164275..0a91e32 100644 --- a/original-kernel-headers/media/msm_vidc.h +++ b/original-kernel-headers/media/msm_vidc.h @@ -25,10 +25,11 @@ int msm_vidc_enum_fmt(void *instance, struct v4l2_fmtdesc *f); int msm_vidc_s_fmt(void *instance, struct v4l2_format *f); int msm_vidc_g_fmt(void *instance, struct v4l2_format *f); int msm_vidc_s_ctrl(void *instance, struct v4l2_control *a); +int msm_vidc_s_ext_ctrl(void *instance, struct v4l2_ext_controls *a); int msm_vidc_g_ctrl(void *instance, struct v4l2_control *a); int msm_vidc_reqbufs(void *instance, struct v4l2_requestbuffers *b); int msm_vidc_prepare_buf(void *instance, struct v4l2_buffer *b); -int msm_vidc_release_buf(void *instance, struct v4l2_buffer *b); +int msm_vidc_release_buffers(void *instance, int buffer_type); int msm_vidc_qbuf(void *instance, struct v4l2_buffer *b); int msm_vidc_dqbuf(void *instance, struct v4l2_buffer *b); int msm_vidc_streamon(void *instance, enum v4l2_buf_type i); @@ -48,6 +49,14 @@ int msm_vidc_wait(void *instance); int msm_vidc_s_parm(void *instance, struct v4l2_streamparm *a); int msm_vidc_enum_framesizes(void *instance, struct v4l2_frmsizeenum *fsize); #endif +struct msm_vidc_extradata_header { + unsigned int size; + unsigned int:32; /** Keeping binary compatibility */ + unsigned int:32; /* with firmware and OpenMAX IL **/ + unsigned int type; /* msm_vidc_extradata_type */ + unsigned int data_size; + unsigned char data[1]; +}; struct msm_vidc_interlace_payload { unsigned int format; }; @@ -64,7 +73,6 @@ struct msm_vidc_concealmb_payload { struct msm_vidc_recoverysei_payload { unsigned int flags; }; - struct msm_vidc_aspect_ratio_payload { unsigned int size; unsigned int version; @@ -72,7 +80,6 @@ struct msm_vidc_aspect_ratio_payload { unsigned int aspect_width; unsigned int aspect_height; }; - struct msm_vidc_mpeg2_seqdisp_payload { unsigned int video_format; bool color_descp; @@ -82,7 +89,30 @@ struct msm_vidc_mpeg2_seqdisp_payload { unsigned int disp_width; unsigned int disp_height; }; - +struct msm_vidc_input_crop_payload { + unsigned int size; + unsigned int version; + unsigned int port_index; + unsigned int left; + unsigned int top; + unsigned int width; + unsigned int height; +}; +struct msm_vidc_digital_zoom_payload { + unsigned int size; + unsigned int version; + unsigned int port_index; + unsigned int zoom_width; + unsigned int zoom_height; +}; +struct msm_vidc_extradata_index { + unsigned int type; + union { + struct msm_vidc_input_crop_payload input_crop; + struct msm_vidc_digital_zoom_payload digital_zoom; + struct msm_vidc_aspect_ratio_payload aspect_ratio; + }; +}; struct msm_vidc_panscan_window { unsigned int panscan_height_offset; unsigned int panscan_width_offset; @@ -93,35 +123,79 @@ struct msm_vidc_panscan_window_payload { unsigned int num_panscan_windows; struct msm_vidc_panscan_window wnd[1]; }; +struct msm_vidc_stream_userdata_payload { + unsigned int type; + unsigned int data[1]; +}; +struct msm_vidc_frame_qp_payload { + unsigned int frame_qp; +}; +struct msm_vidc_frame_bits_info_payload { + unsigned int frame_bits; + unsigned int header_bits; +}; +struct msm_vidc_s3d_frame_packing_payload { + unsigned int fpa_id; + unsigned int cancel_flag; + unsigned int fpa_type; + unsigned int quin_cunx_flag; + unsigned int content_interprtation_type; + unsigned int spatial_flipping_flag; + unsigned int frame0_flipped_flag; + unsigned int field_views_flag; + unsigned int current_frame_is_frame0_flag; + unsigned int frame0_self_contained_flag; + unsigned int frame1_self_contained_flag; + unsigned int frame0_graid_pos_x; + unsigned int frame0_graid_pos_y; + unsigned int frame1_graid_pos_x; + unsigned int frame1_graid_pos_y; + unsigned int fpa_reserved_byte; + unsigned int fpa_repetition_period; + unsigned int fpa_extension_flag; +}; + enum msm_vidc_extradata_type { - EXTRADATA_NONE = 0x00000000, - EXTRADATA_MB_QUANTIZATION = 0x00000001, - EXTRADATA_INTERLACE_VIDEO = 0x00000002, - EXTRADATA_VC1_FRAMEDISP = 0x00000003, - EXTRADATA_VC1_SEQDISP = 0x00000004, - EXTRADATA_TIMESTAMP = 0x00000005, - EXTRADATA_S3D_FRAME_PACKING = 0x00000006, - EXTRADATA_FRAME_RATE = 0x00000007, - EXTRADATA_PANSCAN_WINDOW = 0x00000008, - EXTRADATA_RECOVERY_POINT_SEI = 0x00000009, - EXTRADATA_MPEG2_SEQDISP = 0x0000000D, - EXTRADATA_MULTISLICE_INFO = 0x7F100000, - EXTRADATA_NUM_CONCEALED_MB = 0x7F100001, - EXTRADATA_INDEX = 0x7F100002, - EXTRADATA_ASPECT_RATIO = 0x7F100003, - EXTRADATA_METADATA_FILLER = 0x7FE00002, + MSM_VIDC_EXTRADATA_NONE = 0x00000000, + MSM_VIDC_EXTRADATA_MB_QUANTIZATION = 0x00000001, + MSM_VIDC_EXTRADATA_INTERLACE_VIDEO = 0x00000002, + MSM_VIDC_EXTRADATA_VC1_FRAMEDISP = 0x00000003, + MSM_VIDC_EXTRADATA_VC1_SEQDISP = 0x00000004, + MSM_VIDC_EXTRADATA_TIMESTAMP = 0x00000005, + MSM_VIDC_EXTRADATA_S3D_FRAME_PACKING = 0x00000006, + MSM_VIDC_EXTRADATA_FRAME_RATE = 0x00000007, + MSM_VIDC_EXTRADATA_PANSCAN_WINDOW = 0x00000008, + MSM_VIDC_EXTRADATA_RECOVERY_POINT_SEI = 0x00000009, + MSM_VIDC_EXTRADATA_MPEG2_SEQDISP = 0x0000000D, + MSM_VIDC_EXTRADATA_STREAM_USERDATA = 0x0000000E, + MSM_VIDC_EXTRADATA_FRAME_QP = 0x0000000F, + MSM_VIDC_EXTRADATA_FRAME_BITS_INFO = 0x00000010, + MSM_VIDC_EXTRADATA_INPUT_CROP = 0x0700000E, + MSM_VIDC_EXTRADATA_DIGITAL_ZOOM = 0x07000010, + MSM_VIDC_EXTRADATA_MULTISLICE_INFO = 0x7F100000, + MSM_VIDC_EXTRADATA_NUM_CONCEALED_MB = 0x7F100001, + MSM_VIDC_EXTRADATA_INDEX = 0x7F100002, + MSM_VIDC_EXTRADATA_ASPECT_RATIO = 0x7F100003, + MSM_VIDC_EXTRADATA_METADATA_LTR = 0x7F100004, + MSM_VIDC_EXTRADATA_METADATA_FILLER = 0x7FE00002, + MSM_VIDC_EXTRADATA_METADATA_MBI = 0x7F100005, }; enum msm_vidc_interlace_type { - INTERLACE_FRAME_PROGRESSIVE = 0x01, - INTERLACE_INTERLEAVE_FRAME_TOPFIELDFIRST = 0x02, - INTERLACE_INTERLEAVE_FRAME_BOTTOMFIELDFIRST = 0x04, - INTERLACE_FRAME_TOPFIELDFIRST = 0x08, - INTERLACE_FRAME_BOTTOMFIELDFIRST = 0x10, + MSM_VIDC_INTERLACE_FRAME_PROGRESSIVE = 0x01, + MSM_VIDC_INTERLACE_INTERLEAVE_FRAME_TOPFIELDFIRST = 0x02, + MSM_VIDC_INTERLACE_INTERLEAVE_FRAME_BOTTOMFIELDFIRST = 0x04, + MSM_VIDC_INTERLACE_FRAME_TOPFIELDFIRST = 0x08, + MSM_VIDC_INTERLACE_FRAME_BOTTOMFIELDFIRST = 0x10, }; enum msm_vidc_recovery_sei { - FRAME_RECONSTRUCTION_INCORRECT = 0x0, - FRAME_RECONSTRUCTION_CORRECT = 0x01, - FRAME_RECONSTRUCTION_APPROXIMATELY_CORRECT = 0x02, + MSM_VIDC_FRAME_RECONSTRUCTION_INCORRECT = 0x0, + MSM_VIDC_FRAME_RECONSTRUCTION_CORRECT = 0x01, + MSM_VIDC_FRAME_RECONSTRUCTION_APPROXIMATELY_CORRECT = 0x02, +}; +enum msm_vidc_userdata_type { + MSM_VIDC_USERDATA_TYPE_FRAME = 0x1, + MSM_VIDC_USERDATA_TYPE_TOP_FIELD = 0x2, + MSM_VIDC_USERDATA_TYPE_BOTTOM_FIELD = 0x3, }; #endif |