| From f4801626a551c7a9acc6e98318233bf4afe9fdf5 Mon Sep 17 00:00:00 2001 |
| From: Daniel Wang <wonderfly@google.com> |
| Date: Mon, 13 Mar 2017 15:21:58 -0700 |
| Subject: [PATCH] CHROMIUM: v4l: Add H264 low-level decoder API compound |
| controls. |
| |
| This patch adds pre v4.19 H264 header as legacy where new h264 headers will |
| be added in a different patch for Chromium to support both versions later. |
| This patch also adds config store support. |
| |
| Change-Id: I5968831097ab093391783565c821266c4a337f00 |
| Signed-off-by: Francois Buergisser <fbuergisser@chromium.org> |
| --- |
| include/uapi/linux/media/h264-ctrls-legacy.h | 168 +++++++++++++++++++ |
| include/uapi/linux/videodev2.h | 9 +- |
| 2 files changed, 176 insertions(+), 1 deletion(-) |
| create mode 100644 include/uapi/linux/media/h264-ctrls-legacy.h |
| |
| diff --git a/include/uapi/linux/media/h264-ctrls-legacy.h b/include/uapi/linux/media/h264-ctrls-legacy.h |
| new file mode 100644 |
| index 000000000000..463f97cf01c4 |
| --- /dev/null |
| +++ b/include/uapi/linux/media/h264-ctrls-legacy.h |
| @@ -0,0 +1,168 @@ |
| +/* SPDX-License-Identifier: GPL-2.0 */ |
| +/* |
| + * These are the H.264 state controls for use with stateless H.264 |
| + * codec drivers. |
| + * |
| + * These headers are legacy H264 headers and specific to Chromium only. |
| + * Chromium needs to support pre v4.19 headers but will be removed in the |
| + * future when Chromium will support only v4.19 and onward. |
| + */ |
| + |
| +#ifndef _H264_CTRLS_LEGACY_H_ |
| +#define _H264_CTRLS_LEGACY_H_ |
| + |
| +#include <linux/videodev2.h> |
| + |
| +#define V4L2_CID_MPEG_VIDEO_H264_SPS (V4L2_CID_MPEG_BASE+383) |
| +#define V4L2_CID_MPEG_VIDEO_H264_PPS (V4L2_CID_MPEG_BASE+384) |
| +#define V4L2_CID_MPEG_VIDEO_H264_SCALING_MATRIX (V4L2_CID_MPEG_BASE+385) |
| +#define V4L2_CID_MPEG_VIDEO_H264_SLICE_PARAM (V4L2_CID_MPEG_BASE+386) |
| +#define V4L2_CID_MPEG_VIDEO_H264_DECODE_PARAM (V4L2_CID_MPEG_BASE+387) |
| + |
| +#define V4L2_H264_SPS_CONSTRAINT_SET0_FLAG 0x01 |
| +#define V4L2_H264_SPS_CONSTRAINT_SET1_FLAG 0x02 |
| +#define V4L2_H264_SPS_CONSTRAINT_SET2_FLAG 0x04 |
| +#define V4L2_H264_SPS_CONSTRAINT_SET3_FLAG 0x08 |
| +#define V4L2_H264_SPS_CONSTRAINT_SET4_FLAG 0x10 |
| +#define V4L2_H264_SPS_CONSTRAINT_SET5_FLAG 0x20 |
| + |
| +#define V4L2_H264_SPS_FLAG_SEPARATE_COLOUR_PLANE 0x01 |
| +#define V4L2_H264_SPS_FLAG_QPPRIME_Y_ZERO_TRANSFORM_BYPASS 0x02 |
| +#define V4L2_H264_SPS_FLAG_DELTA_PIC_ORDER_ALWAYS_ZERO 0x04 |
| +#define V4L2_H264_SPS_FLAG_GAPS_IN_FRAME_NUM_VALUE_ALLOWED 0x08 |
| +#define V4L2_H264_SPS_FLAG_FRAME_MBS_ONLY 0x10 |
| +#define V4L2_H264_SPS_FLAG_MB_ADAPTIVE_FRAME_FIELD 0x20 |
| +#define V4L2_H264_SPS_FLAG_DIRECT_8X8_INFERENCE 0x40 |
| +struct v4l2_ctrl_h264_sps { |
| + __u8 profile_idc; |
| + __u8 constraint_set_flags; |
| + __u8 level_idc; |
| + __u8 seq_parameter_set_id; |
| + __u8 chroma_format_idc; |
| + __u8 bit_depth_luma_minus8; |
| + __u8 bit_depth_chroma_minus8; |
| + __u8 log2_max_frame_num_minus4; |
| + __u8 pic_order_cnt_type; |
| + __u8 log2_max_pic_order_cnt_lsb_minus4; |
| + __s32 offset_for_non_ref_pic; |
| + __s32 offset_for_top_to_bottom_field; |
| + __u8 num_ref_frames_in_pic_order_cnt_cycle; |
| + __s32 offset_for_ref_frame[255]; |
| + __u8 max_num_ref_frames; |
| + __u16 pic_width_in_mbs_minus1; |
| + __u16 pic_height_in_map_units_minus1; |
| + __u8 flags; |
| +}; |
| + |
| +#define V4L2_H264_PPS_FLAG_ENTROPY_CODING_MODE 0x0001 |
| +#define V4L2_H264_PPS_FLAG_BOTTOM_FIELD_PIC_ORDER_IN_FRAME_PRESENT 0x0002 |
| +#define V4L2_H264_PPS_FLAG_WEIGHTED_PRED 0x0004 |
| +#define V4L2_H264_PPS_FLAG_DEBLOCKING_FILTER_CONTROL_PRESENT 0x0008 |
| +#define V4L2_H264_PPS_FLAG_CONSTRAINED_INTRA_PRED 0x0010 |
| +#define V4L2_H264_PPS_FLAG_REDUNDANT_PIC_CNT_PRESENT 0x0020 |
| +#define V4L2_H264_PPS_FLAG_TRANSFORM_8X8_MODE 0x0040 |
| +#define V4L2_H264_PPS_FLAG_PIC_SCALING_MATRIX_PRESENT 0x0080 |
| +struct v4l2_ctrl_h264_pps { |
| + __u8 pic_parameter_set_id; |
| + __u8 seq_parameter_set_id; |
| + __u8 num_slice_groups_minus1; |
| + __u8 num_ref_idx_l0_default_active_minus1; |
| + __u8 num_ref_idx_l1_default_active_minus1; |
| + __u8 weighted_bipred_idc; |
| + __s8 pic_init_qp_minus26; |
| + __s8 pic_init_qs_minus26; |
| + __s8 chroma_qp_index_offset; |
| + __s8 second_chroma_qp_index_offset; |
| + __u8 flags; |
| +}; |
| + |
| +struct v4l2_ctrl_h264_scaling_matrix { |
| + __u8 scaling_list_4x4[6][16]; |
| + __u8 scaling_list_8x8[6][64]; |
| +}; |
| + |
| +struct v4l2_h264_weight_factors { |
| + __s8 luma_weight[32]; |
| + __s8 luma_offset[32]; |
| + __s8 chroma_weight[32][2]; |
| + __s8 chroma_offset[32][2]; |
| +}; |
| + |
| +struct v4l2_h264_pred_weight_table { |
| + __u8 luma_log2_weight_denom; |
| + __u8 chroma_log2_weight_denom; |
| + struct v4l2_h264_weight_factors weight_factors[2]; |
| +}; |
| + |
| +#define V4L2_SLICE_FLAG_FIELD_PIC 0x01 |
| +#define V4L2_SLICE_FLAG_BOTTOM_FIELD 0x02 |
| +#define V4L2_SLICE_FLAG_DIRECT_SPATIAL_MV_PRED 0x04 |
| +#define V4L2_SLICE_FLAG_SP_FOR_SWITCH 0x08 |
| +struct v4l2_ctrl_h264_slice_param { |
| + /* Size in bytes, including header */ |
| + __u32 size; |
| + /* Offset in bits to slice_data() from the beginning of this slice. */ |
| + __u32 header_bit_size; |
| + |
| + __u16 first_mb_in_slice; |
| + __u8 slice_type; |
| + __u8 pic_parameter_set_id; |
| + __u8 colour_plane_id; |
| + __u16 frame_num; |
| + __u16 idr_pic_id; |
| + __u16 pic_order_cnt_lsb; |
| + __s32 delta_pic_order_cnt_bottom; |
| + __s32 delta_pic_order_cnt0; |
| + __s32 delta_pic_order_cnt1; |
| + __u8 redundant_pic_cnt; |
| + |
| + struct v4l2_h264_pred_weight_table pred_weight_table; |
| + /* Size in bits of dec_ref_pic_marking() syntax element. */ |
| + __u32 dec_ref_pic_marking_bit_size; |
| + /* Size in bits of pic order count syntax. */ |
| + __u32 pic_order_cnt_bit_size; |
| + |
| + __u8 cabac_init_idc; |
| + __s8 slice_qp_delta; |
| + __s8 slice_qs_delta; |
| + __u8 disable_deblocking_filter_idc; |
| + __s8 slice_alpha_c0_offset_div2; |
| + __s8 slice_beta_offset_div2; |
| + __u32 slice_group_change_cycle; |
| + |
| + __u8 num_ref_idx_l0_active_minus1; |
| + __u8 num_ref_idx_l1_active_minus1; |
| + /* Entries on each list are indices |
| + * into v4l2_ctrl_h264_decode_param.dpb[]. */ |
| + __u8 ref_pic_list0[32]; |
| + __u8 ref_pic_list1[32]; |
| + |
| + __u8 flags; |
| +}; |
| + |
| +/* If not set, this entry is unused for reference. */ |
| +#define V4L2_H264_DPB_ENTRY_FLAG_ACTIVE 0x01 |
| +#define V4L2_H264_DPB_ENTRY_FLAG_LONG_TERM 0x02 |
| +struct v4l2_h264_dpb_entry { |
| + __u32 buf_index; /* v4l2_buffer index */ |
| + __u16 frame_num; |
| + __u16 pic_num; |
| + /* Note that field is indicated by v4l2_buffer.field */ |
| + __s32 top_field_order_cnt; |
| + __s32 bottom_field_order_cnt; |
| + __u8 flags; /* V4L2_H264_DPB_ENTRY_FLAG_* */ |
| +}; |
| + |
| +struct v4l2_ctrl_h264_decode_param { |
| + __u32 num_slices; |
| + __u8 idr_pic_flag; |
| + __u8 nal_ref_idc; |
| + __s32 top_field_order_cnt; |
| + __s32 bottom_field_order_cnt; |
| + __u8 ref_pic_list_p0[32]; |
| + __u8 ref_pic_list_b0[32]; |
| + __u8 ref_pic_list_b1[32]; |
| + struct v4l2_h264_dpb_entry dpb[16]; |
| +}; |
| + |
| +#endif /* __LINUX_MEDIA_H264_CTRLS_LEGACY_H_ */ |
| diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h |
| index 1c095b5a99c5..c2c9e44e70a7 100644 |
| --- a/include/uapi/linux/videodev2.h |
| +++ b/include/uapi/linux/videodev2.h |
| @@ -65,6 +65,7 @@ |
| #include <linux/types.h> |
| #include <linux/v4l2-common.h> |
| #include <linux/v4l2-controls.h> |
| +#include <linux/media/h264-ctrls-legacy.h> |
| |
| /* |
| * Common stuff for both V4L1 and V4L2 |
| @@ -626,6 +627,7 @@ struct v4l2_pix_format { |
| #define V4L2_PIX_FMT_H264 v4l2_fourcc('H', '2', '6', '4') /* H264 with start codes */ |
| #define V4L2_PIX_FMT_H264_NO_SC v4l2_fourcc('A', 'V', 'C', '1') /* H264 without start codes */ |
| #define V4L2_PIX_FMT_H264_MVC v4l2_fourcc('M', '2', '6', '4') /* H264 MVC */ |
| +#define V4L2_PIX_FMT_H264_SLICE v4l2_fourcc('S', '2', '6', '4') /* H264 parsed slices */ |
| #define V4L2_PIX_FMT_H263 v4l2_fourcc('H', '2', '6', '3') /* H263 */ |
| #define V4L2_PIX_FMT_MPEG1 v4l2_fourcc('M', 'P', 'G', '1') /* MPEG-1 ES */ |
| #define V4L2_PIX_FMT_MPEG2 v4l2_fourcc('M', 'P', 'G', '2') /* MPEG-2 ES */ |
| @@ -902,6 +904,7 @@ struct v4l2_plane { |
| * @length: size in bytes of the buffer (NOT its payload) for single-plane |
| * buffers (when type != *_MPLANE); number of elements in the |
| * planes array for multi-plane buffers |
| + * @config_store: this buffer should use this configuration store |
| * |
| * Contains data exchanged by application and driver using one of the Streaming |
| * I/O methods. |
| @@ -925,7 +928,7 @@ struct v4l2_buffer { |
| __s32 fd; |
| } m; |
| __u32 length; |
| - __u32 reserved2; |
| + __u32 config_store; |
| __u32 reserved; |
| }; |
| |
| @@ -1579,6 +1582,7 @@ struct v4l2_ext_controls { |
| union { |
| #ifndef __KERNEL__ |
| __u32 ctrl_class; |
| + __u32 config_store; |
| #endif |
| __u32 which; |
| }; |
| @@ -1614,6 +1618,8 @@ enum v4l2_ctrl_type { |
| V4L2_CTRL_TYPE_U8 = 0x0100, |
| V4L2_CTRL_TYPE_U16 = 0x0101, |
| V4L2_CTRL_TYPE_U32 = 0x0102, |
| + |
| + V4L2_CTRL_TYPE_PRIVATE = 0xffff, |
| }; |
| |
| /* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ |
| @@ -1669,6 +1675,7 @@ struct v4l2_querymenu { |
| #define V4L2_CTRL_FLAG_HAS_PAYLOAD 0x0100 |
| #define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE 0x0200 |
| #define V4L2_CTRL_FLAG_MODIFY_LAYOUT 0x0400 |
| +#define V4L2_CTRL_FLAG_CAN_STORE 0x8000 |
| |
| /* Query flags, to be ORed with the control ID */ |
| #define V4L2_CTRL_FLAG_NEXT_CTRL 0x80000000 |
| -- |
| 2.22.0.657.g960e92d24f-goog |
| |
