Enable Hantro G1 post-processor
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v4 Latest4 patches 0 repliesNew
- v33 patches 17 repliesSuperseded
- v24 patches 5 repliesSuperseded
Earlier versions · 1
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v1 | 4 patches | 13 replies | Superseded |
Changes in v4 from the cover letter
* Make the post-proc queue as deep as the capture queue.
* Rework the mmio read/write/relaxed helpers to avoid impacting the VP8 implementation.
* Rename prepare/finish_run to avoid confusion.
* Remove HANTRO_PP_REG_WRITE unneeded checks.
* Add a comment in vidioc_enum_fmt regarding the format enumeration order.
Patches in v4 No applies recorded yet
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/4 | media: vidioc-enum-fmt.rst: clarify format preferenceDocumentation/ | +3 | 0 replies | |
| 2/4 | media: hantro: Cleanup format negotiation helpersdrivers/ | +20 | 0 replies | |
| 3/4 | hantro: Rename {prepare,finish}_run to {start,end}_prepare_rundrivers/ drivers/ drivers/ +7 more | +18 | 0 replies | |
| 4/4 | media: hantro: Support color conversion via post-processingdrivers/ drivers/ drivers/ +8 more | +343 | 0 replies |
Reviews trailers per patch
3 of 4 patches have a Reviewed-by or Acked-by.
| Patch | Boris Brezillon | Philipp Zabel |
|---|---|---|
| 1/4 | R-b | |
| 2/4 | R-b | R-b |
| 3/4 | ||
| 4/4 | R-b |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v4 0/4] Enable Hantro G1 post-processor
Hi all,
The Hantro G1 VPU post-processor block can be pipelined with the decoder hardware, allowing to perform operations such as color conversion, scaling, rotation, cropping, among others.
When the post-processor is enabled, the decoder hardware needs its own set of NV12 buffers (the native decoder format), and the post-processor is the owner of the CAPTURE buffers, allocated for the post-processed format.
This way, applications obtain post-processed
(scaled, converted, etc) buffers transparently.
This feature is implemented by exposing the post-processed pixel formats on ENUM_FMT, ordered as "preferred pixelformat first":
v4l2-ctl -d 1 --list-formats
ioctl: VIDIOC_ENUM_FMT
Type: Video Capture Multiplanar [0]: 'NV12' (Y/CbCr 4:2:0) [1]: 'YUYV' (YUYV 4:2:2)
The order of preference in ENUM_FMT can be used as a hint by applications. This series updates the uAPI specification accordingly.
When the application sets a pixel format other than NV12, the post-processor is transparently enabled.
Patch 1 updates the uAPI specification.
Patch 2 and 3 are cleanups to easier integrate the post-processor. Patch 4 introduces the post-processing support.
This is tested on RK3288 platforms with MPEG-2, VP8 and H264 streams, decoding to YUY2 surfaces. For now, this series is only adding support for NV12-to-YUY2 conversion.
Applies to media/master.
Changelog
---------
Changes v4:
* Make the post-proc queue as deep as the capture queue.
* Rework the mmio read/write/relaxed helpers to avoid impacting the VP8 implementation.
* Rename prepare/finish_run to avoid confusion.
* Remove HANTRO_PP_REG_WRITE unneeded checks.
* Add a comment in vidioc_enum_fmt regarding the format enumeration order.
Changes v3:
* After discussing with Hans and Tomasz during the media summit in ELCE, we decided to go back on the MC changes. The MC topology is now untouched. This means the series is now similar to v1, except we explicitly use the ENUM_FMT to hint about the post-processed formats.
Changes v2:
* The decoder->post-processor topology is now exposed explicitly and applications need to configure the pipeline. By default, the decoder is enabled and the post-processor is disabled.
* RGB post-processing output has been dropped. We might add this in the future, but for now, it seems it would make the code more complex without a use-case in mind. RGB is much more memory-consuming so less attractive than YUV, and modern GPUs and display controllers support YUV.
* The post-processor implementation still supports RK3288 only. However, a generic register infrastructure is introduced to make addition of other variants such as RK3399 really easy.
Ezequiel Garcia (4):
media: vidioc-enum-fmt.rst: clarify format preference
media: hantro: Cleanup format negotiation helpers
hantro: Rename {prepare,finish}_run to {start,end}_prepare_run
media: hantro: Support color conversion via post-processing
.../media/uapi/v4l/vidioc-enum-fmt.rst | 4 +- drivers/staging/media/hantro/Makefile | 1 + drivers/staging/media/hantro/hantro.h | 66 +++++++- drivers/staging/media/hantro/hantro_drv.c | 11 +- .../staging/media/hantro/hantro_g1_h264_dec.c | 4 +- .../media/hantro/hantro_g1_mpeg2_dec.c | 6 +- drivers/staging/media/hantro/hantro_g1_regs.h | 53 +++++++ .../staging/media/hantro/hantro_g1_vp8_dec.c | 6 +- .../staging/media/hantro/hantro_h1_jpeg_enc.c | 4 +- drivers/staging/media/hantro/hantro_h264.c | 2 +- drivers/staging/media/hantro/hantro_hw.h | 17 ++- .../staging/media/hantro/hantro_postproc.c | 142 ++++++++++++++++++ drivers/staging/media/hantro/hantro_v4l2.c | 109 +++++++++----- drivers/staging/media/hantro/rk3288_vpu_hw.c | 10 ++ .../media/hantro/rk3399_vpu_hw_jpeg_enc.c | 4 +- .../media/hantro/rk3399_vpu_hw_mpeg2_dec.c | 4 +- .../media/hantro/rk3399_vpu_hw_vp8_dec.c | 4 +- 17 files changed, 384 insertions(+), 63 deletions(-) create mode 100644 drivers/staging/media/hantro/hantro_postproc.c
Signature · 1 line
2.22.0