Unlike when resolution change on keyframes, dynamic resolution change
on inter frames doesn't allow to do a stream off/on sequence because
it is need to keep all previous references alive to decode inter frames.
This constraint have two main problems:
- more memory consumption.
- more buffers in use.
To solve these issue this series introduce DELETE_BUFS ioctl and remove
the 32 buffers limit per queue.
VP9 conformance tests using fluster give a score of 210/305.
The 24 resize inter tests (vp90-2-21-resize_inter_* files) are ok
but require to use postprocessor.
Kernel branch is available here:
https://gitlab.collabora.com/benjamin.gaignard/for-upstream/-/commits/remove_vb2_queue_limit_v7
GStreamer branch to use DELETE_BUF ioctl and testing dynamic resolution
change is here:
https://gitlab.freedesktop.org/benjamin.gaignard1/gstreamer/-/commits/VP9_drc
changes in version 7:
- Use a bitmap to know which entries are valid in queue bufs array.
The number of buffers in the queue could must calculated from the
bitmap so num_buffers becomes useless. This led to add quite few
patches to remove it from all the drivers.
Note: despiste my attention I may have miss some calls to
num_buffers...
- Split patches to make them more readable.
- Run v4l2-compliance with additional delete-bufs tests.
- Run ./test-media -kmemleak vivid and no more failures.
Note: I had to remove USERPTR streaming test because they to much
frequentely hit get_framevec bug. It is not related to my series
since this happens all the time on master branch.
- Fix Hans remarks on v6
changes in version 6:
- Get a patch per driver to use vb2_get_buffer() instead of directly access
to queue buffers array.
- Add lock in vb2_core_delete_buf()
- Use vb2_buffer instead of index
- Fix various comments
- Change buffer index name to BUFFER_INDEX_MASK
- Stop spamming kernel log with unbalanced counters
changes in version 5:
- Rework offset cookie encoding pattern is n ow the first patch of the
serie.
- Use static array instead of allocated one for postprocessor buffers.
changes in version 4:
- Stop using Xarray, instead let queues decide about their own maximum
number of buffer and allocate bufs array given that value.
- Rework offset cookie encoding pattern.
- Change DELETE_BUF to DELETE_BUFS because it now usable for
range of buffer to be symetrical of CREATE_BUFS.
- Add fixes tags on couple of Verisilicon related patches.
- Be smarter in Verisilicon postprocessor buffers management.
- Rebase on top of v6.4
changes in version 3:
- Use Xarray API to store allocated video buffers.
- No module parameter to limit the number of buffer per queue.
- Use Xarray inside Verisilicon driver to store postprocessor buffers
and remove VB2_MAX_FRAME limit.
- Allow Versilicon driver to change of resolution while streaming
- Various fixes the Verisilicon VP9 code to improve fluster score.
changes in version 2:
- Use a dynamic array and not a list to keep trace of allocated buffers.
Not use IDR interface because it is marked as deprecated in kernel
documentation.
- Add a module parameter to limit the number of buffer per queue.
- Add DELETE_BUF ioctl and m2m helpers.
Regards,
Benjamin
Benjamin Gaignard (49):
media: videobuf2: Rework offset 'cookie' encoding pattern
media: videobuf2: Stop spamming kernel log with all queue counter
media: videobuf2: Use vb2_buffer instead of index
media: amphion: Use vb2_get_buffer() instead of directly access to
buffers array
media: mediatek: jpeg: Use vb2_get_buffer() instead of directly access
to buffers array
media: mediatek: vdec: Use vb2_get_buffer() instead of directly access
to buffers array
media: sti: hva: Use vb2_get_buffer() instead of directly access to
buffers array
media: visl: Use vb2_get_buffer() instead of directly access to
buffers array
media: atomisp: Use vb2_get_buffer() instead of directly access to
buffers array
media: dvb-core: Use vb2_get_buffer() instead of directly access to
buffers array
media: videobuf2: Access vb2_queue bufs array through helper functions
media: videobuf2: Be more flexible on the number of queue stored
buffers
media: verisilicon: Refactor postprocessor to store more buffers
media: verisilicon: Store chroma and motion vectors offset
media: verisilicon: g2: Use common helpers to compute chroma and mv
offsets
media: verisilicon: postproc: Fix down scale test
media: verisilicon: vp9: Allow to change resolution while streaming
media: Remove duplicated index vs q->num_buffers check
media: core: Add helper to get queue number of buffers
media: core: Rework how create_buf index returned value is computed
media: dvb: Stop direct calls to queue num_buffers field
media: i2c: Stop direct calls to queue num_buffers field
media: pci: cx18: Stop direct calls to queue num_buffers field
media: pci: dt3155: Stop direct calls to queue num_buffers field
media: pci: netup_unidvb: Stop direct calls to queue num_buffers field
media: pci: tw68: Stop direct calls to queue num_buffers field
media: pci: tw686x: Stop direct calls to queue num_buffers field
media: amphion: Stop direct calls to queue num_buffers field
media: coda: Stop direct calls to queue num_buffers field
media: mediatek: vcodec: Stop direct calls to queue num_buffers field
media: nxp: Stop direct calls to queue num_buffers field
media: renesas: Stop direct calls to queue num_buffers field
media: sti: hva: Stop direct calls to queue num_buffers field
media: ti: Stop direct calls to queue num_buffers field
media: verisilicon: Stop direct calls to queue num_buffers field
media: test-drivers: Stop direct calls to queue num_buffers field
media: usb: airspy: Stop direct calls to queue num_buffers field
media: usb: cx231xx: Stop direct calls to queue num_buffers field
media: usb: hackrf: Stop direct calls to queue num_buffers field
media: usb: usbtv: Stop direct calls to queue num_buffers field
media: atomisp: Stop direct calls to queue num_buffers field
media: imx: Stop direct calls to queue num_buffers field
media: meson: vdec: Stop direct calls to queue num_buffers field
media: cedrus: Stop direct calls to queue num_buffers field
media: core: Add bitmap manage bufs array entries
media: core: Free range of buffers
media: v4l2: Add DELETE_BUFS ioctl
media: v4l2: Add mem2mem helpers for DELETE_BUFS ioctl
media: test-drivers: Use helper for DELETE_BUFS ioctl
.../userspace-api/media/v4l/user-func.rst | 1 +
.../media/v4l/vidioc-delete-bufs.rst | 77 +++
.../media/common/videobuf2/videobuf2-core.c | 583 ++++++++++++------
.../media/common/videobuf2/videobuf2-v4l2.c | 107 +++-
drivers/media/dvb-core/dvb_vb2.c | 17 +-
drivers/media/dvb-frontends/rtl2832_sdr.c | 5 +-
drivers/media/i2c/video-i2c.c | 2 +-
drivers/media/pci/cx18/cx18-streams.c | 5 +-
drivers/media/pci/dt3155/dt3155.c | 5 +-
.../pci/netup_unidvb/netup_unidvb_core.c | 5 +-
drivers/media/pci/tw68/tw68-video.c | 4 +-
drivers/media/pci/tw686x/tw686x-video.c | 5 +-
drivers/media/platform/amphion/vpu_dbg.c | 30 +-
drivers/media/platform/amphion/vpu_v4l2.c | 4 +-
.../media/platform/chips-media/coda-common.c | 2 +-
.../platform/mediatek/jpeg/mtk_jpeg_core.c | 7 +-
.../vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 4 +-
.../mediatek/vcodec/encoder/mtk_vcodec_enc.c | 2 +-
drivers/media/platform/nxp/imx7-media-csi.c | 7 +-
drivers/media/platform/renesas/rcar_drif.c | 5 +-
drivers/media/platform/st/sti/hva/hva-v4l2.c | 9 +-
.../media/platform/ti/am437x/am437x-vpfe.c | 5 +-
drivers/media/platform/ti/cal/cal-video.c | 5 +-
.../media/platform/ti/davinci/vpif_capture.c | 5 +-
.../media/platform/ti/davinci/vpif_display.c | 5 +-
drivers/media/platform/ti/omap/omap_vout.c | 5 +-
drivers/media/platform/verisilicon/hantro.h | 9 +-
.../media/platform/verisilicon/hantro_drv.c | 4 +-
.../media/platform/verisilicon/hantro_g2.c | 14 +
.../platform/verisilicon/hantro_g2_hevc_dec.c | 18 +-
.../platform/verisilicon/hantro_g2_vp9_dec.c | 28 +-
.../media/platform/verisilicon/hantro_hw.h | 7 +-
.../platform/verisilicon/hantro_postproc.c | 95 ++-
.../media/platform/verisilicon/hantro_v4l2.c | 27 +-
.../media/test-drivers/vicodec/vicodec-core.c | 1 +
drivers/media/test-drivers/vim2m.c | 1 +
.../media/test-drivers/vimc/vimc-capture.c | 1 +
drivers/media/test-drivers/visl/visl-dec.c | 32 +-
drivers/media/test-drivers/visl/visl-video.c | 1 +
drivers/media/test-drivers/vivid/vivid-core.c | 1 +
.../media/test-drivers/vivid/vivid-meta-cap.c | 5 +-
.../media/test-drivers/vivid/vivid-meta-out.c | 5 +-
.../test-drivers/vivid/vivid-touch-cap.c | 5 +-
.../media/test-drivers/vivid/vivid-vbi-cap.c | 5 +-
.../media/test-drivers/vivid/vivid-vbi-out.c | 5 +-
.../media/test-drivers/vivid/vivid-vid-cap.c | 5 +-
.../media/test-drivers/vivid/vivid-vid-out.c | 5 +-
drivers/media/usb/airspy/airspy.c | 5 +-
drivers/media/usb/cx231xx/cx231xx-417.c | 5 +-
drivers/media/usb/cx231xx/cx231xx-video.c | 5 +-
drivers/media/usb/hackrf/hackrf.c | 5 +-
drivers/media/usb/usbtv/usbtv-video.c | 5 +-
drivers/media/v4l2-core/v4l2-dev.c | 1 +
drivers/media/v4l2-core/v4l2-ioctl.c | 17 +
drivers/media/v4l2-core/v4l2-mem2mem.c | 20 +
.../staging/media/atomisp/pci/atomisp_ioctl.c | 4 +-
drivers/staging/media/imx/imx-media-capture.c | 7 +-
drivers/staging/media/meson/vdec/vdec.c | 13 +-
.../staging/media/sunxi/cedrus/cedrus_h264.c | 4 +-
.../staging/media/sunxi/cedrus/cedrus_h265.c | 4 +-
include/media/v4l2-ioctl.h | 4 +
include/media/v4l2-mem2mem.h | 12 +
include/media/videobuf2-core.h | 57 +-
include/media/videobuf2-v4l2.h | 13 +
include/uapi/linux/videodev2.h | 16 +
65 files changed, 955 insertions(+), 427 deletions(-)
create mode 100644 Documentation/userspace-api/media/v4l/vidioc-delete-bufs.rst
Unlike when resolution change on keyframes, dynamic resolution change on inter frames doesn't allow to do a stream off/on sequence because it is need to keep all previous references alive to decode inter frames. This constraint have two main problems: - more memory consumption. - more buffers in use. To solve these issue this series introduce DELETE_BUFS ioctl and remove the 32 buffers limit per queue. VP9 conformance tests using fluster give a score of 210/305. The 24 resize inter tests (vp90-2-21-resize_inter_* files) are ok but require to use postprocessor. Kernel branch is available here: https://gitlab.collabora.com/benjamin.gaignard/for-upstream/-/commits/remove_vb2_queue_limit_v7 GStreamer branch to use DELETE_BUF ioctl and testing dynamic resolution change is here: https://gitlab.freedesktop.org/benjamin.gaignard1/gstreamer/-/commits/VP9_drc changes in version 7: - Use a bitmap to know which entries are valid in queue bufs array. The number of buffers in the queue could must calculated from the bitmap so num_buffers becomes useless. This led to add quite few patches to remove it from all the drivers. Note: despiste my attention I may have miss some calls to num_buffers... - Split patches to make them more readable. - Run v4l2-compliance with additional delete-bufs tests. - Run ./test-media -kmemleak vivid and no more failures. Note: I had to remove USERPTR streaming test because they to much frequentely hit get_framevec bug. It is not related to my series since this happens all the time on master branch. - Fix Hans remarks on v6 changes in version 6: - Get a patch per driver to use vb2_get_buffer() instead of directly access to queue buffers array. - Add lock in vb2_core_delete_buf() - Use vb2_buffer instead of index - Fix various comments - Change buffer index name to BUFFER_INDEX_MASK - Stop spamming kernel log with unbalanced counters changes in version 5: - Rework offset cookie encoding pattern is n ow the first patch of the serie. - Use static array instead of allocated one for postprocessor buffers. changes in version 4: - Stop using Xarray, instead let queues decide about their own maximum number of buffer and allocate bufs array given that value. - Rework offset cookie encoding pattern. - Change DELETE_BUF to DELETE_BUFS because it now usable for range of buffer to be symetrical of CREATE_BUFS. - Add fixes tags on couple of Verisilicon related patches. - Be smarter in Verisilicon postprocessor buffers management. - Rebase on top of v6.4 changes in version 3: - Use Xarray API to store allocated video buffers. - No module parameter to limit the number of buffer per queue. - Use Xarray inside Verisilicon driver to store postprocessor buffers and remove VB2_MAX_FRAME limit. - Allow Versilicon driver to change of resolution while streaming - Various fixes the Verisilicon VP9 code to improve fluster score. changes in version 2: - Use a dynamic array and not a list to keep trace of allocated buffers. Not use IDR interface because it is marked as deprecated in kernel documentation. - Add a module parameter to limit the number of buffer per queue. - Add DELETE_BUF ioctl and m2m helpers. Regards, Benjamin Benjamin Gaignard (49): media: videobuf2: Rework offset 'cookie' encoding pattern media: videobuf2: Stop spamming kernel log with all queue counter media: videobuf2: Use vb2_buffer instead of index media: amphion: Use vb2_get_buffer() instead of directly access to buffers array media: mediatek: jpeg: Use vb2_get_buffer() instead of directly access to buffers array media: mediatek: vdec: Use vb2_get_buffer() instead of directly access to buffers array media: sti: hva: Use vb2_get_buffer() instead of directly access to buffers array media: visl: Use vb2_get_buffer() instead of directly access to buffers array media: atomisp: Use vb2_get_buffer() instead of directly access to buffers array media: dvb-core: Use vb2_get_buffer() instead of directly access to buffers array media: videobuf2: Access vb2_queue bufs array through helper functions media: videobuf2: Be more flexible on the number of queue stored buffers media: verisilicon: Refactor postprocessor to store more buffers media: verisilicon: Store chroma and motion vectors offset media: verisilicon: g2: Use common helpers to compute chroma and mv offsets media: verisilicon: postproc: Fix down scale test media: verisilicon: vp9: Allow to change resolution while streaming media: Remove duplicated index vs q->num_buffers check media: core: Add helper to get queue number of buffers media: core: Rework how create_buf index returned value is computed media: dvb: Stop direct calls to queue num_buffers field media: i2c: Stop direct calls to queue num_buffers field media: pci: cx18: Stop direct calls to queue num_buffers field media: pci: dt3155: Stop direct calls to queue num_buffers field media: pci: netup_unidvb: Stop direct calls to queue num_buffers field media: pci: tw68: Stop direct calls to queue num_buffers field media: pci: tw686x: Stop direct calls to queue num_buffers field media: amphion: Stop direct calls to queue num_buffers field media: coda: Stop direct calls to queue num_buffers field media: mediatek: vcodec: Stop direct calls to queue num_buffers field media: nxp: Stop direct calls to queue num_buffers field media: renesas: Stop direct calls to queue num_buffers field media: sti: hva: Stop direct calls to queue num_buffers field media: ti: Stop direct calls to queue num_buffers field media: verisilicon: Stop direct calls to queue num_buffers field media: test-drivers: Stop direct calls to queue num_buffers field media: usb: airspy: Stop direct calls to queue num_buffers field media: usb: cx231xx: Stop direct calls to queue num_buffers field media: usb: hackrf: Stop direct calls to queue num_buffers field media: usb: usbtv: Stop direct calls to queue num_buffers field media: atomisp: Stop direct calls to queue num_buffers field media: imx: Stop direct calls to queue num_buffers field media: meson: vdec: Stop direct calls to queue num_buffers field media: cedrus: Stop direct calls to queue num_buffers field media: core: Add bitmap manage bufs array entries media: core: Free range of buffers media: v4l2: Add DELETE_BUFS ioctl media: v4l2: Add mem2mem helpers for DELETE_BUFS ioctl media: test-drivers: Use helper for DELETE_BUFS ioctl .../userspace-api/media/v4l/user-func.rst | 1 + .../media/v4l/vidioc-delete-bufs.rst | 77 +++ .../media/common/videobuf2/videobuf2-core.c | 583 ++++++++++++------ .../media/common/videobuf2/videobuf2-v4l2.c | 107 +++- drivers/media/dvb-core/dvb_vb2.c | 17 +- drivers/media/dvb-frontends/rtl2832_sdr.c | 5 +- drivers/media/i2c/video-i2c.c | 2 +- drivers/media/pci/cx18/cx18-streams.c | 5 +- drivers/media/pci/dt3155/dt3155.c | 5 +- .../pci/netup_unidvb/netup_unidvb_core.c | 5 +- drivers/media/pci/tw68/tw68-video.c | 4 +- drivers/media/pci/tw686x/tw686x-video.c | 5 +- drivers/media/platform/amphion/vpu_dbg.c | 30 +- drivers/media/platform/amphion/vpu_v4l2.c | 4 +- .../media/platform/chips-media/coda-common.c | 2 +- .../platform/mediatek/jpeg/mtk_jpeg_core.c | 7 +- .../vcodec/decoder/vdec/vdec_vp9_req_lat_if.c | 4 +- .../mediatek/vcodec/encoder/mtk_vcodec_enc.c | 2 +- drivers/media/platform/nxp/imx7-media-csi.c | 7 +- drivers/media/platform/renesas/rcar_drif.c | 5 +- drivers/media/platform/st/sti/hva/hva-v4l2.c | 9 +- .../media/platform/ti/am437x/am437x-vpfe.c | 5 +- drivers/media/platform/ti/cal/cal-video.c | 5 +- .../media/platform/ti/davinci/vpif_capture.c | 5 +- .../media/platform/ti/davinci/vpif_display.c | 5 +- drivers/media/platform/ti/omap/omap_vout.c | 5 +- drivers/media/platform/verisilicon/hantro.h | 9 +- .../media/platform/verisilicon/hantro_drv.c | 4 +- .../media/platform/verisilicon/hantro_g2.c | 14 + .../platform/verisilicon/hantro_g2_hevc_dec.c | 18 +- .../platform/verisilicon/hantro_g2_vp9_dec.c | 28 +- .../media/platform/verisilicon/hantro_hw.h | 7 +- .../platform/verisilicon/hantro_postproc.c | 95 ++- .../media/platform/verisilicon/hantro_v4l2.c | 27 +- .../media/test-drivers/vicodec/vicodec-core.c | 1 + drivers/media/test-drivers/vim2m.c | 1 + .../media/test-drivers/vimc/vimc-capture.c | 1 + drivers/media/test-drivers/visl/visl-dec.c | 32 +- drivers/media/test-drivers/visl/visl-video.c | 1 + drivers/media/test-drivers/vivid/vivid-core.c | 1 + .../media/test-drivers/vivid/vivid-meta-cap.c | 5 +- .../media/test-drivers/vivid/vivid-meta-out.c | 5 +- .../test-drivers/vivid/vivid-touch-cap.c | 5 +- .../media/test-drivers/vivid/vivid-vbi-cap.c | 5 +- .../media/test-drivers/vivid/vivid-vbi-out.c | 5 +- .../media/test-drivers/vivid/vivid-vid-cap.c | 5 +- .../media/test-drivers/vivid/vivid-vid-out.c | 5 +- drivers/media/usb/airspy/airspy.c | 5 +- drivers/media/usb/cx231xx/cx231xx-417.c | 5 +- drivers/media/usb/cx231xx/cx231xx-video.c | 5 +- drivers/media/usb/hackrf/hackrf.c | 5 +- drivers/media/usb/usbtv/usbtv-video.c | 5 +- drivers/media/v4l2-core/v4l2-dev.c | 1 + drivers/media/v4l2-core/v4l2-ioctl.c | 17 + drivers/media/v4l2-core/v4l2-mem2mem.c | 20 + .../staging/media/atomisp/pci/atomisp_ioctl.c | 4 +- drivers/staging/media/imx/imx-media-capture.c | 7 +- drivers/staging/media/meson/vdec/vdec.c | 13 +- .../staging/media/sunxi/cedrus/cedrus_h264.c | 4 +- .../staging/media/sunxi/cedrus/cedrus_h265.c | 4 +- include/media/v4l2-ioctl.h | 4 + include/media/v4l2-mem2mem.h | 12 + include/media/videobuf2-core.h | 57 +- include/media/videobuf2-v4l2.h | 13 + include/uapi/linux/videodev2.h | 16 + 65 files changed, 955 insertions(+), 427 deletions(-) create mode 100644 Documentation/userspace-api/media/v4l/vidioc-delete-bufs.rst