From: Boris Brezillon <boris.brezillon@collabora.com> To: Mauro Carvalho Chehab <mchehab@kernel.org>, Hans Verkuil <hans.verkuil@cisco.com>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Sakari Ailus <sakari.ailus@iki.fi>, linux-media@vger.kernel.org Cc: Tomasz Figa <tfiga@chromium.org>, Nicolas Dufresne <nicolas@ndufresne.ca>, kernel@collabora.com, Paul Kocialkowski <paul.kocialkowski@bootlin.com>, Ezequiel Garcia <ezequiel@collabora.com>, Jonas Karlman <jonas@kwiboo.se>, linux-rockchip@lists.infradead.org, Heiko Stuebner <heiko@sntech.de>, Boris Brezillon <boris.brezillon@collabora.com> Subject: [PATCH v5 00/15] Add MPEG-2 decoding to Rockchip VPU Date: Fri, 3 May 2019 13:47:04 +0200 [thread overview] Message-ID: <20190503114719.28784-1-boris.brezillon@collabora.com> (raw) This series introduces the decoding infrastructure that will be used to add support for other codecs such as VP8, VP9 and H.264. As explained in the cover letter for the v1 patchset, the driver is now exposing two video device nodes. The VPU encoder is exposed on /dev/video0, and the VPU decoder is exposed on /dev/video1. Both devices are tied to the same memory-to-memory queue, and same media device /dev/media0. Therefore there are two media graphs: ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-enc-source │ │ /dev/video0 │ └────────────────────────────────┘ ┃ ┃ ▼ ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-enc-proc │ └────────────────────────────────┘ ┃ ┃ ▼ ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-enc-sink │ │ /dev/video0 │ └────────────────────────────────┘ ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-dec-source │ │ /dev/video1 │ └────────────────────────────────┘ ┃ ┃ ▼ ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-dec-proc │ └────────────────────────────────┘ ┃ ┃ ▼ ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-dec-sink │ │ /dev/video1 │ └────────────────────────────────┘ Of course, this work has been possible thanks to Jonas Karlman, who did the initial MPEG-2 decoding work and also got mpv+ffmpeg working using the Request API. Regards, Boris v5: * Add helper to clamp height/width based on frmsize * Modify fill_fmt() helpers to keep user-defined sizeimage/bytesperline when they're big enough * Fixed a bunch of problems reported by Hans (see per-patch changelog for more details) v4: * Fix issues in the probe/remove path preventing the driver from being unloaded/reloaded (Jonas) * Rework the media controller registration code to simplify the error/remove path (Boris) * Split the MPEG2 patches (one adding the generic code and one patch per platform) v3: * Share more code between the encoder/decoder logic (VB2/V4L2 interface implementation) * Add a patch to support MPEG2 decoding on RK3288 (Jonas) * Several fixes/improvements all over the place (see changelog in each patch for more details) v2: * Fixed some minor issues brought up by v4l2-compliance. * Fixed bytesused wrongly assigned 0 on the MPEG-2 decoder. * Addressed comments from Hans and Tomasz on the pixel format helpers. Boris Brezillon (8): media: v4l2-common: Fix v4l2_fill_pixfmt[_mp]() prototypes media: v4l2-common: Add an helper to apply frmsize constraints media: v4l2-common: Support custom imagesize/bytesperline in fill_pixfmt() rockchip/vpu: Use v4l2_apply_frmsize_constraints() where appropriate rockchip/vpu: Rename rockchip_vpu_common.h into rockchip_vpu_v4l2.h rockchip/vpu: Move encoder logic to a common place rockchip/vpu: Provide a helper to reset both src and dst formats rockchip/vpu: Prepare things to support decoders Ezequiel Garcia (4): rockchip/vpu: Open-code media controller register rockchip/vpu: Support the Request API rockchip/vpu: Add decoder boilerplate rockchip/vpu: Add support for non-standard controls Jonas Karlman (3): rockchip/vpu: Add infra to support MPEG-2 decoding rockchip/vpu: Add MPEG2 decoding support to RK3399 rockchip/vpu: Add support for MPEG-2 decoding on RK3288 drivers/media/v4l2-core/v4l2-common.c | 86 ++- drivers/staging/media/rockchip/vpu/Kconfig | 1 + drivers/staging/media/rockchip/vpu/Makefile | 7 +- .../media/rockchip/vpu/rk3288_vpu_hw.c | 59 +- .../rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | 2 +- .../rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c | 261 +++++++ .../media/rockchip/vpu/rk3288_vpu_regs.h | 1 + .../media/rockchip/vpu/rk3399_vpu_hw.c | 59 +- .../rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | 8 +- .../rockchip/vpu/rk3399_vpu_hw_mpeg2_dec.c | 267 +++++++ .../staging/media/rockchip/vpu/rockchip_vpu.h | 110 ++- .../media/rockchip/vpu/rockchip_vpu_drv.c | 467 ++++++++++-- .../media/rockchip/vpu/rockchip_vpu_enc.c | 571 --------------- .../media/rockchip/vpu/rockchip_vpu_hw.h | 16 + .../media/rockchip/vpu/rockchip_vpu_mpeg2.c | 61 ++ .../media/rockchip/vpu/rockchip_vpu_v4l2.c | 692 ++++++++++++++++++ ...kchip_vpu_common.h => rockchip_vpu_v4l2.h} | 15 +- include/media/v4l2-common.h | 10 +- 18 files changed, 2009 insertions(+), 684 deletions(-) create mode 100644 drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c create mode 100644 drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_mpeg2_dec.c delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_mpeg2.c create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.c rename drivers/staging/media/rockchip/vpu/{rockchip_vpu_common.h => rockchip_vpu_v4l2.h} (50%) -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Boris Brezillon <boris.brezillon-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> To: Mauro Carvalho Chehab <mchehab-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Hans Verkuil <hans.verkuil-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>, Laurent Pinchart <laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>, Sakari Ailus <sakari.ailus-X3B1VOXEql0@public.gmane.org>, linux-media-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Tomasz Figa <tfiga-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org>, Heiko Stuebner <heiko-4mtYJXux2i+zQB+pC5nmwQ@public.gmane.org>, Jonas Karlman <jonas-uIzNG4q0ceqzQB+pC5nmwQ@public.gmane.org>, Nicolas Dufresne <nicolas-dDhyB4GVkw9AFePFGvp55w@public.gmane.org>, Paul Kocialkowski <paul.kocialkowski-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org>, linux-rockchip-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, Boris Brezillon <boris.brezillon-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org>, kernel-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org, Ezequiel Garcia <ezequiel-ZGY8ohtN/8qB+jHODAdFcQ@public.gmane.org> Subject: [PATCH v5 00/15] Add MPEG-2 decoding to Rockchip VPU Date: Fri, 3 May 2019 13:47:04 +0200 [thread overview] Message-ID: <20190503114719.28784-1-boris.brezillon@collabora.com> (raw) This series introduces the decoding infrastructure that will be used to add support for other codecs such as VP8, VP9 and H.264. As explained in the cover letter for the v1 patchset, the driver is now exposing two video device nodes. The VPU encoder is exposed on /dev/video0, and the VPU decoder is exposed on /dev/video1. Both devices are tied to the same memory-to-memory queue, and same media device /dev/media0. Therefore there are two media graphs: ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-enc-source │ │ /dev/video0 │ └────────────────────────────────┘ ┃ ┃ ▼ ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-enc-proc │ └────────────────────────────────┘ ┃ ┃ ▼ ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-enc-sink │ │ /dev/video0 │ └────────────────────────────────┘ ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-dec-source │ │ /dev/video1 │ └────────────────────────────────┘ ┃ ┃ ▼ ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-dec-proc │ └────────────────────────────────┘ ┃ ┃ ▼ ┌────────────────────────────────┐ │ rockchip,rk3399-vpu-dec-sink │ │ /dev/video1 │ └────────────────────────────────┘ Of course, this work has been possible thanks to Jonas Karlman, who did the initial MPEG-2 decoding work and also got mpv+ffmpeg working using the Request API. Regards, Boris v5: * Add helper to clamp height/width based on frmsize * Modify fill_fmt() helpers to keep user-defined sizeimage/bytesperline when they're big enough * Fixed a bunch of problems reported by Hans (see per-patch changelog for more details) v4: * Fix issues in the probe/remove path preventing the driver from being unloaded/reloaded (Jonas) * Rework the media controller registration code to simplify the error/remove path (Boris) * Split the MPEG2 patches (one adding the generic code and one patch per platform) v3: * Share more code between the encoder/decoder logic (VB2/V4L2 interface implementation) * Add a patch to support MPEG2 decoding on RK3288 (Jonas) * Several fixes/improvements all over the place (see changelog in each patch for more details) v2: * Fixed some minor issues brought up by v4l2-compliance. * Fixed bytesused wrongly assigned 0 on the MPEG-2 decoder. * Addressed comments from Hans and Tomasz on the pixel format helpers. Boris Brezillon (8): media: v4l2-common: Fix v4l2_fill_pixfmt[_mp]() prototypes media: v4l2-common: Add an helper to apply frmsize constraints media: v4l2-common: Support custom imagesize/bytesperline in fill_pixfmt() rockchip/vpu: Use v4l2_apply_frmsize_constraints() where appropriate rockchip/vpu: Rename rockchip_vpu_common.h into rockchip_vpu_v4l2.h rockchip/vpu: Move encoder logic to a common place rockchip/vpu: Provide a helper to reset both src and dst formats rockchip/vpu: Prepare things to support decoders Ezequiel Garcia (4): rockchip/vpu: Open-code media controller register rockchip/vpu: Support the Request API rockchip/vpu: Add decoder boilerplate rockchip/vpu: Add support for non-standard controls Jonas Karlman (3): rockchip/vpu: Add infra to support MPEG-2 decoding rockchip/vpu: Add MPEG2 decoding support to RK3399 rockchip/vpu: Add support for MPEG-2 decoding on RK3288 drivers/media/v4l2-core/v4l2-common.c | 86 ++- drivers/staging/media/rockchip/vpu/Kconfig | 1 + drivers/staging/media/rockchip/vpu/Makefile | 7 +- .../media/rockchip/vpu/rk3288_vpu_hw.c | 59 +- .../rockchip/vpu/rk3288_vpu_hw_jpeg_enc.c | 2 +- .../rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c | 261 +++++++ .../media/rockchip/vpu/rk3288_vpu_regs.h | 1 + .../media/rockchip/vpu/rk3399_vpu_hw.c | 59 +- .../rockchip/vpu/rk3399_vpu_hw_jpeg_enc.c | 8 +- .../rockchip/vpu/rk3399_vpu_hw_mpeg2_dec.c | 267 +++++++ .../staging/media/rockchip/vpu/rockchip_vpu.h | 110 ++- .../media/rockchip/vpu/rockchip_vpu_drv.c | 467 ++++++++++-- .../media/rockchip/vpu/rockchip_vpu_enc.c | 571 --------------- .../media/rockchip/vpu/rockchip_vpu_hw.h | 16 + .../media/rockchip/vpu/rockchip_vpu_mpeg2.c | 61 ++ .../media/rockchip/vpu/rockchip_vpu_v4l2.c | 692 ++++++++++++++++++ ...kchip_vpu_common.h => rockchip_vpu_v4l2.h} | 15 +- include/media/v4l2-common.h | 10 +- 18 files changed, 2009 insertions(+), 684 deletions(-) create mode 100644 drivers/staging/media/rockchip/vpu/rk3288_vpu_hw_mpeg2_dec.c create mode 100644 drivers/staging/media/rockchip/vpu/rk3399_vpu_hw_mpeg2_dec.c delete mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_enc.c create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_mpeg2.c create mode 100644 drivers/staging/media/rockchip/vpu/rockchip_vpu_v4l2.c rename drivers/staging/media/rockchip/vpu/{rockchip_vpu_common.h => rockchip_vpu_v4l2.h} (50%) -- 2.20.1 _______________________________________________ Linux-rockchip mailing list Linux-rockchip@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-rockchip
next reply other threads:[~2019-05-03 11:47 UTC|newest] Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-03 11:47 Boris Brezillon [this message] 2019-05-03 11:47 ` [PATCH v5 00/15] Add MPEG-2 decoding to Rockchip VPU Boris Brezillon 2019-05-03 11:47 ` [PATCH v5 01/15] media: v4l2-common: Fix v4l2_fill_pixfmt[_mp]() prototypes Boris Brezillon 2019-05-03 11:47 ` Boris Brezillon 2019-05-03 11:47 ` [PATCH v5 02/15] media: v4l2-common: Add an helper to apply frmsize constraints Boris Brezillon 2019-05-03 11:47 ` Boris Brezillon 2019-05-03 11:47 ` [PATCH v5 03/15] media: v4l2-common: Support custom imagesize/bytesperline in fill_pixfmt() Boris Brezillon 2019-05-03 11:47 ` Boris Brezillon 2019-05-10 8:57 ` Hans Verkuil 2019-05-10 8:57 ` Hans Verkuil 2019-05-10 11:28 ` Laurent Pinchart 2019-05-10 11:28 ` Laurent Pinchart 2019-05-10 12:17 ` Hans Verkuil 2019-05-10 12:17 ` Hans Verkuil 2019-05-10 12:24 ` Laurent Pinchart 2019-05-10 12:24 ` Laurent Pinchart 2019-05-10 12:30 ` Hans Verkuil 2019-05-10 12:30 ` Hans Verkuil 2019-05-10 13:51 ` Nicolas Dufresne 2019-05-10 13:51 ` Nicolas Dufresne 2019-05-10 14:07 ` Hans Verkuil 2019-05-10 14:07 ` Hans Verkuil 2019-05-10 16:01 ` Nicolas Dufresne 2019-05-10 16:01 ` Nicolas Dufresne 2019-05-03 11:47 ` [PATCH v5 04/15] rockchip/vpu: Use v4l2_apply_frmsize_constraints() where appropriate Boris Brezillon 2019-05-03 11:47 ` Boris Brezillon 2019-05-03 11:47 ` [PATCH v5 05/15] rockchip/vpu: Open-code media controller register Boris Brezillon 2019-05-03 11:47 ` Boris Brezillon 2019-05-03 11:47 ` [PATCH v5 06/15] rockchip/vpu: Support the Request API Boris Brezillon 2019-05-03 11:47 ` Boris Brezillon 2019-05-03 11:47 ` [PATCH v5 07/15] rockchip/vpu: Rename rockchip_vpu_common.h into rockchip_vpu_v4l2.h Boris Brezillon 2019-05-03 11:47 ` Boris Brezillon 2019-05-03 11:47 ` [PATCH v5 08/15] rockchip/vpu: Move encoder logic to a common place Boris Brezillon 2019-05-03 11:47 ` Boris Brezillon 2019-05-03 11:47 ` [PATCH v5 09/15] rockchip/vpu: Provide a helper to reset both src and dst formats Boris Brezillon 2019-05-03 11:47 ` Boris Brezillon 2019-05-03 11:47 ` [PATCH v5 10/15] rockchip/vpu: Prepare things to support decoders Boris Brezillon 2019-05-03 11:47 ` Boris Brezillon 2019-05-03 11:47 ` [PATCH v5 11/15] rockchip/vpu: Add decoder boilerplate Boris Brezillon 2019-05-03 11:47 ` Boris Brezillon 2019-05-03 11:47 ` [PATCH v5 12/15] rockchip/vpu: Add support for non-standard controls Boris Brezillon 2019-05-03 11:47 ` Boris Brezillon 2019-05-03 11:47 ` [PATCH v5 13/15] rockchip/vpu: Add infra to support MPEG-2 decoding Boris Brezillon 2019-05-03 11:47 ` Boris Brezillon 2019-05-03 11:47 ` [PATCH v5 14/15] rockchip/vpu: Add MPEG2 decoding support to RK3399 Boris Brezillon 2019-05-03 11:47 ` Boris Brezillon 2019-05-03 11:47 ` [PATCH v5 15/15] rockchip/vpu: Add support for MPEG-2 decoding on RK3288 Boris Brezillon 2019-05-03 11:47 ` Boris Brezillon
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190503114719.28784-1-boris.brezillon@collabora.com \ --to=boris.brezillon@collabora.com \ --cc=ezequiel@collabora.com \ --cc=hans.verkuil@cisco.com \ --cc=heiko@sntech.de \ --cc=jonas@kwiboo.se \ --cc=kernel@collabora.com \ --cc=laurent.pinchart@ideasonboard.com \ --cc=linux-media@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=mchehab@kernel.org \ --cc=nicolas@ndufresne.ca \ --cc=paul.kocialkowski@bootlin.com \ --cc=sakari.ailus@iki.fi \ --cc=tfiga@chromium.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.