mbox series

[v3,00/10] media: rkvdec: Add H.264 High 10 and 4:2:2 profile support

Message ID 20231029183427.1781554-1-jonas@kwiboo.se
Headers show
Series media: rkvdec: Add H.264 High 10 and 4:2:2 profile support | expand

Message

Jonas Karlman Oct. 29, 2023, 6:34 p.m. UTC
This is a revival of a 3 year old series [1] now that NV15/NV20/NV30 support
for display driver have landed in drm-misc tree.

This series adds H.264 High 10 and 4:2:2 profile support to the Rockchip
Video Decoder driver.

Patch 1 adds helpers for calculating plane bytesperline and sizeimage.
Patch 2 adds two new pixelformats for semi-planer 10-bit 4:2:0/4:2:2 YUV.

Patch 3 change to use bytesperline and buffer height to configure strides.
Patch 4 change to use values from SPS/PPS control to configure the HW.
Patch 5 remove an unnecessary call to validate sps at streaming start.

Patch 6-9 refactor code to support validation and filtering of CAPUTRE
formats based on codec ops.

Patch 10 adds final bits to support H.264 High 10 and 4:2:2 profiles.

Changes in v3:
- Drop merged patches
- Use bpp and bpp_div instead of prior misuse of block_w/block_h
- New patch to use values from SPS/PPS control to configure the HW
- New patch to remove an unnecessary call to validate sps at streaming start
- Reworked pixel format validation

Changes in v2:
- Collect r-b tags
- SPS pic width and height in mbs validation moved to rkvdec_try_ctrl
- New patch to not override output buffer sizeimage
- Reworked pixel format validation
- Only align decoded buffer instead of changing frmsize step_width

Following drm-misc commits adds support for NV15/NV20/NV30 to VOP driver:
728c15b4b5f3 ("drm/fourcc: Add NV20 and NV30 YUV formats")
d4b384228562 ("drm/rockchip: vop: Add NV15, NV20 and NV30 support")

To fully runtime test this series you may need above drm commits and ffmpeg
patches from [2], this series and drm patches is also available at [3].

[1] https://lore.kernel.org/linux-media/20200706215430.22859-1-jonas@kwiboo.se/
[2] https://github.com/jernejsk/FFmpeg/commits/v4l2-request-n6.0/
[3] https://github.com/Kwiboo/linux-rockchip/commits/linuxtv-rkvdec-high-10-v3/

Regards,
Jonas

Alex Bee (1):
  media: rkvdec: h264: Don't hardcode SPS/PPS parameters

Jonas Karlman (9):
  media: v4l2-common: Add helpers to calculate bytesperline and
    sizeimage
  media: v4l2: Add NV15 and NV20 pixel formats
  media: rkvdec: h264: Use bytesperline and buffer height as virstride
  media: rkvdec: h264: Remove SPS validation at streaming start
  media: rkvdec: Extract rkvdec_fill_decoded_pixfmt helper method
  media: rkvdec: Move rkvdec_reset_decoded_fmt() function
  media: rkvdec: Prepare for adding format validation ops
  media: rkvdec: Add get_fmt_opaque and valid_fmt ops
  media: rkvdec: h264: Support High 10 and 4:2:2 profiles

 .../media/v4l/pixfmt-yuv-planar.rst           | 128 ++++++++++++
 drivers/media/v4l2-core/v4l2-common.c         |  80 ++++----
 drivers/media/v4l2-core/v4l2-ioctl.c          |   2 +
 drivers/staging/media/rkvdec/rkvdec-h264.c    |  91 ++++----
 drivers/staging/media/rkvdec/rkvdec.c         | 194 +++++++++++++-----
 drivers/staging/media/rkvdec/rkvdec.h         |   3 +
 include/uapi/linux/videodev2.h                |   2 +
 7 files changed, 367 insertions(+), 133 deletions(-)

--
2.42.0

Comments

Christopher Obbard Dec. 22, 2023, 2:15 p.m. UTC | #1
Hi Jonas,

