| Message ID | 20180831085205.14760-1-mjourdan@baylibre.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | Add Amlogic video decoder driver | expand |
On 08/31/2018 10:52 AM, Maxime Jourdan wrote: > Hi everyone, > > This patch series adds support for the Amlogic video decoder, > as well as the corresponding dt bindings for GXBB/GXL/GXM chips. > > It features decoding for the following formats: > - MPEG 1 > - MPEG 2 > > The following formats will be added in future patches: > - MJPEG > - MPEG 4 (incl. Xvid, H.263) > - H.264 > - HEVC (incl. 10-bit) > > The following formats' development has still not started, but they are > supported by the hardware: > - VC1 > - VP9 > > The code was made in such a way to allow easy inclusion of those formats > in the future. > > The decoder is single instance. > > Files: > - vdec.c handles the V4L2 M2M logic > - esparser.c manages the hardware bitstream parser > - vdec_helpers.c provides helpers to DONE the dst buffers as well as > various common code used by the codecs > - vdec_1.c manages the VDEC_1 block of the vdec IP > - codec_mpeg12.c enables decoding for MPEG 1/2. > - vdec_platform.c links codec units with vdec units > (e.g vdec_1 with codec_mpeg12) and lists all the available > src/dst formats and requirements (max width/height, etc.), > per compatible chip. > > Firmwares are necessary to run the vdec. They can currently be found at: > https://github.com/chewitt/meson-firmware > > It was tested primarily with ffmpeg's v4l2-m2m implementation. For instance: > $ ffmpeg -c:v mpeg2_v4l2m2m -i sample_mpeg2.mkv -f null - > > Note: This patch series depends on > "[PATCH v3 0/3] soc: amlogic: add meson-canvas" > https://patchwork.kernel.org/cover/10573763/ > > The v4l2-compliance results are available below the patch diff. > > Maxime Jourdan (4): > dt-bindings: media: add Amlogic Video Decoder Bindings > media: meson: add v4l2 m2m video decoder driver > ARM64: dts: meson-gx: add vdec entry > ARM64: dts: meson: add vdec entries > > .../bindings/media/amlogic,vdec.txt | 63 ++ > arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 13 + > arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 11 + > arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 11 + > arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 4 + > drivers/media/platform/Kconfig | 10 + > drivers/media/platform/meson/Makefile | 1 + > drivers/media/platform/meson/vdec/Makefile | 8 + > .../media/platform/meson/vdec/codec_mpeg12.c | 169 +++ > .../media/platform/meson/vdec/codec_mpeg12.h | 13 + > drivers/media/platform/meson/vdec/dos_regs.h | 97 ++ > drivers/media/platform/meson/vdec/esparser.c | 367 +++++++ > drivers/media/platform/meson/vdec/esparser.h | 27 + > drivers/media/platform/meson/vdec/vdec.c | 987 ++++++++++++++++++ > drivers/media/platform/meson/vdec/vdec.h | 233 +++++ > drivers/media/platform/meson/vdec/vdec_1.c | 227 ++++ > drivers/media/platform/meson/vdec/vdec_1.h | 13 + > .../media/platform/meson/vdec/vdec_helpers.c | 353 +++++++ > .../media/platform/meson/vdec/vdec_helpers.h | 44 + > .../media/platform/meson/vdec/vdec_platform.c | 100 ++ > .../media/platform/meson/vdec/vdec_platform.h | 29 + > 21 files changed, 2780 insertions(+) > create mode 100644 Documentation/devicetree/bindings/media/amlogic,vdec.txt > create mode 100644 drivers/media/platform/meson/vdec/Makefile > create mode 100644 drivers/media/platform/meson/vdec/codec_mpeg12.c > create mode 100644 drivers/media/platform/meson/vdec/codec_mpeg12.h > create mode 100644 drivers/media/platform/meson/vdec/dos_regs.h > create mode 100644 drivers/media/platform/meson/vdec/esparser.c > create mode 100644 drivers/media/platform/meson/vdec/esparser.h > create mode 100644 drivers/media/platform/meson/vdec/vdec.c > create mode 100644 drivers/media/platform/meson/vdec/vdec.h > create mode 100644 drivers/media/platform/meson/vdec/vdec_1.c > create mode 100644 drivers/media/platform/meson/vdec/vdec_1.h > create mode 100644 drivers/media/platform/meson/vdec/vdec_helpers.c > create mode 100644 drivers/media/platform/meson/vdec/vdec_helpers.h > create mode 100644 drivers/media/platform/meson/vdec/vdec_platform.c > create mode 100644 drivers/media/platform/meson/vdec/vdec_platform.h > > root@libretech-cc:~/v4l-utils# v4l2-compliance -d /dev/video0 > v4l2-compliance SHA: not available, 64 bits I see that there is no SHA, so you probably didn't compile this from a checked-out git repo. Please do so, since without a SHA I don't know whether or not you used the latest v4l2-compliance version. Regards, Hans > > Compliance test for device /dev/video0: > > Driver Info: > Driver name : meson-vdec > Card type : Amlogic Video Decoder > Bus info : platform:meson-vdec > Driver version : 4.18.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 > > 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 (Not Supported) > test VIDIOC_QUERYCTRL: OK (Not Supported) > test VIDIOC_G/S_CTRL: OK (Not Supported) > test VIDIOC_G/S/TRY_EXT_CTRLS: OK (Not Supported) > test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK (Not Supported) > test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) > Standard Controls: 0 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 > > Total: 43, Succeeded: 43, Failed: 0, Warnings: 0 >
2018-08-31 11:00 GMT+02:00 Hans Verkuil <hverkuil@xs4all.nl>: > > On 08/31/2018 10:52 AM, Maxime Jourdan wrote: > > Hi everyone, > > > > This patch series adds support for the Amlogic video decoder, > > as well as the corresponding dt bindings for GXBB/GXL/GXM chips. > > > > It features decoding for the following formats: > > - MPEG 1 > > - MPEG 2 > > > > The following formats will be added in future patches: > > - MJPEG > > - MPEG 4 (incl. Xvid, H.263) > > - H.264 > > - HEVC (incl. 10-bit) > > > > The following formats' development has still not started, but they are > > supported by the hardware: > > - VC1 > > - VP9 > > > > The code was made in such a way to allow easy inclusion of those formats > > in the future. > > > > The decoder is single instance. > > > > Files: > > - vdec.c handles the V4L2 M2M logic > > - esparser.c manages the hardware bitstream parser > > - vdec_helpers.c provides helpers to DONE the dst buffers as well as > > various common code used by the codecs > > - vdec_1.c manages the VDEC_1 block of the vdec IP > > - codec_mpeg12.c enables decoding for MPEG 1/2. > > - vdec_platform.c links codec units with vdec units > > (e.g vdec_1 with codec_mpeg12) and lists all the available > > src/dst formats and requirements (max width/height, etc.), > > per compatible chip. > > > > Firmwares are necessary to run the vdec. They can currently be found at: > > https://github.com/chewitt/meson-firmware > > > > It was tested primarily with ffmpeg's v4l2-m2m implementation. For instance: > > $ ffmpeg -c:v mpeg2_v4l2m2m -i sample_mpeg2.mkv -f null - > > > > Note: This patch series depends on > > "[PATCH v3 0/3] soc: amlogic: add meson-canvas" > > https://patchwork.kernel.org/cover/10573763/ > > > > The v4l2-compliance results are available below the patch diff. > > > > Maxime Jourdan (4): > > dt-bindings: media: add Amlogic Video Decoder Bindings > > media: meson: add v4l2 m2m video decoder driver > > ARM64: dts: meson-gx: add vdec entry > > ARM64: dts: meson: add vdec entries > > > > .../bindings/media/amlogic,vdec.txt | 63 ++ > > arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 13 + > > arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 11 + > > arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 11 + > > arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 4 + > > drivers/media/platform/Kconfig | 10 + > > drivers/media/platform/meson/Makefile | 1 + > > drivers/media/platform/meson/vdec/Makefile | 8 + > > .../media/platform/meson/vdec/codec_mpeg12.c | 169 +++ > > .../media/platform/meson/vdec/codec_mpeg12.h | 13 + > > drivers/media/platform/meson/vdec/dos_regs.h | 97 ++ > > drivers/media/platform/meson/vdec/esparser.c | 367 +++++++ > > drivers/media/platform/meson/vdec/esparser.h | 27 + > > drivers/media/platform/meson/vdec/vdec.c | 987 ++++++++++++++++++ > > drivers/media/platform/meson/vdec/vdec.h | 233 +++++ > > drivers/media/platform/meson/vdec/vdec_1.c | 227 ++++ > > drivers/media/platform/meson/vdec/vdec_1.h | 13 + > > .../media/platform/meson/vdec/vdec_helpers.c | 353 +++++++ > > .../media/platform/meson/vdec/vdec_helpers.h | 44 + > > .../media/platform/meson/vdec/vdec_platform.c | 100 ++ > > .../media/platform/meson/vdec/vdec_platform.h | 29 + > > 21 files changed, 2780 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/media/amlogic,vdec.txt > > create mode 100644 drivers/media/platform/meson/vdec/Makefile > > create mode 100644 drivers/media/platform/meson/vdec/codec_mpeg12.c > > create mode 100644 drivers/media/platform/meson/vdec/codec_mpeg12.h > > create mode 100644 drivers/media/platform/meson/vdec/dos_regs.h > > create mode 100644 drivers/media/platform/meson/vdec/esparser.c > > create mode 100644 drivers/media/platform/meson/vdec/esparser.h > > create mode 100644 drivers/media/platform/meson/vdec/vdec.c > > create mode 100644 drivers/media/platform/meson/vdec/vdec.h > > create mode 100644 drivers/media/platform/meson/vdec/vdec_1.c > > create mode 100644 drivers/media/platform/meson/vdec/vdec_1.h > > create mode 100644 drivers/media/platform/meson/vdec/vdec_helpers.c > > create mode 100644 drivers/media/platform/meson/vdec/vdec_helpers.h > > create mode 100644 drivers/media/platform/meson/vdec/vdec_platform.c > > create mode 100644 drivers/media/platform/meson/vdec/vdec_platform.h > > > > root@libretech-cc:~/v4l-utils# v4l2-compliance -d /dev/video0 > > v4l2-compliance SHA: not available, 64 bits > > I see that there is no SHA, so you probably didn't compile this from a > checked-out git repo. Please do so, since without a SHA I don't know > whether or not you used the latest v4l2-compliance version. Noted, FWIW the last v4l-utils commit for this run is e37fbf50a28c1a1cfe9e00a60542bc14192a87ba (Aug. 27). I'll make sure to compile inside the git repo for the next submission. Regards, Maxime > Regards, > > Hans > > > > > Compliance test for device /dev/video0: > > > > Driver Info: > > Driver name : meson-vdec > > Card type : Amlogic Video Decoder > > Bus info : platform:meson-vdec > > Driver version : 4.18.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 > > > > 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 (Not Supported) > > test VIDIOC_QUERYCTRL: OK (Not Supported) > > test VIDIOC_G/S_CTRL: OK (Not Supported) > > test VIDIOC_G/S/TRY_EXT_CTRLS: OK (Not Supported) > > test VIDIOC_(UN)SUBSCRIBE_EVENT/DQEVENT: OK (Not Supported) > > test VIDIOC_G/S_JPEGCOMP: OK (Not Supported) > > Standard Controls: 0 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 > > > > Total: 43, Succeeded: 43, Failed: 0, Warnings: 0 > > >