Message ID | 20190808103432.12062-6-ezequiel@collabora.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | media: hantro: Add support for H264 decoding | expand |
On 8/8/19 12:34 PM, Ezequiel Garcia wrote: > From: Boris Brezillon <boris.brezillon@collabora.com> > > 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> > --- > Changes in v4: > * Add R-b ??? Nothing was added, left-over from some old version? Regards, Hans > * Remove the reflist from the struct > > Changes in v3: > * None > > Changes in v2: > * None > --- > Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 9 --------- > include/media/h264-ctrls.h | 3 --- > 2 files changed, 12 deletions(-) > > diff --git a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst > index 94fd3a9b8b9e..d60909b2d1ca 100644 > --- a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst > +++ b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst > @@ -1942,15 +1942,6 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - > * - __u16 > - ``nal_ref_idc`` > - NAL reference ID value coming from the NAL Unit header > - * - __u8 > - - ``ref_pic_list_p0[32]`` > - - Backward reference list used by P-frames in the original bitstream order > - * - __u8 > - - ``ref_pic_list_b0[32]`` > - - Backward reference list used by B-frames in the original bitstream order > - * - __u8 > - - ``ref_pic_list_b1[32]`` > - - Forward reference list used by B-frames in the original bitstream order > * - __s32 > - ``top_field_order_cnt`` > - Picture Order Count for the coded top field > diff --git a/include/media/h264-ctrls.h b/include/media/h264-ctrls.h > index 31555c99f64a..2de438393025 100644 > --- a/include/media/h264-ctrls.h > +++ b/include/media/h264-ctrls.h > @@ -203,9 +203,6 @@ struct v4l2_ctrl_h264_decode_params { > struct v4l2_h264_dpb_entry dpb[16]; > __u16 num_slices; > __u16 nal_ref_idc; > - __u8 ref_pic_list_p0[32]; > - __u8 ref_pic_list_b0[32]; > - __u8 ref_pic_list_b1[32]; > __s32 top_field_order_cnt; > __s32 bottom_field_order_cnt; > __u32 flags; /* V4L2_H264_DECODE_PARAM_FLAG_* */ >
On Mon, 2019-08-12 at 12:20 +0200, Hans Verkuil wrote: > On 8/8/19 12:34 PM, Ezequiel Garcia wrote: > > From: Boris Brezillon <boris.brezillon@collabora.com> > > > > 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> > > --- > > Changes in v4: > > * Add R-b > > ??? > > Nothing was added, left-over from some old version? > Compared to v3, this version adds the Reviewed-by tags, which is what the Add R-b means. Sorry if that wasn't clear! :-)
diff --git a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst index 94fd3a9b8b9e..d60909b2d1ca 100644 --- a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst +++ b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst @@ -1942,15 +1942,6 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - * - __u16 - ``nal_ref_idc`` - NAL reference ID value coming from the NAL Unit header - * - __u8 - - ``ref_pic_list_p0[32]`` - - Backward reference list used by P-frames in the original bitstream order - * - __u8 - - ``ref_pic_list_b0[32]`` - - Backward reference list used by B-frames in the original bitstream order - * - __u8 - - ``ref_pic_list_b1[32]`` - - Forward reference list used by B-frames in the original bitstream order * - __s32 - ``top_field_order_cnt`` - Picture Order Count for the coded top field diff --git a/include/media/h264-ctrls.h b/include/media/h264-ctrls.h index 31555c99f64a..2de438393025 100644 --- a/include/media/h264-ctrls.h +++ b/include/media/h264-ctrls.h @@ -203,9 +203,6 @@ struct v4l2_ctrl_h264_decode_params { struct v4l2_h264_dpb_entry dpb[16]; __u16 num_slices; __u16 nal_ref_idc; - __u8 ref_pic_list_p0[32]; - __u8 ref_pic_list_b0[32]; - __u8 ref_pic_list_b1[32]; __s32 top_field_order_cnt; __s32 bottom_field_order_cnt; __u32 flags; /* V4L2_H264_DECODE_PARAM_FLAG_* */