On Sun, 2023-10-29 at 18:34 +0000, Jonas Karlman wrote:
> This is a revival of a 3 year old series [1] now that NV15/NV20/NV30 support
> for display driver have landed in drm-misc tree.
> 
> This series adds H.264 High 10 and 4:2:2 profile support to the Rockchip
> Video Decoder driver.
> 
> Patch 1 adds helpers for calculating plane bytesperline and sizeimage.
> Patch 2 adds two new pixelformats for semi-planer 10-bit 4:2:0/4:2:2 YUV.
> 
> Patch 3 change to use bytesperline and buffer height to configure strides.
> Patch 4 change to use values from SPS/PPS control to configure the HW.
> Patch 5 remove an unnecessary call to validate sps at streaming start.
> 
> Patch 6-9 refactor code to support validation and filtering of CAPUTRE
> formats based on codec ops.
> 
> Patch 10 adds final bits to support H.264 High 10 and 4:2:2 profiles.
> 
> Changes in v3:
> - Drop merged patches
> - Use bpp and bpp_div instead of prior misuse of block_w/block_h
> - New patch to use values from SPS/PPS control to configure the HW
> - New patch to remove an unnecessary call to validate sps at streaming start
> - Reworked pixel format validation
> 
> Changes in v2:
> - Collect r-b tags
> - SPS pic width and height in mbs validation moved to rkvdec_try_ctrl
> - New patch to not override output buffer sizeimage
> - Reworked pixel format validation
> - Only align decoded buffer instead of changing frmsize step_width
> 
> Following drm-misc commits adds support for NV15/NV20/NV30 to VOP driver:
> 728c15b4b5f3 ("drm/fourcc: Add NV20 and NV30 YUV formats")
> d4b384228562 ("drm/rockchip: vop: Add NV15, NV20 and NV30 support")
> 
> To fully runtime test this series you may need above drm commits and ffmpeg
> patches from [2], this series and drm patches is also available at [3].
> 
> [1]
> https://lore.kernel.org/linux-media/20200706215430.22859-1-jonas@kwiboo.se/
> [2] https://github.com/jernejsk/FFmpeg/commits/v4l2-request-n6.0/
> [3]
> https://github.com/Kwiboo/linux-rockchip/commits/linuxtv-rkvdec-high-10-v3/


For this whole series:

Tested-by: Christopher Obbard <chris.obbard@collabora.com>

> 
> Regards,
> Jonas
> 
> Alex Bee (1):
>   media: rkvdec: h264: Don't hardcode SPS/PPS parameters
> 
> Jonas Karlman (9):
>   media: v4l2-common: Add helpers to calculate bytesperline and
>     sizeimage
>   media: v4l2: Add NV15 and NV20 pixel formats
>   media: rkvdec: h264: Use bytesperline and buffer height as virstride
>   media: rkvdec: h264: Remove SPS validation at streaming start
>   media: rkvdec: Extract rkvdec_fill_decoded_pixfmt helper method
>   media: rkvdec: Move rkvdec_reset_decoded_fmt() function
>   media: rkvdec: Prepare for adding format validation ops
>   media: rkvdec: Add get_fmt_opaque and valid_fmt ops
>   media: rkvdec: h264: Support High 10 and 4:2:2 profiles
> 
>  .../media/v4l/pixfmt-yuv-planar.rst           | 128 ++++++++++++
>  drivers/media/v4l2-core/v4l2-common.c         |  80 ++++----
>  drivers/media/v4l2-core/v4l2-ioctl.c          |   2 +
>  drivers/staging/media/rkvdec/rkvdec-h264.c    |  91 ++++----
>  drivers/staging/media/rkvdec/rkvdec.c         | 194 +++++++++++++-----
>  drivers/staging/media/rkvdec/rkvdec.h         |   3 +
>  include/uapi/linux/videodev2.h                |   2 +
>  7 files changed, 367 insertions(+), 133 deletions(-)
> 
> --
> 2.42.0
>