diff options
author | Boris Brezillon <boris.brezillon@collabora.com> | 2019-08-16 12:01:26 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | 2019-08-19 12:24:04 -0400 |
commit | c3adb85745ca6cc19532b2ee197d7abece1ac732 (patch) | |
tree | fa02835bdf9ee0af7746fa3a1b3e3532ea7073a6 | |
parent | 8cae93e090113e46bd29a99c1727d8f13ea12fdf (diff) |
media: uapi: h264: Get rid of the p0/b0/b1 ref-lists
Those lists can be extracted from the dpb, let's simplify userspace
life and build that list kernel-side (generic helpers will be provided
for drivers that need this list).
Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Reviewed-by: Ezequiel Garcia <ezequiel@collabora.com>
Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Tested-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
-rw-r--r-- | Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 9 | ||||
-rw-r--r-- | include/media/h264-ctrls.h | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst index 810ae9bb6f7c..bc5dd8e76567 100644 --- a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst +++ b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst | |||
@@ -1945,15 +1945,6 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - | |||
1945 | * - __u16 | 1945 | * - __u16 |
1946 | - ``nal_ref_idc`` | 1946 | - ``nal_ref_idc`` |
1947 | - NAL reference ID value coming from the NAL Unit header | 1947 | - NAL reference ID value coming from the NAL Unit header |
1948 | * - __u8 | ||
1949 | - ``ref_pic_list_p0[32]`` | ||
1950 | - Backward reference list used by P-frames in the original bitstream order | ||
1951 | * - __u8 | ||
1952 | - ``ref_pic_list_b0[32]`` | ||
1953 | - Backward reference list used by B-frames in the original bitstream order | ||
1954 | * - __u8 | ||
1955 | - ``ref_pic_list_b1[32]`` | ||
1956 | - Forward reference list used by B-frames in the original bitstream order | ||
1957 | * - __s32 | 1948 | * - __s32 |
1958 | - ``top_field_order_cnt`` | 1949 | - ``top_field_order_cnt`` |
1959 | - Picture Order Count for the coded top field | 1950 | - Picture Order Count for the coded top field |
diff --git a/include/media/h264-ctrls.h b/include/media/h264-ctrls.h index ba2876a64cf6..e877bf1d537c 100644 --- a/include/media/h264-ctrls.h +++ b/include/media/h264-ctrls.h | |||
@@ -202,9 +202,6 @@ struct v4l2_ctrl_h264_decode_params { | |||
202 | struct v4l2_h264_dpb_entry dpb[16]; | 202 | struct v4l2_h264_dpb_entry dpb[16]; |
203 | __u16 num_slices; | 203 | __u16 num_slices; |
204 | __u16 nal_ref_idc; | 204 | __u16 nal_ref_idc; |
205 | __u8 ref_pic_list_p0[32]; | ||
206 | __u8 ref_pic_list_b0[32]; | ||
207 | __u8 ref_pic_list_b1[32]; | ||
208 | __s32 top_field_order_cnt; | 205 | __s32 top_field_order_cnt; |
209 | __s32 bottom_field_order_cnt; | 206 | __s32 bottom_field_order_cnt; |
210 | __u32 flags; /* V4L2_H264_DECODE_PARAM_FLAG_* */ | 207 | __u32 flags; /* V4L2_H264_DECODE_PARAM_FLAG_* */ |