On 10/7/19 4:59 PM, Maxime Jourdan wrote:
> Hello,
>
> This patch series aims to bring H.264 support as well as compliance update
> to the amlogic stateful video decoder driver.
>
> There is 1 issue that remains currently:
>
> - The following codepath had to be commented out from v4l2-compliance as
> it led to stalling:
>
> if (node->codec_mask & STATEFUL_DECODER) {
> struct v4l2_decoder_cmd cmd;
> buffer buf_cap(m2m_q);
>
> memset(&cmd, 0, sizeof(cmd));
> cmd.cmd = V4L2_DEC_CMD_STOP;
>
> /* No buffers are queued, call STREAMON, then STOP */
> fail_on_test(node->streamon(q.g_type()));
> fail_on_test(node->streamon(m2m_q.g_type()));
> fail_on_test(doioctl(node, VIDIOC_DECODER_CMD, &cmd));
>
> fail_on_test(buf_cap.querybuf(node, 0));
> fail_on_test(buf_cap.qbuf(node));
> fail_on_test(buf_cap.dqbuf(node));
> fail_on_test(!(buf_cap.g_flags() & V4L2_BUF_FLAG_LAST));
> for (unsigned p = 0; p < buf_cap.g_num_planes(); p++)
> fail_on_test(buf_cap.g_bytesused(p));
> fail_on_test(node->streamoff(q.g_type()));
> fail_on_test(node->streamoff(m2m_q.g_type()));
>
> /* Call STREAMON, queue one CAPTURE buffer, then STOP */
> fail_on_test(node->streamon(q.g_type()));
> fail_on_test(node->streamon(m2m_q.g_type()));
> fail_on_test(buf_cap.querybuf(node, 0));
> fail_on_test(buf_cap.qbuf(node));
> fail_on_test(doioctl(node, VIDIOC_DECODER_CMD, &cmd));
>
> fail_on_test(buf_cap.dqbuf(node));
> fail_on_test(!(buf_cap.g_flags() & V4L2_BUF_FLAG_LAST));
> for (unsigned p = 0; p < buf_cap.g_num_planes(); p++)
> fail_on_test(buf_cap.g_bytesused(p));
> fail_on_test(node->streamoff(q.g_type()));
> fail_on_test(node->streamoff(m2m_q.g_type()));
> }
>
> The reason for this is because the driver has a limitation where all
> capturebuffers must be queued to the driver before STREAMON is effective.
> The firmware needs to know in advance what all the buffers are before
> starting to decode.
> This limitation is enforced via q->min_buffers_needed.
> As such, in this compliance codepath, STREAMON is never actually called
> driver-side and there is a stall on fail_on_test(buf_cap.dqbuf(node));
That's interesting. I will have to look more closely at this.
>
>
> One last detail: V4L2_FMT_FLAG_DYN_RESOLUTION is currently not recognized
> by v4l2-compliance, so it was left out for the test. However, it is
> present in the patch series.
It is definitely recognized by v4l2-compliance.
>
> The second patch has 3 "Alignment should match open parenthesis" lines
> where I preferred to keep them that way.
>
> Thanks Stanimir for sharing your HDR file creation tools, this was very
> helpful :).
>
> Maxime
>
> # v4l2-compliance --stream-from-hdr test-25fps.h264.hdr -s250
> v4l2-compliance SHA: a162244d47d4bb01d0692da879dce5a070f118e7, 64 bits
But this SHA isn't in the v4l-utils repo, so this makes me wonder where you
got this repo from.
Regards,
Hans
>
> Compliance test for meson-vdec device /dev/video0:
>
> Driver Info:
> Driver name : meson-vdec
> Card type : Amlogic Video Decoder
> Bus info : platform:meson-vdec
> Driver version : 5.4.0
> Capabilities : 0x84204000
> Video Memory-to-Memory Multiplanar
> Streaming
> Extended Pix Format
> Device Capabilities
> Device Caps : 0x04204000
> Video Memory-to-Memory Multiplanar
> Streaming
> Extended Pix Format
> Detected Stateful Decoder
>
> Required ioctls:
> 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: 2 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 (Not Supported)
> test Composing: OK (Not Supported)
> test Scaling: OK
>
> Codec ioctls:
> test VIDIOC_(TRY_)ENCODER_CMD: OK (Not Supported)
> test VIDIOC_G_ENC_INDEX: OK (Not Supported)
> test VIDIOC_(TRY_)DECODER_CMD: OK
>
> 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 Multiplanar: Captured 250 buffers
> test MMAP (select): OK
> Video Capture Multiplanar: Captured 250 buffers
> test MMAP (epoll): OK
> test USERPTR (select): OK (Not Supported)
> test DMABUF: Cannot test, specify --expbuf-device
>
> Total for meson-vdec device /dev/video0: 49, Succeeded: 49, Failed: 0, Warnings: 0
>
> Maxime Jourdan (2):
> media: meson: vdec: bring up to compliance
> media: meson: vdec: add H.264 decoding support
>
> 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 | 34 +-
> drivers/staging/media/meson/vdec/vdec.c | 70 ++-
> 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 | 43 ++
> 9 files changed, 654 insertions(+), 96 deletions(-)
> create mode 100644 drivers/staging/media/meson/vdec/codec_h264.c
> create mode 100644 drivers/staging/media/meson/vdec/codec_h264.h
>
