@@ -1662,6 +1662,9 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type -
* - __u16
- ``flags``
- See :ref:`Picture Parameter Set Flags <h264_pps_flags>`
+ * - __u32
+ - ``reserved``
+ - Applications and drivers must set this to zero.
.. _h264_pps_flags:
@@ -1735,6 +1735,7 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx,
struct v4l2_ctrl_vp8_frame_header *p_vp8_frame_header;
struct v4l2_ctrl_h264_slice_params *p_h264_slice_params;
struct v4l2_ctrl_h264_decode_params *p_h264_dec_params;
+ struct v4l2_ctrl_h264_pps *p_h264_pps;
struct v4l2_ctrl_hevc_sps *p_hevc_sps;
struct v4l2_ctrl_hevc_pps *p_hevc_pps;
struct v4l2_ctrl_hevc_slice_params *p_hevc_slice_params;
@@ -1792,7 +1793,11 @@ static int std_validate_compound(const struct v4l2_ctrl *ctrl, u32 idx,
break;
case V4L2_CTRL_TYPE_H264_SPS:
+ break;
case V4L2_CTRL_TYPE_H264_PPS:
+ p_h264_pps = p;
+ zero_reserved(*p_h264_pps);
+ break;
case V4L2_CTRL_TYPE_H264_SCALING_MATRIX:
break;
case V4L2_CTRL_TYPE_H264_SLICE_PARAMS:
@@ -111,6 +111,7 @@ struct v4l2_ctrl_h264_pps {
__s8 chroma_qp_index_offset;
__s8 second_chroma_qp_index_offset;
__u16 flags;
+ __u32 reserved;
};
struct v4l2_ctrl_h264_scaling_matrix {
The struct does not contain 64-bit types, and therefore doesn't suffer from compatibility issues. However, having it aligned to 64-bits is cleaner and has the advantage of allowing future extensions. Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> --- Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst | 3 +++ drivers/media/v4l2-core/v4l2-ctrls.c | 5 +++++ include/media/h264-ctrls.h | 1 + 3 files changed, 9 insertions(+)