Hello,
This patch series aims to bring H.264 support as well as compliance update
to the amlogic stateful video decoder driver.
The issue in the V1 patchset at [1] is solved by patch #1 following comments
and requirements from hans. It moves the full draining & stopped state tracking
and handling from vicodec to core v4l2-mem2mem.
With this, it passes v4l2-compliance with streaming on Amlogic G12A and
Amlogic SM1 SoCs successfully.
This patchset depends on G12A and SM1 enablement series at [2] and [3].
The compliance log is:
# v4l2-compliance --stream-from-hdr test-25fps.h264.hdr -s
v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bits
Compliance test for vicodec device /dev/video0:
Driver Info:
Driver name : vicodec
Card type : vicodec
Bus info : platform:vicodec
Driver version : 5.5.0
Capabilities : 0x84208000
Video Memory-to-Memory
Streaming
Extended Pix Format
Device Capabilities
Device Caps : 0x04208000
Video Memory-to-Memory
Streaming
Extended Pix Format
Detected Stateful Encoder
Media Driver Info:
Driver name : vicodec
Model : vicodec
Serial :
Bus info : platform:vicodec
Media version : 5.5.0
Hardware revision: 0x00000000 (0)
Driver version : 5.5.0
Interface Info:
ID : 0x0300000c
Type : V4L Video
Entity Info:
ID : 0x00000001 (1)
Name : stateful-encoder-source
Function : V4L2 I/O
Pad 0x01000002 : 0: Source
Link 0x02000008: to remote pad 0x1000005 of entity 'stateful-encoder-proc': Data, Enabled, Immutable
Required ioctls:
test MC information (see 'Media Driver Info' above): OK
test VIDIOC_QUERYCAP: OK
Allow for multiple opens:
test second /dev/video0 open: OK
test VIDIOC_QUERYCAP: OK
test VIDIOC_G/S_PRIORITY: OK
test for unlimited opens: OK
Debug ioctls:
test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported)
test VIDIOC_LOG_STATUS: OK (Not Supported)
Input ioctls:
test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported)
test VIDIOC_ENUMAUDIO: OK (Not Supported)
test VIDIOC_G/S/ENUMINPUT: OK (Not Supported)
test VIDIOC_G/S_AUDIO: OK (Not Supported)
Inputs: 0 Audio Inputs: 0 Tuners: 0
Output ioctls:
test VIDIOC_G/S_MODULATOR: OK (Not Supported)
test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
test VIDIOC_ENUMAUDOUT: OK (Not Supported)
test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported)
test VIDIOC_G/S_AUDOUT: OK (Not Supported)
Outputs: 0 Audio Outputs: 0 Modulators: 0
Input/Output configuration ioctls:
test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported)
test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported)
test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported)
test VIDIOC_G/S_EDID: OK (Not Supported)
Control ioctls:
test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK
test VIDIOC_QUERYCTRL: OK
test VIDIOC_G/S_CTRL: OK
test VIDIOC_G/S/TRY_EXT_CTRLS: OK
test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK
test VIDIOC_G/S_JPEGCOMP: OK (Not Supported)
Standard Controls: 6 Private Controls: 0
Format ioctls:
test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK
test VIDIOC_G/S_PARM: OK (Not Supported)
test VIDIOC_G_FBUF: OK (Not Supported)
test VIDIOC_G_FMT: OK
test VIDIOC_TRY_FMT: OK
test VIDIOC_S_FMT: OK
test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported)
test Cropping: OK
test Composing: OK (Not Supported)
test Scaling: OK (Not Supported)
Codec ioctls:
test VIDIOC_(TRY_)ENCODER_CMD: OK
test VIDIOC_G_ENC_INDEX: OK (Not Supported)
test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)
Buffer ioctls:
test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK
test VIDIOC_EXPBUF: OK
test Requests: OK (Not Supported)
Test input 0:
Streaming ioctls:
test read/write: OK (Not Supported)
test blocking wait: OK
Video Capture: Captured 60 buffers
test MMAP (select): OK
Video Capture: Captured 60 buffers
test MMAP (epoll): OK
Video Capture: Captured 60 buffers
test USERPTR (select): OK
test DMABUF: Cannot test, specify --expbuf-device
Total for vicodec device /dev/video0: 50, Succeeded: 50, Failed: 0, Warnings: 0
Changes since v2 at [4]:
- Move full draining & stopped state tracking into core v4l2-mem2mem
- Adapt vicodec to use the core v4l2-mem2mem draining & stopped state tracking
Changes since v1 at [1]:
- fixed output_size is never used reported by hans
- rebased on G12A and SM1 patches
- added handling of qbuf after STREAMON and STOP before enought buffer queued
[1] https://lore.kernel.org/linux-media/[email protected]
[2] https://lore.kernel.org/linux-media/[email protected]
[3] https://lore.kernel.org/linux-media/[email protected]
[4] https://lore.kernel.org/linux-media/[email protected]
Maxime Jourdan (2):
media: meson: vdec: bring up to compliance
media: meson: vdec: add H.264 decoding support
Neil Armstrong (2):
media: v4l2-mem2mem: handle draining, stopped and next-buf-is-last
states
media: vicodec: use v4l2-mem2mem draining, stopped and
next-buf-is-last states handling
drivers/media/platform/vicodec/vicodec-core.c | 154 ++----
drivers/media/v4l2-core/v4l2-mem2mem.c | 174 ++++++-
drivers/staging/media/meson/vdec/Makefile | 2 +-
drivers/staging/media/meson/vdec/codec_h264.c | 482 ++++++++++++++++++
drivers/staging/media/meson/vdec/codec_h264.h | 14 +
drivers/staging/media/meson/vdec/esparser.c | 58 +--
drivers/staging/media/meson/vdec/vdec.c | 92 ++--
drivers/staging/media/meson/vdec/vdec.h | 14 +-
.../staging/media/meson/vdec/vdec_helpers.c | 85 ++-
.../staging/media/meson/vdec/vdec_helpers.h | 6 +-
.../staging/media/meson/vdec/vdec_platform.c | 71 +++
include/media/v4l2-mem2mem.h | 87 ++++
12 files changed, 1009 insertions(+), 230 deletions(-)
create mode 100644 drivers/staging/media/meson/vdec/codec_h264.c
create mode 100644 drivers/staging/media/meson/vdec/codec_h264.h
--
2.22.0
Hi,
Le lundi 09 décembre 2019 à 13:20 +0100, Neil Armstrong a écrit :
> Hello,
>
> This patch series aims to bring H.264 support as well as compliance update
> to the amlogic stateful video decoder driver.
I have started testing this patchset on S905X. I'm not very far into it
yet, but noticed this spam in the kernel logs:
[ 192.230935] meson-vdec c8820000.video-codec: VIFIFO usage (16777858) > VIFIFO size (16777216)
So far it seems to be printed once per frame while decoding
bbb_sunflower_1080p_30fps_normal.mp4 from blender fondation. I'm don't
think I have ever seen that one before.
>
> The issue in the V1 patchset at [1] is solved by patch #1 following comments
> and requirements from hans. It moves the full draining & stopped state tracking
> and handling from vicodec to core v4l2-mem2mem.
>
> With this, it passes v4l2-compliance with streaming on Amlogic G12A and
> Amlogic SM1 SoCs successfully.
>
> This patchset depends on G12A and SM1 enablement series at [2] and [3].
>
> The compliance log is:
> # v4l2-compliance --stream-from-hdr test-25fps.h264.hdr -s
> v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bits
>
> Compliance test for vicodec device /dev/video0:
>
> Driver Info:
> Driver name : vicodec
> Card type : vicodec
> Bus info : platform:vicodec
> Driver version : 5.5.0
> Capabilities : 0x84208000
> Video Memory-to-Memory
> Streaming
> Extended Pix Format
> Device Capabilities
> Device Caps : 0x04208000
> Video Memory-to-Memory
> Streaming
> Extended Pix Format
> Detected Stateful Encoder
> Media Driver Info:
> Driver name : vicodec
> Model : vicodec
> Serial :
> Bus info : platform:vicodec
> Media version : 5.5.0
> Hardware revision: 0x00000000 (0)
> Driver version : 5.5.0
> Interface Info:
> ID : 0x0300000c
> Type : V4L Video
> Entity Info:
> ID : 0x00000001 (1)
> Name : stateful-encoder-source
> Function : V4L2 I/O
> Pad 0x01000002 : 0: Source
> Link 0x02000008: to remote pad 0x1000005 of entity 'stateful-encoder-proc': Data, Enabled, Immutable
>
> Required ioctls:
> test MC information (see 'Media Driver Info' above): OK
> test VIDIOC_QUERYCAP: OK
>
> Allow for multiple opens:
> test second /dev/video0 open: OK
> test VIDIOC_QUERYCAP: OK
> test VIDIOC_G/S_PRIORITY: OK
> test for unlimited opens: OK
>
> Debug ioctls:
> test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported)
> test VIDIOC_LOG_STATUS: OK (Not Supported)
>
> Input ioctls:
> test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported)
> test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
> test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported)
> test VIDIOC_ENUMAUDIO: OK (Not Supported)
> test VIDIOC_G/S/ENUMINPUT: OK (Not Supported)
> test VIDIOC_G/S_AUDIO: OK (Not Supported)
> Inputs: 0 Audio Inputs: 0 Tuners: 0
>
> Output ioctls:
> test VIDIOC_G/S_MODULATOR: OK (Not Supported)
> test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
> test VIDIOC_ENUMAUDOUT: OK (Not Supported)
> test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported)
> test VIDIOC_G/S_AUDOUT: OK (Not Supported)
> Outputs: 0 Audio Outputs: 0 Modulators: 0
>
> Input/Output configuration ioctls:
> test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported)
> test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported)
> test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported)
> test VIDIOC_G/S_EDID: OK (Not Supported)
>
> Control ioctls:
> test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK
> test VIDIOC_QUERYCTRL: OK
> test VIDIOC_G/S_CTRL: OK
> test VIDIOC_G/S/TRY_EXT_CTRLS: OK
> test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK
> test VIDIOC_G/S_JPEGCOMP: OK (Not Supported)
> Standard Controls: 6 Private Controls: 0
>
> Format ioctls:
> test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK
> test VIDIOC_G/S_PARM: OK (Not Supported)
> test VIDIOC_G_FBUF: OK (Not Supported)
> test VIDIOC_G_FMT: OK
> test VIDIOC_TRY_FMT: OK
> test VIDIOC_S_FMT: OK
> test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported)
> test Cropping: OK
> test Composing: OK (Not Supported)
> test Scaling: OK (Not Supported)
>
> Codec ioctls:
> test VIDIOC_(TRY_)ENCODER_CMD: OK
> test VIDIOC_G_ENC_INDEX: OK (Not Supported)
> test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)
>
> Buffer ioctls:
> test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK
> test VIDIOC_EXPBUF: OK
> test Requests: OK (Not Supported)
>
> Test input 0:
>
> Streaming ioctls:
> test read/write: OK (Not Supported)
> test blocking wait: OK
> Video Capture: Captured 60 buffers
> test MMAP (select): OK
> Video Capture: Captured 60 buffers
> test MMAP (epoll): OK
> Video Capture: Captured 60 buffers
> test USERPTR (select): OK
> test DMABUF: Cannot test, specify --expbuf-device
>
> Total for vicodec device /dev/video0: 50, Succeeded: 50, Failed: 0, Warnings: 0
>
> Changes since v2 at [4]:
> - Move full draining & stopped state tracking into core v4l2-mem2mem
> - Adapt vicodec to use the core v4l2-mem2mem draining & stopped state tracking
>
> Changes since v1 at [1]:
> - fixed output_size is never used reported by hans
> - rebased on G12A and SM1 patches
> - added handling of qbuf after STREAMON and STOP before enought buffer queued
>
> [1] https://lore.kernel.org/linux-media/[email protected]
> [2] https://lore.kernel.org/linux-media/[email protected]
> [3] https://lore.kernel.org/linux-media/[email protected]
> [4] https://lore.kernel.org/linux-media/[email protected]
>
> Maxime Jourdan (2):
> media: meson: vdec: bring up to compliance
> media: meson: vdec: add H.264 decoding support
>
> Neil Armstrong (2):
> media: v4l2-mem2mem: handle draining, stopped and next-buf-is-last
> states
> media: vicodec: use v4l2-mem2mem draining, stopped and
> next-buf-is-last states handling
>
> drivers/media/platform/vicodec/vicodec-core.c | 154 ++----
> drivers/media/v4l2-core/v4l2-mem2mem.c | 174 ++++++-
> drivers/staging/media/meson/vdec/Makefile | 2 +-
> drivers/staging/media/meson/vdec/codec_h264.c | 482 ++++++++++++++++++
> drivers/staging/media/meson/vdec/codec_h264.h | 14 +
> drivers/staging/media/meson/vdec/esparser.c | 58 +--
> drivers/staging/media/meson/vdec/vdec.c | 92 ++--
> drivers/staging/media/meson/vdec/vdec.h | 14 +-
> .../staging/media/meson/vdec/vdec_helpers.c | 85 ++-
> .../staging/media/meson/vdec/vdec_helpers.h | 6 +-
> .../staging/media/meson/vdec/vdec_platform.c | 71 +++
> include/media/v4l2-mem2mem.h | 87 ++++
> 12 files changed, 1009 insertions(+), 230 deletions(-)
> create mode 100644 drivers/staging/media/meson/vdec/codec_h264.c
> create mode 100644 drivers/staging/media/meson/vdec/codec_h264.h
>
Hi,
On 10/12/2019 04:42, Nicolas Dufresne wrote:
> Hi,
>
> Le lundi 09 décembre 2019 à 13:20 +0100, Neil Armstrong a écrit :
>> Hello,
>>
>> This patch series aims to bring H.264 support as well as compliance update
>> to the amlogic stateful video decoder driver.
>
> I have started testing this patchset on S905X. I'm not very far into it
> yet, but noticed this spam in the kernel logs:
>
> [ 192.230935] meson-vdec c8820000.video-codec: VIFIFO usage (16777858) > VIFIFO size (16777216)
>
> So far it seems to be printed once per frame while decoding
> bbb_sunflower_1080p_30fps_normal.mp4 from blender fondation. I'm don't
> think I have ever seen that one before.
Will check.
Neil
>
>>
>> The issue in the V1 patchset at [1] is solved by patch #1 following comments
>> and requirements from hans. It moves the full draining & stopped state tracking
>> and handling from vicodec to core v4l2-mem2mem.
>>
>> With this, it passes v4l2-compliance with streaming on Amlogic G12A and
>> Amlogic SM1 SoCs successfully.
>>
>> This patchset depends on G12A and SM1 enablement series at [2] and [3].
>>
>> The compliance log is:
>> # v4l2-compliance --stream-from-hdr test-25fps.h264.hdr -s
>> v4l2-compliance SHA: 7ead0e1856b89f2e19369af452bb03fd0cd16793, 64 bits
>>
>> Compliance test for vicodec device /dev/video0:
>>
>> Driver Info:
>> Driver name : vicodec
>> Card type : vicodec
>> Bus info : platform:vicodec
>> Driver version : 5.5.0
>> Capabilities : 0x84208000
>> Video Memory-to-Memory
>> Streaming
>> Extended Pix Format
>> Device Capabilities
>> Device Caps : 0x04208000
>> Video Memory-to-Memory
>> Streaming
>> Extended Pix Format
>> Detected Stateful Encoder
>> Media Driver Info:
>> Driver name : vicodec
>> Model : vicodec
>> Serial :
>> Bus info : platform:vicodec
>> Media version : 5.5.0
>> Hardware revision: 0x00000000 (0)
>> Driver version : 5.5.0
>> Interface Info:
>> ID : 0x0300000c
>> Type : V4L Video
>> Entity Info:
>> ID : 0x00000001 (1)
>> Name : stateful-encoder-source
>> Function : V4L2 I/O
>> Pad 0x01000002 : 0: Source
>> Link 0x02000008: to remote pad 0x1000005 of entity 'stateful-encoder-proc': Data, Enabled, Immutable
>>
>> Required ioctls:
>> test MC information (see 'Media Driver Info' above): OK
>> test VIDIOC_QUERYCAP: OK
>>
>> Allow for multiple opens:
>> test second /dev/video0 open: OK
>> test VIDIOC_QUERYCAP: OK
>> test VIDIOC_G/S_PRIORITY: OK
>> test for unlimited opens: OK
>>
>> Debug ioctls:
>> test VIDIOC_DBG_G/S_REGISTER: OK (Not Supported)
>> test VIDIOC_LOG_STATUS: OK (Not Supported)
>>
>> Input ioctls:
>> test VIDIOC_G/S_TUNER/ENUM_FREQ_BANDS: OK (Not Supported)
>> test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
>> test VIDIOC_S_HW_FREQ_SEEK: OK (Not Supported)
>> test VIDIOC_ENUMAUDIO: OK (Not Supported)
>> test VIDIOC_G/S/ENUMINPUT: OK (Not Supported)
>> test VIDIOC_G/S_AUDIO: OK (Not Supported)
>> Inputs: 0 Audio Inputs: 0 Tuners: 0
>>
>> Output ioctls:
>> test VIDIOC_G/S_MODULATOR: OK (Not Supported)
>> test VIDIOC_G/S_FREQUENCY: OK (Not Supported)
>> test VIDIOC_ENUMAUDOUT: OK (Not Supported)
>> test VIDIOC_G/S/ENUMOUTPUT: OK (Not Supported)
>> test VIDIOC_G/S_AUDOUT: OK (Not Supported)
>> Outputs: 0 Audio Outputs: 0 Modulators: 0
>>
>> Input/Output configuration ioctls:
>> test VIDIOC_ENUM/G/S/QUERY_STD: OK (Not Supported)
>> test VIDIOC_ENUM/G/S/QUERY_DV_TIMINGS: OK (Not Supported)
>> test VIDIOC_DV_TIMINGS_CAP: OK (Not Supported)
>> test VIDIOC_G/S_EDID: OK (Not Supported)
>>
>> Control ioctls:
>> test VIDIOC_QUERY_EXT_CTRL/QUERYMENU: OK
>> test VIDIOC_QUERYCTRL: OK
>> test VIDIOC_G/S_CTRL: OK
>> test VIDIOC_G/S/TRY_EXT_CTRLS: OK
>> test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK
>> test VIDIOC_G/S_JPEGCOMP: OK (Not Supported)
>> Standard Controls: 6 Private Controls: 0
>>
>> Format ioctls:
>> test VIDIOC_ENUM_FMT/FRAMESIZES/FRAMEINTERVALS: OK
>> test VIDIOC_G/S_PARM: OK (Not Supported)
>> test VIDIOC_G_FBUF: OK (Not Supported)
>> test VIDIOC_G_FMT: OK
>> test VIDIOC_TRY_FMT: OK
>> test VIDIOC_S_FMT: OK
>> test VIDIOC_G_SLICED_VBI_CAP: OK (Not Supported)
>> test Cropping: OK
>> test Composing: OK (Not Supported)
>> test Scaling: OK (Not Supported)
>>
>> Codec ioctls:
>> test VIDIOC_(TRY_)ENCODER_CMD: OK
>> test VIDIOC_G_ENC_INDEX: OK (Not Supported)
>> test VIDIOC_(TRY_)DECODER_CMD: OK (Not Supported)
>>
>> Buffer ioctls:
>> test VIDIOC_REQBUFS/CREATE_BUFS/QUERYBUF: OK
>> test VIDIOC_EXPBUF: OK
>> test Requests: OK (Not Supported)
>>
>> Test input 0:
>>
>> Streaming ioctls:
>> test read/write: OK (Not Supported)
>> test blocking wait: OK
>> Video Capture: Captured 60 buffers
>> test MMAP (select): OK
>> Video Capture: Captured 60 buffers
>> test MMAP (epoll): OK
>> Video Capture: Captured 60 buffers
>> test USERPTR (select): OK
>> test DMABUF: Cannot test, specify --expbuf-device
>>
>> Total for vicodec device /dev/video0: 50, Succeeded: 50, Failed: 0, Warnings: 0
>>
>> Changes since v2 at [4]:
>> - Move full draining & stopped state tracking into core v4l2-mem2mem
>> - Adapt vicodec to use the core v4l2-mem2mem draining & stopped state tracking
>>
>> Changes since v1 at [1]:
>> - fixed output_size is never used reported by hans
>> - rebased on G12A and SM1 patches
>> - added handling of qbuf after STREAMON and STOP before enought buffer queued
>>
>> [1] https://lore.kernel.org/linux-media/[email protected]
>> [2] https://lore.kernel.org/linux-media/[email protected]
>> [3] https://lore.kernel.org/linux-media/[email protected]
>> [4] https://lore.kernel.org/linux-media/[email protected]
>>
>> Maxime Jourdan (2):
>> media: meson: vdec: bring up to compliance
>> media: meson: vdec: add H.264 decoding support
>>
>> Neil Armstrong (2):
>> media: v4l2-mem2mem: handle draining, stopped and next-buf-is-last
>> states
>> media: vicodec: use v4l2-mem2mem draining, stopped and
>> next-buf-is-last states handling
>>
>> drivers/media/platform/vicodec/vicodec-core.c | 154 ++----
>> drivers/media/v4l2-core/v4l2-mem2mem.c | 174 ++++++-
>> drivers/staging/media/meson/vdec/Makefile | 2 +-
>> drivers/staging/media/meson/vdec/codec_h264.c | 482 ++++++++++++++++++
>> drivers/staging/media/meson/vdec/codec_h264.h | 14 +
>> drivers/staging/media/meson/vdec/esparser.c | 58 +--
>> drivers/staging/media/meson/vdec/vdec.c | 92 ++--
>> drivers/staging/media/meson/vdec/vdec.h | 14 +-
>> .../staging/media/meson/vdec/vdec_helpers.c | 85 ++-
>> .../staging/media/meson/vdec/vdec_helpers.h | 6 +-
>> .../staging/media/meson/vdec/vdec_platform.c | 71 +++
>> include/media/v4l2-mem2mem.h | 87 ++++
>> 12 files changed, 1009 insertions(+), 230 deletions(-)
>> create mode 100644 drivers/staging/media/meson/vdec/codec_h264.c
>> create mode 100644 drivers/staging/media/meson/vdec/codec_h264.h
>>
>