* [PATCHv2 01/12] videodev2.h: add V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM
2019-08-12 11:05 [PATCHv2 00/12] Stateful/stateless codec core support Hans Verkuil
@ 2019-08-12 11:05 ` Hans Verkuil
2019-08-14 12:52 ` Paul Kocialkowski
2019-08-15 8:11 ` Alexandre Courbot
2019-08-12 11:05 ` [PATCHv2 02/12] videodev2.h: add V4L2_FMT_FLAG_DYN_RESOLUTION Hans Verkuil
` (10 subsequent siblings)
11 siblings, 2 replies; 42+ messages in thread
From: Hans Verkuil @ 2019-08-12 11:05 UTC (permalink / raw)
To: linux-media; +Cc: Tomasz Figa, Hans Verkuil
Add an enum_fmt format flag to specifically tag coded formats where
full bytestream parsing is supported by the device.
Some stateful decoders are capable of fully parsing a bytestream,
but others require that userspace pre-parses the bytestream into
frames or fields (see the corresponding pixelformat descriptions
for details).
If this flag is set, then this pre-parsing step is not required
(but still possible, of course).
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 8 ++++++++
Documentation/media/videodev2.h.rst.exceptions | 1 +
include/uapi/linux/videodev2.h | 5 +++--
3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
index 822d6730e7d2..ebc05ce74bdf 100644
--- a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
@@ -127,6 +127,14 @@ one until ``EINVAL`` is returned.
- This format is not native to the device but emulated through
software (usually libv4l2), where possible try to use a native
format instead for better performance.
+ * - ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
+ - 0x0004
+ - The hardware decoder for this compressed bytestream format (aka coded
+ format) is capable of parsing a continuous bytestream. Applications do
+ not need to parse the bytestream themselves to find the boundaries
+ between frames/fields. This flag can only be used in combination with
+ the ``V4L2_FMT_FLAG_COMPRESSED`` flag, since this applies to compressed
+ formats only. This flag is valid for stateful decoders only.
Return Value
diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
index 8e7d3492d248..a0640b6d0f68 100644
--- a/Documentation/media/videodev2.h.rst.exceptions
+++ b/Documentation/media/videodev2.h.rst.exceptions
@@ -180,6 +180,7 @@ replace define V4L2_PIX_FMT_FLAG_PREMUL_ALPHA reserved-formats
# V4L2 format flags
replace define V4L2_FMT_FLAG_COMPRESSED fmtdesc-flags
replace define V4L2_FMT_FLAG_EMULATED fmtdesc-flags
+replace define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM fmtdesc-flags
# V4L2 timecode types
replace define V4L2_TC_TYPE_24FPS timecode-type
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 2427bc4d8eba..67077d52c59d 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -774,8 +774,9 @@ struct v4l2_fmtdesc {
__u32 reserved[4];
};
-#define V4L2_FMT_FLAG_COMPRESSED 0x0001
-#define V4L2_FMT_FLAG_EMULATED 0x0002
+#define V4L2_FMT_FLAG_COMPRESSED 0x0001
+#define V4L2_FMT_FLAG_EMULATED 0x0002
+#define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM 0x0004
/* Frame Size and frame rate enumeration */
/*
--
2.20.1
^ permalink raw reply related [flat|nested] 42+ messages in thread* Re: [PATCHv2 01/12] videodev2.h: add V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM
2019-08-12 11:05 ` [PATCHv2 01/12] videodev2.h: add V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM Hans Verkuil
@ 2019-08-14 12:52 ` Paul Kocialkowski
2019-08-15 8:11 ` Alexandre Courbot
1 sibling, 0 replies; 42+ messages in thread
From: Paul Kocialkowski @ 2019-08-14 12:52 UTC (permalink / raw)
To: Hans Verkuil; +Cc: linux-media, Tomasz Figa
[-- Attachment #1: Type: text/plain, Size: 3387 bytes --]
Hi,
On Mon 12 Aug 19, 13:05, Hans Verkuil wrote:
> Add an enum_fmt format flag to specifically tag coded formats where
> full bytestream parsing is supported by the device.
>
> Some stateful decoders are capable of fully parsing a bytestream,
> but others require that userspace pre-parses the bytestream into
> frames or fields (see the corresponding pixelformat descriptions
> for details).
>
> If this flag is set, then this pre-parsing step is not required
> (but still possible, of course).
Although I wasn't involved with the initial issue, looks good to me!
Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Cheers,
Paul
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> ---
> Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 8 ++++++++
> Documentation/media/videodev2.h.rst.exceptions | 1 +
> include/uapi/linux/videodev2.h | 5 +++--
> 3 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
> index 822d6730e7d2..ebc05ce74bdf 100644
> --- a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
> +++ b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
> @@ -127,6 +127,14 @@ one until ``EINVAL`` is returned.
> - This format is not native to the device but emulated through
> software (usually libv4l2), where possible try to use a native
> format instead for better performance.
> + * - ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
> + - 0x0004
> + - The hardware decoder for this compressed bytestream format (aka coded
> + format) is capable of parsing a continuous bytestream. Applications do
> + not need to parse the bytestream themselves to find the boundaries
> + between frames/fields. This flag can only be used in combination with
> + the ``V4L2_FMT_FLAG_COMPRESSED`` flag, since this applies to compressed
> + formats only. This flag is valid for stateful decoders only.
>
>
> Return Value
> diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
> index 8e7d3492d248..a0640b6d0f68 100644
> --- a/Documentation/media/videodev2.h.rst.exceptions
> +++ b/Documentation/media/videodev2.h.rst.exceptions
> @@ -180,6 +180,7 @@ replace define V4L2_PIX_FMT_FLAG_PREMUL_ALPHA reserved-formats
> # V4L2 format flags
> replace define V4L2_FMT_FLAG_COMPRESSED fmtdesc-flags
> replace define V4L2_FMT_FLAG_EMULATED fmtdesc-flags
> +replace define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM fmtdesc-flags
>
> # V4L2 timecode types
> replace define V4L2_TC_TYPE_24FPS timecode-type
> diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
> index 2427bc4d8eba..67077d52c59d 100644
> --- a/include/uapi/linux/videodev2.h
> +++ b/include/uapi/linux/videodev2.h
> @@ -774,8 +774,9 @@ struct v4l2_fmtdesc {
> __u32 reserved[4];
> };
>
> -#define V4L2_FMT_FLAG_COMPRESSED 0x0001
> -#define V4L2_FMT_FLAG_EMULATED 0x0002
> +#define V4L2_FMT_FLAG_COMPRESSED 0x0001
> +#define V4L2_FMT_FLAG_EMULATED 0x0002
> +#define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM 0x0004
>
> /* Frame Size and frame rate enumeration */
> /*
> --
> 2.20.1
>
--
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCHv2 01/12] videodev2.h: add V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM
2019-08-12 11:05 ` [PATCHv2 01/12] videodev2.h: add V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM Hans Verkuil
2019-08-14 12:52 ` Paul Kocialkowski
@ 2019-08-15 8:11 ` Alexandre Courbot
2019-08-15 8:13 ` Alexandre Courbot
1 sibling, 1 reply; 42+ messages in thread
From: Alexandre Courbot @ 2019-08-15 8:11 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Linux Media Mailing List, Tomasz Figa
On Mon, Aug 12, 2019 at 8:05 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>
> Add an enum_fmt format flag to specifically tag coded formats where
> full bytestream parsing is supported by the device.
>
> Some stateful decoders are capable of fully parsing a bytestream,
> but others require that userspace pre-parses the bytestream into
> frames or fields (see the corresponding pixelformat descriptions
> for details).
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
This patch does not update the pixelformat descriptions though, are we
planning on doing this?
>
> If this flag is set, then this pre-parsing step is not required
> (but still possible, of course).
>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> ---
> Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 8 ++++++++
> Documentation/media/videodev2.h.rst.exceptions | 1 +
> include/uapi/linux/videodev2.h | 5 +++--
> 3 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
> index 822d6730e7d2..ebc05ce74bdf 100644
> --- a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
> +++ b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
> @@ -127,6 +127,14 @@ one until ``EINVAL`` is returned.
> - This format is not native to the device but emulated through
> software (usually libv4l2), where possible try to use a native
> format instead for better performance.
> + * - ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
> + - 0x0004
> + - The hardware decoder for this compressed bytestream format (aka coded
> + format) is capable of parsing a continuous bytestream. Applications do
> + not need to parse the bytestream themselves to find the boundaries
> + between frames/fields. This flag can only be used in combination with
> + the ``V4L2_FMT_FLAG_COMPRESSED`` flag, since this applies to compressed
> + formats only. This flag is valid for stateful decoders only.
>
>
> Return Value
> diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
> index 8e7d3492d248..a0640b6d0f68 100644
> --- a/Documentation/media/videodev2.h.rst.exceptions
> +++ b/Documentation/media/videodev2.h.rst.exceptions
> @@ -180,6 +180,7 @@ replace define V4L2_PIX_FMT_FLAG_PREMUL_ALPHA reserved-formats
> # V4L2 format flags
> replace define V4L2_FMT_FLAG_COMPRESSED fmtdesc-flags
> replace define V4L2_FMT_FLAG_EMULATED fmtdesc-flags
> +replace define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM fmtdesc-flags
>
> # V4L2 timecode types
> replace define V4L2_TC_TYPE_24FPS timecode-type
> diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
> index 2427bc4d8eba..67077d52c59d 100644
> --- a/include/uapi/linux/videodev2.h
> +++ b/include/uapi/linux/videodev2.h
> @@ -774,8 +774,9 @@ struct v4l2_fmtdesc {
> __u32 reserved[4];
> };
>
> -#define V4L2_FMT_FLAG_COMPRESSED 0x0001
> -#define V4L2_FMT_FLAG_EMULATED 0x0002
> +#define V4L2_FMT_FLAG_COMPRESSED 0x0001
> +#define V4L2_FMT_FLAG_EMULATED 0x0002
> +#define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM 0x0004
>
> /* Frame Size and frame rate enumeration */
> /*
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCHv2 01/12] videodev2.h: add V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM
2019-08-15 8:11 ` Alexandre Courbot
@ 2019-08-15 8:13 ` Alexandre Courbot
0 siblings, 0 replies; 42+ messages in thread
From: Alexandre Courbot @ 2019-08-15 8:13 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Linux Media Mailing List, Tomasz Figa
On Thu, Aug 15, 2019 at 5:11 PM Alexandre Courbot <acourbot@chromium.org> wrote:
>
> On Mon, Aug 12, 2019 at 8:05 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
> >
> > Add an enum_fmt format flag to specifically tag coded formats where
> > full bytestream parsing is supported by the device.
> >
> > Some stateful decoders are capable of fully parsing a bytestream,
> > but others require that userspace pre-parses the bytestream into
> > frames or fields (see the corresponding pixelformat descriptions
> > for details).
>
> Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
>
> This patch does not update the pixelformat descriptions though, are we
> planning on doing this?
I pressed Send too fast, patch 8 takes care of this. Sorry for the noise.
>
>
> >
> > If this flag is set, then this pre-parsing step is not required
> > (but still possible, of course).
> >
> > Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> > ---
> > Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 8 ++++++++
> > Documentation/media/videodev2.h.rst.exceptions | 1 +
> > include/uapi/linux/videodev2.h | 5 +++--
> > 3 files changed, 12 insertions(+), 2 deletions(-)
> >
> > diff --git a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
> > index 822d6730e7d2..ebc05ce74bdf 100644
> > --- a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
> > +++ b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
> > @@ -127,6 +127,14 @@ one until ``EINVAL`` is returned.
> > - This format is not native to the device but emulated through
> > software (usually libv4l2), where possible try to use a native
> > format instead for better performance.
> > + * - ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
> > + - 0x0004
> > + - The hardware decoder for this compressed bytestream format (aka coded
> > + format) is capable of parsing a continuous bytestream. Applications do
> > + not need to parse the bytestream themselves to find the boundaries
> > + between frames/fields. This flag can only be used in combination with
> > + the ``V4L2_FMT_FLAG_COMPRESSED`` flag, since this applies to compressed
> > + formats only. This flag is valid for stateful decoders only.
> >
> >
> > Return Value
> > diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
> > index 8e7d3492d248..a0640b6d0f68 100644
> > --- a/Documentation/media/videodev2.h.rst.exceptions
> > +++ b/Documentation/media/videodev2.h.rst.exceptions
> > @@ -180,6 +180,7 @@ replace define V4L2_PIX_FMT_FLAG_PREMUL_ALPHA reserved-formats
> > # V4L2 format flags
> > replace define V4L2_FMT_FLAG_COMPRESSED fmtdesc-flags
> > replace define V4L2_FMT_FLAG_EMULATED fmtdesc-flags
> > +replace define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM fmtdesc-flags
> >
> > # V4L2 timecode types
> > replace define V4L2_TC_TYPE_24FPS timecode-type
> > diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
> > index 2427bc4d8eba..67077d52c59d 100644
> > --- a/include/uapi/linux/videodev2.h
> > +++ b/include/uapi/linux/videodev2.h
> > @@ -774,8 +774,9 @@ struct v4l2_fmtdesc {
> > __u32 reserved[4];
> > };
> >
> > -#define V4L2_FMT_FLAG_COMPRESSED 0x0001
> > -#define V4L2_FMT_FLAG_EMULATED 0x0002
> > +#define V4L2_FMT_FLAG_COMPRESSED 0x0001
> > +#define V4L2_FMT_FLAG_EMULATED 0x0002
> > +#define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM 0x0004
> >
> > /* Frame Size and frame rate enumeration */
> > /*
> > --
> > 2.20.1
> >
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCHv2 02/12] videodev2.h: add V4L2_FMT_FLAG_DYN_RESOLUTION
2019-08-12 11:05 [PATCHv2 00/12] Stateful/stateless codec core support Hans Verkuil
2019-08-12 11:05 ` [PATCHv2 01/12] videodev2.h: add V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM Hans Verkuil
@ 2019-08-12 11:05 ` Hans Verkuil
2019-08-14 12:53 ` Paul Kocialkowski
2019-08-12 11:05 ` [PATCHv2 03/12] media: venus: vdec: flag OUTPUT formats with V4L2_FMT_FLAG_DYN_RESOLUTION Hans Verkuil
` (9 subsequent siblings)
11 siblings, 1 reply; 42+ messages in thread
From: Hans Verkuil @ 2019-08-12 11:05 UTC (permalink / raw)
To: linux-media; +Cc: Tomasz Figa, Maxime Jourdan, Hans Verkuil
From: Maxime Jourdan <mjourdan@baylibre.com>
Add an enum_fmt format flag to specifically tag coded formats where
dynamic resolution switching is supported by the device.
This is useful for some codec drivers that can support dynamic
resolution switching for one or more of their listed coded formats. It
allows userspace to know whether it should extract the video parameters
itself, or if it can rely on the device to send V4L2_EVENT_SOURCE_CHANGE
when such changes are detected.
Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: added flag to videodev2.h.rst.exceptions]
[hverkuil-cisco@xs4all.nl: updated commit text: 'one or more' instead of 'all']
Acked-by: Tomasz Figa <tfiga@chromium.org>
---
Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 8 ++++++++
Documentation/media/videodev2.h.rst.exceptions | 1 +
include/uapi/linux/videodev2.h | 1 +
3 files changed, 10 insertions(+)
diff --git a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
index ebc05ce74bdf..719f1ed64f7d 100644
--- a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
@@ -135,6 +135,14 @@ one until ``EINVAL`` is returned.
between frames/fields. This flag can only be used in combination with
the ``V4L2_FMT_FLAG_COMPRESSED`` flag, since this applies to compressed
formats only. This flag is valid for stateful decoders only.
+ * - ``V4L2_FMT_FLAG_DYN_RESOLUTION``
+ - 0x0008
+ - Dynamic resolution switching is supported by the device for this
+ compressed bytestream format (aka coded format). It will notify the user
+ via the event ``V4L2_EVENT_SOURCE_CHANGE`` when changes in the video
+ parameters are detected. This flag can only be used in combination
+ with the ``V4L2_FMT_FLAG_COMPRESSED`` flag, since this applies to
+ compressed formats only.
Return Value
diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
index a0640b6d0f68..adeb6b7a15cb 100644
--- a/Documentation/media/videodev2.h.rst.exceptions
+++ b/Documentation/media/videodev2.h.rst.exceptions
@@ -181,6 +181,7 @@ replace define V4L2_PIX_FMT_FLAG_PREMUL_ALPHA reserved-formats
replace define V4L2_FMT_FLAG_COMPRESSED fmtdesc-flags
replace define V4L2_FMT_FLAG_EMULATED fmtdesc-flags
replace define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM fmtdesc-flags
+replace define V4L2_FMT_FLAG_DYN_RESOLUTION fmtdesc-flags
# V4L2 timecode types
replace define V4L2_TC_TYPE_24FPS timecode-type
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 67077d52c59d..530638dffd93 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -777,6 +777,7 @@ struct v4l2_fmtdesc {
#define V4L2_FMT_FLAG_COMPRESSED 0x0001
#define V4L2_FMT_FLAG_EMULATED 0x0002
#define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM 0x0004
+#define V4L2_FMT_FLAG_DYN_RESOLUTION 0x0008
/* Frame Size and frame rate enumeration */
/*
--
2.20.1
^ permalink raw reply related [flat|nested] 42+ messages in thread* Re: [PATCHv2 02/12] videodev2.h: add V4L2_FMT_FLAG_DYN_RESOLUTION
2019-08-12 11:05 ` [PATCHv2 02/12] videodev2.h: add V4L2_FMT_FLAG_DYN_RESOLUTION Hans Verkuil
@ 2019-08-14 12:53 ` Paul Kocialkowski
2019-08-15 8:11 ` Alexandre Courbot
2019-08-15 14:22 ` Hans Verkuil
0 siblings, 2 replies; 42+ messages in thread
From: Paul Kocialkowski @ 2019-08-14 12:53 UTC (permalink / raw)
To: Hans Verkuil; +Cc: linux-media, Tomasz Figa, Maxime Jourdan
[-- Attachment #1: Type: text/plain, Size: 3727 bytes --]
Hi,
On Mon 12 Aug 19, 13:05, Hans Verkuil wrote:
> From: Maxime Jourdan <mjourdan@baylibre.com>
>
> Add an enum_fmt format flag to specifically tag coded formats where
> dynamic resolution switching is supported by the device.
>
> This is useful for some codec drivers that can support dynamic
> resolution switching for one or more of their listed coded formats. It
> allows userspace to know whether it should extract the video parameters
> itself, or if it can rely on the device to send V4L2_EVENT_SOURCE_CHANGE
> when such changes are detected.
Makes sense and looks good to me:
Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
The docs aren't saying that this only applies to stateful decoders, but I think
it is quite clear that this can't apply to stateless decoders.
Cheers,
Paul
> Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> [hverkuil-cisco@xs4all.nl: added flag to videodev2.h.rst.exceptions]
> [hverkuil-cisco@xs4all.nl: updated commit text: 'one or more' instead of 'all']
> Acked-by: Tomasz Figa <tfiga@chromium.org>
> ---
> Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 8 ++++++++
> Documentation/media/videodev2.h.rst.exceptions | 1 +
> include/uapi/linux/videodev2.h | 1 +
> 3 files changed, 10 insertions(+)
>
> diff --git a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
> index ebc05ce74bdf..719f1ed64f7d 100644
> --- a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
> +++ b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
> @@ -135,6 +135,14 @@ one until ``EINVAL`` is returned.
> between frames/fields. This flag can only be used in combination with
> the ``V4L2_FMT_FLAG_COMPRESSED`` flag, since this applies to compressed
> formats only. This flag is valid for stateful decoders only.
> + * - ``V4L2_FMT_FLAG_DYN_RESOLUTION``
> + - 0x0008
> + - Dynamic resolution switching is supported by the device for this
> + compressed bytestream format (aka coded format). It will notify the user
> + via the event ``V4L2_EVENT_SOURCE_CHANGE`` when changes in the video
> + parameters are detected. This flag can only be used in combination
> + with the ``V4L2_FMT_FLAG_COMPRESSED`` flag, since this applies to
> + compressed formats only.
>
>
> Return Value
> diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
> index a0640b6d0f68..adeb6b7a15cb 100644
> --- a/Documentation/media/videodev2.h.rst.exceptions
> +++ b/Documentation/media/videodev2.h.rst.exceptions
> @@ -181,6 +181,7 @@ replace define V4L2_PIX_FMT_FLAG_PREMUL_ALPHA reserved-formats
> replace define V4L2_FMT_FLAG_COMPRESSED fmtdesc-flags
> replace define V4L2_FMT_FLAG_EMULATED fmtdesc-flags
> replace define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM fmtdesc-flags
> +replace define V4L2_FMT_FLAG_DYN_RESOLUTION fmtdesc-flags
>
> # V4L2 timecode types
> replace define V4L2_TC_TYPE_24FPS timecode-type
> diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
> index 67077d52c59d..530638dffd93 100644
> --- a/include/uapi/linux/videodev2.h
> +++ b/include/uapi/linux/videodev2.h
> @@ -777,6 +777,7 @@ struct v4l2_fmtdesc {
> #define V4L2_FMT_FLAG_COMPRESSED 0x0001
> #define V4L2_FMT_FLAG_EMULATED 0x0002
> #define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM 0x0004
> +#define V4L2_FMT_FLAG_DYN_RESOLUTION 0x0008
>
> /* Frame Size and frame rate enumeration */
> /*
> --
> 2.20.1
>
--
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCHv2 02/12] videodev2.h: add V4L2_FMT_FLAG_DYN_RESOLUTION
2019-08-14 12:53 ` Paul Kocialkowski
@ 2019-08-15 8:11 ` Alexandre Courbot
2019-08-15 10:09 ` Tomasz Figa
2019-08-15 14:22 ` Hans Verkuil
1 sibling, 1 reply; 42+ messages in thread
From: Alexandre Courbot @ 2019-08-15 8:11 UTC (permalink / raw)
To: Paul Kocialkowski
Cc: Hans Verkuil, Linux Media Mailing List, Tomasz Figa, Maxime Jourdan
On Wed, Aug 14, 2019 at 9:53 PM Paul Kocialkowski
<paul.kocialkowski@bootlin.com> wrote:
>
> Hi,
>
> On Mon 12 Aug 19, 13:05, Hans Verkuil wrote:
> > From: Maxime Jourdan <mjourdan@baylibre.com>
> >
> > Add an enum_fmt format flag to specifically tag coded formats where
> > dynamic resolution switching is supported by the device.
> >
> > This is useful for some codec drivers that can support dynamic
> > resolution switching for one or more of their listed coded formats. It
> > allows userspace to know whether it should extract the video parameters
> > itself, or if it can rely on the device to send V4L2_EVENT_SOURCE_CHANGE
> > when such changes are detected.
>
> Makes sense and looks good to me:
> Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
>
> The docs aren't saying that this only applies to stateful decoders, but I think
> it is quite clear that this can't apply to stateless decoders.
Even though this can be inferred from reading the specs, I think it
would be reasonable to explicitly mention it though.
I also wonder, since this flag does not make sense for encoders, maybe
we can use more precise vocabulary in the patch description and doc?
I.e. s/codec/decoder.
With that,
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCHv2 02/12] videodev2.h: add V4L2_FMT_FLAG_DYN_RESOLUTION
2019-08-15 8:11 ` Alexandre Courbot
@ 2019-08-15 10:09 ` Tomasz Figa
0 siblings, 0 replies; 42+ messages in thread
From: Tomasz Figa @ 2019-08-15 10:09 UTC (permalink / raw)
To: Alexandre Courbot
Cc: Paul Kocialkowski, Hans Verkuil, Linux Media Mailing List,
Maxime Jourdan
On Thu, Aug 15, 2019 at 5:12 PM Alexandre Courbot <acourbot@chromium.org> wrote:
>
> On Wed, Aug 14, 2019 at 9:53 PM Paul Kocialkowski
> <paul.kocialkowski@bootlin.com> wrote:
> >
> > Hi,
> >
> > On Mon 12 Aug 19, 13:05, Hans Verkuil wrote:
> > > From: Maxime Jourdan <mjourdan@baylibre.com>
> > >
> > > Add an enum_fmt format flag to specifically tag coded formats where
> > > dynamic resolution switching is supported by the device.
> > >
> > > This is useful for some codec drivers that can support dynamic
> > > resolution switching for one or more of their listed coded formats. It
> > > allows userspace to know whether it should extract the video parameters
> > > itself, or if it can rely on the device to send V4L2_EVENT_SOURCE_CHANGE
> > > when such changes are detected.
> >
> > Makes sense and looks good to me:
> > Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
> >
> > The docs aren't saying that this only applies to stateful decoders, but I think
> > it is quite clear that this can't apply to stateless decoders.
>
> Even though this can be inferred from reading the specs, I think it
> would be reasonable to explicitly mention it though.
>
> I also wonder, since this flag does not make sense for encoders, maybe
> we can use more precise vocabulary in the patch description and doc?
> I.e. s/codec/decoder.
>
> With that,
> Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
There is no reason why it couldn't apply to an encoder. I think the
idea is to actually have the encoder advertise the same flag once we
figure out how to implement encoding with resolution changes.
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCHv2 02/12] videodev2.h: add V4L2_FMT_FLAG_DYN_RESOLUTION
2019-08-14 12:53 ` Paul Kocialkowski
2019-08-15 8:11 ` Alexandre Courbot
@ 2019-08-15 14:22 ` Hans Verkuil
1 sibling, 0 replies; 42+ messages in thread
From: Hans Verkuil @ 2019-08-15 14:22 UTC (permalink / raw)
To: Paul Kocialkowski; +Cc: linux-media, Tomasz Figa, Maxime Jourdan
On 8/14/19 2:53 PM, Paul Kocialkowski wrote:
> Hi,
>
> On Mon 12 Aug 19, 13:05, Hans Verkuil wrote:
>> From: Maxime Jourdan <mjourdan@baylibre.com>
>>
>> Add an enum_fmt format flag to specifically tag coded formats where
>> dynamic resolution switching is supported by the device.
>>
>> This is useful for some codec drivers that can support dynamic
>> resolution switching for one or more of their listed coded formats. It
>> allows userspace to know whether it should extract the video parameters
>> itself, or if it can rely on the device to send V4L2_EVENT_SOURCE_CHANGE
>> when such changes are detected.
>
> Makes sense and looks good to me:
> Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
>
> The docs aren't saying that this only applies to stateful decoders, but I think
> it is quite clear that this can't apply to stateless decoders.
>
> Cheers,
>
> Paul
>
>> Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
>> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
>> [hverkuil-cisco@xs4all.nl: added flag to videodev2.h.rst.exceptions]
>> [hverkuil-cisco@xs4all.nl: updated commit text: 'one or more' instead of 'all']
>> Acked-by: Tomasz Figa <tfiga@chromium.org>
>> ---
>> Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 8 ++++++++
>> Documentation/media/videodev2.h.rst.exceptions | 1 +
>> include/uapi/linux/videodev2.h | 1 +
>> 3 files changed, 10 insertions(+)
>>
>> diff --git a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
>> index ebc05ce74bdf..719f1ed64f7d 100644
>> --- a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
>> +++ b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
>> @@ -135,6 +135,14 @@ one until ``EINVAL`` is returned.
>> between frames/fields. This flag can only be used in combination with
>> the ``V4L2_FMT_FLAG_COMPRESSED`` flag, since this applies to compressed
>> formats only. This flag is valid for stateful decoders only.
>> + * - ``V4L2_FMT_FLAG_DYN_RESOLUTION``
>> + - 0x0008
>> + - Dynamic resolution switching is supported by the device for this
>> + compressed bytestream format (aka coded format). It will notify the user
>> + via the event ``V4L2_EVENT_SOURCE_CHANGE`` when changes in the video
>> + parameters are detected. This flag can only be used in combination
>> + with the ``V4L2_FMT_FLAG_COMPRESSED`` flag, since this applies to
>> + compressed formats only.
I added "It is also only applies to stateful codecs." at the end of this
paragraph.
Regards,
Hans
>>
>>
>> Return Value
>> diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
>> index a0640b6d0f68..adeb6b7a15cb 100644
>> --- a/Documentation/media/videodev2.h.rst.exceptions
>> +++ b/Documentation/media/videodev2.h.rst.exceptions
>> @@ -181,6 +181,7 @@ replace define V4L2_PIX_FMT_FLAG_PREMUL_ALPHA reserved-formats
>> replace define V4L2_FMT_FLAG_COMPRESSED fmtdesc-flags
>> replace define V4L2_FMT_FLAG_EMULATED fmtdesc-flags
>> replace define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM fmtdesc-flags
>> +replace define V4L2_FMT_FLAG_DYN_RESOLUTION fmtdesc-flags
>>
>> # V4L2 timecode types
>> replace define V4L2_TC_TYPE_24FPS timecode-type
>> diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
>> index 67077d52c59d..530638dffd93 100644
>> --- a/include/uapi/linux/videodev2.h
>> +++ b/include/uapi/linux/videodev2.h
>> @@ -777,6 +777,7 @@ struct v4l2_fmtdesc {
>> #define V4L2_FMT_FLAG_COMPRESSED 0x0001
>> #define V4L2_FMT_FLAG_EMULATED 0x0002
>> #define V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM 0x0004
>> +#define V4L2_FMT_FLAG_DYN_RESOLUTION 0x0008
>>
>> /* Frame Size and frame rate enumeration */
>> /*
>> --
>> 2.20.1
>>
>
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCHv2 03/12] media: venus: vdec: flag OUTPUT formats with V4L2_FMT_FLAG_DYN_RESOLUTION
2019-08-12 11:05 [PATCHv2 00/12] Stateful/stateless codec core support Hans Verkuil
2019-08-12 11:05 ` [PATCHv2 01/12] videodev2.h: add V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM Hans Verkuil
2019-08-12 11:05 ` [PATCHv2 02/12] videodev2.h: add V4L2_FMT_FLAG_DYN_RESOLUTION Hans Verkuil
@ 2019-08-12 11:05 ` Hans Verkuil
2019-08-12 13:49 ` Stanimir Varbanov
2019-08-14 12:54 ` Paul Kocialkowski
2019-08-12 11:05 ` [PATCHv2 04/12] media: s5p_mfc_dec: set flags for OUTPUT coded formats Hans Verkuil
` (8 subsequent siblings)
11 siblings, 2 replies; 42+ messages in thread
From: Hans Verkuil @ 2019-08-12 11:05 UTC (permalink / raw)
To: linux-media; +Cc: Tomasz Figa, Maxime Jourdan, Hans Verkuil
From: Maxime Jourdan <mjourdan@baylibre.com>
Tag all the coded formats where the venus vdec supports dynamic
resolution switching.
Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
drivers/media/platform/qcom/venus/core.h | 1 +
drivers/media/platform/qcom/venus/vdec.c | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
index 959eaa550f4e..922cb7e64bfa 100644
--- a/drivers/media/platform/qcom/venus/core.h
+++ b/drivers/media/platform/qcom/venus/core.h
@@ -46,6 +46,7 @@ struct venus_format {
u32 pixfmt;
unsigned int num_planes;
u32 type;
+ u32 flags;
};
#define MAX_PLANES 4
diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
index 0b7d65db5cdc..7f4660555ddb 100644
--- a/drivers/media/platform/qcom/venus/vdec.c
+++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -37,42 +37,52 @@ static const struct venus_format vdec_formats[] = {
.pixfmt = V4L2_PIX_FMT_MPEG4,
.num_planes = 1,
.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
}, {
.pixfmt = V4L2_PIX_FMT_MPEG2,
.num_planes = 1,
.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
}, {
.pixfmt = V4L2_PIX_FMT_H263,
.num_planes = 1,
.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
}, {
.pixfmt = V4L2_PIX_FMT_VC1_ANNEX_G,
.num_planes = 1,
.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
}, {
.pixfmt = V4L2_PIX_FMT_VC1_ANNEX_L,
.num_planes = 1,
.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
}, {
.pixfmt = V4L2_PIX_FMT_H264,
.num_planes = 1,
.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
}, {
.pixfmt = V4L2_PIX_FMT_VP8,
.num_planes = 1,
.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
}, {
.pixfmt = V4L2_PIX_FMT_VP9,
.num_planes = 1,
.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
}, {
.pixfmt = V4L2_PIX_FMT_XVID,
.num_planes = 1,
.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
}, {
.pixfmt = V4L2_PIX_FMT_HEVC,
.num_planes = 1,
.type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
},
};
@@ -379,6 +389,7 @@ static int vdec_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *f)
return -EINVAL;
f->pixelformat = fmt->pixfmt;
+ f->flags = fmt->flags;
return 0;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 42+ messages in thread* Re: [PATCHv2 03/12] media: venus: vdec: flag OUTPUT formats with V4L2_FMT_FLAG_DYN_RESOLUTION
2019-08-12 11:05 ` [PATCHv2 03/12] media: venus: vdec: flag OUTPUT formats with V4L2_FMT_FLAG_DYN_RESOLUTION Hans Verkuil
@ 2019-08-12 13:49 ` Stanimir Varbanov
2019-08-14 12:54 ` Paul Kocialkowski
1 sibling, 0 replies; 42+ messages in thread
From: Stanimir Varbanov @ 2019-08-12 13:49 UTC (permalink / raw)
To: Hans Verkuil, linux-media; +Cc: Tomasz Figa, Maxime Jourdan
Thanks for the patch!
On 8/12/19 2:05 PM, Hans Verkuil wrote:
> From: Maxime Jourdan <mjourdan@baylibre.com>
>
> Tag all the coded formats where the venus vdec supports dynamic
> resolution switching.
>
> Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> ---
> drivers/media/platform/qcom/venus/core.h | 1 +
> drivers/media/platform/qcom/venus/vdec.c | 11 +++++++++++
> 2 files changed, 12 insertions(+)
Acked-by: Stanimir Varbanov <stanimir.varbanov@linaro.org>
--
regards,
Stan
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCHv2 03/12] media: venus: vdec: flag OUTPUT formats with V4L2_FMT_FLAG_DYN_RESOLUTION
2019-08-12 11:05 ` [PATCHv2 03/12] media: venus: vdec: flag OUTPUT formats with V4L2_FMT_FLAG_DYN_RESOLUTION Hans Verkuil
2019-08-12 13:49 ` Stanimir Varbanov
@ 2019-08-14 12:54 ` Paul Kocialkowski
1 sibling, 0 replies; 42+ messages in thread
From: Paul Kocialkowski @ 2019-08-14 12:54 UTC (permalink / raw)
To: Hans Verkuil; +Cc: linux-media, Tomasz Figa, Maxime Jourdan
[-- Attachment #1: Type: text/plain, Size: 3280 bytes --]
Hi,
On Mon 12 Aug 19, 13:05, Hans Verkuil wrote:
> From: Maxime Jourdan <mjourdan@baylibre.com>
>
> Tag all the coded formats where the venus vdec supports dynamic
> resolution switching.
Looks good to me.
Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Cheers,
Paul
> Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> ---
> drivers/media/platform/qcom/venus/core.h | 1 +
> drivers/media/platform/qcom/venus/vdec.c | 11 +++++++++++
> 2 files changed, 12 insertions(+)
>
> diff --git a/drivers/media/platform/qcom/venus/core.h b/drivers/media/platform/qcom/venus/core.h
> index 959eaa550f4e..922cb7e64bfa 100644
> --- a/drivers/media/platform/qcom/venus/core.h
> +++ b/drivers/media/platform/qcom/venus/core.h
> @@ -46,6 +46,7 @@ struct venus_format {
> u32 pixfmt;
> unsigned int num_planes;
> u32 type;
> + u32 flags;
> };
>
> #define MAX_PLANES 4
> diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c
> index 0b7d65db5cdc..7f4660555ddb 100644
> --- a/drivers/media/platform/qcom/venus/vdec.c
> +++ b/drivers/media/platform/qcom/venus/vdec.c
> @@ -37,42 +37,52 @@ static const struct venus_format vdec_formats[] = {
> .pixfmt = V4L2_PIX_FMT_MPEG4,
> .num_planes = 1,
> .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> }, {
> .pixfmt = V4L2_PIX_FMT_MPEG2,
> .num_planes = 1,
> .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> }, {
> .pixfmt = V4L2_PIX_FMT_H263,
> .num_planes = 1,
> .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> }, {
> .pixfmt = V4L2_PIX_FMT_VC1_ANNEX_G,
> .num_planes = 1,
> .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> }, {
> .pixfmt = V4L2_PIX_FMT_VC1_ANNEX_L,
> .num_planes = 1,
> .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> }, {
> .pixfmt = V4L2_PIX_FMT_H264,
> .num_planes = 1,
> .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> }, {
> .pixfmt = V4L2_PIX_FMT_VP8,
> .num_planes = 1,
> .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> }, {
> .pixfmt = V4L2_PIX_FMT_VP9,
> .num_planes = 1,
> .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> }, {
> .pixfmt = V4L2_PIX_FMT_XVID,
> .num_planes = 1,
> .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> }, {
> .pixfmt = V4L2_PIX_FMT_HEVC,
> .num_planes = 1,
> .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> };
>
> @@ -379,6 +389,7 @@ static int vdec_enum_fmt(struct file *file, void *fh, struct v4l2_fmtdesc *f)
> return -EINVAL;
>
> f->pixelformat = fmt->pixfmt;
> + f->flags = fmt->flags;
>
> return 0;
> }
> --
> 2.20.1
>
--
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCHv2 04/12] media: s5p_mfc_dec: set flags for OUTPUT coded formats
2019-08-12 11:05 [PATCHv2 00/12] Stateful/stateless codec core support Hans Verkuil
` (2 preceding siblings ...)
2019-08-12 11:05 ` [PATCHv2 03/12] media: venus: vdec: flag OUTPUT formats with V4L2_FMT_FLAG_DYN_RESOLUTION Hans Verkuil
@ 2019-08-12 11:05 ` Hans Verkuil
2019-08-14 12:55 ` Paul Kocialkowski
2019-08-15 10:14 ` Tomasz Figa
2019-08-12 11:05 ` [PATCHv2 05/12] media: mtk-vcodec: flag OUTPUT formats with V4L2_FMT_FLAG_DYN_RESOLUTION Hans Verkuil
` (7 subsequent siblings)
11 siblings, 2 replies; 42+ messages in thread
From: Hans Verkuil @ 2019-08-12 11:05 UTC (permalink / raw)
To: linux-media; +Cc: Tomasz Figa, Maxime Jourdan, Hans Verkuil
From: Maxime Jourdan <mjourdan@baylibre.com>
Tag all the coded formats where the s5p_mfc decoder supports dynamic
resolution switching or has a bytestream parser.
Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: added CONTINUOUS_BYTESTREAM]
---
.../media/platform/s5p-mfc/s5p_mfc_common.h | 1 +
drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 18 ++++++++++++++++++
2 files changed, 19 insertions(+)
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
index 96d1ecd1521b..31b133af91eb 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
@@ -723,6 +723,7 @@ struct s5p_mfc_fmt {
enum s5p_mfc_fmt_type type;
u32 num_planes;
u32 versions;
+ u32 flags;
};
/**
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
index 61e144a35201..1423c33c70cb 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
@@ -62,6 +62,8 @@ static struct s5p_mfc_fmt formats[] = {
.type = MFC_FMT_DEC,
.num_planes = 1,
.versions = MFC_V5PLUS_BITS,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
+ V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
},
{
.fourcc = V4L2_PIX_FMT_H264_MVC,
@@ -69,6 +71,8 @@ static struct s5p_mfc_fmt formats[] = {
.type = MFC_FMT_DEC,
.num_planes = 1,
.versions = MFC_V6PLUS_BITS,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
+ V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
},
{
.fourcc = V4L2_PIX_FMT_H263,
@@ -76,6 +80,7 @@ static struct s5p_mfc_fmt formats[] = {
.type = MFC_FMT_DEC,
.num_planes = 1,
.versions = MFC_V5PLUS_BITS,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
},
{
.fourcc = V4L2_PIX_FMT_MPEG1,
@@ -83,6 +88,8 @@ static struct s5p_mfc_fmt formats[] = {
.type = MFC_FMT_DEC,
.num_planes = 1,
.versions = MFC_V5PLUS_BITS,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
+ V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
},
{
.fourcc = V4L2_PIX_FMT_MPEG2,
@@ -90,6 +97,8 @@ static struct s5p_mfc_fmt formats[] = {
.type = MFC_FMT_DEC,
.num_planes = 1,
.versions = MFC_V5PLUS_BITS,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
+ V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
},
{
.fourcc = V4L2_PIX_FMT_MPEG4,
@@ -97,6 +106,8 @@ static struct s5p_mfc_fmt formats[] = {
.type = MFC_FMT_DEC,
.num_planes = 1,
.versions = MFC_V5PLUS_BITS,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
+ V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
},
{
.fourcc = V4L2_PIX_FMT_XVID,
@@ -104,6 +115,7 @@ static struct s5p_mfc_fmt formats[] = {
.type = MFC_FMT_DEC,
.num_planes = 1,
.versions = MFC_V5PLUS_BITS,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
},
{
.fourcc = V4L2_PIX_FMT_VC1_ANNEX_G,
@@ -111,6 +123,7 @@ static struct s5p_mfc_fmt formats[] = {
.type = MFC_FMT_DEC,
.num_planes = 1,
.versions = MFC_V5PLUS_BITS,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
},
{
.fourcc = V4L2_PIX_FMT_VC1_ANNEX_L,
@@ -118,6 +131,7 @@ static struct s5p_mfc_fmt formats[] = {
.type = MFC_FMT_DEC,
.num_planes = 1,
.versions = MFC_V5PLUS_BITS,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
},
{
.fourcc = V4L2_PIX_FMT_VP8,
@@ -125,6 +139,7 @@ static struct s5p_mfc_fmt formats[] = {
.type = MFC_FMT_DEC,
.num_planes = 1,
.versions = MFC_V6PLUS_BITS,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
},
{
.fourcc = V4L2_PIX_FMT_HEVC,
@@ -132,6 +147,8 @@ static struct s5p_mfc_fmt formats[] = {
.type = MFC_FMT_DEC,
.num_planes = 1,
.versions = MFC_V10_BIT,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
+ V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
},
{
.fourcc = V4L2_PIX_FMT_VP9,
@@ -139,6 +156,7 @@ static struct s5p_mfc_fmt formats[] = {
.type = MFC_FMT_DEC,
.num_planes = 1,
.versions = MFC_V10_BIT,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
},
};
--
2.20.1
^ permalink raw reply related [flat|nested] 42+ messages in thread* Re: [PATCHv2 04/12] media: s5p_mfc_dec: set flags for OUTPUT coded formats
2019-08-12 11:05 ` [PATCHv2 04/12] media: s5p_mfc_dec: set flags for OUTPUT coded formats Hans Verkuil
@ 2019-08-14 12:55 ` Paul Kocialkowski
2019-08-15 10:14 ` Tomasz Figa
1 sibling, 0 replies; 42+ messages in thread
From: Paul Kocialkowski @ 2019-08-14 12:55 UTC (permalink / raw)
To: Hans Verkuil; +Cc: linux-media, Tomasz Figa, Maxime Jourdan
[-- Attachment #1: Type: text/plain, Size: 4787 bytes --]
Hi,
On Mon 12 Aug 19, 13:05, Hans Verkuil wrote:
> From: Maxime Jourdan <mjourdan@baylibre.com>
>
> Tag all the coded formats where the s5p_mfc decoder supports dynamic
> resolution switching or has a bytestream parser.
Looks good to me, despite lacking knowledge of whether this matches what the
hardware really supports.
Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Cheers,
Paul
> Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> [hverkuil-cisco@xs4all.nl: added CONTINUOUS_BYTESTREAM]
> ---
> .../media/platform/s5p-mfc/s5p_mfc_common.h | 1 +
> drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 18 ++++++++++++++++++
> 2 files changed, 19 insertions(+)
>
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> index 96d1ecd1521b..31b133af91eb 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> @@ -723,6 +723,7 @@ struct s5p_mfc_fmt {
> enum s5p_mfc_fmt_type type;
> u32 num_planes;
> u32 versions;
> + u32 flags;
> };
>
> /**
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> index 61e144a35201..1423c33c70cb 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> @@ -62,6 +62,8 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> },
> {
> .fourcc = V4L2_PIX_FMT_H264_MVC,
> @@ -69,6 +71,8 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V6PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> },
> {
> .fourcc = V4L2_PIX_FMT_H263,
> @@ -76,6 +80,7 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_MPEG1,
> @@ -83,6 +88,8 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> },
> {
> .fourcc = V4L2_PIX_FMT_MPEG2,
> @@ -90,6 +97,8 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> },
> {
> .fourcc = V4L2_PIX_FMT_MPEG4,
> @@ -97,6 +106,8 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> },
> {
> .fourcc = V4L2_PIX_FMT_XVID,
> @@ -104,6 +115,7 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_VC1_ANNEX_G,
> @@ -111,6 +123,7 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_VC1_ANNEX_L,
> @@ -118,6 +131,7 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_VP8,
> @@ -125,6 +139,7 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V6PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_HEVC,
> @@ -132,6 +147,8 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V10_BIT,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> },
> {
> .fourcc = V4L2_PIX_FMT_VP9,
> @@ -139,6 +156,7 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V10_BIT,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> };
>
> --
> 2.20.1
>
--
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCHv2 04/12] media: s5p_mfc_dec: set flags for OUTPUT coded formats
2019-08-12 11:05 ` [PATCHv2 04/12] media: s5p_mfc_dec: set flags for OUTPUT coded formats Hans Verkuil
2019-08-14 12:55 ` Paul Kocialkowski
@ 2019-08-15 10:14 ` Tomasz Figa
2019-08-16 11:37 ` Marek Szyprowski
1 sibling, 1 reply; 42+ messages in thread
From: Tomasz Figa @ 2019-08-15 10:14 UTC (permalink / raw)
To: Hans Verkuil, Kyungmin Park, Kamil Debski, Jeongtae Park,
Andrzej Hajda, Marek Szyprowski
Cc: Linux Media Mailing List, Maxime Jourdan
Hi Hans,
On Mon, Aug 12, 2019 at 8:05 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>
> From: Maxime Jourdan <mjourdan@baylibre.com>
>
> Tag all the coded formats where the s5p_mfc decoder supports dynamic
> resolution switching or has a bytestream parser.
>
I believe it depends on the MFC hardware version. v5 might have some
additional restrictions.
Let me add some more folks to figure out.
> Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> [hverkuil-cisco@xs4all.nl: added CONTINUOUS_BYTESTREAM]
> ---
> .../media/platform/s5p-mfc/s5p_mfc_common.h | 1 +
> drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 18 ++++++++++++++++++
> 2 files changed, 19 insertions(+)
>
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> index 96d1ecd1521b..31b133af91eb 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> @@ -723,6 +723,7 @@ struct s5p_mfc_fmt {
> enum s5p_mfc_fmt_type type;
> u32 num_planes;
> u32 versions;
> + u32 flags;
> };
>
> /**
> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> index 61e144a35201..1423c33c70cb 100644
> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> @@ -62,6 +62,8 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> },
> {
> .fourcc = V4L2_PIX_FMT_H264_MVC,
> @@ -69,6 +71,8 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V6PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> },
> {
> .fourcc = V4L2_PIX_FMT_H263,
> @@ -76,6 +80,7 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_MPEG1,
> @@ -83,6 +88,8 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> },
> {
> .fourcc = V4L2_PIX_FMT_MPEG2,
> @@ -90,6 +97,8 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> },
> {
> .fourcc = V4L2_PIX_FMT_MPEG4,
> @@ -97,6 +106,8 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> },
> {
> .fourcc = V4L2_PIX_FMT_XVID,
> @@ -104,6 +115,7 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_VC1_ANNEX_G,
> @@ -111,6 +123,7 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_VC1_ANNEX_L,
> @@ -118,6 +131,7 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V5PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_VP8,
> @@ -125,6 +139,7 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V6PLUS_BITS,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_HEVC,
> @@ -132,6 +147,8 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V10_BIT,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> },
> {
> .fourcc = V4L2_PIX_FMT_VP9,
> @@ -139,6 +156,7 @@ static struct s5p_mfc_fmt formats[] = {
> .type = MFC_FMT_DEC,
> .num_planes = 1,
> .versions = MFC_V10_BIT,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> };
>
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCHv2 04/12] media: s5p_mfc_dec: set flags for OUTPUT coded formats
2019-08-15 10:14 ` Tomasz Figa
@ 2019-08-16 11:37 ` Marek Szyprowski
2019-08-16 11:47 ` Tomasz Figa
0 siblings, 1 reply; 42+ messages in thread
From: Marek Szyprowski @ 2019-08-16 11:37 UTC (permalink / raw)
To: Tomasz Figa, Hans Verkuil, Kyungmin Park, Kamil Debski,
Jeongtae Park, Andrzej Hajda
Cc: Linux Media Mailing List, Maxime Jourdan
Hi Tomasz,
On 2019-08-15 12:14, Tomasz Figa wrote:
> Hi Hans,
>
> On Mon, Aug 12, 2019 at 8:05 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>> From: Maxime Jourdan <mjourdan@baylibre.com>
>>
>> Tag all the coded formats where the s5p_mfc decoder supports dynamic
>> resolution switching or has a bytestream parser.
>>
> I believe it depends on the MFC hardware version. v5 might have some
> additional restrictions.
>
> Let me add some more folks to figure out.
IIRC MFC v5 also supported resolution change.
>> Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
>> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
>> [hverkuil-cisco@xs4all.nl: added CONTINUOUS_BYTESTREAM]
>> ---
>> .../media/platform/s5p-mfc/s5p_mfc_common.h | 1 +
>> drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 18 ++++++++++++++++++
>> 2 files changed, 19 insertions(+)
>>
>> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>> index 96d1ecd1521b..31b133af91eb 100644
>> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
>> @@ -723,6 +723,7 @@ struct s5p_mfc_fmt {
>> enum s5p_mfc_fmt_type type;
>> u32 num_planes;
>> u32 versions;
>> + u32 flags;
>> };
>>
>> /**
>> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
>> index 61e144a35201..1423c33c70cb 100644
>> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
>> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
>> @@ -62,6 +62,8 @@ static struct s5p_mfc_fmt formats[] = {
>> .type = MFC_FMT_DEC,
>> .num_planes = 1,
>> .versions = MFC_V5PLUS_BITS,
>> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
>> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
>> },
>> {
>> .fourcc = V4L2_PIX_FMT_H264_MVC,
>> @@ -69,6 +71,8 @@ static struct s5p_mfc_fmt formats[] = {
>> .type = MFC_FMT_DEC,
>> .num_planes = 1,
>> .versions = MFC_V6PLUS_BITS,
>> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
>> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
>> },
>> {
>> .fourcc = V4L2_PIX_FMT_H263,
>> @@ -76,6 +80,7 @@ static struct s5p_mfc_fmt formats[] = {
>> .type = MFC_FMT_DEC,
>> .num_planes = 1,
>> .versions = MFC_V5PLUS_BITS,
>> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
>> },
>> {
>> .fourcc = V4L2_PIX_FMT_MPEG1,
>> @@ -83,6 +88,8 @@ static struct s5p_mfc_fmt formats[] = {
>> .type = MFC_FMT_DEC,
>> .num_planes = 1,
>> .versions = MFC_V5PLUS_BITS,
>> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
>> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
>> },
>> {
>> .fourcc = V4L2_PIX_FMT_MPEG2,
>> @@ -90,6 +97,8 @@ static struct s5p_mfc_fmt formats[] = {
>> .type = MFC_FMT_DEC,
>> .num_planes = 1,
>> .versions = MFC_V5PLUS_BITS,
>> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
>> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
>> },
>> {
>> .fourcc = V4L2_PIX_FMT_MPEG4,
>> @@ -97,6 +106,8 @@ static struct s5p_mfc_fmt formats[] = {
>> .type = MFC_FMT_DEC,
>> .num_planes = 1,
>> .versions = MFC_V5PLUS_BITS,
>> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
>> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
>> },
>> {
>> .fourcc = V4L2_PIX_FMT_XVID,
>> @@ -104,6 +115,7 @@ static struct s5p_mfc_fmt formats[] = {
>> .type = MFC_FMT_DEC,
>> .num_planes = 1,
>> .versions = MFC_V5PLUS_BITS,
>> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
>> },
>> {
>> .fourcc = V4L2_PIX_FMT_VC1_ANNEX_G,
>> @@ -111,6 +123,7 @@ static struct s5p_mfc_fmt formats[] = {
>> .type = MFC_FMT_DEC,
>> .num_planes = 1,
>> .versions = MFC_V5PLUS_BITS,
>> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
>> },
>> {
>> .fourcc = V4L2_PIX_FMT_VC1_ANNEX_L,
>> @@ -118,6 +131,7 @@ static struct s5p_mfc_fmt formats[] = {
>> .type = MFC_FMT_DEC,
>> .num_planes = 1,
>> .versions = MFC_V5PLUS_BITS,
>> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
>> },
>> {
>> .fourcc = V4L2_PIX_FMT_VP8,
>> @@ -125,6 +139,7 @@ static struct s5p_mfc_fmt formats[] = {
>> .type = MFC_FMT_DEC,
>> .num_planes = 1,
>> .versions = MFC_V6PLUS_BITS,
>> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
>> },
>> {
>> .fourcc = V4L2_PIX_FMT_HEVC,
>> @@ -132,6 +147,8 @@ static struct s5p_mfc_fmt formats[] = {
>> .type = MFC_FMT_DEC,
>> .num_planes = 1,
>> .versions = MFC_V10_BIT,
>> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
>> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
>> },
>> {
>> .fourcc = V4L2_PIX_FMT_VP9,
>> @@ -139,6 +156,7 @@ static struct s5p_mfc_fmt formats[] = {
>> .type = MFC_FMT_DEC,
>> .num_planes = 1,
>> .versions = MFC_V10_BIT,
>> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
>> },
>> };
>>
>> --
>> 2.20.1
>>
>
Best regards
--
Marek Szyprowski, PhD
Samsung R&D Institute Poland
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCHv2 04/12] media: s5p_mfc_dec: set flags for OUTPUT coded formats
2019-08-16 11:37 ` Marek Szyprowski
@ 2019-08-16 11:47 ` Tomasz Figa
0 siblings, 0 replies; 42+ messages in thread
From: Tomasz Figa @ 2019-08-16 11:47 UTC (permalink / raw)
To: Marek Szyprowski
Cc: Hans Verkuil, Kyungmin Park, Kamil Debski, Jeongtae Park,
Andrzej Hajda, Linux Media Mailing List, Maxime Jourdan
Hi Marek,
On Fri, Aug 16, 2019 at 8:37 PM Marek Szyprowski
<m.szyprowski@samsung.com> wrote:
>
> Hi Tomasz,
>
> On 2019-08-15 12:14, Tomasz Figa wrote:
> > Hi Hans,
> >
> > On Mon, Aug 12, 2019 at 8:05 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
> >> From: Maxime Jourdan <mjourdan@baylibre.com>
> >>
> >> Tag all the coded formats where the s5p_mfc decoder supports dynamic
> >> resolution switching or has a bytestream parser.
> >>
> > I believe it depends on the MFC hardware version. v5 might have some
> > additional restrictions.
> >
> > Let me add some more folks to figure out.
>
> IIRC MFC v5 also supported resolution change.
>
Right, I'm not worried about that part, but rather the
CONTINUOUS_BYTESTREAM flag. I know that the MFC on daisy and peach
indeed handled H.264 in that manner, but not sure about the earlier
revisions.
Best regards,
Tomasz
> >> Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
> >> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> >> [hverkuil-cisco@xs4all.nl: added CONTINUOUS_BYTESTREAM]
> >> ---
> >> .../media/platform/s5p-mfc/s5p_mfc_common.h | 1 +
> >> drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 18 ++++++++++++++++++
> >> 2 files changed, 19 insertions(+)
> >>
> >> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> >> index 96d1ecd1521b..31b133af91eb 100644
> >> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> >> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_common.h
> >> @@ -723,6 +723,7 @@ struct s5p_mfc_fmt {
> >> enum s5p_mfc_fmt_type type;
> >> u32 num_planes;
> >> u32 versions;
> >> + u32 flags;
> >> };
> >>
> >> /**
> >> diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> >> index 61e144a35201..1423c33c70cb 100644
> >> --- a/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> >> +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_dec.c
> >> @@ -62,6 +62,8 @@ static struct s5p_mfc_fmt formats[] = {
> >> .type = MFC_FMT_DEC,
> >> .num_planes = 1,
> >> .versions = MFC_V5PLUS_BITS,
> >> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> >> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> >> },
> >> {
> >> .fourcc = V4L2_PIX_FMT_H264_MVC,
> >> @@ -69,6 +71,8 @@ static struct s5p_mfc_fmt formats[] = {
> >> .type = MFC_FMT_DEC,
> >> .num_planes = 1,
> >> .versions = MFC_V6PLUS_BITS,
> >> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> >> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> >> },
> >> {
> >> .fourcc = V4L2_PIX_FMT_H263,
> >> @@ -76,6 +80,7 @@ static struct s5p_mfc_fmt formats[] = {
> >> .type = MFC_FMT_DEC,
> >> .num_planes = 1,
> >> .versions = MFC_V5PLUS_BITS,
> >> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> >> },
> >> {
> >> .fourcc = V4L2_PIX_FMT_MPEG1,
> >> @@ -83,6 +88,8 @@ static struct s5p_mfc_fmt formats[] = {
> >> .type = MFC_FMT_DEC,
> >> .num_planes = 1,
> >> .versions = MFC_V5PLUS_BITS,
> >> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> >> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> >> },
> >> {
> >> .fourcc = V4L2_PIX_FMT_MPEG2,
> >> @@ -90,6 +97,8 @@ static struct s5p_mfc_fmt formats[] = {
> >> .type = MFC_FMT_DEC,
> >> .num_planes = 1,
> >> .versions = MFC_V5PLUS_BITS,
> >> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> >> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> >> },
> >> {
> >> .fourcc = V4L2_PIX_FMT_MPEG4,
> >> @@ -97,6 +106,8 @@ static struct s5p_mfc_fmt formats[] = {
> >> .type = MFC_FMT_DEC,
> >> .num_planes = 1,
> >> .versions = MFC_V5PLUS_BITS,
> >> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> >> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> >> },
> >> {
> >> .fourcc = V4L2_PIX_FMT_XVID,
> >> @@ -104,6 +115,7 @@ static struct s5p_mfc_fmt formats[] = {
> >> .type = MFC_FMT_DEC,
> >> .num_planes = 1,
> >> .versions = MFC_V5PLUS_BITS,
> >> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> >> },
> >> {
> >> .fourcc = V4L2_PIX_FMT_VC1_ANNEX_G,
> >> @@ -111,6 +123,7 @@ static struct s5p_mfc_fmt formats[] = {
> >> .type = MFC_FMT_DEC,
> >> .num_planes = 1,
> >> .versions = MFC_V5PLUS_BITS,
> >> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> >> },
> >> {
> >> .fourcc = V4L2_PIX_FMT_VC1_ANNEX_L,
> >> @@ -118,6 +131,7 @@ static struct s5p_mfc_fmt formats[] = {
> >> .type = MFC_FMT_DEC,
> >> .num_planes = 1,
> >> .versions = MFC_V5PLUS_BITS,
> >> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> >> },
> >> {
> >> .fourcc = V4L2_PIX_FMT_VP8,
> >> @@ -125,6 +139,7 @@ static struct s5p_mfc_fmt formats[] = {
> >> .type = MFC_FMT_DEC,
> >> .num_planes = 1,
> >> .versions = MFC_V6PLUS_BITS,
> >> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> >> },
> >> {
> >> .fourcc = V4L2_PIX_FMT_HEVC,
> >> @@ -132,6 +147,8 @@ static struct s5p_mfc_fmt formats[] = {
> >> .type = MFC_FMT_DEC,
> >> .num_planes = 1,
> >> .versions = MFC_V10_BIT,
> >> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> >> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM,
> >> },
> >> {
> >> .fourcc = V4L2_PIX_FMT_VP9,
> >> @@ -139,6 +156,7 @@ static struct s5p_mfc_fmt formats[] = {
> >> .type = MFC_FMT_DEC,
> >> .num_planes = 1,
> >> .versions = MFC_V10_BIT,
> >> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> >> },
> >> };
> >>
> >> --
> >> 2.20.1
> >>
> >
> Best regards
> --
> Marek Szyprowski, PhD
> Samsung R&D Institute Poland
>
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCHv2 05/12] media: mtk-vcodec: flag OUTPUT formats with V4L2_FMT_FLAG_DYN_RESOLUTION
2019-08-12 11:05 [PATCHv2 00/12] Stateful/stateless codec core support Hans Verkuil
` (3 preceding siblings ...)
2019-08-12 11:05 ` [PATCHv2 04/12] media: s5p_mfc_dec: set flags for OUTPUT coded formats Hans Verkuil
@ 2019-08-12 11:05 ` Hans Verkuil
2019-08-14 12:59 ` Paul Kocialkowski
2019-08-15 8:12 ` Alexandre Courbot
2019-08-12 11:05 ` [PATCHv2 06/12] media: vicodec: set flags for vdec/stateful OUTPUT coded formats Hans Verkuil
` (6 subsequent siblings)
11 siblings, 2 replies; 42+ messages in thread
From: Hans Verkuil @ 2019-08-12 11:05 UTC (permalink / raw)
To: linux-media; +Cc: Tomasz Figa, Maxime Jourdan, Hans Verkuil
From: Maxime Jourdan <mjourdan@baylibre.com>
Tag all the coded formats where the mtk-vcodec decoder supports dynamic
resolution switching.
Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 4 ++++
drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 1 +
2 files changed, 5 insertions(+)
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
index 90d1a67db7e5..26a55c3e807e 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
@@ -29,16 +29,19 @@ static const struct mtk_video_fmt mtk_video_formats[] = {
.fourcc = V4L2_PIX_FMT_H264,
.type = MTK_FMT_DEC,
.num_planes = 1,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
},
{
.fourcc = V4L2_PIX_FMT_VP8,
.type = MTK_FMT_DEC,
.num_planes = 1,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
},
{
.fourcc = V4L2_PIX_FMT_VP9,
.type = MTK_FMT_DEC,
.num_planes = 1,
+ .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
},
{
.fourcc = V4L2_PIX_FMT_MT21C,
@@ -948,6 +951,7 @@ static int vidioc_enum_fmt(struct v4l2_fmtdesc *f, bool output_queue)
fmt = &mtk_video_formats[i];
f->pixelformat = fmt->fourcc;
+ f->flags = fmt->flags;
return 0;
}
diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
index c95de5d08dda..9fd56dee7fd1 100644
--- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
+++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
@@ -99,6 +99,7 @@ struct mtk_video_fmt {
u32 fourcc;
enum mtk_fmt_type type;
u32 num_planes;
+ u32 flags;
};
/**
--
2.20.1
^ permalink raw reply related [flat|nested] 42+ messages in thread* Re: [PATCHv2 05/12] media: mtk-vcodec: flag OUTPUT formats with V4L2_FMT_FLAG_DYN_RESOLUTION
2019-08-12 11:05 ` [PATCHv2 05/12] media: mtk-vcodec: flag OUTPUT formats with V4L2_FMT_FLAG_DYN_RESOLUTION Hans Verkuil
@ 2019-08-14 12:59 ` Paul Kocialkowski
2019-08-15 8:12 ` Alexandre Courbot
1 sibling, 0 replies; 42+ messages in thread
From: Paul Kocialkowski @ 2019-08-14 12:59 UTC (permalink / raw)
To: Hans Verkuil; +Cc: linux-media, Tomasz Figa, Maxime Jourdan
[-- Attachment #1: Type: text/plain, Size: 2246 bytes --]
Hi,
On Mon 12 Aug 19, 13:05, Hans Verkuil wrote:
> From: Maxime Jourdan <mjourdan@baylibre.com>
>
> Tag all the coded formats where the mtk-vcodec decoder supports dynamic
> resolution switching.
Looks good to me despite lack of knowledge about the hardware.
Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Cheers,
Paul
> Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> ---
> drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 4 ++++
> drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 1 +
> 2 files changed, 5 insertions(+)
>
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
> index 90d1a67db7e5..26a55c3e807e 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
> @@ -29,16 +29,19 @@ static const struct mtk_video_fmt mtk_video_formats[] = {
> .fourcc = V4L2_PIX_FMT_H264,
> .type = MTK_FMT_DEC,
> .num_planes = 1,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_VP8,
> .type = MTK_FMT_DEC,
> .num_planes = 1,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_VP9,
> .type = MTK_FMT_DEC,
> .num_planes = 1,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_MT21C,
> @@ -948,6 +951,7 @@ static int vidioc_enum_fmt(struct v4l2_fmtdesc *f, bool output_queue)
>
> fmt = &mtk_video_formats[i];
> f->pixelformat = fmt->fourcc;
> + f->flags = fmt->flags;
>
> return 0;
> }
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> index c95de5d08dda..9fd56dee7fd1 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> @@ -99,6 +99,7 @@ struct mtk_video_fmt {
> u32 fourcc;
> enum mtk_fmt_type type;
> u32 num_planes;
> + u32 flags;
> };
>
> /**
> --
> 2.20.1
>
--
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCHv2 05/12] media: mtk-vcodec: flag OUTPUT formats with V4L2_FMT_FLAG_DYN_RESOLUTION
2019-08-12 11:05 ` [PATCHv2 05/12] media: mtk-vcodec: flag OUTPUT formats with V4L2_FMT_FLAG_DYN_RESOLUTION Hans Verkuil
2019-08-14 12:59 ` Paul Kocialkowski
@ 2019-08-15 8:12 ` Alexandre Courbot
1 sibling, 0 replies; 42+ messages in thread
From: Alexandre Courbot @ 2019-08-15 8:12 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Linux Media Mailing List, Tomasz Figa, Maxime Jourdan
On Mon, Aug 12, 2019 at 8:06 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>
> From: Maxime Jourdan <mjourdan@baylibre.com>
>
> Tag all the coded formats where the mtk-vcodec decoder supports dynamic
> resolution switching.
>
> Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
From our use of this driver in Chrome this seems to be correct.
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
> ---
> drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 4 ++++
> drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 1 +
> 2 files changed, 5 insertions(+)
>
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
> index 90d1a67db7e5..26a55c3e807e 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c
> @@ -29,16 +29,19 @@ static const struct mtk_video_fmt mtk_video_formats[] = {
> .fourcc = V4L2_PIX_FMT_H264,
> .type = MTK_FMT_DEC,
> .num_planes = 1,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_VP8,
> .type = MTK_FMT_DEC,
> .num_planes = 1,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_VP9,
> .type = MTK_FMT_DEC,
> .num_planes = 1,
> + .flags = V4L2_FMT_FLAG_DYN_RESOLUTION,
> },
> {
> .fourcc = V4L2_PIX_FMT_MT21C,
> @@ -948,6 +951,7 @@ static int vidioc_enum_fmt(struct v4l2_fmtdesc *f, bool output_queue)
>
> fmt = &mtk_video_formats[i];
> f->pixelformat = fmt->fourcc;
> + f->flags = fmt->flags;
>
> return 0;
> }
> diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> index c95de5d08dda..9fd56dee7fd1 100644
> --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h
> @@ -99,6 +99,7 @@ struct mtk_video_fmt {
> u32 fourcc;
> enum mtk_fmt_type type;
> u32 num_planes;
> + u32 flags;
> };
>
> /**
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCHv2 06/12] media: vicodec: set flags for vdec/stateful OUTPUT coded formats
2019-08-12 11:05 [PATCHv2 00/12] Stateful/stateless codec core support Hans Verkuil
` (4 preceding siblings ...)
2019-08-12 11:05 ` [PATCHv2 05/12] media: mtk-vcodec: flag OUTPUT formats with V4L2_FMT_FLAG_DYN_RESOLUTION Hans Verkuil
@ 2019-08-12 11:05 ` Hans Verkuil
2019-08-14 13:04 ` Paul Kocialkowski
2019-08-12 11:05 ` [PATCHv2 07/12] media: docs-rst: Document memory-to-memory video decoder interface Hans Verkuil
` (5 subsequent siblings)
11 siblings, 1 reply; 42+ messages in thread
From: Hans Verkuil @ 2019-08-12 11:05 UTC (permalink / raw)
To: linux-media; +Cc: Tomasz Figa, Maxime Jourdan, Hans Verkuil
From: Maxime Jourdan <mjourdan@baylibre.com>
Tag all the coded formats where the vicodec stateful decoder supports
dynamic resolution switching and bytestream parsing.
Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
[hverkuil-cisco@xs4all.nl: added CONTINUOUS_BYTESTREAM]
---
drivers/media/platform/vicodec/vicodec-core.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c
index 7e7c1e80f29f..5152f44bcc0a 100644
--- a/drivers/media/platform/vicodec/vicodec-core.c
+++ b/drivers/media/platform/vicodec/vicodec-core.c
@@ -742,6 +742,9 @@ static int enum_fmt(struct v4l2_fmtdesc *f, struct vicodec_ctx *ctx,
return -EINVAL;
f->pixelformat = ctx->is_stateless ?
V4L2_PIX_FMT_FWHT_STATELESS : V4L2_PIX_FMT_FWHT;
+ if (!ctx->is_enc && !ctx->is_stateless)
+ f->flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
+ V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM;
}
return 0;
}
--
2.20.1
^ permalink raw reply related [flat|nested] 42+ messages in thread* Re: [PATCHv2 06/12] media: vicodec: set flags for vdec/stateful OUTPUT coded formats
2019-08-12 11:05 ` [PATCHv2 06/12] media: vicodec: set flags for vdec/stateful OUTPUT coded formats Hans Verkuil
@ 2019-08-14 13:04 ` Paul Kocialkowski
0 siblings, 0 replies; 42+ messages in thread
From: Paul Kocialkowski @ 2019-08-14 13:04 UTC (permalink / raw)
To: Hans Verkuil; +Cc: linux-media, Tomasz Figa, Maxime Jourdan
[-- Attachment #1: Type: text/plain, Size: 1385 bytes --]
Hi,
On Mon 12 Aug 19, 13:05, Hans Verkuil wrote:
> From: Maxime Jourdan <mjourdan@baylibre.com>
>
> Tag all the coded formats where the vicodec stateful decoder supports
> dynamic resolution switching and bytestream parsing.
Looks good to me:
Reviewed-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Cheers,
Paul
> Signed-off-by: Maxime Jourdan <mjourdan@baylibre.com>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> [hverkuil-cisco@xs4all.nl: added CONTINUOUS_BYTESTREAM]
> ---
> drivers/media/platform/vicodec/vicodec-core.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/drivers/media/platform/vicodec/vicodec-core.c b/drivers/media/platform/vicodec/vicodec-core.c
> index 7e7c1e80f29f..5152f44bcc0a 100644
> --- a/drivers/media/platform/vicodec/vicodec-core.c
> +++ b/drivers/media/platform/vicodec/vicodec-core.c
> @@ -742,6 +742,9 @@ static int enum_fmt(struct v4l2_fmtdesc *f, struct vicodec_ctx *ctx,
> return -EINVAL;
> f->pixelformat = ctx->is_stateless ?
> V4L2_PIX_FMT_FWHT_STATELESS : V4L2_PIX_FMT_FWHT;
> + if (!ctx->is_enc && !ctx->is_stateless)
> + f->flags = V4L2_FMT_FLAG_DYN_RESOLUTION |
> + V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM;
> }
> return 0;
> }
> --
> 2.20.1
>
--
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCHv2 07/12] media: docs-rst: Document memory-to-memory video decoder interface
2019-08-12 11:05 [PATCHv2 00/12] Stateful/stateless codec core support Hans Verkuil
` (5 preceding siblings ...)
2019-08-12 11:05 ` [PATCHv2 06/12] media: vicodec: set flags for vdec/stateful OUTPUT coded formats Hans Verkuil
@ 2019-08-12 11:05 ` Hans Verkuil
2019-08-12 11:05 ` [PATCHv2 08/12] pixfmt-compressed.rst: improve H264/HEVC/MPEG1+2/VP8+9 documentation Hans Verkuil
` (4 subsequent siblings)
11 siblings, 0 replies; 42+ messages in thread
From: Hans Verkuil @ 2019-08-12 11:05 UTC (permalink / raw)
To: linux-media; +Cc: Tomasz Figa, Hans Verkuil
From: Tomasz Figa <tfiga@chromium.org>
Due to complexity of the video decoding process, the V4L2 drivers of
stateful decoder hardware require specific sequences of V4L2 API calls
to be followed. These include capability enumeration, initialization,
decoding, seek, pause, dynamic resolution change, drain and end of
stream.
Specifics of the above have been discussed during Media Workshops at
LinuxCon Europe 2012 in Barcelona and then later Embedded Linux
Conference Europe 2014 in Düsseldorf. The de facto Codec API that
originated at those events was later implemented by the drivers we already
have merged in mainline, such as s5p-mfc or coda.
The only thing missing was the real specification included as a part of
Linux Media documentation. Fix it now and document the decoder part of
the Codec API.
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Reviewed-by: Tomasz Figa <tfiga@chromium.org>
---
Documentation/media/uapi/v4l/dev-decoder.rst | 1101 +++++++++++++++++
Documentation/media/uapi/v4l/dev-mem2mem.rst | 8 +-
Documentation/media/uapi/v4l/pixfmt-v4l2.rst | 5 +
Documentation/media/uapi/v4l/v4l2.rst | 10 +-
.../media/uapi/v4l/vidioc-decoder-cmd.rst | 41 +-
.../media/uapi/v4l/vidioc-dqevent.rst | 11 +-
6 files changed, 1157 insertions(+), 19 deletions(-)
create mode 100644 Documentation/media/uapi/v4l/dev-decoder.rst
diff --git a/Documentation/media/uapi/v4l/dev-decoder.rst b/Documentation/media/uapi/v4l/dev-decoder.rst
new file mode 100644
index 000000000000..606b54947e10
--- /dev/null
+++ b/Documentation/media/uapi/v4l/dev-decoder.rst
@@ -0,0 +1,1101 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+.. _decoder:
+
+*************************************************
+Memory-to-Memory Stateful Video Decoder Interface
+*************************************************
+
+A stateful video decoder takes complete chunks of the bytestream (e.g. Annex-B
+H.264/HEVC stream, raw VP8/9 stream) and decodes them into raw video frames in
+display order. The decoder is expected not to require any additional information
+from the client to process these buffers.
+
+Performing software parsing, processing etc. of the stream in the driver in
+order to support this interface is strongly discouraged. In case such
+operations are needed, use of the Stateless Video Decoder Interface (in
+development) is strongly advised.
+
+Conventions and Notations Used in This Document
+===============================================
+
+1. The general V4L2 API rules apply if not specified in this document
+ otherwise.
+
+2. The meaning of words "must", "may", "should", etc. is as per `RFC
+ 2119 <https://tools.ietf.org/html/rfc2119>`_.
+
+3. All steps not marked "optional" are required.
+
+4. :c:func:`VIDIOC_G_EXT_CTRLS` and :c:func:`VIDIOC_S_EXT_CTRLS` may be used
+ interchangeably with :c:func:`VIDIOC_G_CTRL` and :c:func:`VIDIOC_S_CTRL`,
+ unless specified otherwise.
+
+5. Single-planar API (see :ref:`planar-apis`) and applicable structures may be
+ used interchangeably with multi-planar API, unless specified otherwise,
+ depending on decoder capabilities and following the general V4L2 guidelines.
+
+6. i = [a..b]: sequence of integers from a to b, inclusive, i.e. i =
+ [0..2]: i = 0, 1, 2.
+
+7. Given an ``OUTPUT`` buffer A, then A’ represents a buffer on the ``CAPTURE``
+ queue containing data that resulted from processing buffer A.
+
+.. _decoder-glossary:
+
+Glossary
+========
+
+CAPTURE
+ the destination buffer queue; for decoders, the queue of buffers containing
+ decoded frames; for encoders, the queue of buffers containing an encoded
+ bytestream; ``V4L2_BUF_TYPE_VIDEO_CAPTURE`` or
+ ``V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE``; data is captured from the hardware
+ into ``CAPTURE`` buffers.
+
+client
+ the application communicating with the decoder or encoder implementing
+ this interface.
+
+coded format
+ encoded/compressed video bytestream format (e.g. H.264, VP8, etc.); see
+ also: raw format.
+
+coded height
+ height for given coded resolution.
+
+coded resolution
+ stream resolution in pixels aligned to codec and hardware requirements;
+ typically visible resolution rounded up to full macroblocks;
+ see also: visible resolution.
+
+coded width
+ width for given coded resolution.
+
+decode order
+ the order in which frames are decoded; may differ from display order if the
+ coded format includes a feature of frame reordering; for decoders,
+ ``OUTPUT`` buffers must be queued by the client in decode order; for
+ encoders ``CAPTURE`` buffers must be returned by the encoder in decode order.
+
+destination
+ data resulting from the decode process; see ``CAPTURE``.
+
+display order
+ the order in which frames must be displayed; for encoders, ``OUTPUT``
+ buffers must be queued by the client in display order; for decoders,
+ ``CAPTURE`` buffers must be returned by the decoder in display order.
+
+DPB
+ Decoded Picture Buffer; an H.264/HEVC term for a buffer that stores a decoded
+ raw frame available for reference in further decoding steps.
+
+EOS
+ end of stream.
+
+IDR
+ Instantaneous Decoder Refresh; a type of a keyframe in an H.264/HEVC-encoded
+ stream, which clears the list of earlier reference frames (DPBs).
+
+keyframe
+ an encoded frame that does not reference frames decoded earlier, i.e.
+ can be decoded fully on its own.
+
+macroblock
+ a processing unit in image and video compression formats based on linear
+ block transforms (e.g. H.264, VP8, VP9); codec-specific, but for most of
+ popular codecs the size is 16x16 samples (pixels).
+
+OUTPUT
+ the source buffer queue; for decoders, the queue of buffers containing
+ an encoded bytestream; for encoders, the queue of buffers containing raw
+ frames; ``V4L2_BUF_TYPE_VIDEO_OUTPUT`` or
+ ``V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE``; the hardware is fed with data
+ from ``OUTPUT`` buffers.
+
+PPS
+ Picture Parameter Set; a type of metadata entity in an H.264/HEVC bytestream.
+
+raw format
+ uncompressed format containing raw pixel data (e.g. YUV, RGB formats).
+
+resume point
+ a point in the bytestream from which decoding may start/continue, without
+ any previous state/data present, e.g.: a keyframe (VP8/VP9) or
+ SPS/PPS/IDR sequence (H.264/HEVC); a resume point is required to start decode
+ of a new stream, or to resume decoding after a seek.
+
+source
+ data fed to the decoder or encoder; see ``OUTPUT``.
+
+source height
+ height in pixels for given source resolution; relevant to encoders only.
+
+source resolution
+ resolution in pixels of source frames being source to the encoder and
+ subject to further cropping to the bounds of visible resolution; relevant to
+ encoders only.
+
+source width
+ width in pixels for given source resolution; relevant to encoders only.
+
+SPS
+ Sequence Parameter Set; a type of metadata entity in an H.264/HEVC bytestream.
+
+stream metadata
+ additional (non-visual) information contained inside encoded bytestream;
+ for example: coded resolution, visible resolution, codec profile.
+
+visible height
+ height for given visible resolution; display height.
+
+visible resolution
+ stream resolution of the visible picture, in pixels, to be used for
+ display purposes; must be smaller or equal to coded resolution;
+ display resolution.
+
+visible width
+ width for given visible resolution; display width.
+
+State Machine
+=============
+
+.. kernel-render:: DOT
+ :alt: DOT digraph of decoder state machine
+ :caption: Decoder State Machine
+
+ digraph decoder_state_machine {
+ node [shape = doublecircle, label="Decoding"] Decoding;
+
+ node [shape = circle, label="Initialization"] Initialization;
+ node [shape = circle, label="Capture\nsetup"] CaptureSetup;
+ node [shape = circle, label="Dynamic\nResolution\nChange"] ResChange;
+ node [shape = circle, label="Stopped"] Stopped;
+ node [shape = circle, label="Drain"] Drain;
+ node [shape = circle, label="Seek"] Seek;
+ node [shape = circle, label="End of Stream"] EoS;
+
+ node [shape = point]; qi
+ qi -> Initialization [ label = "open()" ];
+
+ Initialization -> CaptureSetup [ label = "CAPTURE\nformat\nestablished" ];
+
+ CaptureSetup -> Stopped [ label = "CAPTURE\nbuffers\nready" ];
+
+ Decoding -> ResChange [ label = "Stream\nresolution\nchange" ];
+ Decoding -> Drain [ label = "V4L2_DEC_CMD_STOP" ];
+ Decoding -> EoS [ label = "EoS mark\nin the stream" ];
+ Decoding -> Seek [ label = "VIDIOC_STREAMOFF(OUTPUT)" ];
+ Decoding -> Stopped [ label = "VIDIOC_STREAMOFF(CAPTURE)" ];
+ Decoding -> Decoding;
+
+ ResChange -> CaptureSetup [ label = "CAPTURE\nformat\nestablished" ];
+ ResChange -> Seek [ label = "VIDIOC_STREAMOFF(OUTPUT)" ];
+
+ EoS -> Drain [ label = "Implicit\ndrain" ];
+
+ Drain -> Stopped [ label = "All CAPTURE\nbuffers dequeued\nor\nVIDIOC_STREAMOFF(CAPTURE)" ];
+ Drain -> Seek [ label = "VIDIOC_STREAMOFF(OUTPUT)" ];
+
+ Seek -> Decoding [ label = "VIDIOC_STREAMON(OUTPUT)" ];
+ Seek -> Initialization [ label = "VIDIOC_REQBUFS(OUTPUT, 0)" ];
+
+ Stopped -> Decoding [ label = "V4L2_DEC_CMD_START\nor\nVIDIOC_STREAMON(CAPTURE)" ];
+ Stopped -> Seek [ label = "VIDIOC_STREAMOFF(OUTPUT)" ];
+ }
+
+Querying Capabilities
+=====================
+
+1. To enumerate the set of coded formats supported by the decoder, the
+ client may call :c:func:`VIDIOC_ENUM_FMT` on ``OUTPUT``.
+
+ * The full set of supported formats will be returned, regardless of the
+ format set on ``CAPTURE``.
+ * Check the flags field of :c:type:`v4l2_fmtdesc` for more information
+ about the decoder's capabilities with respect to each coded format.
+ In particular whether or not the decoder has a full-fledged bytestream
+ parser and if the decoder supports dynamic resolution changes.
+
+2. To enumerate the set of supported raw formats, the client may call
+ :c:func:`VIDIOC_ENUM_FMT` on ``CAPTURE``.
+
+ * Only the formats supported for the format currently active on ``OUTPUT``
+ will be returned.
+
+ * In order to enumerate raw formats supported by a given coded format,
+ the client must first set that coded format on ``OUTPUT`` and then
+ enumerate formats on ``CAPTURE``.
+
+3. The client may use :c:func:`VIDIOC_ENUM_FRAMESIZES` to detect supported
+ resolutions for a given format, passing desired pixel format in
+ :c:type:`v4l2_frmsizeenum` ``pixel_format``.
+
+ * Values returned by :c:func:`VIDIOC_ENUM_FRAMESIZES` for a coded pixel
+ format will include all possible coded resolutions supported by the
+ decoder for given coded pixel format.
+
+ * Values returned by :c:func:`VIDIOC_ENUM_FRAMESIZES` for a raw pixel format
+ will include all possible frame buffer resolutions supported by the
+ decoder for given raw pixel format and the coded format currently set on
+ ``OUTPUT``.
+
+4. Supported profiles and levels for the coded format currently set on
+ ``OUTPUT``, if applicable, may be queried using their respective controls
+ via :c:func:`VIDIOC_QUERYCTRL`.
+
+Initialization
+==============
+
+1. Set the coded format on ``OUTPUT`` via :c:func:`VIDIOC_S_FMT`
+
+ * **Required fields:**
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
+
+ ``pixelformat``
+ a coded pixel format.
+
+ ``width``, ``height``
+ coded resolution of the stream; required only if it cannot be parsed
+ from the stream for the given coded format; otherwise the decoder will
+ use this resolution as a placeholder resolution that will likely change
+ as soon as it can parse the actual coded resolution from the stream.
+
+ ``sizeimage``
+ desired size of ``OUTPUT`` buffers; the decoder may adjust it to
+ match hardware requirements.
+
+ other fields
+ follow standard semantics.
+
+ * **Return fields:**
+
+ ``sizeimage``
+ adjusted size of ``OUTPUT`` buffers.
+
+ * The ``CAPTURE`` format will be updated with an appropriate frame buffer
+ resolution instantly based on the width and height returned by
+ :c:func:`VIDIOC_S_FMT`.
+ However, for coded formats that include stream resolution information,
+ after the decoder is done parsing the information from the stream, it will
+ update the ``CAPTURE`` format with new values and signal a source change
+ event, regardless of whether they match the values set by the client or
+ not.
+
+ .. important::
+
+ Changing the ``OUTPUT`` format may change the currently set ``CAPTURE``
+ format. How the new ``CAPTURE`` format is determined is up to the decoder
+ and the client must ensure it matches its needs afterwards.
+
+2. Allocate source (bytestream) buffers via :c:func:`VIDIOC_REQBUFS` on
+ ``OUTPUT``.
+
+ * **Required fields:**
+
+ ``count``
+ requested number of buffers to allocate; greater than zero.
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
+
+ ``memory``
+ follows standard semantics.
+
+ * **Return fields:**
+
+ ``count``
+ the actual number of buffers allocated.
+
+ .. warning::
+
+ The actual number of allocated buffers may differ from the ``count``
+ given. The client must check the updated value of ``count`` after the
+ call returns.
+
+ Alternatively, :c:func:`VIDIOC_CREATE_BUFS` on the ``OUTPUT`` queue can be
+ used to have more control over buffer allocation.
+
+ * **Required fields:**
+
+ ``count``
+ requested number of buffers to allocate; greater than zero.
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
+
+ ``memory``
+ follows standard semantics.
+
+ ``format``
+ follows standard semantics.
+
+ * **Return fields:**
+
+ ``count``
+ adjusted to the number of allocated buffers.
+
+ .. warning::
+
+ The actual number of allocated buffers may differ from the ``count``
+ given. The client must check the updated value of ``count`` after the
+ call returns.
+
+3. Start streaming on the ``OUTPUT`` queue via :c:func:`VIDIOC_STREAMON`.
+
+4. **This step only applies to coded formats that contain resolution information
+ in the stream.** Continue queuing/dequeuing bytestream buffers to/from the
+ ``OUTPUT`` queue via :c:func:`VIDIOC_QBUF` and :c:func:`VIDIOC_DQBUF`. The
+ buffers will be processed and returned to the client in order, until
+ required metadata to configure the ``CAPTURE`` queue are found. This is
+ indicated by the decoder sending a ``V4L2_EVENT_SOURCE_CHANGE`` event with
+ ``changes`` set to ``V4L2_EVENT_SRC_CH_RESOLUTION``.
+
+ * It is not an error if the first buffer does not contain enough data for
+ this to occur. Processing of the buffers will continue as long as more
+ data is needed.
+
+ * If data in a buffer that triggers the event is required to decode the
+ first frame, it will not be returned to the client, until the
+ initialization sequence completes and the frame is decoded.
+
+ * If the client has not set the coded resolution of the stream on its own,
+ calling :c:func:`VIDIOC_G_FMT`, :c:func:`VIDIOC_S_FMT`,
+ :c:func:`VIDIOC_TRY_FMT` or :c:func:`VIDIOC_REQBUFS` on the ``CAPTURE``
+ queue will not return the real values for the stream until a
+ ``V4L2_EVENT_SOURCE_CHANGE`` event with ``changes`` set to
+ ``V4L2_EVENT_SRC_CH_RESOLUTION`` is signaled.
+
+ .. important::
+
+ Any client query issued after the decoder queues the event will return
+ values applying to the just parsed stream, including queue formats,
+ selection rectangles and controls.
+
+ .. note::
+
+ A client capable of acquiring stream parameters from the bytestream on
+ its own may attempt to set the width and height of the ``OUTPUT`` format
+ to non-zero values matching the coded size of the stream, skip this step
+ and continue with the `Capture Setup` sequence. However, it must not
+ rely on any driver queries regarding stream parameters, such as
+ selection rectangles and controls, since the decoder has not parsed them
+ from the stream yet. If the values configured by the client do not match
+ those parsed by the decoder, a `Dynamic Resolution Change` will be
+ triggered to reconfigure them.
+
+ .. note::
+
+ No decoded frames are produced during this phase.
+
+5. Continue with the `Capture Setup` sequence.
+
+Capture Setup
+=============
+
+1. Call :c:func:`VIDIOC_G_FMT` on the ``CAPTURE`` queue to get format for the
+ destination buffers parsed/decoded from the bytestream.
+
+ * **Required fields:**
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
+
+ * **Return fields:**
+
+ ``width``, ``height``
+ frame buffer resolution for the decoded frames.
+
+ ``pixelformat``
+ pixel format for decoded frames.
+
+ ``num_planes`` (for _MPLANE ``type`` only)
+ number of planes for pixelformat.
+
+ ``sizeimage``, ``bytesperline``
+ as per standard semantics; matching frame buffer format.
+
+ .. note::
+
+ The value of ``pixelformat`` may be any pixel format supported by the
+ decoder for the current stream. The decoder should choose a
+ preferred/optimal format for the default configuration. For example, a
+ YUV format may be preferred over an RGB format if an additional
+ conversion step would be required for the latter.
+
+2. **Optional.** Acquire the visible resolution via
+ :c:func:`VIDIOC_G_SELECTION`.
+
+ * **Required fields:**
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
+
+ ``target``
+ set to ``V4L2_SEL_TGT_COMPOSE``.
+
+ * **Return fields:**
+
+ ``r.left``, ``r.top``, ``r.width``, ``r.height``
+ the visible rectangle; it must fit within the frame buffer resolution
+ returned by :c:func:`VIDIOC_G_FMT` on ``CAPTURE``.
+
+ * The following selection targets are supported on ``CAPTURE``:
+
+ ``V4L2_SEL_TGT_CROP_BOUNDS``
+ corresponds to the coded resolution of the stream.
+
+ ``V4L2_SEL_TGT_CROP_DEFAULT``
+ the rectangle covering the part of the ``CAPTURE`` buffer that
+ contains meaningful picture data (visible area); width and height
+ will be equal to the visible resolution of the stream.
+
+ ``V4L2_SEL_TGT_CROP``
+ the rectangle within the coded resolution to be output to
+ ``CAPTURE``; defaults to ``V4L2_SEL_TGT_CROP_DEFAULT``; read-only on
+ hardware without additional compose/scaling capabilities.
+
+ ``V4L2_SEL_TGT_COMPOSE_BOUNDS``
+ the maximum rectangle within a ``CAPTURE`` buffer, which the cropped
+ frame can be composed into; equal to ``V4L2_SEL_TGT_CROP`` if the
+ hardware does not support compose/scaling.
+
+ ``V4L2_SEL_TGT_COMPOSE_DEFAULT``
+ equal to ``V4L2_SEL_TGT_CROP``.
+
+ ``V4L2_SEL_TGT_COMPOSE``
+ the rectangle inside a ``CAPTURE`` buffer into which the cropped
+ frame is written; defaults to ``V4L2_SEL_TGT_COMPOSE_DEFAULT``;
+ read-only on hardware without additional compose/scaling capabilities.
+
+ ``V4L2_SEL_TGT_COMPOSE_PADDED``
+ the rectangle inside a ``CAPTURE`` buffer which is overwritten by the
+ hardware; equal to ``V4L2_SEL_TGT_COMPOSE`` if the hardware does not
+ write padding pixels.
+
+ .. warning::
+
+ The values are guaranteed to be meaningful only after the decoder
+ successfully parses the stream metadata. The client must not rely on the
+ query before that happens.
+
+3. **Optional.** Enumerate ``CAPTURE`` formats via :c:func:`VIDIOC_ENUM_FMT` on
+ the ``CAPTURE`` queue. Once the stream information is parsed and known, the
+ client may use this ioctl to discover which raw formats are supported for
+ given stream and select one of them via :c:func:`VIDIOC_S_FMT`.
+
+ .. important::
+
+ The decoder will return only formats supported for the currently
+ established coded format, as per the ``OUTPUT`` format and/or stream
+ metadata parsed in this initialization sequence, even if more formats
+ may be supported by the decoder in general. In other words, the set
+ returned will be a subset of the initial query mentioned in the
+ `Querying Capabilities` section.
+
+ For example, a decoder may support YUV and RGB formats for resolutions
+ 1920x1088 and lower, but only YUV for higher resolutions (due to
+ hardware limitations). After parsing a resolution of 1920x1088 or lower,
+ :c:func:`VIDIOC_ENUM_FMT` may return a set of YUV and RGB pixel formats,
+ but after parsing resolution higher than 1920x1088, the decoder will not
+ return RGB, unsupported for this resolution.
+
+ However, subsequent resolution change event triggered after
+ discovering a resolution change within the same stream may switch
+ the stream into a lower resolution and :c:func:`VIDIOC_ENUM_FMT`
+ would return RGB formats again in that case.
+
+4. **Optional.** Set the ``CAPTURE`` format via :c:func:`VIDIOC_S_FMT` on the
+ ``CAPTURE`` queue. The client may choose a different format than
+ selected/suggested by the decoder in :c:func:`VIDIOC_G_FMT`.
+
+ * **Required fields:**
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
+
+ ``pixelformat``
+ a raw pixel format.
+
+ ``width``, ``height``
+ frame buffer resolution of the decoded stream; typically unchanged from
+ what was returned with :c:func:`VIDIOC_G_FMT`, but it may be different
+ if the hardware supports composition and/or scaling.
+
+ * Setting the ``CAPTURE`` format will reset the compose selection rectangles
+ to their default values, based on the new resolution, as described in the
+ previous step.
+
+5. **Optional.** Set the compose rectangle via :c:func:`VIDIOC_S_SELECTION` on
+ the ``CAPTURE`` queue if it is desired and if the decoder has compose and/or
+ scaling capabilities.
+
+ * **Required fields:**
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
+
+ ``target``
+ set to ``V4L2_SEL_TGT_COMPOSE``.
+
+ ``r.left``, ``r.top``, ``r.width``, ``r.height``
+ the rectangle inside a ``CAPTURE`` buffer into which the cropped
+ frame is written; defaults to ``V4L2_SEL_TGT_COMPOSE_DEFAULT``;
+ read-only on hardware without additional compose/scaling capabilities.
+
+ * **Return fields:**
+
+ ``r.left``, ``r.top``, ``r.width``, ``r.height``
+ the visible rectangle; it must fit within the frame buffer resolution
+ returned by :c:func:`VIDIOC_G_FMT` on ``CAPTURE``.
+
+ .. warning::
+
+ The decoder may adjust the compose rectangle to the nearest
+ supported one to meet codec and hardware requirements. The client needs
+ to check the adjusted rectangle returned by :c:func:`VIDIOC_S_SELECTION`.
+
+6. If all the following conditions are met, the client may resume the decoding
+ instantly:
+
+ * ``sizeimage`` of the new format (determined in previous steps) is less
+ than or equal to the size of currently allocated buffers,
+
+ * the number of buffers currently allocated is greater than or equal to the
+ minimum number of buffers acquired in previous steps. To fulfill this
+ requirement, the client may use :c:func:`VIDIOC_CREATE_BUFS` to add new
+ buffers.
+
+ In that case, the remaining steps do not apply and the client may resume
+ the decoding by one of the following actions:
+
+ * if the ``CAPTURE`` queue is streaming, call :c:func:`VIDIOC_DECODER_CMD`
+ with the ``V4L2_DEC_CMD_START`` command,
+
+ * if the ``CAPTURE`` queue is not streaming, call :c:func:`VIDIOC_STREAMON`
+ on the ``CAPTURE`` queue.
+
+ However, if the client intends to change the buffer set, to lower
+ memory usage or for any other reasons, it may be achieved by following
+ the steps below.
+
+7. **If the** ``CAPTURE`` **queue is streaming,** keep queuing and dequeuing
+ buffers on the ``CAPTURE`` queue until a buffer marked with the
+ ``V4L2_BUF_FLAG_LAST`` flag is dequeued.
+
+8. **If the** ``CAPTURE`` **queue is streaming,** call :c:func:`VIDIOC_STREAMOFF`
+ on the ``CAPTURE`` queue to stop streaming.
+
+ .. warning::
+
+ The ``OUTPUT`` queue must remain streaming. Calling
+ :c:func:`VIDIOC_STREAMOFF` on it would abort the sequence and trigger a
+ seek.
+
+9. **If the** ``CAPTURE`` **queue has buffers allocated,** free the ``CAPTURE``
+ buffers using :c:func:`VIDIOC_REQBUFS`.
+
+ * **Required fields:**
+
+ ``count``
+ set to 0.
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
+
+ ``memory``
+ follows standard semantics.
+
+10. Allocate ``CAPTURE`` buffers via :c:func:`VIDIOC_REQBUFS` on the
+ ``CAPTURE`` queue.
+
+ * **Required fields:**
+
+ ``count``
+ requested number of buffers to allocate; greater than zero.
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
+
+ ``memory``
+ follows standard semantics.
+
+ * **Return fields:**
+
+ ``count``
+ actual number of buffers allocated.
+
+ .. warning::
+
+ The actual number of allocated buffers may differ from the ``count``
+ given. The client must check the updated value of ``count`` after the
+ call returns.
+
+ .. note::
+
+ To allocate more than the minimum number of buffers (for pipeline
+ depth), the client may query the ``V4L2_CID_MIN_BUFFERS_FOR_CAPTURE``
+ control to get the minimum number of buffers required, and pass the
+ obtained value plus the number of additional buffers needed in the
+ ``count`` field to :c:func:`VIDIOC_REQBUFS`.
+
+ Alternatively, :c:func:`VIDIOC_CREATE_BUFS` on the ``CAPTURE`` queue can be
+ used to have more control over buffer allocation. For example, by
+ allocating buffers larger than the current ``CAPTURE`` format, future
+ resolution changes can be accommodated.
+
+ * **Required fields:**
+
+ ``count``
+ requested number of buffers to allocate; greater than zero.
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
+
+ ``memory``
+ follows standard semantics.
+
+ ``format``
+ a format representing the maximum framebuffer resolution to be
+ accommodated by newly allocated buffers.
+
+ * **Return fields:**
+
+ ``count``
+ adjusted to the number of allocated buffers.
+
+ .. warning::
+
+ The actual number of allocated buffers may differ from the ``count``
+ given. The client must check the updated value of ``count`` after the
+ call returns.
+
+ .. note::
+
+ To allocate buffers for a format different than parsed from the stream
+ metadata, the client must proceed as follows, before the metadata
+ parsing is initiated:
+
+ * set width and height of the ``OUTPUT`` format to desired coded resolution to
+ let the decoder configure the ``CAPTURE`` format appropriately,
+
+ * query the ``CAPTURE`` format using :c:func:`VIDIOC_G_FMT` and save it
+ until this step.
+
+ The format obtained in the query may be then used with
+ :c:func:`VIDIOC_CREATE_BUFS` in this step to allocate the buffers.
+
+11. Call :c:func:`VIDIOC_STREAMON` on the ``CAPTURE`` queue to start decoding
+ frames.
+
+Decoding
+========
+
+This state is reached after the `Capture Setup` sequence finishes successfully.
+In this state, the client queues and dequeues buffers to both queues via
+:c:func:`VIDIOC_QBUF` and :c:func:`VIDIOC_DQBUF`, following the standard
+semantics.
+
+The content of the source ``OUTPUT`` buffers depends on the active coded pixel
+format and may be affected by codec-specific extended controls, as stated in
+the documentation of each format.
+
+Both queues operate independently, following the standard behavior of V4L2
+buffer queues and memory-to-memory devices. In addition, the order of decoded
+frames dequeued from the ``CAPTURE`` queue may differ from the order of queuing
+coded frames to the ``OUTPUT`` queue, due to properties of the selected coded
+format, e.g. frame reordering.
+
+The client must not assume any direct relationship between ``CAPTURE``
+and ``OUTPUT`` buffers and any specific timing of buffers becoming
+available to dequeue. Specifically:
+
+* a buffer queued to ``OUTPUT`` may result in no buffers being produced
+ on ``CAPTURE`` (e.g. if it does not contain encoded data, or if only
+ metadata syntax structures are present in it),
+
+* a buffer queued to ``OUTPUT`` may result in more than one buffer produced
+ on ``CAPTURE`` (if the encoded data contained more than one frame, or if
+ returning a decoded frame allowed the decoder to return a frame that
+ preceded it in decode, but succeeded it in the display order),
+
+* a buffer queued to ``OUTPUT`` may result in a buffer being produced on
+ ``CAPTURE`` later into decode process, and/or after processing further
+ ``OUTPUT`` buffers, or be returned out of order, e.g. if display
+ reordering is used,
+
+* buffers may become available on the ``CAPTURE`` queue without additional
+ buffers queued to ``OUTPUT`` (e.g. during drain or ``EOS``), because of the
+ ``OUTPUT`` buffers queued in the past whose decoding results are only
+ available at later time, due to specifics of the decoding process.
+
+.. note::
+
+ To allow matching decoded ``CAPTURE`` buffers with ``OUTPUT`` buffers they
+ originated from, the client can set the ``timestamp`` field of the
+ :c:type:`v4l2_buffer` struct when queuing an ``OUTPUT`` buffer. The
+ ``CAPTURE`` buffer(s), which resulted from decoding that ``OUTPUT`` buffer
+ will have their ``timestamp`` field set to the same value when dequeued.
+
+ In addition to the straightforward case of one ``OUTPUT`` buffer producing
+ one ``CAPTURE`` buffer, the following cases are defined:
+
+ * one ``OUTPUT`` buffer generates multiple ``CAPTURE`` buffers: the same
+ ``OUTPUT`` timestamp will be copied to multiple ``CAPTURE`` buffers.
+
+ * multiple ``OUTPUT`` buffers generate one ``CAPTURE`` buffer: timestamp of
+ the ``OUTPUT`` buffer queued first will be copied.
+
+ * the decoding order differs from the display order (i.e. the ``CAPTURE``
+ buffers are out-of-order compared to the ``OUTPUT`` buffers): ``CAPTURE``
+ timestamps will not retain the order of ``OUTPUT`` timestamps.
+
+During the decoding, the decoder may initiate one of the special sequences, as
+listed below. The sequences will result in the decoder returning all the
+``CAPTURE`` buffers that originated from all the ``OUTPUT`` buffers processed
+before the sequence started. Last of the buffers will have the
+``V4L2_BUF_FLAG_LAST`` flag set. To determine the sequence to follow, the client
+must check if there is any pending event and:
+
+* if a ``V4L2_EVENT_SOURCE_CHANGE`` event with ``changes`` set to
+ ``V4L2_EVENT_SRC_CH_RESOLUTION`` is pending, the `Dynamic Resolution
+ Change` sequence needs to be followed,
+
+* if a ``V4L2_EVENT_EOS`` event is pending, the `End of Stream` sequence needs
+ to be followed.
+
+Some of the sequences can be intermixed with each other and need to be handled
+as they happen. The exact operation is documented for each sequence.
+
+Should a decoding error occur, it will be reported to the client with the level
+of details depending on the decoder capabilities. Specifically:
+
+* the CAPTURE buffer that contains the results of the failed decode operation
+ will be returned with the V4L2_BUF_FLAG_ERROR flag set,
+
+* if the decoder is able to precisely report the OUTPUT buffer that triggered
+ the error, such buffer will be returned with the V4L2_BUF_FLAG_ERROR flag
+ set.
+
+In case of a fatal failure that does not allow the decoding to continue, any
+further operations on corresponding decoder file handle will return the -EIO
+error code. The client may close the file handle and open a new one, or
+alternatively reinitialize the instance by stopping streaming on both queues,
+releasing all buffers and performing the Initialization sequence again.
+
+Seek
+====
+
+Seek is controlled by the ``OUTPUT`` queue, as it is the source of coded data.
+The seek does not require any specific operation on the ``CAPTURE`` queue, but
+it may be affected as per normal decoder operation.
+
+1. Stop the ``OUTPUT`` queue to begin the seek sequence via
+ :c:func:`VIDIOC_STREAMOFF`.
+
+ * **Required fields:**
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
+
+ * The decoder will drop all the pending ``OUTPUT`` buffers and they must be
+ treated as returned to the client (following standard semantics).
+
+2. Restart the ``OUTPUT`` queue via :c:func:`VIDIOC_STREAMON`
+
+ * **Required fields:**
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
+
+ * The decoder will start accepting new source bytestream buffers after the
+ call returns.
+
+3. Start queuing buffers containing coded data after the seek to the ``OUTPUT``
+ queue until a suitable resume point is found.
+
+ .. note::
+
+ There is no requirement to begin queuing coded data starting exactly
+ from a resume point (e.g. SPS or a keyframe). Any queued ``OUTPUT``
+ buffers will be processed and returned to the client until a suitable
+ resume point is found. While looking for a resume point, the decoder
+ should not produce any decoded frames into ``CAPTURE`` buffers.
+
+ Some hardware is known to mishandle seeks to a non-resume point. Such an
+ operation may result in an unspecified number of corrupted decoded frames
+ being made available on the ``CAPTURE`` queue. Drivers must ensure that
+ no fatal decoding errors or crashes occur, and implement any necessary
+ handling and workarounds for hardware issues related to seek operations.
+
+ .. warning::
+
+ In case of the H.264/HEVC codec, the client must take care not to seek
+ over a change of SPS/PPS. Even though the target frame could be a
+ keyframe, the stale SPS/PPS inside decoder state would lead to undefined
+ results when decoding. Although the decoder must handle that case without
+ a crash or a fatal decode error, the client must not expect a sensible
+ decode output.
+
+ If the hardware can detect such corrupted decoded frames, then
+ corresponding buffers will be returned to the client with the
+ V4L2_BUF_FLAG_ERROR set. See the `Decoding` section for further
+ description of decode error reporting.
+
+4. After a resume point is found, the decoder will start returning ``CAPTURE``
+ buffers containing decoded frames.
+
+.. important::
+
+ A seek may result in the `Dynamic Resolution Change` sequence being
+ initiated, due to the seek target having decoding parameters different from
+ the part of the stream decoded before the seek. The sequence must be handled
+ as per normal decoder operation.
+
+.. warning::
+
+ It is not specified when the ``CAPTURE`` queue starts producing buffers
+ containing decoded data from the ``OUTPUT`` buffers queued after the seek,
+ as it operates independently from the ``OUTPUT`` queue.
+
+ The decoder may return a number of remaining ``CAPTURE`` buffers containing
+ decoded frames originating from the ``OUTPUT`` buffers queued before the
+ seek sequence is performed.
+
+ The ``VIDIOC_STREAMOFF`` operation discards any remaining queued
+ ``OUTPUT`` buffers, which means that not all of the ``OUTPUT`` buffers
+ queued before the seek sequence may have matching ``CAPTURE`` buffers
+ produced. For example, given the sequence of operations on the
+ ``OUTPUT`` queue:
+
+ QBUF(A), QBUF(B), STREAMOFF(), STREAMON(), QBUF(G), QBUF(H),
+
+ any of the following results on the ``CAPTURE`` queue is allowed:
+
+ {A’, B’, G’, H’}, {A’, G’, H’}, {G’, H’}.
+
+ To determine the CAPTURE buffer containing the first decoded frame after the
+ seek, the client may observe the timestamps to match the CAPTURE and OUTPUT
+ buffers or use V4L2_DEC_CMD_STOP and V4L2_DEC_CMD_START to drain the
+ decoder.
+
+.. note::
+
+ To achieve instantaneous seek, the client may restart streaming on the
+ ``CAPTURE`` queue too to discard decoded, but not yet dequeued buffers.
+
+Dynamic Resolution Change
+=========================
+
+Streams that include resolution metadata in the bytestream may require switching
+to a different resolution during the decoding.
+
+.. note::
+
+ Not all decoders can detect resolution changes. Those that do set the
+ ``V4L2_FMT_FLAG_DYN_RESOLUTION`` flag for the coded format when
+ :c:func:`VIDIOC_ENUM_FMT` is called.
+
+The sequence starts when the decoder detects a coded frame with one or more of
+the following parameters different from those previously established (and
+reflected by corresponding queries):
+
+* coded resolution (``OUTPUT`` width and height),
+
+* visible resolution (selection rectangles),
+
+* the minimum number of buffers needed for decoding.
+
+Whenever that happens, the decoder must proceed as follows:
+
+1. After encountering a resolution change in the stream, the decoder sends a
+ ``V4L2_EVENT_SOURCE_CHANGE`` event with ``changes`` set to
+ ``V4L2_EVENT_SRC_CH_RESOLUTION``.
+
+ .. important::
+
+ Any client query issued after the decoder queues the event will return
+ values applying to the stream after the resolution change, including
+ queue formats, selection rectangles and controls.
+
+2. The decoder will then process and decode all remaining buffers from before
+ the resolution change point.
+
+ * The last buffer from before the change must be marked with the
+ ``V4L2_BUF_FLAG_LAST`` flag, similarly to the `Drain` sequence above.
+
+ .. warning::
+
+ The last buffer may be empty (with :c:type:`v4l2_buffer` ``bytesused``
+ = 0) and in that case it must be ignored by the client, as it does not
+ contain a decoded frame.
+
+ .. note::
+
+ Any attempt to dequeue more ``CAPTURE`` buffers beyond the buffer marked
+ with ``V4L2_BUF_FLAG_LAST`` will result in a -EPIPE error from
+ :c:func:`VIDIOC_DQBUF`.
+
+The client must continue the sequence as described below to continue the
+decoding process.
+
+1. Dequeue the source change event.
+
+ .. important::
+
+ A source change triggers an implicit decoder drain, similar to the
+ explicit `Drain` sequence. The decoder is stopped after it completes.
+ The decoding process must be resumed with either a pair of calls to
+ :c:func:`VIDIOC_STREAMOFF` and :c:func:`VIDIOC_STREAMON` on the
+ ``CAPTURE`` queue, or a call to :c:func:`VIDIOC_DECODER_CMD` with the
+ ``V4L2_DEC_CMD_START`` command.
+
+2. Continue with the `Capture Setup` sequence.
+
+.. note::
+
+ During the resolution change sequence, the ``OUTPUT`` queue must remain
+ streaming. Calling :c:func:`VIDIOC_STREAMOFF` on the ``OUTPUT`` queue would
+ abort the sequence and initiate a seek.
+
+ In principle, the ``OUTPUT`` queue operates separately from the ``CAPTURE``
+ queue and this remains true for the duration of the entire resolution change
+ sequence as well.
+
+ The client should, for best performance and simplicity, keep queuing/dequeuing
+ buffers to/from the ``OUTPUT`` queue even while processing this sequence.
+
+Drain
+=====
+
+To ensure that all queued ``OUTPUT`` buffers have been processed and related
+``CAPTURE`` buffers are given to the client, the client must follow the drain
+sequence described below. After the drain sequence ends, the client has
+received all decoded frames for all ``OUTPUT`` buffers queued before the
+sequence was started.
+
+1. Begin drain by issuing :c:func:`VIDIOC_DECODER_CMD`.
+
+ * **Required fields:**
+
+ ``cmd``
+ set to ``V4L2_DEC_CMD_STOP``.
+
+ ``flags``
+ set to 0.
+
+ ``pts``
+ set to 0.
+
+ .. warning::
+
+ The sequence can be only initiated if both ``OUTPUT`` and ``CAPTURE``
+ queues are streaming. For compatibility reasons, the call to
+ :c:func:`VIDIOC_DECODER_CMD` will not fail even if any of the queues is
+ not streaming, but at the same time it will not initiate the `Drain`
+ sequence and so the steps described below would not be applicable.
+
+2. Any ``OUTPUT`` buffers queued by the client before the
+ :c:func:`VIDIOC_DECODER_CMD` was issued will be processed and decoded as
+ normal. The client must continue to handle both queues independently,
+ similarly to normal decode operation. This includes:
+
+ * handling any operations triggered as a result of processing those buffers,
+ such as the `Dynamic Resolution Change` sequence, before continuing with
+ the drain sequence,
+
+ * queuing and dequeuing ``CAPTURE`` buffers, until a buffer marked with the
+ ``V4L2_BUF_FLAG_LAST`` flag is dequeued,
+
+ .. warning::
+
+ The last buffer may be empty (with :c:type:`v4l2_buffer`
+ ``bytesused`` = 0) and in that case it must be ignored by the client,
+ as it does not contain a decoded frame.
+
+ .. note::
+
+ Any attempt to dequeue more ``CAPTURE`` buffers beyond the buffer
+ marked with ``V4L2_BUF_FLAG_LAST`` will result in a -EPIPE error from
+ :c:func:`VIDIOC_DQBUF`.
+
+ * dequeuing processed ``OUTPUT`` buffers, until all the buffers queued
+ before the ``V4L2_DEC_CMD_STOP`` command are dequeued,
+
+ * dequeuing the ``V4L2_EVENT_EOS`` event, if the client subscribed to it.
+
+ .. note::
+
+ For backwards compatibility, the decoder will signal a ``V4L2_EVENT_EOS``
+ event when the last frame has been decoded and all frames are ready to be
+ dequeued. It is a deprecated behavior and the client must not rely on it.
+ The ``V4L2_BUF_FLAG_LAST`` buffer flag should be used instead.
+
+3. Once all the ``OUTPUT`` buffers queued before the ``V4L2_DEC_CMD_STOP`` call
+ are dequeued and the last ``CAPTURE`` buffer is dequeued, the decoder is
+ stopped and it will accept, but not process, any newly queued ``OUTPUT``
+ buffers until the client issues any of the following operations:
+
+ * ``V4L2_DEC_CMD_START`` - the decoder will not be reset and will resume
+ operation normally, with all the state from before the drain,
+
+ * a pair of :c:func:`VIDIOC_STREAMOFF` and :c:func:`VIDIOC_STREAMON` on the
+ ``CAPTURE`` queue - the decoder will resume the operation normally,
+ however any ``CAPTURE`` buffers still in the queue will be returned to the
+ client,
+
+ * a pair of :c:func:`VIDIOC_STREAMOFF` and :c:func:`VIDIOC_STREAMON` on the
+ ``OUTPUT`` queue - any pending source buffers will be returned to the
+ client and the `Seek` sequence will be triggered.
+
+.. note::
+
+ Once the drain sequence is initiated, the client needs to drive it to
+ completion, as described by the steps above, unless it aborts the process by
+ issuing :c:func:`VIDIOC_STREAMOFF` on any of the ``OUTPUT`` or ``CAPTURE``
+ queues. The client is not allowed to issue ``V4L2_DEC_CMD_START`` or
+ ``V4L2_DEC_CMD_STOP`` again while the drain sequence is in progress and they
+ will fail with -EBUSY error code if attempted.
+
+ Although mandatory, the availability of decoder commands may be queried
+ using :c:func:`VIDIOC_TRY_DECODER_CMD`.
+
+End of Stream
+=============
+
+If the decoder encounters an end of stream marking in the stream, the decoder
+will initiate the `Drain` sequence, which the client must handle as described
+above, skipping the initial :c:func:`VIDIOC_DECODER_CMD`.
+
+Commit Points
+=============
+
+Setting formats and allocating buffers trigger changes in the behavior of the
+decoder.
+
+1. Setting the format on the ``OUTPUT`` queue may change the set of formats
+ supported/advertised on the ``CAPTURE`` queue. In particular, it also means
+ that the ``CAPTURE`` format may be reset and the client must not rely on the
+ previously set format being preserved.
+
+2. Enumerating formats on the ``CAPTURE`` queue always returns only formats
+ supported for the current ``OUTPUT`` format.
+
+3. Setting the format on the ``CAPTURE`` queue does not change the list of
+ formats available on the ``OUTPUT`` queue. An attempt to set a ``CAPTURE``
+ format that is not supported for the currently selected ``OUTPUT`` format
+ will result in the decoder adjusting the requested ``CAPTURE`` format to a
+ supported one.
+
+4. Enumerating formats on the ``OUTPUT`` queue always returns the full set of
+ supported coded formats, irrespectively of the current ``CAPTURE`` format.
+
+5. While buffers are allocated on any of the ``OUTPUT`` or ``CAPTURE`` queues,
+ the client must not change the format on the ``OUTPUT`` queue. Drivers will
+ return the -EBUSY error code for any such format change attempt.
+
+To summarize, setting formats and allocation must always start with the
+``OUTPUT`` queue and the ``OUTPUT`` queue is the master that governs the
+set of supported formats for the ``CAPTURE`` queue.
diff --git a/Documentation/media/uapi/v4l/dev-mem2mem.rst b/Documentation/media/uapi/v4l/dev-mem2mem.rst
index 67a980818dc8..caa05f5f6380 100644
--- a/Documentation/media/uapi/v4l/dev-mem2mem.rst
+++ b/Documentation/media/uapi/v4l/dev-mem2mem.rst
@@ -39,4 +39,10 @@ file handle is visible through another file handle).
One of the most common memory-to-memory device is the codec. Codecs
are more complicated than most and require additional setup for
their codec parameters. This is done through codec controls.
-See :ref:`mpeg-controls`.
+See :ref:`mpeg-controls`. More details on how to use codec memory-to-memory
+devices are given in the following sections.
+
+.. toctree::
+ :maxdepth: 1
+
+ dev-decoder
diff --git a/Documentation/media/uapi/v4l/pixfmt-v4l2.rst b/Documentation/media/uapi/v4l/pixfmt-v4l2.rst
index da6da2ef139a..e7b6825657c2 100644
--- a/Documentation/media/uapi/v4l/pixfmt-v4l2.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-v4l2.rst
@@ -39,6 +39,11 @@ Single-planar format structure
to a multiple of the scale factor of any smaller planes. For
example when the image format is YUV 4:2:0, ``width`` and
``height`` must be multiples of two.
+
+ For compressed formats that contain the resolution information encoded
+ inside the stream, when fed to a stateful mem2mem decoder, the fields
+ may be zero to rely on the decoder to detect the right values. For more
+ details see :ref:`decoder` and format descriptions.
* - __u32
- ``pixelformat``
- The pixel format or type of compression, set by the application.
diff --git a/Documentation/media/uapi/v4l/v4l2.rst b/Documentation/media/uapi/v4l/v4l2.rst
index 004ec00db6bd..97015b9b40b8 100644
--- a/Documentation/media/uapi/v4l/v4l2.rst
+++ b/Documentation/media/uapi/v4l/v4l2.rst
@@ -60,6 +60,10 @@ Authors, in alphabetical order:
- Original author of the V4L2 API and documentation.
+- Figa, Tomasz <tfiga@chromium.org>
+
+ - Documented the memory-to-memory decoder interface.
+
- H Schimek, Michael <mschimek@gmx.at>
- Original author of the V4L2 API and documentation.
@@ -68,6 +72,10 @@ Authors, in alphabetical order:
- Documented the Digital Video timings API.
+- Osciak, Pawel <posciak@chromium.org>
+
+ - Documented the memory-to-memory decoder interface.
+
- Osciak, Pawel <pawel@osciak.com>
- Designed and documented the multi-planar API.
@@ -92,7 +100,7 @@ Authors, in alphabetical order:
- Designed and documented the VIDIOC_LOG_STATUS ioctl, the extended control ioctls, major parts of the sliced VBI API, the MPEG encoder and decoder APIs and the DV Timings API.
-**Copyright** |copy| 1999-2016: Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin Rubli, Andy Walls, Muralidharan Karicheri, Mauro Carvalho Chehab, Pawel Osciak, Sakari Ailus & Antti Palosaari.
+**Copyright** |copy| 1999-2018: Bill Dirks, Michael H. Schimek, Hans Verkuil, Martin Rubli, Andy Walls, Muralidharan Karicheri, Mauro Carvalho Chehab, Pawel Osciak, Sakari Ailus & Antti Palosaari, Tomasz Figa
Except when explicitly stated as GPL, programming examples within this
part can be used and distributed without restrictions.
diff --git a/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
index ccf83b05afa7..57f0066f4cff 100644
--- a/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
+++ b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
@@ -56,14 +56,16 @@ The ``cmd`` field must contain the command code. Some commands use the
A :ref:`write() <func-write>` or :ref:`VIDIOC_STREAMON`
call sends an implicit START command to the decoder if it has not been
-started yet.
+started yet. Applies to both queues of mem2mem decoders.
A :ref:`close() <func-close>` or :ref:`VIDIOC_STREAMOFF <VIDIOC_STREAMON>`
call of a streaming file descriptor sends an implicit immediate STOP
-command to the decoder, and all buffered data is discarded.
+command to the decoder, and all buffered data is discarded. Applies to both
+queues of mem2mem decoders.
-These ioctls are optional, not all drivers may support them. They were
-introduced in Linux 3.3.
+In principle, these ioctls are optional, not all drivers may support them. They were
+introduced in Linux 3.3. They are, however, mandatory for stateful mem2mem decoders
+(as further documented in :ref:`decoder`).
.. tabularcolumns:: |p{1.1cm}|p{2.4cm}|p{1.2cm}|p{1.6cm}|p{10.6cm}|
@@ -167,26 +169,32 @@ introduced in Linux 3.3.
``V4L2_DEC_CMD_RESUME`` for that. This command has one flag:
``V4L2_DEC_CMD_START_MUTE_AUDIO``. If set, then audio will be
muted when playing back at a non-standard speed.
+
+ For a device implementing the :ref:`decoder`, once the drain sequence
+ is initiated with the ``V4L2_DEC_CMD_STOP`` command, it must be driven
+ to completion before this command can be invoked. Any attempt to
+ invoke the command while the drain sequence is in progress will trigger
+ an ``EBUSY`` error code. The command may be also used to restart the
+ decoder in case of an implicit stop initiated by the decoder itself,
+ without the ``V4L2_DEC_CMD_STOP`` being called explicitly. See
+ :ref:`decoder` for more details.
* - ``V4L2_DEC_CMD_STOP``
- 1
- Stop the decoder. When the decoder is already stopped, this
command does nothing. This command has two flags: if
``V4L2_DEC_CMD_STOP_TO_BLACK`` is set, then the decoder will set
the picture to black after it stopped decoding. Otherwise the last
- image will repeat. mem2mem decoders will stop producing new frames
- altogether. They will send a ``V4L2_EVENT_EOS`` event when the
- last frame has been decoded and all frames are ready to be
- dequeued and will set the ``V4L2_BUF_FLAG_LAST`` buffer flag on
- the last buffer of the capture queue to indicate there will be no
- new buffers produced to dequeue. This buffer may be empty,
- indicated by the driver setting the ``bytesused`` field to 0. Once
- the ``V4L2_BUF_FLAG_LAST`` flag was set, the
- :ref:`VIDIOC_DQBUF <VIDIOC_QBUF>` ioctl will not block anymore,
- but return an ``EPIPE`` error code. If
+ image will repeat. If
``V4L2_DEC_CMD_STOP_IMMEDIATELY`` is set, then the decoder stops
immediately (ignoring the ``pts`` value), otherwise it will keep
decoding until timestamp >= pts or until the last of the pending
data from its internal buffers was decoded.
+
+ For a device implementing the :ref:`decoder`, the command will initiate
+ the drain sequence as documented in :ref:`decoder`. No flags or other
+ arguments are accepted in this case. Any attempt to invoke the command
+ again before the sequence completes will trigger an ``EBUSY`` error
+ code.
* - ``V4L2_DEC_CMD_PAUSE``
- 2
- Pause the decoder. When the decoder has not been started yet, the
@@ -209,6 +217,11 @@ On success 0 is returned, on error -1 and the ``errno`` variable is set
appropriately. The generic error codes are described at the
:ref:`Generic Error Codes <gen-errors>` chapter.
+EBUSY
+ A drain sequence of a device implementing the :ref:`decoder` is still in
+ progress. It is not allowed to issue another decoder command until it
+ completes.
+
EINVAL
The ``cmd`` field is invalid.
diff --git a/Documentation/media/uapi/v4l/vidioc-dqevent.rst b/Documentation/media/uapi/v4l/vidioc-dqevent.rst
index dea9c0cc00ab..42659a3d1705 100644
--- a/Documentation/media/uapi/v4l/vidioc-dqevent.rst
+++ b/Documentation/media/uapi/v4l/vidioc-dqevent.rst
@@ -389,14 +389,19 @@ call.
decoder. Applications will have to query the new resolution (if
any, the signal may also have been lost).
+ For stateful decoders follow the guidelines in :ref:`decoder`.
+ Video Capture devices have to query the new timings using
+ :ref:`VIDIOC_QUERY_DV_TIMINGS` or
+ :ref:`VIDIOC_QUERYSTD <VIDIOC_QUERYSTD>`.
+
*Important*: even if the new video timings appear identical to the old
ones, receiving this event indicates that there was an issue with the
video signal and you must stop and restart streaming
(:ref:`VIDIOC_STREAMOFF <VIDIOC_STREAMON>`
followed by :ref:`VIDIOC_STREAMON <VIDIOC_STREAMON>`). The reason is
- that many devices are not able to recover from a temporary loss of
- signal and so restarting streaming I/O is required in order for the
- hardware to synchronize to the video signal.
+ that many Video Capture devices are not able to recover from a temporary
+ loss of signal and so restarting streaming I/O is required in order for
+ the hardware to synchronize to the video signal.
Return Value
--
2.20.1
^ permalink raw reply related [flat|nested] 42+ messages in thread* [PATCHv2 08/12] pixfmt-compressed.rst: improve H264/HEVC/MPEG1+2/VP8+9 documentation
2019-08-12 11:05 [PATCHv2 00/12] Stateful/stateless codec core support Hans Verkuil
` (6 preceding siblings ...)
2019-08-12 11:05 ` [PATCHv2 07/12] media: docs-rst: Document memory-to-memory video decoder interface Hans Verkuil
@ 2019-08-12 11:05 ` Hans Verkuil
2019-08-14 13:09 ` Paul Kocialkowski
2019-08-12 11:05 ` [PATCHv2 09/12] vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF Hans Verkuil
` (3 subsequent siblings)
11 siblings, 1 reply; 42+ messages in thread
From: Hans Verkuil @ 2019-08-12 11:05 UTC (permalink / raw)
To: linux-media; +Cc: Tomasz Figa, Hans Verkuil
The existing documentation was incorrect and did not correspond
to how actual codec drivers implemented this.
Update the documentation to explicitly specify what is actually
expected.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
.../media/uapi/v4l/pixfmt-compressed.rst | 36 +++++++++++++++----
1 file changed, 30 insertions(+), 6 deletions(-)
diff --git a/Documentation/media/uapi/v4l/pixfmt-compressed.rst b/Documentation/media/uapi/v4l/pixfmt-compressed.rst
index f52a7b67023d..9bb4a172a660 100644
--- a/Documentation/media/uapi/v4l/pixfmt-compressed.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-compressed.rst
@@ -41,7 +41,12 @@ Compressed Formats
- ``V4L2_PIX_FMT_H264``
- 'H264'
- - H264 video elementary stream with start codes.
+ - H264 Access Unit.
+ The decoder expects one Access Unit per buffer.
+ The encoder generates one Access Unit per buffer.
+ If :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
+ then the decoder has no requirements since it can parse all the
+ information from the raw bytestream.
* .. _V4L2-PIX-FMT-H264-NO-SC:
- ``V4L2_PIX_FMT_H264_NO_SC``
@@ -86,12 +91,20 @@ Compressed Formats
- ``V4L2_PIX_FMT_MPEG1``
- 'MPG1'
- - MPEG1 video elementary stream.
+ - MPEG1 Picture. Each buffer starts with a Picture header, followed
+ by other headers as needed and ending with the Picture data.
+ If :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
+ then the decoder has no requirements since it can parse all the
+ information from the raw bytestream.
* .. _V4L2-PIX-FMT-MPEG2:
- ``V4L2_PIX_FMT_MPEG2``
- 'MPG2'
- - MPEG2 video elementary stream.
+ - MPEG2 Picture. Each buffer starts with a Picture header, followed
+ by other headers as needed and ending with the Picture data.
+ If :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
+ then the decoder has no requirements since it can parse all the
+ information from the raw bytestream.
* .. _V4L2-PIX-FMT-MPEG2-SLICE:
- ``V4L2_PIX_FMT_MPEG2_SLICE``
@@ -132,7 +145,9 @@ Compressed Formats
- ``V4L2_PIX_FMT_VP8``
- 'VP80'
- - VP8 video elementary stream.
+ - VP8 compressed video frame. The encoder generates one
+ compressed frame per buffer, and the decoder requires one
+ compressed frame per buffer.
* .. _V4L2-PIX-FMT-VP8-FRAME:
- ``V4L2_PIX_FMT_VP8_FRAME``
@@ -157,12 +172,19 @@ Compressed Formats
- ``V4L2_PIX_FMT_VP9``
- 'VP90'
- - VP9 video elementary stream.
+ - VP9 compressed video frame. The encoder generates one
+ compressed frame per buffer, and the decoder requires one
+ compressed frame per buffer.
* .. _V4L2-PIX-FMT-HEVC:
- ``V4L2_PIX_FMT_HEVC``
- 'HEVC'
- - HEVC/H.265 video elementary stream.
+ - HEVC/H.265 Access Unit.
+ The decoder expects one Access Unit per buffer.
+ The encoder generates one Access Unit per buffer.
+ If :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
+ then the decoder has no requirements since it can parse all the
+ information from the raw bytestream.
* .. _V4L2-PIX-FMT-FWHT:
- ``V4L2_PIX_FMT_FWHT``
@@ -170,6 +192,8 @@ Compressed Formats
- Video elementary stream using a codec based on the Fast Walsh Hadamard
Transform. This codec is implemented by the vicodec ('Virtual Codec')
driver. See the codec-fwht.h header for more details.
+ :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
+ since the decoder can parse all the information from the raw bytestream.
* .. _V4L2-PIX-FMT-FWHT-STATELESS:
- ``V4L2_PIX_FMT_FWHT_STATELESS``
--
2.20.1
^ permalink raw reply related [flat|nested] 42+ messages in thread* Re: [PATCHv2 08/12] pixfmt-compressed.rst: improve H264/HEVC/MPEG1+2/VP8+9 documentation
2019-08-12 11:05 ` [PATCHv2 08/12] pixfmt-compressed.rst: improve H264/HEVC/MPEG1+2/VP8+9 documentation Hans Verkuil
@ 2019-08-14 13:09 ` Paul Kocialkowski
2019-08-14 13:15 ` Hans Verkuil
0 siblings, 1 reply; 42+ messages in thread
From: Paul Kocialkowski @ 2019-08-14 13:09 UTC (permalink / raw)
To: Hans Verkuil; +Cc: linux-media, Tomasz Figa
[-- Attachment #1: Type: text/plain, Size: 4444 bytes --]
Hi,
On Mon 12 Aug 19, 13:05, Hans Verkuil wrote:
> The existing documentation was incorrect and did not correspond
> to how actual codec drivers implemented this.
>
> Update the documentation to explicitly specify what is actually
> expected.
>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> ---
> .../media/uapi/v4l/pixfmt-compressed.rst | 36 +++++++++++++++----
> 1 file changed, 30 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/media/uapi/v4l/pixfmt-compressed.rst b/Documentation/media/uapi/v4l/pixfmt-compressed.rst
> index f52a7b67023d..9bb4a172a660 100644
> --- a/Documentation/media/uapi/v4l/pixfmt-compressed.rst
> +++ b/Documentation/media/uapi/v4l/pixfmt-compressed.rst
> @@ -41,7 +41,12 @@ Compressed Formats
>
> - ``V4L2_PIX_FMT_H264``
> - 'H264'
> - - H264 video elementary stream with start codes.
> + - H264 Access Unit.
> + The decoder expects one Access Unit per buffer.
> + The encoder generates one Access Unit per buffer.
> + If :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
> + then the decoder has no requirements since it can parse all the
> + information from the raw bytestream.
Maybe it would be clearer to mention that "no requirements" concerns the
lack of frame/field boundary requirement? Otherwise it feels a bit unclear
what userspace is expected to do or not do depending on the flag.
Cheers,
Paul
> * .. _V4L2-PIX-FMT-H264-NO-SC:
>
> - ``V4L2_PIX_FMT_H264_NO_SC``
> @@ -86,12 +91,20 @@ Compressed Formats
>
> - ``V4L2_PIX_FMT_MPEG1``
> - 'MPG1'
> - - MPEG1 video elementary stream.
> + - MPEG1 Picture. Each buffer starts with a Picture header, followed
> + by other headers as needed and ending with the Picture data.
> + If :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
> + then the decoder has no requirements since it can parse all the
> + information from the raw bytestream.
> * .. _V4L2-PIX-FMT-MPEG2:
>
> - ``V4L2_PIX_FMT_MPEG2``
> - 'MPG2'
> - - MPEG2 video elementary stream.
> + - MPEG2 Picture. Each buffer starts with a Picture header, followed
> + by other headers as needed and ending with the Picture data.
> + If :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
> + then the decoder has no requirements since it can parse all the
> + information from the raw bytestream.
> * .. _V4L2-PIX-FMT-MPEG2-SLICE:
>
> - ``V4L2_PIX_FMT_MPEG2_SLICE``
> @@ -132,7 +145,9 @@ Compressed Formats
>
> - ``V4L2_PIX_FMT_VP8``
> - 'VP80'
> - - VP8 video elementary stream.
> + - VP8 compressed video frame. The encoder generates one
> + compressed frame per buffer, and the decoder requires one
> + compressed frame per buffer.
> * .. _V4L2-PIX-FMT-VP8-FRAME:
>
> - ``V4L2_PIX_FMT_VP8_FRAME``
> @@ -157,12 +172,19 @@ Compressed Formats
>
> - ``V4L2_PIX_FMT_VP9``
> - 'VP90'
> - - VP9 video elementary stream.
> + - VP9 compressed video frame. The encoder generates one
> + compressed frame per buffer, and the decoder requires one
> + compressed frame per buffer.
> * .. _V4L2-PIX-FMT-HEVC:
>
> - ``V4L2_PIX_FMT_HEVC``
> - 'HEVC'
> - - HEVC/H.265 video elementary stream.
> + - HEVC/H.265 Access Unit.
> + The decoder expects one Access Unit per buffer.
> + The encoder generates one Access Unit per buffer.
> + If :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
> + then the decoder has no requirements since it can parse all the
> + information from the raw bytestream.
> * .. _V4L2-PIX-FMT-FWHT:
>
> - ``V4L2_PIX_FMT_FWHT``
> @@ -170,6 +192,8 @@ Compressed Formats
> - Video elementary stream using a codec based on the Fast Walsh Hadamard
> Transform. This codec is implemented by the vicodec ('Virtual Codec')
> driver. See the codec-fwht.h header for more details.
> + :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
> + since the decoder can parse all the information from the raw bytestream.
> * .. _V4L2-PIX-FMT-FWHT-STATELESS:
>
> - ``V4L2_PIX_FMT_FWHT_STATELESS``
> --
> 2.20.1
>
--
Paul Kocialkowski, Bootlin
Embedded Linux and kernel engineering
https://bootlin.com
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCHv2 08/12] pixfmt-compressed.rst: improve H264/HEVC/MPEG1+2/VP8+9 documentation
2019-08-14 13:09 ` Paul Kocialkowski
@ 2019-08-14 13:15 ` Hans Verkuil
0 siblings, 0 replies; 42+ messages in thread
From: Hans Verkuil @ 2019-08-14 13:15 UTC (permalink / raw)
To: Paul Kocialkowski; +Cc: linux-media, Tomasz Figa
On 8/14/19 3:09 PM, Paul Kocialkowski wrote:
> Hi,
>
> On Mon 12 Aug 19, 13:05, Hans Verkuil wrote:
>> The existing documentation was incorrect and did not correspond
>> to how actual codec drivers implemented this.
>>
>> Update the documentation to explicitly specify what is actually
>> expected.
>>
>> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
>> ---
>> .../media/uapi/v4l/pixfmt-compressed.rst | 36 +++++++++++++++----
>> 1 file changed, 30 insertions(+), 6 deletions(-)
>>
>> diff --git a/Documentation/media/uapi/v4l/pixfmt-compressed.rst b/Documentation/media/uapi/v4l/pixfmt-compressed.rst
>> index f52a7b67023d..9bb4a172a660 100644
>> --- a/Documentation/media/uapi/v4l/pixfmt-compressed.rst
>> +++ b/Documentation/media/uapi/v4l/pixfmt-compressed.rst
>> @@ -41,7 +41,12 @@ Compressed Formats
>>
>> - ``V4L2_PIX_FMT_H264``
>> - 'H264'
>> - - H264 video elementary stream with start codes.
>> + - H264 Access Unit.
>> + The decoder expects one Access Unit per buffer.
>> + The encoder generates one Access Unit per buffer.
>> + If :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
>> + then the decoder has no requirements since it can parse all the
>> + information from the raw bytestream.
>
> Maybe it would be clearer to mention that "no requirements" concerns the
> lack of frame/field boundary requirement? Otherwise it feels a bit unclear
> what userspace is expected to do or not do depending on the flag.
Hmm, how about:
If :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
then the decoder can start streaming at any point in the bytestream and
it can parse the Access Units by itself.
What do you think?
Hans
>
> Cheers,
>
> Paul
>
>> * .. _V4L2-PIX-FMT-H264-NO-SC:
>>
>> - ``V4L2_PIX_FMT_H264_NO_SC``
>> @@ -86,12 +91,20 @@ Compressed Formats
>>
>> - ``V4L2_PIX_FMT_MPEG1``
>> - 'MPG1'
>> - - MPEG1 video elementary stream.
>> + - MPEG1 Picture. Each buffer starts with a Picture header, followed
>> + by other headers as needed and ending with the Picture data.
>> + If :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
>> + then the decoder has no requirements since it can parse all the
>> + information from the raw bytestream.
>> * .. _V4L2-PIX-FMT-MPEG2:
>>
>> - ``V4L2_PIX_FMT_MPEG2``
>> - 'MPG2'
>> - - MPEG2 video elementary stream.
>> + - MPEG2 Picture. Each buffer starts with a Picture header, followed
>> + by other headers as needed and ending with the Picture data.
>> + If :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
>> + then the decoder has no requirements since it can parse all the
>> + information from the raw bytestream.
>> * .. _V4L2-PIX-FMT-MPEG2-SLICE:
>>
>> - ``V4L2_PIX_FMT_MPEG2_SLICE``
>> @@ -132,7 +145,9 @@ Compressed Formats
>>
>> - ``V4L2_PIX_FMT_VP8``
>> - 'VP80'
>> - - VP8 video elementary stream.
>> + - VP8 compressed video frame. The encoder generates one
>> + compressed frame per buffer, and the decoder requires one
>> + compressed frame per buffer.
>> * .. _V4L2-PIX-FMT-VP8-FRAME:
>>
>> - ``V4L2_PIX_FMT_VP8_FRAME``
>> @@ -157,12 +172,19 @@ Compressed Formats
>>
>> - ``V4L2_PIX_FMT_VP9``
>> - 'VP90'
>> - - VP9 video elementary stream.
>> + - VP9 compressed video frame. The encoder generates one
>> + compressed frame per buffer, and the decoder requires one
>> + compressed frame per buffer.
>> * .. _V4L2-PIX-FMT-HEVC:
>>
>> - ``V4L2_PIX_FMT_HEVC``
>> - 'HEVC'
>> - - HEVC/H.265 video elementary stream.
>> + - HEVC/H.265 Access Unit.
>> + The decoder expects one Access Unit per buffer.
>> + The encoder generates one Access Unit per buffer.
>> + If :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
>> + then the decoder has no requirements since it can parse all the
>> + information from the raw bytestream.
>> * .. _V4L2-PIX-FMT-FWHT:
>>
>> - ``V4L2_PIX_FMT_FWHT``
>> @@ -170,6 +192,8 @@ Compressed Formats
>> - Video elementary stream using a codec based on the Fast Walsh Hadamard
>> Transform. This codec is implemented by the vicodec ('Virtual Codec')
>> driver. See the codec-fwht.h header for more details.
>> + :ref:`VIDIOC_ENUM_FMT` reports ``V4L2_FMT_FLAG_CONTINUOUS_BYTESTREAM``
>> + since the decoder can parse all the information from the raw bytestream.
>> * .. _V4L2-PIX-FMT-FWHT-STATELESS:
>>
>> - ``V4L2_PIX_FMT_FWHT_STATELESS``
>> --
>> 2.20.1
>>
>
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCHv2 09/12] vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF
2019-08-12 11:05 [PATCHv2 00/12] Stateful/stateless codec core support Hans Verkuil
` (7 preceding siblings ...)
2019-08-12 11:05 ` [PATCHv2 08/12] pixfmt-compressed.rst: improve H264/HEVC/MPEG1+2/VP8+9 documentation Hans Verkuil
@ 2019-08-12 11:05 ` Hans Verkuil
2019-08-15 8:12 ` Alexandre Courbot
2019-08-12 11:05 ` [PATCHv2 10/12] videodev2.h: add V4L2_DEC_CMD_FLUSH Hans Verkuil
` (2 subsequent siblings)
11 siblings, 1 reply; 42+ messages in thread
From: Hans Verkuil @ 2019-08-12 11:05 UTC (permalink / raw)
To: linux-media; +Cc: Tomasz Figa, Hans Verkuil, Boris Brezillon
This RFC patch adds support for the V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF flag.
It also adds a new V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF capability and
a v4l2_m2m_release_capture_buf() helper function.
Drivers should set vb2_queue->subsystem_flags to VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF
to indicate support for this flag.
The device_run() function should look like this:
if (v4l2_m2m_release_capture_buf(out_vb, cap_vb)) {
v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
v4l2_m2m_job_finish(...);
return;
}
cap_vb->is_held = out_vb->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
...
v4l2_m2m_buf_done(out_vb, VB2_BUF_STATE_DONE);
if (!cap_vb->is_held) {
v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
v4l2_m2m_job_finish(...);
}
In order to handle the corner case where V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF
is always set for the output buffer, and you reached the last frame (so no
new output buffer will be queued with a new timestamp), the driver should
implement support for the V4L2_DEC_CMD_STOP command, and that should do:
struct vb2_v4l2_buffer *out_vb = v4l2_m2m_last_src_buf(m2m_ctx);
struct vb2_v4l2_buffer *cap_vb = v4l2_m2m_last_dst_buf(m2m_ctx);
if (out_vb) {
out_vb->flags &= ~V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
} else if (cap_vb && cap_vb->is_held) {
v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
v4l2_m2m_job_finish(...);
}
At least, I think so. Comments on this are very welcome. We definitely
need better support in v4l2-mem2mem.c for such situations (same for
stateful codecs) since it's too complex for drivers to get right IMHO.
Regards,
Hans
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Tested-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
---
Documentation/media/uapi/v4l/buffer.rst | 13 ++++++
.../media/uapi/v4l/vidioc-reqbufs.rst | 6 +++
.../media/common/videobuf2/videobuf2-v4l2.c | 8 +++-
include/media/v4l2-mem2mem.h | 42 +++++++++++++++++++
include/media/videobuf2-core.h | 3 ++
include/media/videobuf2-v4l2.h | 5 +++
include/uapi/linux/videodev2.h | 13 +++---
7 files changed, 84 insertions(+), 6 deletions(-)
diff --git a/Documentation/media/uapi/v4l/buffer.rst b/Documentation/media/uapi/v4l/buffer.rst
index 1cbd9cde57f3..afb03906ead9 100644
--- a/Documentation/media/uapi/v4l/buffer.rst
+++ b/Documentation/media/uapi/v4l/buffer.rst
@@ -607,6 +607,19 @@ Buffer Flags
applications shall use this flag for output buffers if the data in
this buffer has not been created by the CPU but by some
DMA-capable unit, in which case caches have not been used.
+ * .. _`V4L2-BUF-FLAG-M2M-HOLD-CAPTURE-BUF`:
+
+ - ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF``
+ - 0x00000200
+ - Only valid if ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF`` is
+ set. It is typically used with stateless decoders where multiple
+ output buffers each decode to a slice of the decoded frame.
+ Applications can set this flag when queueing the output buffer
+ to prevent the driver from dequeueing the capture buffer after
+ the output buffer has been decoded (i.e. the capture buffer is
+ 'held'). If the timestamp of this output buffer differs from that
+ of the previous output buffer, then that indicates the start of a
+ new frame and the previously held capture buffer is dequeued.
* .. _`V4L2-BUF-FLAG-LAST`:
- ``V4L2_BUF_FLAG_LAST``
diff --git a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
index d7faef10e39b..d0c643db477a 100644
--- a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
+++ b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
@@ -125,6 +125,7 @@ aborting or finishing any DMA in progress, an implicit
.. _V4L2-BUF-CAP-SUPPORTS-DMABUF:
.. _V4L2-BUF-CAP-SUPPORTS-REQUESTS:
.. _V4L2-BUF-CAP-SUPPORTS-ORPHANED-BUFS:
+.. _V4L2-BUF-CAP-SUPPORTS-M2M-HOLD-CAPTURE-BUF:
.. cssclass:: longtable
@@ -150,6 +151,11 @@ aborting or finishing any DMA in progress, an implicit
- The kernel allows calling :ref:`VIDIOC_REQBUFS` while buffers are still
mapped or exported via DMABUF. These orphaned buffers will be freed
when they are unmapped or when the exported DMABUF fds are closed.
+ * - ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF``
+ - 0x00000020
+ - Only valid for stateless decoders. If set, then userspace can set the
+ ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag to hold off on returning the
+ capture buffer until the OUTPUT timestamp changes.
Return Value
============
diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
index 5a9ba3846f0a..699787f48f46 100644
--- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
+++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
@@ -50,7 +50,8 @@ module_param(debug, int, 0644);
V4L2_BUF_FLAG_TIMESTAMP_MASK)
/* Output buffer flags that should be passed on to the driver */
#define V4L2_BUFFER_OUT_FLAGS (V4L2_BUF_FLAG_PFRAME | V4L2_BUF_FLAG_BFRAME | \
- V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_TIMECODE)
+ V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_TIMECODE | \
+ V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF)
/*
* __verify_planes_array() - verify that the planes array passed in struct
@@ -194,6 +195,7 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b
}
vbuf->sequence = 0;
vbuf->request_fd = -1;
+ vbuf->is_held = false;
if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) {
switch (b->memory) {
@@ -321,6 +323,8 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b
*/
vbuf->flags &= ~V4L2_BUF_FLAG_TIMECODE;
vbuf->field = b->field;
+ if (!(q->subsystem_flags & VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF))
+ vbuf->flags &= ~V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
} else {
/* Zero any output buffer flags as this is a capture buffer */
vbuf->flags &= ~V4L2_BUFFER_OUT_FLAGS;
@@ -654,6 +658,8 @@ static void fill_buf_caps(struct vb2_queue *q, u32 *caps)
*caps |= V4L2_BUF_CAP_SUPPORTS_USERPTR;
if (q->io_modes & VB2_DMABUF)
*caps |= V4L2_BUF_CAP_SUPPORTS_DMABUF;
+ if (q->subsystem_flags & VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF)
+ *caps |= V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF;
#ifdef CONFIG_MEDIA_CONTROLLER_REQUEST_API
if (q->supports_requests)
*caps |= V4L2_BUF_CAP_SUPPORTS_REQUESTS;
diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
index 0b9c3a287061..724858efded2 100644
--- a/include/media/v4l2-mem2mem.h
+++ b/include/media/v4l2-mem2mem.h
@@ -644,6 +644,48 @@ void v4l2_m2m_buf_copy_metadata(const struct vb2_v4l2_buffer *out_vb,
struct vb2_v4l2_buffer *cap_vb,
bool copy_frame_flags);
+/**
+ * v4l2_m2m_release_capture_buf() - check if the capture buffer should be
+ * released
+ *
+ * @out_vb: the output buffer
+ * @cap_vb: the capture buffer
+ *
+ * This helper function returns true if the current capture buffer should
+ * be released to vb2. This is the case if the output buffer specified that
+ * the capture buffer should be held (i.e. not returned to vb2) AND if the
+ * timestamp of the capture buffer differs from the output buffer timestamp.
+ *
+ * This helper is to be called at the start of the device_run callback:
+ *
+ * .. code-block:: c
+ *
+ * if (v4l2_m2m_release_capture_buf(out_vb, cap_vb)) {
+ * v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
+ * v4l2_m2m_job_finish(...);
+ * return;
+ * }
+ * cap_vb->is_held = out_vb->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
+ *
+ * ...
+ *
+ * v4l2_m2m_buf_done(out_vb, VB2_BUF_STATE_DONE);
+ * if (!cap_vb->is_held) {
+ * v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
+ * v4l2_m2m_job_finish(...);
+ * }
+ *
+ * This allows for multiple output buffers to be used to fill in a single
+ * capture buffer. This is typically used by stateless decoders where
+ * multiple e.g. H.264 slices contribute to a single decoded frame.
+ */
+static inline bool v4l2_m2m_release_capture_buf(const struct vb2_v4l2_buffer *out_vb,
+ const struct vb2_v4l2_buffer *cap_vb)
+{
+ return cap_vb->is_held && cap_vb->vb2_buf.copied_timestamp &&
+ out_vb->vb2_buf.timestamp != cap_vb->vb2_buf.timestamp;
+}
+
/* v4l2 request helper */
void v4l2_m2m_request_queue(struct media_request *req);
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index 640aabe69450..a2b2208b02da 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -505,6 +505,8 @@ struct vb2_buf_ops {
* @buf_ops: callbacks to deliver buffer information.
* between user-space and kernel-space.
* @drv_priv: driver private data.
+ * @subsystem_flags: Flags specific to the subsystem (V4L2/DVB/etc.). Not used
+ * by the vb2 core.
* @buf_struct_size: size of the driver-specific buffer structure;
* "0" indicates the driver doesn't want to use a custom buffer
* structure type. for example, ``sizeof(struct vb2_v4l2_buffer)``
@@ -571,6 +573,7 @@ struct vb2_queue {
const struct vb2_buf_ops *buf_ops;
void *drv_priv;
+ u32 subsystem_flags;
unsigned int buf_struct_size;
u32 timestamp_flags;
gfp_t gfp_flags;
diff --git a/include/media/videobuf2-v4l2.h b/include/media/videobuf2-v4l2.h
index 8a10889dc2fd..13ab101864aa 100644
--- a/include/media/videobuf2-v4l2.h
+++ b/include/media/videobuf2-v4l2.h
@@ -33,6 +33,7 @@
* @timecode: frame timecode.
* @sequence: sequence count of this frame.
* @request_fd: the request_fd associated with this buffer
+ * @is_held: if true, then this buffer was held
* @planes: plane information (userptr/fd, length, bytesused, data_offset).
*
* Should contain enough information to be able to cover all the fields
@@ -46,9 +47,13 @@ struct vb2_v4l2_buffer {
struct v4l2_timecode timecode;
__u32 sequence;
__s32 request_fd;
+ bool is_held;
struct vb2_plane planes[VB2_MAX_PLANES];
};
+/* VB2 V4L2 flags as set in vb2_queue.subsystem_flags */
+#define VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 0)
+
/*
* to_vb2_v4l2_buffer() - cast struct vb2_buffer * to struct vb2_v4l2_buffer *
*/
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 530638dffd93..4fa9f543742d 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -915,11 +915,12 @@ struct v4l2_requestbuffers {
};
/* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */
-#define V4L2_BUF_CAP_SUPPORTS_MMAP (1 << 0)
-#define V4L2_BUF_CAP_SUPPORTS_USERPTR (1 << 1)
-#define V4L2_BUF_CAP_SUPPORTS_DMABUF (1 << 2)
-#define V4L2_BUF_CAP_SUPPORTS_REQUESTS (1 << 3)
-#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS (1 << 4)
+#define V4L2_BUF_CAP_SUPPORTS_MMAP (1 << 0)
+#define V4L2_BUF_CAP_SUPPORTS_USERPTR (1 << 1)
+#define V4L2_BUF_CAP_SUPPORTS_DMABUF (1 << 2)
+#define V4L2_BUF_CAP_SUPPORTS_REQUESTS (1 << 3)
+#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS (1 << 4)
+#define V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 5)
/**
* struct v4l2_plane - plane info for multi-planar buffers
@@ -1041,6 +1042,8 @@ static inline __u64 v4l2_timeval_to_ns(const struct timeval *tv)
#define V4L2_BUF_FLAG_IN_REQUEST 0x00000080
/* timecode field is valid */
#define V4L2_BUF_FLAG_TIMECODE 0x00000100
+/* Don't return the capture buffer until OUTPUT timestamp changes */
+#define V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF 0x00000200
/* Buffer is prepared for queuing */
#define V4L2_BUF_FLAG_PREPARED 0x00000400
/* Cache handling flags */
--
2.20.1
^ permalink raw reply related [flat|nested] 42+ messages in thread* Re: [PATCHv2 09/12] vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF
2019-08-12 11:05 ` [PATCHv2 09/12] vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF Hans Verkuil
@ 2019-08-15 8:12 ` Alexandre Courbot
2019-08-15 11:53 ` Hans Verkuil
0 siblings, 1 reply; 42+ messages in thread
From: Alexandre Courbot @ 2019-08-15 8:12 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Linux Media Mailing List, Tomasz Figa, Boris Brezillon
On Mon, Aug 12, 2019 at 8:06 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>
> This RFC patch adds support for the V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF flag.
> It also adds a new V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF capability and
> a v4l2_m2m_release_capture_buf() helper function.
>
> Drivers should set vb2_queue->subsystem_flags to VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF
> to indicate support for this flag.
>
> The device_run() function should look like this:
>
> if (v4l2_m2m_release_capture_buf(out_vb, cap_vb)) {
> v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
> v4l2_m2m_job_finish(...);
> return;
> }
> cap_vb->is_held = out_vb->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
>
> ...
>
> v4l2_m2m_buf_done(out_vb, VB2_BUF_STATE_DONE);
> if (!cap_vb->is_held) {
> v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
> v4l2_m2m_job_finish(...);
> }
>
> In order to handle the corner case where V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF
> is always set for the output buffer, and you reached the last frame (so no
> new output buffer will be queued with a new timestamp), the driver should
> implement support for the V4L2_DEC_CMD_STOP command, and that should do:
I wonder if "the driver must implement..." would not make things
easier: what about drivers that only support formats for which we have
an exact 1:1 mapping (like VP8)? Should they also implement it? What
it permitted for a driver supporting this flag to not implement
V4L2_DEC_CMD_STOP?
Leaving this as an option may complicate user-space quite a bit. Since
the implementation of V4L2_DEC_CMD_STOP does not seem too complicated,
how about making it mandatory for all stateless decoders?
>
> struct vb2_v4l2_buffer *out_vb = v4l2_m2m_last_src_buf(m2m_ctx);
> struct vb2_v4l2_buffer *cap_vb = v4l2_m2m_last_dst_buf(m2m_ctx);
>
> if (out_vb) {
> out_vb->flags &= ~V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
> } else if (cap_vb && cap_vb->is_held) {
> v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
> v4l2_m2m_job_finish(...);
> }
>
> At least, I think so. Comments on this are very welcome. We definitely
> need better support in v4l2-mem2mem.c for such situations (same for
> stateful codecs) since it's too complex for drivers to get right IMHO.
>
> Regards,
>
> Hans
>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> Tested-by: Boris Brezillon <boris.brezillon@collabora.com>
> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
> ---
> Documentation/media/uapi/v4l/buffer.rst | 13 ++++++
> .../media/uapi/v4l/vidioc-reqbufs.rst | 6 +++
> .../media/common/videobuf2/videobuf2-v4l2.c | 8 +++-
> include/media/v4l2-mem2mem.h | 42 +++++++++++++++++++
> include/media/videobuf2-core.h | 3 ++
> include/media/videobuf2-v4l2.h | 5 +++
> include/uapi/linux/videodev2.h | 13 +++---
> 7 files changed, 84 insertions(+), 6 deletions(-)
>
> diff --git a/Documentation/media/uapi/v4l/buffer.rst b/Documentation/media/uapi/v4l/buffer.rst
> index 1cbd9cde57f3..afb03906ead9 100644
> --- a/Documentation/media/uapi/v4l/buffer.rst
> +++ b/Documentation/media/uapi/v4l/buffer.rst
> @@ -607,6 +607,19 @@ Buffer Flags
> applications shall use this flag for output buffers if the data in
> this buffer has not been created by the CPU but by some
> DMA-capable unit, in which case caches have not been used.
> + * .. _`V4L2-BUF-FLAG-M2M-HOLD-CAPTURE-BUF`:
> +
> + - ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF``
> + - 0x00000200
> + - Only valid if ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF`` is
> + set. It is typically used with stateless decoders where multiple
> + output buffers each decode to a slice of the decoded frame.
> + Applications can set this flag when queueing the output buffer
> + to prevent the driver from dequeueing the capture buffer after
> + the output buffer has been decoded (i.e. the capture buffer is
> + 'held'). If the timestamp of this output buffer differs from that
> + of the previous output buffer, then that indicates the start of a
> + new frame and the previously held capture buffer is dequeued.
> * .. _`V4L2-BUF-FLAG-LAST`:
>
> - ``V4L2_BUF_FLAG_LAST``
> diff --git a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
> index d7faef10e39b..d0c643db477a 100644
> --- a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
> +++ b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
> @@ -125,6 +125,7 @@ aborting or finishing any DMA in progress, an implicit
> .. _V4L2-BUF-CAP-SUPPORTS-DMABUF:
> .. _V4L2-BUF-CAP-SUPPORTS-REQUESTS:
> .. _V4L2-BUF-CAP-SUPPORTS-ORPHANED-BUFS:
> +.. _V4L2-BUF-CAP-SUPPORTS-M2M-HOLD-CAPTURE-BUF:
>
> .. cssclass:: longtable
>
> @@ -150,6 +151,11 @@ aborting or finishing any DMA in progress, an implicit
> - The kernel allows calling :ref:`VIDIOC_REQBUFS` while buffers are still
> mapped or exported via DMABUF. These orphaned buffers will be freed
> when they are unmapped or when the exported DMABUF fds are closed.
> + * - ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF``
> + - 0x00000020
> + - Only valid for stateless decoders. If set, then userspace can set the
> + ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag to hold off on returning the
> + capture buffer until the OUTPUT timestamp changes.
>
> Return Value
> ============
> diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
> index 5a9ba3846f0a..699787f48f46 100644
> --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
> +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
> @@ -50,7 +50,8 @@ module_param(debug, int, 0644);
> V4L2_BUF_FLAG_TIMESTAMP_MASK)
> /* Output buffer flags that should be passed on to the driver */
> #define V4L2_BUFFER_OUT_FLAGS (V4L2_BUF_FLAG_PFRAME | V4L2_BUF_FLAG_BFRAME | \
> - V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_TIMECODE)
> + V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_TIMECODE | \
> + V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF)
>
> /*
> * __verify_planes_array() - verify that the planes array passed in struct
> @@ -194,6 +195,7 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b
> }
> vbuf->sequence = 0;
> vbuf->request_fd = -1;
> + vbuf->is_held = false;
>
> if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) {
> switch (b->memory) {
> @@ -321,6 +323,8 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b
> */
> vbuf->flags &= ~V4L2_BUF_FLAG_TIMECODE;
> vbuf->field = b->field;
> + if (!(q->subsystem_flags & VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF))
> + vbuf->flags &= ~V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
> } else {
> /* Zero any output buffer flags as this is a capture buffer */
> vbuf->flags &= ~V4L2_BUFFER_OUT_FLAGS;
> @@ -654,6 +658,8 @@ static void fill_buf_caps(struct vb2_queue *q, u32 *caps)
> *caps |= V4L2_BUF_CAP_SUPPORTS_USERPTR;
> if (q->io_modes & VB2_DMABUF)
> *caps |= V4L2_BUF_CAP_SUPPORTS_DMABUF;
> + if (q->subsystem_flags & VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF)
> + *caps |= V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF;
> #ifdef CONFIG_MEDIA_CONTROLLER_REQUEST_API
> if (q->supports_requests)
> *caps |= V4L2_BUF_CAP_SUPPORTS_REQUESTS;
> diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
> index 0b9c3a287061..724858efded2 100644
> --- a/include/media/v4l2-mem2mem.h
> +++ b/include/media/v4l2-mem2mem.h
> @@ -644,6 +644,48 @@ void v4l2_m2m_buf_copy_metadata(const struct vb2_v4l2_buffer *out_vb,
> struct vb2_v4l2_buffer *cap_vb,
> bool copy_frame_flags);
>
> +/**
> + * v4l2_m2m_release_capture_buf() - check if the capture buffer should be
> + * released
> + *
> + * @out_vb: the output buffer
> + * @cap_vb: the capture buffer
> + *
> + * This helper function returns true if the current capture buffer should
> + * be released to vb2. This is the case if the output buffer specified that
> + * the capture buffer should be held (i.e. not returned to vb2) AND if the
> + * timestamp of the capture buffer differs from the output buffer timestamp.
> + *
> + * This helper is to be called at the start of the device_run callback:
> + *
> + * .. code-block:: c
> + *
> + * if (v4l2_m2m_release_capture_buf(out_vb, cap_vb)) {
> + * v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
> + * v4l2_m2m_job_finish(...);
> + * return;
> + * }
> + * cap_vb->is_held = out_vb->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
> + *
> + * ...
> + *
> + * v4l2_m2m_buf_done(out_vb, VB2_BUF_STATE_DONE);
> + * if (!cap_vb->is_held) {
> + * v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
> + * v4l2_m2m_job_finish(...);
> + * }
> + *
> + * This allows for multiple output buffers to be used to fill in a single
> + * capture buffer. This is typically used by stateless decoders where
> + * multiple e.g. H.264 slices contribute to a single decoded frame.
> + */
> +static inline bool v4l2_m2m_release_capture_buf(const struct vb2_v4l2_buffer *out_vb,
> + const struct vb2_v4l2_buffer *cap_vb)
> +{
> + return cap_vb->is_held && cap_vb->vb2_buf.copied_timestamp &&
> + out_vb->vb2_buf.timestamp != cap_vb->vb2_buf.timestamp;
> +}
> +
> /* v4l2 request helper */
>
> void v4l2_m2m_request_queue(struct media_request *req);
> diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
> index 640aabe69450..a2b2208b02da 100644
> --- a/include/media/videobuf2-core.h
> +++ b/include/media/videobuf2-core.h
> @@ -505,6 +505,8 @@ struct vb2_buf_ops {
> * @buf_ops: callbacks to deliver buffer information.
> * between user-space and kernel-space.
> * @drv_priv: driver private data.
> + * @subsystem_flags: Flags specific to the subsystem (V4L2/DVB/etc.). Not used
> + * by the vb2 core.
> * @buf_struct_size: size of the driver-specific buffer structure;
> * "0" indicates the driver doesn't want to use a custom buffer
> * structure type. for example, ``sizeof(struct vb2_v4l2_buffer)``
> @@ -571,6 +573,7 @@ struct vb2_queue {
> const struct vb2_buf_ops *buf_ops;
>
> void *drv_priv;
> + u32 subsystem_flags;
> unsigned int buf_struct_size;
> u32 timestamp_flags;
> gfp_t gfp_flags;
> diff --git a/include/media/videobuf2-v4l2.h b/include/media/videobuf2-v4l2.h
> index 8a10889dc2fd..13ab101864aa 100644
> --- a/include/media/videobuf2-v4l2.h
> +++ b/include/media/videobuf2-v4l2.h
> @@ -33,6 +33,7 @@
> * @timecode: frame timecode.
> * @sequence: sequence count of this frame.
> * @request_fd: the request_fd associated with this buffer
> + * @is_held: if true, then this buffer was held
> * @planes: plane information (userptr/fd, length, bytesused, data_offset).
> *
> * Should contain enough information to be able to cover all the fields
> @@ -46,9 +47,13 @@ struct vb2_v4l2_buffer {
> struct v4l2_timecode timecode;
> __u32 sequence;
> __s32 request_fd;
> + bool is_held;
> struct vb2_plane planes[VB2_MAX_PLANES];
> };
>
> +/* VB2 V4L2 flags as set in vb2_queue.subsystem_flags */
> +#define VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 0)
> +
> /*
> * to_vb2_v4l2_buffer() - cast struct vb2_buffer * to struct vb2_v4l2_buffer *
> */
> diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
> index 530638dffd93..4fa9f543742d 100644
> --- a/include/uapi/linux/videodev2.h
> +++ b/include/uapi/linux/videodev2.h
> @@ -915,11 +915,12 @@ struct v4l2_requestbuffers {
> };
>
> /* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */
> -#define V4L2_BUF_CAP_SUPPORTS_MMAP (1 << 0)
> -#define V4L2_BUF_CAP_SUPPORTS_USERPTR (1 << 1)
> -#define V4L2_BUF_CAP_SUPPORTS_DMABUF (1 << 2)
> -#define V4L2_BUF_CAP_SUPPORTS_REQUESTS (1 << 3)
> -#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS (1 << 4)
> +#define V4L2_BUF_CAP_SUPPORTS_MMAP (1 << 0)
> +#define V4L2_BUF_CAP_SUPPORTS_USERPTR (1 << 1)
> +#define V4L2_BUF_CAP_SUPPORTS_DMABUF (1 << 2)
> +#define V4L2_BUF_CAP_SUPPORTS_REQUESTS (1 << 3)
> +#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS (1 << 4)
> +#define V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 5)
>
> /**
> * struct v4l2_plane - plane info for multi-planar buffers
> @@ -1041,6 +1042,8 @@ static inline __u64 v4l2_timeval_to_ns(const struct timeval *tv)
> #define V4L2_BUF_FLAG_IN_REQUEST 0x00000080
> /* timecode field is valid */
> #define V4L2_BUF_FLAG_TIMECODE 0x00000100
> +/* Don't return the capture buffer until OUTPUT timestamp changes */
> +#define V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF 0x00000200
> /* Buffer is prepared for queuing */
> #define V4L2_BUF_FLAG_PREPARED 0x00000400
> /* Cache handling flags */
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCHv2 09/12] vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF
2019-08-15 8:12 ` Alexandre Courbot
@ 2019-08-15 11:53 ` Hans Verkuil
2019-08-15 12:27 ` Tomasz Figa
2019-08-15 14:27 ` Alexandre Courbot
0 siblings, 2 replies; 42+ messages in thread
From: Hans Verkuil @ 2019-08-15 11:53 UTC (permalink / raw)
To: Alexandre Courbot; +Cc: Linux Media Mailing List, Tomasz Figa, Boris Brezillon
On 8/15/19 10:12 AM, Alexandre Courbot wrote:
> On Mon, Aug 12, 2019 at 8:06 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>>
>> This RFC patch adds support for the V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF flag.
>> It also adds a new V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF capability and
>> a v4l2_m2m_release_capture_buf() helper function.
>>
>> Drivers should set vb2_queue->subsystem_flags to VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF
>> to indicate support for this flag.
>>
>> The device_run() function should look like this:
>>
>> if (v4l2_m2m_release_capture_buf(out_vb, cap_vb)) {
>> v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
>> v4l2_m2m_job_finish(...);
>> return;
>> }
>> cap_vb->is_held = out_vb->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
>>
>> ...
>>
>> v4l2_m2m_buf_done(out_vb, VB2_BUF_STATE_DONE);
>> if (!cap_vb->is_held) {
>> v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
>> v4l2_m2m_job_finish(...);
>> }
>>
>> In order to handle the corner case where V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF
>> is always set for the output buffer, and you reached the last frame (so no
>> new output buffer will be queued with a new timestamp), the driver should
>> implement support for the V4L2_DEC_CMD_STOP command, and that should do:
V4L2_DEC_CMD_STOP should have been CMD_FLUSH. Sorry for the confusion.
>
> I wonder if "the driver must implement..." would not make things
> easier: what about drivers that only support formats for which we have
> an exact 1:1 mapping (like VP8)? Should they also implement it? What
Such drivers do not need this and will not set
V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF. If that cap is not set,
then V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF will be ignored.
> it permitted for a driver supporting this flag to not implement
> V4L2_DEC_CMD_STOP?
Drivers that support this flag must implement DEC_CMD_FLUSH.
>
> Leaving this as an option may complicate user-space quite a bit. Since
> the implementation of V4L2_DEC_CMD_STOP does not seem too complicated,
> how about making it mandatory for all stateless decoders?
It's a good question: should we support DEC_CMD_FLUSH also for decoders
that do not set V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF?
It would be a NOP, but it might simplify applications.
That said, I think we can postpone a decision about that until we have
more experience. It is easier to add support for this than to remove
it later.
Regards,
Hans
>
>
>>
>> struct vb2_v4l2_buffer *out_vb = v4l2_m2m_last_src_buf(m2m_ctx);
>> struct vb2_v4l2_buffer *cap_vb = v4l2_m2m_last_dst_buf(m2m_ctx);
>>
>> if (out_vb) {
>> out_vb->flags &= ~V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
>> } else if (cap_vb && cap_vb->is_held) {
>> v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
>> v4l2_m2m_job_finish(...);
>> }
>>
>> At least, I think so. Comments on this are very welcome. We definitely
>> need better support in v4l2-mem2mem.c for such situations (same for
>> stateful codecs) since it's too complex for drivers to get right IMHO.
>>
>> Regards,
>>
>> Hans
>>
>> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
>> Tested-by: Boris Brezillon <boris.brezillon@collabora.com>
>> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
>> ---
>> Documentation/media/uapi/v4l/buffer.rst | 13 ++++++
>> .../media/uapi/v4l/vidioc-reqbufs.rst | 6 +++
>> .../media/common/videobuf2/videobuf2-v4l2.c | 8 +++-
>> include/media/v4l2-mem2mem.h | 42 +++++++++++++++++++
>> include/media/videobuf2-core.h | 3 ++
>> include/media/videobuf2-v4l2.h | 5 +++
>> include/uapi/linux/videodev2.h | 13 +++---
>> 7 files changed, 84 insertions(+), 6 deletions(-)
>>
>> diff --git a/Documentation/media/uapi/v4l/buffer.rst b/Documentation/media/uapi/v4l/buffer.rst
>> index 1cbd9cde57f3..afb03906ead9 100644
>> --- a/Documentation/media/uapi/v4l/buffer.rst
>> +++ b/Documentation/media/uapi/v4l/buffer.rst
>> @@ -607,6 +607,19 @@ Buffer Flags
>> applications shall use this flag for output buffers if the data in
>> this buffer has not been created by the CPU but by some
>> DMA-capable unit, in which case caches have not been used.
>> + * .. _`V4L2-BUF-FLAG-M2M-HOLD-CAPTURE-BUF`:
>> +
>> + - ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF``
>> + - 0x00000200
>> + - Only valid if ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF`` is
>> + set. It is typically used with stateless decoders where multiple
>> + output buffers each decode to a slice of the decoded frame.
>> + Applications can set this flag when queueing the output buffer
>> + to prevent the driver from dequeueing the capture buffer after
>> + the output buffer has been decoded (i.e. the capture buffer is
>> + 'held'). If the timestamp of this output buffer differs from that
>> + of the previous output buffer, then that indicates the start of a
>> + new frame and the previously held capture buffer is dequeued.
>> * .. _`V4L2-BUF-FLAG-LAST`:
>>
>> - ``V4L2_BUF_FLAG_LAST``
>> diff --git a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
>> index d7faef10e39b..d0c643db477a 100644
>> --- a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
>> +++ b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
>> @@ -125,6 +125,7 @@ aborting or finishing any DMA in progress, an implicit
>> .. _V4L2-BUF-CAP-SUPPORTS-DMABUF:
>> .. _V4L2-BUF-CAP-SUPPORTS-REQUESTS:
>> .. _V4L2-BUF-CAP-SUPPORTS-ORPHANED-BUFS:
>> +.. _V4L2-BUF-CAP-SUPPORTS-M2M-HOLD-CAPTURE-BUF:
>>
>> .. cssclass:: longtable
>>
>> @@ -150,6 +151,11 @@ aborting or finishing any DMA in progress, an implicit
>> - The kernel allows calling :ref:`VIDIOC_REQBUFS` while buffers are still
>> mapped or exported via DMABUF. These orphaned buffers will be freed
>> when they are unmapped or when the exported DMABUF fds are closed.
>> + * - ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF``
>> + - 0x00000020
>> + - Only valid for stateless decoders. If set, then userspace can set the
>> + ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag to hold off on returning the
>> + capture buffer until the OUTPUT timestamp changes.
>>
>> Return Value
>> ============
>> diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
>> index 5a9ba3846f0a..699787f48f46 100644
>> --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
>> +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
>> @@ -50,7 +50,8 @@ module_param(debug, int, 0644);
>> V4L2_BUF_FLAG_TIMESTAMP_MASK)
>> /* Output buffer flags that should be passed on to the driver */
>> #define V4L2_BUFFER_OUT_FLAGS (V4L2_BUF_FLAG_PFRAME | V4L2_BUF_FLAG_BFRAME | \
>> - V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_TIMECODE)
>> + V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_TIMECODE | \
>> + V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF)
>>
>> /*
>> * __verify_planes_array() - verify that the planes array passed in struct
>> @@ -194,6 +195,7 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b
>> }
>> vbuf->sequence = 0;
>> vbuf->request_fd = -1;
>> + vbuf->is_held = false;
>>
>> if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) {
>> switch (b->memory) {
>> @@ -321,6 +323,8 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b
>> */
>> vbuf->flags &= ~V4L2_BUF_FLAG_TIMECODE;
>> vbuf->field = b->field;
>> + if (!(q->subsystem_flags & VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF))
>> + vbuf->flags &= ~V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
>> } else {
>> /* Zero any output buffer flags as this is a capture buffer */
>> vbuf->flags &= ~V4L2_BUFFER_OUT_FLAGS;
>> @@ -654,6 +658,8 @@ static void fill_buf_caps(struct vb2_queue *q, u32 *caps)
>> *caps |= V4L2_BUF_CAP_SUPPORTS_USERPTR;
>> if (q->io_modes & VB2_DMABUF)
>> *caps |= V4L2_BUF_CAP_SUPPORTS_DMABUF;
>> + if (q->subsystem_flags & VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF)
>> + *caps |= V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF;
>> #ifdef CONFIG_MEDIA_CONTROLLER_REQUEST_API
>> if (q->supports_requests)
>> *caps |= V4L2_BUF_CAP_SUPPORTS_REQUESTS;
>> diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
>> index 0b9c3a287061..724858efded2 100644
>> --- a/include/media/v4l2-mem2mem.h
>> +++ b/include/media/v4l2-mem2mem.h
>> @@ -644,6 +644,48 @@ void v4l2_m2m_buf_copy_metadata(const struct vb2_v4l2_buffer *out_vb,
>> struct vb2_v4l2_buffer *cap_vb,
>> bool copy_frame_flags);
>>
>> +/**
>> + * v4l2_m2m_release_capture_buf() - check if the capture buffer should be
>> + * released
>> + *
>> + * @out_vb: the output buffer
>> + * @cap_vb: the capture buffer
>> + *
>> + * This helper function returns true if the current capture buffer should
>> + * be released to vb2. This is the case if the output buffer specified that
>> + * the capture buffer should be held (i.e. not returned to vb2) AND if the
>> + * timestamp of the capture buffer differs from the output buffer timestamp.
>> + *
>> + * This helper is to be called at the start of the device_run callback:
>> + *
>> + * .. code-block:: c
>> + *
>> + * if (v4l2_m2m_release_capture_buf(out_vb, cap_vb)) {
>> + * v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
>> + * v4l2_m2m_job_finish(...);
>> + * return;
>> + * }
>> + * cap_vb->is_held = out_vb->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
>> + *
>> + * ...
>> + *
>> + * v4l2_m2m_buf_done(out_vb, VB2_BUF_STATE_DONE);
>> + * if (!cap_vb->is_held) {
>> + * v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
>> + * v4l2_m2m_job_finish(...);
>> + * }
>> + *
>> + * This allows for multiple output buffers to be used to fill in a single
>> + * capture buffer. This is typically used by stateless decoders where
>> + * multiple e.g. H.264 slices contribute to a single decoded frame.
>> + */
>> +static inline bool v4l2_m2m_release_capture_buf(const struct vb2_v4l2_buffer *out_vb,
>> + const struct vb2_v4l2_buffer *cap_vb)
>> +{
>> + return cap_vb->is_held && cap_vb->vb2_buf.copied_timestamp &&
>> + out_vb->vb2_buf.timestamp != cap_vb->vb2_buf.timestamp;
>> +}
>> +
>> /* v4l2 request helper */
>>
>> void v4l2_m2m_request_queue(struct media_request *req);
>> diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
>> index 640aabe69450..a2b2208b02da 100644
>> --- a/include/media/videobuf2-core.h
>> +++ b/include/media/videobuf2-core.h
>> @@ -505,6 +505,8 @@ struct vb2_buf_ops {
>> * @buf_ops: callbacks to deliver buffer information.
>> * between user-space and kernel-space.
>> * @drv_priv: driver private data.
>> + * @subsystem_flags: Flags specific to the subsystem (V4L2/DVB/etc.). Not used
>> + * by the vb2 core.
>> * @buf_struct_size: size of the driver-specific buffer structure;
>> * "0" indicates the driver doesn't want to use a custom buffer
>> * structure type. for example, ``sizeof(struct vb2_v4l2_buffer)``
>> @@ -571,6 +573,7 @@ struct vb2_queue {
>> const struct vb2_buf_ops *buf_ops;
>>
>> void *drv_priv;
>> + u32 subsystem_flags;
>> unsigned int buf_struct_size;
>> u32 timestamp_flags;
>> gfp_t gfp_flags;
>> diff --git a/include/media/videobuf2-v4l2.h b/include/media/videobuf2-v4l2.h
>> index 8a10889dc2fd..13ab101864aa 100644
>> --- a/include/media/videobuf2-v4l2.h
>> +++ b/include/media/videobuf2-v4l2.h
>> @@ -33,6 +33,7 @@
>> * @timecode: frame timecode.
>> * @sequence: sequence count of this frame.
>> * @request_fd: the request_fd associated with this buffer
>> + * @is_held: if true, then this buffer was held
>> * @planes: plane information (userptr/fd, length, bytesused, data_offset).
>> *
>> * Should contain enough information to be able to cover all the fields
>> @@ -46,9 +47,13 @@ struct vb2_v4l2_buffer {
>> struct v4l2_timecode timecode;
>> __u32 sequence;
>> __s32 request_fd;
>> + bool is_held;
>> struct vb2_plane planes[VB2_MAX_PLANES];
>> };
>>
>> +/* VB2 V4L2 flags as set in vb2_queue.subsystem_flags */
>> +#define VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 0)
>> +
>> /*
>> * to_vb2_v4l2_buffer() - cast struct vb2_buffer * to struct vb2_v4l2_buffer *
>> */
>> diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
>> index 530638dffd93..4fa9f543742d 100644
>> --- a/include/uapi/linux/videodev2.h
>> +++ b/include/uapi/linux/videodev2.h
>> @@ -915,11 +915,12 @@ struct v4l2_requestbuffers {
>> };
>>
>> /* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */
>> -#define V4L2_BUF_CAP_SUPPORTS_MMAP (1 << 0)
>> -#define V4L2_BUF_CAP_SUPPORTS_USERPTR (1 << 1)
>> -#define V4L2_BUF_CAP_SUPPORTS_DMABUF (1 << 2)
>> -#define V4L2_BUF_CAP_SUPPORTS_REQUESTS (1 << 3)
>> -#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS (1 << 4)
>> +#define V4L2_BUF_CAP_SUPPORTS_MMAP (1 << 0)
>> +#define V4L2_BUF_CAP_SUPPORTS_USERPTR (1 << 1)
>> +#define V4L2_BUF_CAP_SUPPORTS_DMABUF (1 << 2)
>> +#define V4L2_BUF_CAP_SUPPORTS_REQUESTS (1 << 3)
>> +#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS (1 << 4)
>> +#define V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 5)
>>
>> /**
>> * struct v4l2_plane - plane info for multi-planar buffers
>> @@ -1041,6 +1042,8 @@ static inline __u64 v4l2_timeval_to_ns(const struct timeval *tv)
>> #define V4L2_BUF_FLAG_IN_REQUEST 0x00000080
>> /* timecode field is valid */
>> #define V4L2_BUF_FLAG_TIMECODE 0x00000100
>> +/* Don't return the capture buffer until OUTPUT timestamp changes */
>> +#define V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF 0x00000200
>> /* Buffer is prepared for queuing */
>> #define V4L2_BUF_FLAG_PREPARED 0x00000400
>> /* Cache handling flags */
>> --
>> 2.20.1
>>
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCHv2 09/12] vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF
2019-08-15 11:53 ` Hans Verkuil
@ 2019-08-15 12:27 ` Tomasz Figa
2019-08-15 12:31 ` Hans Verkuil
2019-08-15 14:27 ` Alexandre Courbot
1 sibling, 1 reply; 42+ messages in thread
From: Tomasz Figa @ 2019-08-15 12:27 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Alexandre Courbot, Linux Media Mailing List, Boris Brezillon
On Thu, Aug 15, 2019 at 8:53 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>
> On 8/15/19 10:12 AM, Alexandre Courbot wrote:
> > On Mon, Aug 12, 2019 at 8:06 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
> >>
> >> This RFC patch adds support for the V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF flag.
> >> It also adds a new V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF capability and
> >> a v4l2_m2m_release_capture_buf() helper function.
> >>
> >> Drivers should set vb2_queue->subsystem_flags to VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF
> >> to indicate support for this flag.
> >>
> >> The device_run() function should look like this:
> >>
> >> if (v4l2_m2m_release_capture_buf(out_vb, cap_vb)) {
> >> v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
> >> v4l2_m2m_job_finish(...);
> >> return;
> >> }
> >> cap_vb->is_held = out_vb->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
> >>
> >> ...
> >>
> >> v4l2_m2m_buf_done(out_vb, VB2_BUF_STATE_DONE);
> >> if (!cap_vb->is_held) {
> >> v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
> >> v4l2_m2m_job_finish(...);
> >> }
> >>
> >> In order to handle the corner case where V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF
> >> is always set for the output buffer, and you reached the last frame (so no
> >> new output buffer will be queued with a new timestamp), the driver should
> >> implement support for the V4L2_DEC_CMD_STOP command, and that should do:
>
> V4L2_DEC_CMD_STOP should have been CMD_FLUSH. Sorry for the confusion.
>
> >
> > I wonder if "the driver must implement..." would not make things
> > easier: what about drivers that only support formats for which we have
> > an exact 1:1 mapping (like VP8)? Should they also implement it? What
>
> Such drivers do not need this and will not set
> V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF. If that cap is not set,
> then V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF will be ignored.
>
> > it permitted for a driver supporting this flag to not implement
> > V4L2_DEC_CMD_STOP?
>
> Drivers that support this flag must implement DEC_CMD_FLUSH.
>
> >
> > Leaving this as an option may complicate user-space quite a bit. Since
> > the implementation of V4L2_DEC_CMD_STOP does not seem too complicated,
> > how about making it mandatory for all stateless decoders?
>
> It's a good question: should we support DEC_CMD_FLUSH also for decoders
> that do not set V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF?
>
> It would be a NOP, but it might simplify applications.
>
> That said, I think we can postpone a decision about that until we have
> more experience. It is easier to add support for this than to remove
> it later.
I might have missed the discussion, but what's the reason not to just
make this consistent with stateful decoder and use the
DEC_CMD_STOP/START pair?
>
> Regards,
>
> Hans
>
> >
> >
> >>
> >> struct vb2_v4l2_buffer *out_vb = v4l2_m2m_last_src_buf(m2m_ctx);
> >> struct vb2_v4l2_buffer *cap_vb = v4l2_m2m_last_dst_buf(m2m_ctx);
> >>
> >> if (out_vb) {
> >> out_vb->flags &= ~V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
> >> } else if (cap_vb && cap_vb->is_held) {
> >> v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
> >> v4l2_m2m_job_finish(...);
> >> }
> >>
> >> At least, I think so. Comments on this are very welcome. We definitely
> >> need better support in v4l2-mem2mem.c for such situations (same for
> >> stateful codecs) since it's too complex for drivers to get right IMHO.
> >>
> >> Regards,
> >>
> >> Hans
> >>
> >> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> >> Tested-by: Boris Brezillon <boris.brezillon@collabora.com>
> >> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
> >> ---
> >> Documentation/media/uapi/v4l/buffer.rst | 13 ++++++
> >> .../media/uapi/v4l/vidioc-reqbufs.rst | 6 +++
> >> .../media/common/videobuf2/videobuf2-v4l2.c | 8 +++-
> >> include/media/v4l2-mem2mem.h | 42 +++++++++++++++++++
> >> include/media/videobuf2-core.h | 3 ++
> >> include/media/videobuf2-v4l2.h | 5 +++
> >> include/uapi/linux/videodev2.h | 13 +++---
> >> 7 files changed, 84 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/Documentation/media/uapi/v4l/buffer.rst b/Documentation/media/uapi/v4l/buffer.rst
> >> index 1cbd9cde57f3..afb03906ead9 100644
> >> --- a/Documentation/media/uapi/v4l/buffer.rst
> >> +++ b/Documentation/media/uapi/v4l/buffer.rst
> >> @@ -607,6 +607,19 @@ Buffer Flags
> >> applications shall use this flag for output buffers if the data in
> >> this buffer has not been created by the CPU but by some
> >> DMA-capable unit, in which case caches have not been used.
> >> + * .. _`V4L2-BUF-FLAG-M2M-HOLD-CAPTURE-BUF`:
> >> +
> >> + - ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF``
> >> + - 0x00000200
> >> + - Only valid if ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF`` is
> >> + set. It is typically used with stateless decoders where multiple
> >> + output buffers each decode to a slice of the decoded frame.
> >> + Applications can set this flag when queueing the output buffer
> >> + to prevent the driver from dequeueing the capture buffer after
> >> + the output buffer has been decoded (i.e. the capture buffer is
> >> + 'held'). If the timestamp of this output buffer differs from that
> >> + of the previous output buffer, then that indicates the start of a
> >> + new frame and the previously held capture buffer is dequeued.
> >> * .. _`V4L2-BUF-FLAG-LAST`:
> >>
> >> - ``V4L2_BUF_FLAG_LAST``
> >> diff --git a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
> >> index d7faef10e39b..d0c643db477a 100644
> >> --- a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
> >> +++ b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
> >> @@ -125,6 +125,7 @@ aborting or finishing any DMA in progress, an implicit
> >> .. _V4L2-BUF-CAP-SUPPORTS-DMABUF:
> >> .. _V4L2-BUF-CAP-SUPPORTS-REQUESTS:
> >> .. _V4L2-BUF-CAP-SUPPORTS-ORPHANED-BUFS:
> >> +.. _V4L2-BUF-CAP-SUPPORTS-M2M-HOLD-CAPTURE-BUF:
> >>
> >> .. cssclass:: longtable
> >>
> >> @@ -150,6 +151,11 @@ aborting or finishing any DMA in progress, an implicit
> >> - The kernel allows calling :ref:`VIDIOC_REQBUFS` while buffers are still
> >> mapped or exported via DMABUF. These orphaned buffers will be freed
> >> when they are unmapped or when the exported DMABUF fds are closed.
> >> + * - ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF``
> >> + - 0x00000020
> >> + - Only valid for stateless decoders. If set, then userspace can set the
> >> + ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag to hold off on returning the
> >> + capture buffer until the OUTPUT timestamp changes.
> >>
> >> Return Value
> >> ============
> >> diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
> >> index 5a9ba3846f0a..699787f48f46 100644
> >> --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
> >> +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
> >> @@ -50,7 +50,8 @@ module_param(debug, int, 0644);
> >> V4L2_BUF_FLAG_TIMESTAMP_MASK)
> >> /* Output buffer flags that should be passed on to the driver */
> >> #define V4L2_BUFFER_OUT_FLAGS (V4L2_BUF_FLAG_PFRAME | V4L2_BUF_FLAG_BFRAME | \
> >> - V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_TIMECODE)
> >> + V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_TIMECODE | \
> >> + V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF)
> >>
> >> /*
> >> * __verify_planes_array() - verify that the planes array passed in struct
> >> @@ -194,6 +195,7 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b
> >> }
> >> vbuf->sequence = 0;
> >> vbuf->request_fd = -1;
> >> + vbuf->is_held = false;
> >>
> >> if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) {
> >> switch (b->memory) {
> >> @@ -321,6 +323,8 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b
> >> */
> >> vbuf->flags &= ~V4L2_BUF_FLAG_TIMECODE;
> >> vbuf->field = b->field;
> >> + if (!(q->subsystem_flags & VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF))
> >> + vbuf->flags &= ~V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
> >> } else {
> >> /* Zero any output buffer flags as this is a capture buffer */
> >> vbuf->flags &= ~V4L2_BUFFER_OUT_FLAGS;
> >> @@ -654,6 +658,8 @@ static void fill_buf_caps(struct vb2_queue *q, u32 *caps)
> >> *caps |= V4L2_BUF_CAP_SUPPORTS_USERPTR;
> >> if (q->io_modes & VB2_DMABUF)
> >> *caps |= V4L2_BUF_CAP_SUPPORTS_DMABUF;
> >> + if (q->subsystem_flags & VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF)
> >> + *caps |= V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF;
> >> #ifdef CONFIG_MEDIA_CONTROLLER_REQUEST_API
> >> if (q->supports_requests)
> >> *caps |= V4L2_BUF_CAP_SUPPORTS_REQUESTS;
> >> diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
> >> index 0b9c3a287061..724858efded2 100644
> >> --- a/include/media/v4l2-mem2mem.h
> >> +++ b/include/media/v4l2-mem2mem.h
> >> @@ -644,6 +644,48 @@ void v4l2_m2m_buf_copy_metadata(const struct vb2_v4l2_buffer *out_vb,
> >> struct vb2_v4l2_buffer *cap_vb,
> >> bool copy_frame_flags);
> >>
> >> +/**
> >> + * v4l2_m2m_release_capture_buf() - check if the capture buffer should be
> >> + * released
> >> + *
> >> + * @out_vb: the output buffer
> >> + * @cap_vb: the capture buffer
> >> + *
> >> + * This helper function returns true if the current capture buffer should
> >> + * be released to vb2. This is the case if the output buffer specified that
> >> + * the capture buffer should be held (i.e. not returned to vb2) AND if the
> >> + * timestamp of the capture buffer differs from the output buffer timestamp.
> >> + *
> >> + * This helper is to be called at the start of the device_run callback:
> >> + *
> >> + * .. code-block:: c
> >> + *
> >> + * if (v4l2_m2m_release_capture_buf(out_vb, cap_vb)) {
> >> + * v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
> >> + * v4l2_m2m_job_finish(...);
> >> + * return;
> >> + * }
> >> + * cap_vb->is_held = out_vb->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
> >> + *
> >> + * ...
> >> + *
> >> + * v4l2_m2m_buf_done(out_vb, VB2_BUF_STATE_DONE);
> >> + * if (!cap_vb->is_held) {
> >> + * v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
> >> + * v4l2_m2m_job_finish(...);
> >> + * }
> >> + *
> >> + * This allows for multiple output buffers to be used to fill in a single
> >> + * capture buffer. This is typically used by stateless decoders where
> >> + * multiple e.g. H.264 slices contribute to a single decoded frame.
> >> + */
> >> +static inline bool v4l2_m2m_release_capture_buf(const struct vb2_v4l2_buffer *out_vb,
> >> + const struct vb2_v4l2_buffer *cap_vb)
> >> +{
> >> + return cap_vb->is_held && cap_vb->vb2_buf.copied_timestamp &&
> >> + out_vb->vb2_buf.timestamp != cap_vb->vb2_buf.timestamp;
> >> +}
> >> +
> >> /* v4l2 request helper */
> >>
> >> void v4l2_m2m_request_queue(struct media_request *req);
> >> diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
> >> index 640aabe69450..a2b2208b02da 100644
> >> --- a/include/media/videobuf2-core.h
> >> +++ b/include/media/videobuf2-core.h
> >> @@ -505,6 +505,8 @@ struct vb2_buf_ops {
> >> * @buf_ops: callbacks to deliver buffer information.
> >> * between user-space and kernel-space.
> >> * @drv_priv: driver private data.
> >> + * @subsystem_flags: Flags specific to the subsystem (V4L2/DVB/etc.). Not used
> >> + * by the vb2 core.
> >> * @buf_struct_size: size of the driver-specific buffer structure;
> >> * "0" indicates the driver doesn't want to use a custom buffer
> >> * structure type. for example, ``sizeof(struct vb2_v4l2_buffer)``
> >> @@ -571,6 +573,7 @@ struct vb2_queue {
> >> const struct vb2_buf_ops *buf_ops;
> >>
> >> void *drv_priv;
> >> + u32 subsystem_flags;
> >> unsigned int buf_struct_size;
> >> u32 timestamp_flags;
> >> gfp_t gfp_flags;
> >> diff --git a/include/media/videobuf2-v4l2.h b/include/media/videobuf2-v4l2.h
> >> index 8a10889dc2fd..13ab101864aa 100644
> >> --- a/include/media/videobuf2-v4l2.h
> >> +++ b/include/media/videobuf2-v4l2.h
> >> @@ -33,6 +33,7 @@
> >> * @timecode: frame timecode.
> >> * @sequence: sequence count of this frame.
> >> * @request_fd: the request_fd associated with this buffer
> >> + * @is_held: if true, then this buffer was held
> >> * @planes: plane information (userptr/fd, length, bytesused, data_offset).
> >> *
> >> * Should contain enough information to be able to cover all the fields
> >> @@ -46,9 +47,13 @@ struct vb2_v4l2_buffer {
> >> struct v4l2_timecode timecode;
> >> __u32 sequence;
> >> __s32 request_fd;
> >> + bool is_held;
> >> struct vb2_plane planes[VB2_MAX_PLANES];
> >> };
> >>
> >> +/* VB2 V4L2 flags as set in vb2_queue.subsystem_flags */
> >> +#define VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 0)
> >> +
> >> /*
> >> * to_vb2_v4l2_buffer() - cast struct vb2_buffer * to struct vb2_v4l2_buffer *
> >> */
> >> diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
> >> index 530638dffd93..4fa9f543742d 100644
> >> --- a/include/uapi/linux/videodev2.h
> >> +++ b/include/uapi/linux/videodev2.h
> >> @@ -915,11 +915,12 @@ struct v4l2_requestbuffers {
> >> };
> >>
> >> /* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */
> >> -#define V4L2_BUF_CAP_SUPPORTS_MMAP (1 << 0)
> >> -#define V4L2_BUF_CAP_SUPPORTS_USERPTR (1 << 1)
> >> -#define V4L2_BUF_CAP_SUPPORTS_DMABUF (1 << 2)
> >> -#define V4L2_BUF_CAP_SUPPORTS_REQUESTS (1 << 3)
> >> -#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS (1 << 4)
> >> +#define V4L2_BUF_CAP_SUPPORTS_MMAP (1 << 0)
> >> +#define V4L2_BUF_CAP_SUPPORTS_USERPTR (1 << 1)
> >> +#define V4L2_BUF_CAP_SUPPORTS_DMABUF (1 << 2)
> >> +#define V4L2_BUF_CAP_SUPPORTS_REQUESTS (1 << 3)
> >> +#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS (1 << 4)
> >> +#define V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 5)
> >>
> >> /**
> >> * struct v4l2_plane - plane info for multi-planar buffers
> >> @@ -1041,6 +1042,8 @@ static inline __u64 v4l2_timeval_to_ns(const struct timeval *tv)
> >> #define V4L2_BUF_FLAG_IN_REQUEST 0x00000080
> >> /* timecode field is valid */
> >> #define V4L2_BUF_FLAG_TIMECODE 0x00000100
> >> +/* Don't return the capture buffer until OUTPUT timestamp changes */
> >> +#define V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF 0x00000200
> >> /* Buffer is prepared for queuing */
> >> #define V4L2_BUF_FLAG_PREPARED 0x00000400
> >> /* Cache handling flags */
> >> --
> >> 2.20.1
> >>
>
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCHv2 09/12] vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF
2019-08-15 12:27 ` Tomasz Figa
@ 2019-08-15 12:31 ` Hans Verkuil
0 siblings, 0 replies; 42+ messages in thread
From: Hans Verkuil @ 2019-08-15 12:31 UTC (permalink / raw)
To: Tomasz Figa; +Cc: Alexandre Courbot, Linux Media Mailing List, Boris Brezillon
On 8/15/19 2:27 PM, Tomasz Figa wrote:
> On Thu, Aug 15, 2019 at 8:53 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>>
>> On 8/15/19 10:12 AM, Alexandre Courbot wrote:
>>> On Mon, Aug 12, 2019 at 8:06 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>>>>
>>>> This RFC patch adds support for the V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF flag.
>>>> It also adds a new V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF capability and
>>>> a v4l2_m2m_release_capture_buf() helper function.
>>>>
>>>> Drivers should set vb2_queue->subsystem_flags to VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF
>>>> to indicate support for this flag.
>>>>
>>>> The device_run() function should look like this:
>>>>
>>>> if (v4l2_m2m_release_capture_buf(out_vb, cap_vb)) {
>>>> v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
>>>> v4l2_m2m_job_finish(...);
>>>> return;
>>>> }
>>>> cap_vb->is_held = out_vb->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
>>>>
>>>> ...
>>>>
>>>> v4l2_m2m_buf_done(out_vb, VB2_BUF_STATE_DONE);
>>>> if (!cap_vb->is_held) {
>>>> v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
>>>> v4l2_m2m_job_finish(...);
>>>> }
>>>>
>>>> In order to handle the corner case where V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF
>>>> is always set for the output buffer, and you reached the last frame (so no
>>>> new output buffer will be queued with a new timestamp), the driver should
>>>> implement support for the V4L2_DEC_CMD_STOP command, and that should do:
>>
>> V4L2_DEC_CMD_STOP should have been CMD_FLUSH. Sorry for the confusion.
>>
>>>
>>> I wonder if "the driver must implement..." would not make things
>>> easier: what about drivers that only support formats for which we have
>>> an exact 1:1 mapping (like VP8)? Should they also implement it? What
>>
>> Such drivers do not need this and will not set
>> V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF. If that cap is not set,
>> then V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF will be ignored.
>>
>>> it permitted for a driver supporting this flag to not implement
>>> V4L2_DEC_CMD_STOP?
>>
>> Drivers that support this flag must implement DEC_CMD_FLUSH.
>>
>>>
>>> Leaving this as an option may complicate user-space quite a bit. Since
>>> the implementation of V4L2_DEC_CMD_STOP does not seem too complicated,
>>> how about making it mandatory for all stateless decoders?
>>
>> It's a good question: should we support DEC_CMD_FLUSH also for decoders
>> that do not set V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF?
>>
>> It would be a NOP, but it might simplify applications.
>>
>> That said, I think we can postpone a decision about that until we have
>> more experience. It is easier to add support for this than to remove
>> it later.
>
> I might have missed the discussion, but what's the reason not to just
> make this consistent with stateful decoder and use the
> DEC_CMD_STOP/START pair?
It's not the same: DEC_CMD_START/STOP starts and stops a decoder state
machine, which is not the case for a stateless decoder. There certainly
isn't a START (makes no sense), so creating a STOP but not a START is
just plain weird.
Also, STOP implies that you are stopping hardware, but that's not the
case either. You just flush the last frame, that's all you do.
So I decided to make a new command instead of trying to hammer a round
peg in a square hole...
Regards,
Hans
>
>>
>> Regards,
>>
>> Hans
>>
>>>
>>>
>>>>
>>>> struct vb2_v4l2_buffer *out_vb = v4l2_m2m_last_src_buf(m2m_ctx);
>>>> struct vb2_v4l2_buffer *cap_vb = v4l2_m2m_last_dst_buf(m2m_ctx);
>>>>
>>>> if (out_vb) {
>>>> out_vb->flags &= ~V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
>>>> } else if (cap_vb && cap_vb->is_held) {
>>>> v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
>>>> v4l2_m2m_job_finish(...);
>>>> }
>>>>
>>>> At least, I think so. Comments on this are very welcome. We definitely
>>>> need better support in v4l2-mem2mem.c for such situations (same for
>>>> stateful codecs) since it's too complex for drivers to get right IMHO.
>>>>
>>>> Regards,
>>>>
>>>> Hans
>>>>
>>>> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
>>>> Tested-by: Boris Brezillon <boris.brezillon@collabora.com>
>>>> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
>>>> ---
>>>> Documentation/media/uapi/v4l/buffer.rst | 13 ++++++
>>>> .../media/uapi/v4l/vidioc-reqbufs.rst | 6 +++
>>>> .../media/common/videobuf2/videobuf2-v4l2.c | 8 +++-
>>>> include/media/v4l2-mem2mem.h | 42 +++++++++++++++++++
>>>> include/media/videobuf2-core.h | 3 ++
>>>> include/media/videobuf2-v4l2.h | 5 +++
>>>> include/uapi/linux/videodev2.h | 13 +++---
>>>> 7 files changed, 84 insertions(+), 6 deletions(-)
>>>>
>>>> diff --git a/Documentation/media/uapi/v4l/buffer.rst b/Documentation/media/uapi/v4l/buffer.rst
>>>> index 1cbd9cde57f3..afb03906ead9 100644
>>>> --- a/Documentation/media/uapi/v4l/buffer.rst
>>>> +++ b/Documentation/media/uapi/v4l/buffer.rst
>>>> @@ -607,6 +607,19 @@ Buffer Flags
>>>> applications shall use this flag for output buffers if the data in
>>>> this buffer has not been created by the CPU but by some
>>>> DMA-capable unit, in which case caches have not been used.
>>>> + * .. _`V4L2-BUF-FLAG-M2M-HOLD-CAPTURE-BUF`:
>>>> +
>>>> + - ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF``
>>>> + - 0x00000200
>>>> + - Only valid if ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF`` is
>>>> + set. It is typically used with stateless decoders where multiple
>>>> + output buffers each decode to a slice of the decoded frame.
>>>> + Applications can set this flag when queueing the output buffer
>>>> + to prevent the driver from dequeueing the capture buffer after
>>>> + the output buffer has been decoded (i.e. the capture buffer is
>>>> + 'held'). If the timestamp of this output buffer differs from that
>>>> + of the previous output buffer, then that indicates the start of a
>>>> + new frame and the previously held capture buffer is dequeued.
>>>> * .. _`V4L2-BUF-FLAG-LAST`:
>>>>
>>>> - ``V4L2_BUF_FLAG_LAST``
>>>> diff --git a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
>>>> index d7faef10e39b..d0c643db477a 100644
>>>> --- a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
>>>> +++ b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
>>>> @@ -125,6 +125,7 @@ aborting or finishing any DMA in progress, an implicit
>>>> .. _V4L2-BUF-CAP-SUPPORTS-DMABUF:
>>>> .. _V4L2-BUF-CAP-SUPPORTS-REQUESTS:
>>>> .. _V4L2-BUF-CAP-SUPPORTS-ORPHANED-BUFS:
>>>> +.. _V4L2-BUF-CAP-SUPPORTS-M2M-HOLD-CAPTURE-BUF:
>>>>
>>>> .. cssclass:: longtable
>>>>
>>>> @@ -150,6 +151,11 @@ aborting or finishing any DMA in progress, an implicit
>>>> - The kernel allows calling :ref:`VIDIOC_REQBUFS` while buffers are still
>>>> mapped or exported via DMABUF. These orphaned buffers will be freed
>>>> when they are unmapped or when the exported DMABUF fds are closed.
>>>> + * - ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF``
>>>> + - 0x00000020
>>>> + - Only valid for stateless decoders. If set, then userspace can set the
>>>> + ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag to hold off on returning the
>>>> + capture buffer until the OUTPUT timestamp changes.
>>>>
>>>> Return Value
>>>> ============
>>>> diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
>>>> index 5a9ba3846f0a..699787f48f46 100644
>>>> --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
>>>> +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
>>>> @@ -50,7 +50,8 @@ module_param(debug, int, 0644);
>>>> V4L2_BUF_FLAG_TIMESTAMP_MASK)
>>>> /* Output buffer flags that should be passed on to the driver */
>>>> #define V4L2_BUFFER_OUT_FLAGS (V4L2_BUF_FLAG_PFRAME | V4L2_BUF_FLAG_BFRAME | \
>>>> - V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_TIMECODE)
>>>> + V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_TIMECODE | \
>>>> + V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF)
>>>>
>>>> /*
>>>> * __verify_planes_array() - verify that the planes array passed in struct
>>>> @@ -194,6 +195,7 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b
>>>> }
>>>> vbuf->sequence = 0;
>>>> vbuf->request_fd = -1;
>>>> + vbuf->is_held = false;
>>>>
>>>> if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) {
>>>> switch (b->memory) {
>>>> @@ -321,6 +323,8 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b
>>>> */
>>>> vbuf->flags &= ~V4L2_BUF_FLAG_TIMECODE;
>>>> vbuf->field = b->field;
>>>> + if (!(q->subsystem_flags & VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF))
>>>> + vbuf->flags &= ~V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
>>>> } else {
>>>> /* Zero any output buffer flags as this is a capture buffer */
>>>> vbuf->flags &= ~V4L2_BUFFER_OUT_FLAGS;
>>>> @@ -654,6 +658,8 @@ static void fill_buf_caps(struct vb2_queue *q, u32 *caps)
>>>> *caps |= V4L2_BUF_CAP_SUPPORTS_USERPTR;
>>>> if (q->io_modes & VB2_DMABUF)
>>>> *caps |= V4L2_BUF_CAP_SUPPORTS_DMABUF;
>>>> + if (q->subsystem_flags & VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF)
>>>> + *caps |= V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF;
>>>> #ifdef CONFIG_MEDIA_CONTROLLER_REQUEST_API
>>>> if (q->supports_requests)
>>>> *caps |= V4L2_BUF_CAP_SUPPORTS_REQUESTS;
>>>> diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
>>>> index 0b9c3a287061..724858efded2 100644
>>>> --- a/include/media/v4l2-mem2mem.h
>>>> +++ b/include/media/v4l2-mem2mem.h
>>>> @@ -644,6 +644,48 @@ void v4l2_m2m_buf_copy_metadata(const struct vb2_v4l2_buffer *out_vb,
>>>> struct vb2_v4l2_buffer *cap_vb,
>>>> bool copy_frame_flags);
>>>>
>>>> +/**
>>>> + * v4l2_m2m_release_capture_buf() - check if the capture buffer should be
>>>> + * released
>>>> + *
>>>> + * @out_vb: the output buffer
>>>> + * @cap_vb: the capture buffer
>>>> + *
>>>> + * This helper function returns true if the current capture buffer should
>>>> + * be released to vb2. This is the case if the output buffer specified that
>>>> + * the capture buffer should be held (i.e. not returned to vb2) AND if the
>>>> + * timestamp of the capture buffer differs from the output buffer timestamp.
>>>> + *
>>>> + * This helper is to be called at the start of the device_run callback:
>>>> + *
>>>> + * .. code-block:: c
>>>> + *
>>>> + * if (v4l2_m2m_release_capture_buf(out_vb, cap_vb)) {
>>>> + * v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
>>>> + * v4l2_m2m_job_finish(...);
>>>> + * return;
>>>> + * }
>>>> + * cap_vb->is_held = out_vb->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
>>>> + *
>>>> + * ...
>>>> + *
>>>> + * v4l2_m2m_buf_done(out_vb, VB2_BUF_STATE_DONE);
>>>> + * if (!cap_vb->is_held) {
>>>> + * v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
>>>> + * v4l2_m2m_job_finish(...);
>>>> + * }
>>>> + *
>>>> + * This allows for multiple output buffers to be used to fill in a single
>>>> + * capture buffer. This is typically used by stateless decoders where
>>>> + * multiple e.g. H.264 slices contribute to a single decoded frame.
>>>> + */
>>>> +static inline bool v4l2_m2m_release_capture_buf(const struct vb2_v4l2_buffer *out_vb,
>>>> + const struct vb2_v4l2_buffer *cap_vb)
>>>> +{
>>>> + return cap_vb->is_held && cap_vb->vb2_buf.copied_timestamp &&
>>>> + out_vb->vb2_buf.timestamp != cap_vb->vb2_buf.timestamp;
>>>> +}
>>>> +
>>>> /* v4l2 request helper */
>>>>
>>>> void v4l2_m2m_request_queue(struct media_request *req);
>>>> diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
>>>> index 640aabe69450..a2b2208b02da 100644
>>>> --- a/include/media/videobuf2-core.h
>>>> +++ b/include/media/videobuf2-core.h
>>>> @@ -505,6 +505,8 @@ struct vb2_buf_ops {
>>>> * @buf_ops: callbacks to deliver buffer information.
>>>> * between user-space and kernel-space.
>>>> * @drv_priv: driver private data.
>>>> + * @subsystem_flags: Flags specific to the subsystem (V4L2/DVB/etc.). Not used
>>>> + * by the vb2 core.
>>>> * @buf_struct_size: size of the driver-specific buffer structure;
>>>> * "0" indicates the driver doesn't want to use a custom buffer
>>>> * structure type. for example, ``sizeof(struct vb2_v4l2_buffer)``
>>>> @@ -571,6 +573,7 @@ struct vb2_queue {
>>>> const struct vb2_buf_ops *buf_ops;
>>>>
>>>> void *drv_priv;
>>>> + u32 subsystem_flags;
>>>> unsigned int buf_struct_size;
>>>> u32 timestamp_flags;
>>>> gfp_t gfp_flags;
>>>> diff --git a/include/media/videobuf2-v4l2.h b/include/media/videobuf2-v4l2.h
>>>> index 8a10889dc2fd..13ab101864aa 100644
>>>> --- a/include/media/videobuf2-v4l2.h
>>>> +++ b/include/media/videobuf2-v4l2.h
>>>> @@ -33,6 +33,7 @@
>>>> * @timecode: frame timecode.
>>>> * @sequence: sequence count of this frame.
>>>> * @request_fd: the request_fd associated with this buffer
>>>> + * @is_held: if true, then this buffer was held
>>>> * @planes: plane information (userptr/fd, length, bytesused, data_offset).
>>>> *
>>>> * Should contain enough information to be able to cover all the fields
>>>> @@ -46,9 +47,13 @@ struct vb2_v4l2_buffer {
>>>> struct v4l2_timecode timecode;
>>>> __u32 sequence;
>>>> __s32 request_fd;
>>>> + bool is_held;
>>>> struct vb2_plane planes[VB2_MAX_PLANES];
>>>> };
>>>>
>>>> +/* VB2 V4L2 flags as set in vb2_queue.subsystem_flags */
>>>> +#define VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 0)
>>>> +
>>>> /*
>>>> * to_vb2_v4l2_buffer() - cast struct vb2_buffer * to struct vb2_v4l2_buffer *
>>>> */
>>>> diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
>>>> index 530638dffd93..4fa9f543742d 100644
>>>> --- a/include/uapi/linux/videodev2.h
>>>> +++ b/include/uapi/linux/videodev2.h
>>>> @@ -915,11 +915,12 @@ struct v4l2_requestbuffers {
>>>> };
>>>>
>>>> /* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */
>>>> -#define V4L2_BUF_CAP_SUPPORTS_MMAP (1 << 0)
>>>> -#define V4L2_BUF_CAP_SUPPORTS_USERPTR (1 << 1)
>>>> -#define V4L2_BUF_CAP_SUPPORTS_DMABUF (1 << 2)
>>>> -#define V4L2_BUF_CAP_SUPPORTS_REQUESTS (1 << 3)
>>>> -#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS (1 << 4)
>>>> +#define V4L2_BUF_CAP_SUPPORTS_MMAP (1 << 0)
>>>> +#define V4L2_BUF_CAP_SUPPORTS_USERPTR (1 << 1)
>>>> +#define V4L2_BUF_CAP_SUPPORTS_DMABUF (1 << 2)
>>>> +#define V4L2_BUF_CAP_SUPPORTS_REQUESTS (1 << 3)
>>>> +#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS (1 << 4)
>>>> +#define V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 5)
>>>>
>>>> /**
>>>> * struct v4l2_plane - plane info for multi-planar buffers
>>>> @@ -1041,6 +1042,8 @@ static inline __u64 v4l2_timeval_to_ns(const struct timeval *tv)
>>>> #define V4L2_BUF_FLAG_IN_REQUEST 0x00000080
>>>> /* timecode field is valid */
>>>> #define V4L2_BUF_FLAG_TIMECODE 0x00000100
>>>> +/* Don't return the capture buffer until OUTPUT timestamp changes */
>>>> +#define V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF 0x00000200
>>>> /* Buffer is prepared for queuing */
>>>> #define V4L2_BUF_FLAG_PREPARED 0x00000400
>>>> /* Cache handling flags */
>>>> --
>>>> 2.20.1
>>>>
>>
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCHv2 09/12] vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF
2019-08-15 11:53 ` Hans Verkuil
2019-08-15 12:27 ` Tomasz Figa
@ 2019-08-15 14:27 ` Alexandre Courbot
1 sibling, 0 replies; 42+ messages in thread
From: Alexandre Courbot @ 2019-08-15 14:27 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Linux Media Mailing List, Tomasz Figa, Boris Brezillon
On Thu, Aug 15, 2019 at 8:53 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>
> On 8/15/19 10:12 AM, Alexandre Courbot wrote:
> > On Mon, Aug 12, 2019 at 8:06 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
> >>
> >> This RFC patch adds support for the V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF flag.
> >> It also adds a new V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF capability and
> >> a v4l2_m2m_release_capture_buf() helper function.
> >>
> >> Drivers should set vb2_queue->subsystem_flags to VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF
> >> to indicate support for this flag.
> >>
> >> The device_run() function should look like this:
> >>
> >> if (v4l2_m2m_release_capture_buf(out_vb, cap_vb)) {
> >> v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
> >> v4l2_m2m_job_finish(...);
> >> return;
> >> }
> >> cap_vb->is_held = out_vb->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
> >>
> >> ...
> >>
> >> v4l2_m2m_buf_done(out_vb, VB2_BUF_STATE_DONE);
> >> if (!cap_vb->is_held) {
> >> v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
> >> v4l2_m2m_job_finish(...);
> >> }
> >>
> >> In order to handle the corner case where V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF
> >> is always set for the output buffer, and you reached the last frame (so no
> >> new output buffer will be queued with a new timestamp), the driver should
> >> implement support for the V4L2_DEC_CMD_STOP command, and that should do:
>
> V4L2_DEC_CMD_STOP should have been CMD_FLUSH. Sorry for the confusion.
>
> >
> > I wonder if "the driver must implement..." would not make things
> > easier: what about drivers that only support formats for which we have
> > an exact 1:1 mapping (like VP8)? Should they also implement it? What
>
> Such drivers do not need this and will not set
> V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF. If that cap is not set,
> then V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF will be ignored.
>
> > it permitted for a driver supporting this flag to not implement
> > V4L2_DEC_CMD_STOP?
>
> Drivers that support this flag must implement DEC_CMD_FLUSH.
>
> >
> > Leaving this as an option may complicate user-space quite a bit. Since
> > the implementation of V4L2_DEC_CMD_STOP does not seem too complicated,
> > how about making it mandatory for all stateless decoders?
>
> It's a good question: should we support DEC_CMD_FLUSH also for decoders
> that do not set V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF?
>
> It would be a NOP, but it might simplify applications.
Supporting it as a NOP (maybe even transparently) seems to be the most
portable and easiest to handle for user-space.
>
> That said, I think we can postpone a decision about that until we have
> more experience. It is easier to add support for this than to remove
> it later.
>
> Regards,
>
> Hans
>
> >
> >
> >>
> >> struct vb2_v4l2_buffer *out_vb = v4l2_m2m_last_src_buf(m2m_ctx);
> >> struct vb2_v4l2_buffer *cap_vb = v4l2_m2m_last_dst_buf(m2m_ctx);
> >>
> >> if (out_vb) {
> >> out_vb->flags &= ~V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
> >> } else if (cap_vb && cap_vb->is_held) {
> >> v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
> >> v4l2_m2m_job_finish(...);
> >> }
> >>
> >> At least, I think so. Comments on this are very welcome. We definitely
> >> need better support in v4l2-mem2mem.c for such situations (same for
> >> stateful codecs) since it's too complex for drivers to get right IMHO.
> >>
> >> Regards,
> >>
> >> Hans
> >>
> >> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> >> Tested-by: Boris Brezillon <boris.brezillon@collabora.com>
> >> Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
> >> ---
> >> Documentation/media/uapi/v4l/buffer.rst | 13 ++++++
> >> .../media/uapi/v4l/vidioc-reqbufs.rst | 6 +++
> >> .../media/common/videobuf2/videobuf2-v4l2.c | 8 +++-
> >> include/media/v4l2-mem2mem.h | 42 +++++++++++++++++++
> >> include/media/videobuf2-core.h | 3 ++
> >> include/media/videobuf2-v4l2.h | 5 +++
> >> include/uapi/linux/videodev2.h | 13 +++---
> >> 7 files changed, 84 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/Documentation/media/uapi/v4l/buffer.rst b/Documentation/media/uapi/v4l/buffer.rst
> >> index 1cbd9cde57f3..afb03906ead9 100644
> >> --- a/Documentation/media/uapi/v4l/buffer.rst
> >> +++ b/Documentation/media/uapi/v4l/buffer.rst
> >> @@ -607,6 +607,19 @@ Buffer Flags
> >> applications shall use this flag for output buffers if the data in
> >> this buffer has not been created by the CPU but by some
> >> DMA-capable unit, in which case caches have not been used.
> >> + * .. _`V4L2-BUF-FLAG-M2M-HOLD-CAPTURE-BUF`:
> >> +
> >> + - ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF``
> >> + - 0x00000200
> >> + - Only valid if ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF`` is
> >> + set. It is typically used with stateless decoders where multiple
> >> + output buffers each decode to a slice of the decoded frame.
> >> + Applications can set this flag when queueing the output buffer
> >> + to prevent the driver from dequeueing the capture buffer after
> >> + the output buffer has been decoded (i.e. the capture buffer is
> >> + 'held'). If the timestamp of this output buffer differs from that
> >> + of the previous output buffer, then that indicates the start of a
> >> + new frame and the previously held capture buffer is dequeued.
> >> * .. _`V4L2-BUF-FLAG-LAST`:
> >>
> >> - ``V4L2_BUF_FLAG_LAST``
> >> diff --git a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
> >> index d7faef10e39b..d0c643db477a 100644
> >> --- a/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
> >> +++ b/Documentation/media/uapi/v4l/vidioc-reqbufs.rst
> >> @@ -125,6 +125,7 @@ aborting or finishing any DMA in progress, an implicit
> >> .. _V4L2-BUF-CAP-SUPPORTS-DMABUF:
> >> .. _V4L2-BUF-CAP-SUPPORTS-REQUESTS:
> >> .. _V4L2-BUF-CAP-SUPPORTS-ORPHANED-BUFS:
> >> +.. _V4L2-BUF-CAP-SUPPORTS-M2M-HOLD-CAPTURE-BUF:
> >>
> >> .. cssclass:: longtable
> >>
> >> @@ -150,6 +151,11 @@ aborting or finishing any DMA in progress, an implicit
> >> - The kernel allows calling :ref:`VIDIOC_REQBUFS` while buffers are still
> >> mapped or exported via DMABUF. These orphaned buffers will be freed
> >> when they are unmapped or when the exported DMABUF fds are closed.
> >> + * - ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF``
> >> + - 0x00000020
> >> + - Only valid for stateless decoders. If set, then userspace can set the
> >> + ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag to hold off on returning the
> >> + capture buffer until the OUTPUT timestamp changes.
> >>
> >> Return Value
> >> ============
> >> diff --git a/drivers/media/common/videobuf2/videobuf2-v4l2.c b/drivers/media/common/videobuf2/videobuf2-v4l2.c
> >> index 5a9ba3846f0a..699787f48f46 100644
> >> --- a/drivers/media/common/videobuf2/videobuf2-v4l2.c
> >> +++ b/drivers/media/common/videobuf2/videobuf2-v4l2.c
> >> @@ -50,7 +50,8 @@ module_param(debug, int, 0644);
> >> V4L2_BUF_FLAG_TIMESTAMP_MASK)
> >> /* Output buffer flags that should be passed on to the driver */
> >> #define V4L2_BUFFER_OUT_FLAGS (V4L2_BUF_FLAG_PFRAME | V4L2_BUF_FLAG_BFRAME | \
> >> - V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_TIMECODE)
> >> + V4L2_BUF_FLAG_KEYFRAME | V4L2_BUF_FLAG_TIMECODE | \
> >> + V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF)
> >>
> >> /*
> >> * __verify_planes_array() - verify that the planes array passed in struct
> >> @@ -194,6 +195,7 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b
> >> }
> >> vbuf->sequence = 0;
> >> vbuf->request_fd = -1;
> >> + vbuf->is_held = false;
> >>
> >> if (V4L2_TYPE_IS_MULTIPLANAR(b->type)) {
> >> switch (b->memory) {
> >> @@ -321,6 +323,8 @@ static int vb2_fill_vb2_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b
> >> */
> >> vbuf->flags &= ~V4L2_BUF_FLAG_TIMECODE;
> >> vbuf->field = b->field;
> >> + if (!(q->subsystem_flags & VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF))
> >> + vbuf->flags &= ~V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
> >> } else {
> >> /* Zero any output buffer flags as this is a capture buffer */
> >> vbuf->flags &= ~V4L2_BUFFER_OUT_FLAGS;
> >> @@ -654,6 +658,8 @@ static void fill_buf_caps(struct vb2_queue *q, u32 *caps)
> >> *caps |= V4L2_BUF_CAP_SUPPORTS_USERPTR;
> >> if (q->io_modes & VB2_DMABUF)
> >> *caps |= V4L2_BUF_CAP_SUPPORTS_DMABUF;
> >> + if (q->subsystem_flags & VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF)
> >> + *caps |= V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF;
> >> #ifdef CONFIG_MEDIA_CONTROLLER_REQUEST_API
> >> if (q->supports_requests)
> >> *caps |= V4L2_BUF_CAP_SUPPORTS_REQUESTS;
> >> diff --git a/include/media/v4l2-mem2mem.h b/include/media/v4l2-mem2mem.h
> >> index 0b9c3a287061..724858efded2 100644
> >> --- a/include/media/v4l2-mem2mem.h
> >> +++ b/include/media/v4l2-mem2mem.h
> >> @@ -644,6 +644,48 @@ void v4l2_m2m_buf_copy_metadata(const struct vb2_v4l2_buffer *out_vb,
> >> struct vb2_v4l2_buffer *cap_vb,
> >> bool copy_frame_flags);
> >>
> >> +/**
> >> + * v4l2_m2m_release_capture_buf() - check if the capture buffer should be
> >> + * released
> >> + *
> >> + * @out_vb: the output buffer
> >> + * @cap_vb: the capture buffer
> >> + *
> >> + * This helper function returns true if the current capture buffer should
> >> + * be released to vb2. This is the case if the output buffer specified that
> >> + * the capture buffer should be held (i.e. not returned to vb2) AND if the
> >> + * timestamp of the capture buffer differs from the output buffer timestamp.
> >> + *
> >> + * This helper is to be called at the start of the device_run callback:
> >> + *
> >> + * .. code-block:: c
> >> + *
> >> + * if (v4l2_m2m_release_capture_buf(out_vb, cap_vb)) {
> >> + * v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
> >> + * v4l2_m2m_job_finish(...);
> >> + * return;
> >> + * }
> >> + * cap_vb->is_held = out_vb->flags & V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF;
> >> + *
> >> + * ...
> >> + *
> >> + * v4l2_m2m_buf_done(out_vb, VB2_BUF_STATE_DONE);
> >> + * if (!cap_vb->is_held) {
> >> + * v4l2_m2m_buf_done(cap_vb, VB2_BUF_STATE_DONE);
> >> + * v4l2_m2m_job_finish(...);
> >> + * }
> >> + *
> >> + * This allows for multiple output buffers to be used to fill in a single
> >> + * capture buffer. This is typically used by stateless decoders where
> >> + * multiple e.g. H.264 slices contribute to a single decoded frame.
> >> + */
> >> +static inline bool v4l2_m2m_release_capture_buf(const struct vb2_v4l2_buffer *out_vb,
> >> + const struct vb2_v4l2_buffer *cap_vb)
> >> +{
> >> + return cap_vb->is_held && cap_vb->vb2_buf.copied_timestamp &&
> >> + out_vb->vb2_buf.timestamp != cap_vb->vb2_buf.timestamp;
> >> +}
> >> +
> >> /* v4l2 request helper */
> >>
> >> void v4l2_m2m_request_queue(struct media_request *req);
> >> diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
> >> index 640aabe69450..a2b2208b02da 100644
> >> --- a/include/media/videobuf2-core.h
> >> +++ b/include/media/videobuf2-core.h
> >> @@ -505,6 +505,8 @@ struct vb2_buf_ops {
> >> * @buf_ops: callbacks to deliver buffer information.
> >> * between user-space and kernel-space.
> >> * @drv_priv: driver private data.
> >> + * @subsystem_flags: Flags specific to the subsystem (V4L2/DVB/etc.). Not used
> >> + * by the vb2 core.
> >> * @buf_struct_size: size of the driver-specific buffer structure;
> >> * "0" indicates the driver doesn't want to use a custom buffer
> >> * structure type. for example, ``sizeof(struct vb2_v4l2_buffer)``
> >> @@ -571,6 +573,7 @@ struct vb2_queue {
> >> const struct vb2_buf_ops *buf_ops;
> >>
> >> void *drv_priv;
> >> + u32 subsystem_flags;
> >> unsigned int buf_struct_size;
> >> u32 timestamp_flags;
> >> gfp_t gfp_flags;
> >> diff --git a/include/media/videobuf2-v4l2.h b/include/media/videobuf2-v4l2.h
> >> index 8a10889dc2fd..13ab101864aa 100644
> >> --- a/include/media/videobuf2-v4l2.h
> >> +++ b/include/media/videobuf2-v4l2.h
> >> @@ -33,6 +33,7 @@
> >> * @timecode: frame timecode.
> >> * @sequence: sequence count of this frame.
> >> * @request_fd: the request_fd associated with this buffer
> >> + * @is_held: if true, then this buffer was held
> >> * @planes: plane information (userptr/fd, length, bytesused, data_offset).
> >> *
> >> * Should contain enough information to be able to cover all the fields
> >> @@ -46,9 +47,13 @@ struct vb2_v4l2_buffer {
> >> struct v4l2_timecode timecode;
> >> __u32 sequence;
> >> __s32 request_fd;
> >> + bool is_held;
> >> struct vb2_plane planes[VB2_MAX_PLANES];
> >> };
> >>
> >> +/* VB2 V4L2 flags as set in vb2_queue.subsystem_flags */
> >> +#define VB2_V4L2_FL_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 0)
> >> +
> >> /*
> >> * to_vb2_v4l2_buffer() - cast struct vb2_buffer * to struct vb2_v4l2_buffer *
> >> */
> >> diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
> >> index 530638dffd93..4fa9f543742d 100644
> >> --- a/include/uapi/linux/videodev2.h
> >> +++ b/include/uapi/linux/videodev2.h
> >> @@ -915,11 +915,12 @@ struct v4l2_requestbuffers {
> >> };
> >>
> >> /* capabilities for struct v4l2_requestbuffers and v4l2_create_buffers */
> >> -#define V4L2_BUF_CAP_SUPPORTS_MMAP (1 << 0)
> >> -#define V4L2_BUF_CAP_SUPPORTS_USERPTR (1 << 1)
> >> -#define V4L2_BUF_CAP_SUPPORTS_DMABUF (1 << 2)
> >> -#define V4L2_BUF_CAP_SUPPORTS_REQUESTS (1 << 3)
> >> -#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS (1 << 4)
> >> +#define V4L2_BUF_CAP_SUPPORTS_MMAP (1 << 0)
> >> +#define V4L2_BUF_CAP_SUPPORTS_USERPTR (1 << 1)
> >> +#define V4L2_BUF_CAP_SUPPORTS_DMABUF (1 << 2)
> >> +#define V4L2_BUF_CAP_SUPPORTS_REQUESTS (1 << 3)
> >> +#define V4L2_BUF_CAP_SUPPORTS_ORPHANED_BUFS (1 << 4)
> >> +#define V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF (1 << 5)
> >>
> >> /**
> >> * struct v4l2_plane - plane info for multi-planar buffers
> >> @@ -1041,6 +1042,8 @@ static inline __u64 v4l2_timeval_to_ns(const struct timeval *tv)
> >> #define V4L2_BUF_FLAG_IN_REQUEST 0x00000080
> >> /* timecode field is valid */
> >> #define V4L2_BUF_FLAG_TIMECODE 0x00000100
> >> +/* Don't return the capture buffer until OUTPUT timestamp changes */
> >> +#define V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF 0x00000200
> >> /* Buffer is prepared for queuing */
> >> #define V4L2_BUF_FLAG_PREPARED 0x00000400
> >> /* Cache handling flags */
> >> --
> >> 2.20.1
> >>
>
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCHv2 10/12] videodev2.h: add V4L2_DEC_CMD_FLUSH
2019-08-12 11:05 [PATCHv2 00/12] Stateful/stateless codec core support Hans Verkuil
` (8 preceding siblings ...)
2019-08-12 11:05 ` [PATCHv2 09/12] vb2: add V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF Hans Verkuil
@ 2019-08-12 11:05 ` Hans Verkuil
2019-08-15 8:12 ` Alexandre Courbot
2019-08-12 11:05 ` [PATCHv2 11/12] media: docs-rst: Document m2m stateless video decoder interface Hans Verkuil
2019-08-12 11:05 ` [PATCHv2 12/12] media: docs-rst: Document memory-to-memory video encoder interface Hans Verkuil
11 siblings, 1 reply; 42+ messages in thread
From: Hans Verkuil @ 2019-08-12 11:05 UTC (permalink / raw)
To: linux-media; +Cc: Tomasz Figa, Hans Verkuil
Add this new V4L2_DEC_CMD_FLUSH decoder command and document it.
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst | 11 ++++++++++-
Documentation/media/videodev2.h.rst.exceptions | 1 +
include/uapi/linux/videodev2.h | 1 +
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
index 57f0066f4cff..0bffef6058f7 100644
--- a/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
+++ b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
@@ -208,7 +208,16 @@ introduced in Linux 3.3. They are, however, mandatory for stateful mem2mem decod
been started yet, the driver will return an ``EPERM`` error code. When
the decoder is already running, this command does nothing. No
flags are defined for this command.
-
+ * - ``V4L2_DEC_CMD_FLUSH``
+ - 4
+ - Flush any held capture buffers. Only valid for stateless decoders,
+ and only if ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF`` was set.
+ This command is typically used when the application reached the
+ end of the stream and the last output buffer had the
+ ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag set. This would prevent
+ dequeueing the last capture buffer containing the last decoded frame.
+ So this command can be used to explicitly flush that last decoded
+ frame.
Return Value
============
diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
index adeb6b7a15cb..a79028e4d929 100644
--- a/Documentation/media/videodev2.h.rst.exceptions
+++ b/Documentation/media/videodev2.h.rst.exceptions
@@ -434,6 +434,7 @@ replace define V4L2_DEC_CMD_START decoder-cmds
replace define V4L2_DEC_CMD_STOP decoder-cmds
replace define V4L2_DEC_CMD_PAUSE decoder-cmds
replace define V4L2_DEC_CMD_RESUME decoder-cmds
+replace define V4L2_DEC_CMD_FLUSH decoder-cmds
replace define V4L2_DEC_CMD_START_MUTE_AUDIO decoder-cmds
replace define V4L2_DEC_CMD_PAUSE_TO_BLACK decoder-cmds
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 4fa9f543742d..91a79e16089c 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -1978,6 +1978,7 @@ struct v4l2_encoder_cmd {
#define V4L2_DEC_CMD_STOP (1)
#define V4L2_DEC_CMD_PAUSE (2)
#define V4L2_DEC_CMD_RESUME (3)
+#define V4L2_DEC_CMD_FLUSH (4)
/* Flags for V4L2_DEC_CMD_START */
#define V4L2_DEC_CMD_START_MUTE_AUDIO (1 << 0)
--
2.20.1
^ permalink raw reply related [flat|nested] 42+ messages in thread* Re: [PATCHv2 10/12] videodev2.h: add V4L2_DEC_CMD_FLUSH
2019-08-12 11:05 ` [PATCHv2 10/12] videodev2.h: add V4L2_DEC_CMD_FLUSH Hans Verkuil
@ 2019-08-15 8:12 ` Alexandre Courbot
2019-08-15 11:53 ` Hans Verkuil
0 siblings, 1 reply; 42+ messages in thread
From: Alexandre Courbot @ 2019-08-15 8:12 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Linux Media Mailing List, Tomasz Figa
On Mon, Aug 12, 2019 at 8:07 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>
> Add this new V4L2_DEC_CMD_FLUSH decoder command and document it.
>
> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
> ---
> Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst | 11 ++++++++++-
> Documentation/media/videodev2.h.rst.exceptions | 1 +
> include/uapi/linux/videodev2.h | 1 +
> 3 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
> index 57f0066f4cff..0bffef6058f7 100644
> --- a/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
> +++ b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
> @@ -208,7 +208,16 @@ introduced in Linux 3.3. They are, however, mandatory for stateful mem2mem decod
> been started yet, the driver will return an ``EPERM`` error code. When
> the decoder is already running, this command does nothing. No
> flags are defined for this command.
> -
> + * - ``V4L2_DEC_CMD_FLUSH``
> + - 4
> + - Flush any held capture buffers. Only valid for stateless decoders,
> + and only if ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF`` was set.
> + This command is typically used when the application reached the
> + end of the stream and the last output buffer had the
> + ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag set. This would prevent
> + dequeueing the last capture buffer containing the last decoded frame.
> + So this command can be used to explicitly flush that last decoded
> + frame.
I'm a bit confused here, isn't this command referred to as
V4L2_DEC_CMD_STOP in the previous patch?
>
> Return Value
> ============
> diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
> index adeb6b7a15cb..a79028e4d929 100644
> --- a/Documentation/media/videodev2.h.rst.exceptions
> +++ b/Documentation/media/videodev2.h.rst.exceptions
> @@ -434,6 +434,7 @@ replace define V4L2_DEC_CMD_START decoder-cmds
> replace define V4L2_DEC_CMD_STOP decoder-cmds
> replace define V4L2_DEC_CMD_PAUSE decoder-cmds
> replace define V4L2_DEC_CMD_RESUME decoder-cmds
> +replace define V4L2_DEC_CMD_FLUSH decoder-cmds
>
> replace define V4L2_DEC_CMD_START_MUTE_AUDIO decoder-cmds
> replace define V4L2_DEC_CMD_PAUSE_TO_BLACK decoder-cmds
> diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
> index 4fa9f543742d..91a79e16089c 100644
> --- a/include/uapi/linux/videodev2.h
> +++ b/include/uapi/linux/videodev2.h
> @@ -1978,6 +1978,7 @@ struct v4l2_encoder_cmd {
> #define V4L2_DEC_CMD_STOP (1)
> #define V4L2_DEC_CMD_PAUSE (2)
> #define V4L2_DEC_CMD_RESUME (3)
> +#define V4L2_DEC_CMD_FLUSH (4)
>
> /* Flags for V4L2_DEC_CMD_START */
> #define V4L2_DEC_CMD_START_MUTE_AUDIO (1 << 0)
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCHv2 10/12] videodev2.h: add V4L2_DEC_CMD_FLUSH
2019-08-15 8:12 ` Alexandre Courbot
@ 2019-08-15 11:53 ` Hans Verkuil
0 siblings, 0 replies; 42+ messages in thread
From: Hans Verkuil @ 2019-08-15 11:53 UTC (permalink / raw)
To: Alexandre Courbot; +Cc: Linux Media Mailing List, Tomasz Figa
On 8/15/19 10:12 AM, Alexandre Courbot wrote:
> On Mon, Aug 12, 2019 at 8:07 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>>
>> Add this new V4L2_DEC_CMD_FLUSH decoder command and document it.
>>
>> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
>> ---
>> Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst | 11 ++++++++++-
>> Documentation/media/videodev2.h.rst.exceptions | 1 +
>> include/uapi/linux/videodev2.h | 1 +
>> 3 files changed, 12 insertions(+), 1 deletion(-)
>>
>> diff --git a/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
>> index 57f0066f4cff..0bffef6058f7 100644
>> --- a/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
>> +++ b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
>> @@ -208,7 +208,16 @@ introduced in Linux 3.3. They are, however, mandatory for stateful mem2mem decod
>> been started yet, the driver will return an ``EPERM`` error code. When
>> the decoder is already running, this command does nothing. No
>> flags are defined for this command.
>> -
>> + * - ``V4L2_DEC_CMD_FLUSH``
>> + - 4
>> + - Flush any held capture buffers. Only valid for stateless decoders,
>> + and only if ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF`` was set.
>> + This command is typically used when the application reached the
>> + end of the stream and the last output buffer had the
>> + ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag set. This would prevent
>> + dequeueing the last capture buffer containing the last decoded frame.
>> + So this command can be used to explicitly flush that last decoded
>> + frame.
>
> I'm a bit confused here, isn't this command referred to as
> V4L2_DEC_CMD_STOP in the previous patch?
That was a typo in the previous patch. It really is FLUSH.
Regards,
Hans
>
>
>>
>> Return Value
>> ============
>> diff --git a/Documentation/media/videodev2.h.rst.exceptions b/Documentation/media/videodev2.h.rst.exceptions
>> index adeb6b7a15cb..a79028e4d929 100644
>> --- a/Documentation/media/videodev2.h.rst.exceptions
>> +++ b/Documentation/media/videodev2.h.rst.exceptions
>> @@ -434,6 +434,7 @@ replace define V4L2_DEC_CMD_START decoder-cmds
>> replace define V4L2_DEC_CMD_STOP decoder-cmds
>> replace define V4L2_DEC_CMD_PAUSE decoder-cmds
>> replace define V4L2_DEC_CMD_RESUME decoder-cmds
>> +replace define V4L2_DEC_CMD_FLUSH decoder-cmds
>>
>> replace define V4L2_DEC_CMD_START_MUTE_AUDIO decoder-cmds
>> replace define V4L2_DEC_CMD_PAUSE_TO_BLACK decoder-cmds
>> diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
>> index 4fa9f543742d..91a79e16089c 100644
>> --- a/include/uapi/linux/videodev2.h
>> +++ b/include/uapi/linux/videodev2.h
>> @@ -1978,6 +1978,7 @@ struct v4l2_encoder_cmd {
>> #define V4L2_DEC_CMD_STOP (1)
>> #define V4L2_DEC_CMD_PAUSE (2)
>> #define V4L2_DEC_CMD_RESUME (3)
>> +#define V4L2_DEC_CMD_FLUSH (4)
>>
>> /* Flags for V4L2_DEC_CMD_START */
>> #define V4L2_DEC_CMD_START_MUTE_AUDIO (1 << 0)
>> --
>> 2.20.1
>>
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCHv2 11/12] media: docs-rst: Document m2m stateless video decoder interface
2019-08-12 11:05 [PATCHv2 00/12] Stateful/stateless codec core support Hans Verkuil
` (9 preceding siblings ...)
2019-08-12 11:05 ` [PATCHv2 10/12] videodev2.h: add V4L2_DEC_CMD_FLUSH Hans Verkuil
@ 2019-08-12 11:05 ` Hans Verkuil
2019-08-15 9:58 ` Alexandre Courbot
2019-08-16 5:49 ` Alexandre Courbot
2019-08-12 11:05 ` [PATCHv2 12/12] media: docs-rst: Document memory-to-memory video encoder interface Hans Verkuil
11 siblings, 2 replies; 42+ messages in thread
From: Hans Verkuil @ 2019-08-12 11:05 UTC (permalink / raw)
To: linux-media; +Cc: Tomasz Figa, Alexandre Courbot
From: Alexandre Courbot <acourbot@chromium.org>
Documents the protocol that user-space should follow when
communicating with stateless video decoders.
The stateless video decoding API makes use of the new request and tags
APIs. While it has been implemented with the Cedrus driver so far, it
should probably still be considered staging for a short while.
Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
---
Documentation/media/uapi/v4l/dev-mem2mem.rst | 1 +
.../media/uapi/v4l/dev-stateless-decoder.rst | 424 ++++++++++++++++++
2 files changed, 425 insertions(+)
create mode 100644 Documentation/media/uapi/v4l/dev-stateless-decoder.rst
diff --git a/Documentation/media/uapi/v4l/dev-mem2mem.rst b/Documentation/media/uapi/v4l/dev-mem2mem.rst
index caa05f5f6380..70953958cee6 100644
--- a/Documentation/media/uapi/v4l/dev-mem2mem.rst
+++ b/Documentation/media/uapi/v4l/dev-mem2mem.rst
@@ -46,3 +46,4 @@ devices are given in the following sections.
:maxdepth: 1
dev-decoder
+ dev-stateless-decoder
diff --git a/Documentation/media/uapi/v4l/dev-stateless-decoder.rst b/Documentation/media/uapi/v4l/dev-stateless-decoder.rst
new file mode 100644
index 000000000000..4a26646eeec5
--- /dev/null
+++ b/Documentation/media/uapi/v4l/dev-stateless-decoder.rst
@@ -0,0 +1,424 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+.. _stateless_decoder:
+
+**************************************************
+Memory-to-memory Stateless Video Decoder Interface
+**************************************************
+
+A stateless decoder is a decoder that works without retaining any kind of state
+between processed frames. This means that each frame is decoded independently
+of any previous and future frames, and that the client is responsible for
+maintaining the decoding state and providing it to the decoder with each
+decoding request. This is in contrast to the stateful video decoder interface,
+where the hardware and driver maintain the decoding state and all the client
+has to do is to provide the raw encoded stream and dequeue decoded frames in
+display order.
+
+This section describes how user-space ("the client") is expected to communicate
+with stateless decoders in order to successfully decode an encoded stream.
+Compared to stateful codecs, the decoder/client sequence is simpler, but the
+cost of this simplicity is extra complexity in the client which is responsible
+for maintaining a consistent decoding state.
+
+Stateless decoders make use of the :ref:`media-request-api`. A stateless
+decoder must expose the ``V4L2_BUF_CAP_SUPPORTS_REQUESTS`` capability on its
+``OUTPUT`` queue when :c:func:`VIDIOC_REQBUFS` or :c:func:`VIDIOC_CREATE_BUFS`
+are invoked.
+
+Depending on the encoded formats supported by the decoder, a single decoded
+frame may be the result of several decode requests (for instance, H.264 streams
+with multiple slices per frame). Decoders that support such formats must also
+expose the ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF`` capability on their
+``OUTPUT`` queue.
+
+Querying capabilities
+=====================
+
+1. To enumerate the set of coded formats supported by the decoder, the client
+ calls :c:func:`VIDIOC_ENUM_FMT` on the ``OUTPUT`` queue.
+
+ * The driver must always return the full set of supported ``OUTPUT`` formats,
+ irrespective of the format currently set on the ``CAPTURE`` queue.
+
+ * Simultaneously, the driver must restrain the set of values returned by
+ codec-specific capability controls (such as H.264 profiles) to the set
+ actually supported by the hardware.
+
+2. To enumerate the set of supported raw formats, the client calls
+ :c:func:`VIDIOC_ENUM_FMT` on the ``CAPTURE`` queue.
+
+ * The driver must return only the formats supported for the format currently
+ active on the ``OUTPUT`` queue.
+
+ * Depending on the currently set ``OUTPUT`` format, the set of supported raw
+ formats may depend on the value of some codec-dependent controls.
+ The client is responsible for making sure that these controls are set
+ before querying the ``CAPTURE`` queue. Failure to do so will result in the
+ default values for these controls being used, and a returned set of formats
+ that may not be usable for the media the client is trying to decode.
+
+3. The client may use :c:func:`VIDIOC_ENUM_FRAMESIZES` to detect supported
+ resolutions for a given format, passing desired pixel format in
+ :c:type:`v4l2_frmsizeenum`'s ``pixel_format``.
+
+4. Supported profiles and levels for the current ``OUTPUT`` format, if
+ applicable, may be queried using their respective controls via
+ :c:func:`VIDIOC_QUERYCTRL`.
+
+Initialization
+==============
+
+1. Set the coded format on the ``OUTPUT`` queue via :c:func:`VIDIOC_S_FMT`.
+
+ * **Required fields:**
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
+
+ ``pixelformat``
+ a coded pixel format.
+
+ ``width``, ``height``
+ coded width and height parsed from the stream.
+
+ other fields
+ follow standard semantics.
+
+ .. note::
+
+ Changing the ``OUTPUT`` format may change the currently set ``CAPTURE``
+ format. The driver will derive a new ``CAPTURE`` format from the
+ ``OUTPUT`` format being set, including resolution, colorimetry
+ parameters, etc. If the client needs a specific ``CAPTURE`` format,
+ it must adjust it afterwards.
+
+2. Call :c:func:`VIDIOC_S_EXT_CTRLS` to set all the controls (parsed headers,
+ etc.) required by the ``OUTPUT`` format to enumerate the ``CAPTURE`` formats.
+
+3. Call :c:func:`VIDIOC_G_FMT` for ``CAPTURE`` queue to get the format for the
+ destination buffers parsed/decoded from the bytestream.
+
+ * **Required fields:**
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
+
+ * **Returned fields:**
+
+ ``width``, ``height``
+ frame buffer resolution for the decoded frames.
+
+ ``pixelformat``
+ pixel format for decoded frames.
+
+ ``num_planes`` (for _MPLANE ``type`` only)
+ number of planes for pixelformat.
+
+ ``sizeimage``, ``bytesperline``
+ as per standard semantics; matching frame buffer format.
+
+ .. note::
+
+ The value of ``pixelformat`` may be any pixel format supported for the
+ ``OUTPUT`` format, based on the hardware capabilities. It is suggested
+ that the driver chooses the preferred/optimal format for the current
+ configuration. For example, a YUV format may be preferred over an RGB
+ format, if an additional conversion step would be required for RGB.
+
+4. *[optional]* Enumerate ``CAPTURE`` formats via :c:func:`VIDIOC_ENUM_FMT` on
+ the ``CAPTURE`` queue. The client may use this ioctl to discover which
+ alternative raw formats are supported for the current ``OUTPUT`` format and
+ select one of them via :c:func:`VIDIOC_S_FMT`.
+
+ .. note::
+
+ The driver will return only formats supported for the currently selected
+ ``OUTPUT`` format and currently set controls, even if more formats may be
+ supported by the decoder in general.
+
+ For example, a decoder may support YUV and RGB formats for
+ resolutions 1920x1088 and lower, but only YUV for higher resolutions (due
+ to hardware limitations). After setting a resolution of 1920x1088 or lower
+ as the ``OUTPUT`` format, :c:func:`VIDIOC_ENUM_FMT` may return a set of
+ YUV and RGB pixel formats, but after setting a resolution higher than
+ 1920x1088, the driver will not return RGB pixel formats, since they are
+ unsupported for this resolution.
+
+5. *[optional]* Choose a different ``CAPTURE`` format than suggested via
+ :c:func:`VIDIOC_S_FMT` on ``CAPTURE`` queue. It is possible for the client to
+ choose a different format than selected/suggested by the driver in
+ :c:func:`VIDIOC_G_FMT`.
+
+ * **Required fields:**
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
+
+ ``pixelformat``
+ a raw pixel format.
+
+ ``width``, ``height``
+ frame buffer resolution of the decoded stream; typically unchanged from
+ what was returned with :c:func:`VIDIOC_G_FMT`, but it may be different
+ if the hardware supports composition and/or scaling.
+
+ After performing this step, the client must perform step 3 again in order
+ to obtain up-to-date information about the buffers size and layout.
+
+6. Allocate source (bytestream) buffers via :c:func:`VIDIOC_REQBUFS` on
+ ``OUTPUT`` queue.
+
+ * **Required fields:**
+
+ ``count``
+ requested number of buffers to allocate; greater than zero.
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
+
+ ``memory``
+ follows standard semantics.
+
+ * **Return fields:**
+
+ ``count``
+ actual number of buffers allocated.
+
+ * If required, the driver will adjust ``count`` to be equal or bigger to the
+ minimum of required number of ``OUTPUT`` buffers for the given format and
+ requested count. The client must check this value after the ioctl returns
+ to get the actual number of buffers allocated.
+
+7. Allocate destination (raw format) buffers via :c:func:`VIDIOC_REQBUFS` on the
+ ``CAPTURE`` queue.
+
+ * **Required fields:**
+
+ ``count``
+ requested number of buffers to allocate; greater than zero. The client
+ is responsible for deducing the minimum number of buffers required
+ for the stream to be properly decoded (taking e.g. reference frames
+ into account) and pass an equal or bigger number.
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
+
+ ``memory``
+ follows standard semantics. ``V4L2_MEMORY_USERPTR`` is not supported
+ for ``CAPTURE`` buffers.
+
+ * **Return fields:**
+
+ ``count``
+ adjusted to allocated number of buffers, in case the codec requires
+ more buffers than requested.
+
+ * The driver must adjust count to the minimum of required number of
+ ``CAPTURE`` buffers for the current format, stream configuration and
+ requested count. The client must check this value after the ioctl
+ returns to get the number of buffers allocated.
+
+8. Allocate requests (likely one per ``OUTPUT`` buffer) via
+ :c:func:`MEDIA_IOC_REQUEST_ALLOC` on the media device.
+
+9. Start streaming on both ``OUTPUT`` and ``CAPTURE`` queues via
+ :c:func:`VIDIOC_STREAMON`.
+
+Decoding
+========
+
+For each frame, the client is responsible for submitting at least one request to
+which the following is attached:
+
+* The amount of encoded data expected by the codec for its current
+ configuration, as a buffer submitted to the ``OUTPUT`` queue. Typically, this
+ corresponds to one frame worth of encoded data, but some formats may allow (or
+ require) different amounts per unit.
+* All the metadata needed to decode the submitted encoded data, in the form of
+ controls relevant to the format being decoded.
+
+The amount of data and contents of the source ``OUTPUT`` buffer, as well as the
+controls that must be set on the request, depend on the active coded pixel
+format and might be affected by codec-specific extended controls, as stated in
+documentation of each format.
+
+If there is a possibility that the decoded frame will require one or more
+decode requests after the current one in order to be produced, then the client
+must set the ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag on the ``OUTPUT``
+buffer. This will result in the (potentially partially) decoded ``CAPTURE``
+buffer not being made available for dequeueing, and reused for the next decode
+request if the timestamp of the next ``OUTPUT`` buffer has not changed.
+
+A typical frame would thus be decoded using the following sequence:
+
+1. Queue an ``OUTPUT`` buffer containing one unit of encoded bytestream data for
+ the decoding request, using :c:func:`VIDIOC_QBUF`.
+
+ * **Required fields:**
+
+ ``index``
+ index of the buffer being queued.
+
+ ``type``
+ type of the buffer.
+
+ ``bytesused``
+ number of bytes taken by the encoded data frame in the buffer.
+
+ ``flags``
+ the ``V4L2_BUF_FLAG_REQUEST_FD`` flag must be set. Additionally, if
+ we are not sure that the current decode request is the last one needed
+ to produce a fully decoded frame, then
+ ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` must also be set.
+
+ ``request_fd``
+ must be set to the file descriptor of the decoding request.
+
+ ``timestamp``
+ must be set to a unique value per frame. This value will be propagated
+ into the decoded frame's buffer and can also be used to use this frame
+ as the reference of another. If using multiple decode requests per
+ frame, then the timestamps of all the ``OUTPUT`` buffers for a given
+ frame must be identical. If the timestamp changes, then the currently
+ held ``CAPTURE`` buffer will be made available for dequeuing and the
+ current request will work on a new ``CAPTURE`` buffer.
+
+2. Set the codec-specific controls for the decoding request, using
+ :c:func:`VIDIOC_S_EXT_CTRLS`.
+
+ * **Required fields:**
+
+ ``which``
+ must be ``V4L2_CTRL_WHICH_REQUEST_VAL``.
+
+ ``request_fd``
+ must be set to the file descriptor of the decoding request.
+
+ other fields
+ other fields are set as usual when setting controls. The ``controls``
+ array must contain all the codec-specific controls required to decode
+ a frame.
+
+ .. note::
+
+ It is possible to specify the controls in different invocations of
+ :c:func:`VIDIOC_S_EXT_CTRLS`, or to overwrite a previously set control, as
+ long as ``request_fd`` and ``which`` are properly set. The controls state
+ at the moment of request submission is the one that will be considered.
+
+ .. note::
+
+ The order in which steps 1 and 2 take place is interchangeable.
+
+3. Submit the request by invoking :c:func:`MEDIA_REQUEST_IOC_QUEUE` on the
+ request FD.
+
+ If the request is submitted without an ``OUTPUT`` buffer, or if some of the
+ required controls are missing from the request, then
+ :c:func:`MEDIA_REQUEST_IOC_QUEUE` will return ``-ENOENT``. If more than one
+ ``OUTPUT`` buffer is queued, then it will return ``-EINVAL``.
+ :c:func:`MEDIA_REQUEST_IOC_QUEUE` returning non-zero means that no
+ ``CAPTURE`` buffer will be produced for this request.
+
+``CAPTURE`` buffers must not be part of the request, and are queued
+independently. They are returned in decode order (i.e. the same order as coded
+frames were submitted to the ``OUTPUT`` queue).
+
+Runtime decoding errors are signaled by the dequeued ``CAPTURE`` buffers
+carrying the ``V4L2_BUF_FLAG_ERROR`` flag. If a decoded reference frame has an
+error, then all following decoded frames that refer to it also have the
+``V4L2_BUF_FLAG_ERROR`` flag set, although the decoder will still try to
+produce (likely corrupted) frames.
+
+Buffer management while decoding
+================================
+Contrary to stateful decoders, a stateless decoder does not perform any kind of
+buffer management: it only guarantees that dequeued ``CAPTURE`` buffers can be
+used by the client for as long as they are not queued again. "Used" here
+encompasses using the buffer for compositing or display.
+
+A dequeued capture buffer can also be used as the reference frame of another
+buffer.
+
+A frame is specified as reference by converting its timestamp into nanoseconds,
+and storing it into the relevant member of a codec-dependent control structure.
+The :c:func:`v4l2_timeval_to_ns` function must be used to perform that
+conversion. The timestamp of a frame can be used to reference it as soon as all
+its units of encoded data are successfully submitted to the ``OUTPUT`` queue.
+
+A decoded buffer containing a reference frame must not be reused as a decoding
+target until all the frames referencing it have been decoded. The safest way to
+achieve this is to refrain from queueing a reference buffer until all the
+decoded frames referencing it have been dequeued. However, if the driver can
+guarantee that buffers queued to the ``CAPTURE`` queue are processed in queued
+order, then user-space can take advantage of this guarantee and queue a
+reference buffer when the following conditions are met:
+
+1. All the requests for frames affected by the reference frame have been
+ queued, and
+
+2. A sufficient number of ``CAPTURE`` buffers to cover all the decoded
+ referencing frames have been queued.
+
+When queuing a decoding request, the driver will increase the reference count of
+all the resources associated with reference frames. This means that the client
+can e.g. close the DMABUF file descriptors of reference frame buffers if it
+won't need them afterwards.
+
+Seeking
+=======
+In order to seek, the client just needs to submit requests using input buffers
+corresponding to the new stream position. It must however be aware that
+resolution may have changed and follow the dynamic resolution change sequence in
+that case. Also depending on the codec used, picture parameters (e.g. SPS/PPS
+for H.264) may have changed and the client is responsible for making sure that a
+valid state is sent to the decoder.
+
+The client is then free to ignore any returned ``CAPTURE`` buffer that comes
+from the pre-seek position.
+
+Pausing
+=======
+
+In order to pause, the client can just cease queuing buffers onto the ``OUTPUT``
+queue. Without source bytestream data, there is no data to process and the codec
+will remain idle.
+
+Dynamic resolution change
+=========================
+
+If the client detects a resolution change in the stream, it will need to perform
+the initialization sequence again with the new resolution:
+
+1. If the last submitted request resulted in a ``CAPTURE`` buffer being
+ held by the use of the ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag, then the
+ last frame is not available on the ``CAPTURE`` queue. In this case, a
+ ``V4L2_DEC_CMD_FLUSH`` command shall be sent. This will make the driver
+ dequeue the held ``CAPTURE`` buffer.
+
+2. Wait until all submitted requests have completed and dequeue the
+ corresponding output buffers.
+
+3. Call :c:func:`VIDIOC_STREAMOFF` on both the ``OUTPUT`` and ``CAPTURE``
+ queues.
+
+4. Free all ``CAPTURE`` buffers by calling :c:func:`VIDIOC_REQBUFS` on the
+ ``CAPTURE`` queue with a buffer count of zero.
+
+5. Perform the initialization sequence again (minus the allocation of
+ ``OUTPUT`` buffers), with the new resolution set on the ``OUTPUT`` queue.
+ Note that due to resolution constraints, a different format may need to be
+ picked on the ``CAPTURE`` queue.
+
+Drain
+=====
+
+If the last submitted request resulted in a ``CAPTURE`` buffer being
+held by the use of the ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag, then the
+last frame is not available on the ``CAPTURE`` queue. In this case, a
+``V4L2_DEC_CMD_FLUSH`` command shall be sent. This will make the driver
+dequeue the held ``CAPTURE`` buffer.
+
+After that, in order to drain the stream on a stateless decoder, the client
+just needs to wait until all the submitted requests are completed.
--
2.20.1
^ permalink raw reply related [flat|nested] 42+ messages in thread* Re: [PATCHv2 11/12] media: docs-rst: Document m2m stateless video decoder interface
2019-08-12 11:05 ` [PATCHv2 11/12] media: docs-rst: Document m2m stateless video decoder interface Hans Verkuil
@ 2019-08-15 9:58 ` Alexandre Courbot
2019-08-16 5:49 ` Alexandre Courbot
1 sibling, 0 replies; 42+ messages in thread
From: Alexandre Courbot @ 2019-08-15 9:58 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Linux Media Mailing List, Tomasz Figa
On Mon, Aug 12, 2019 at 8:07 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>
> From: Alexandre Courbot <acourbot@chromium.org>
>
> Documents the protocol that user-space should follow when
> communicating with stateless video decoders.
>
> The stateless video decoding API makes use of the new request and tags
> APIs. While it has been implemented with the Cedrus driver so far, it
> should probably still be considered staging for a short while.
>
> Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
> ---
> Documentation/media/uapi/v4l/dev-mem2mem.rst | 1 +
> .../media/uapi/v4l/dev-stateless-decoder.rst | 424 ++++++++++++++++++
> 2 files changed, 425 insertions(+)
> create mode 100644 Documentation/media/uapi/v4l/dev-stateless-decoder.rst
>
> diff --git a/Documentation/media/uapi/v4l/dev-mem2mem.rst b/Documentation/media/uapi/v4l/dev-mem2mem.rst
> index caa05f5f6380..70953958cee6 100644
> --- a/Documentation/media/uapi/v4l/dev-mem2mem.rst
> +++ b/Documentation/media/uapi/v4l/dev-mem2mem.rst
> @@ -46,3 +46,4 @@ devices are given in the following sections.
> :maxdepth: 1
>
> dev-decoder
> + dev-stateless-decoder
> diff --git a/Documentation/media/uapi/v4l/dev-stateless-decoder.rst b/Documentation/media/uapi/v4l/dev-stateless-decoder.rst
> new file mode 100644
> index 000000000000..4a26646eeec5
> --- /dev/null
> +++ b/Documentation/media/uapi/v4l/dev-stateless-decoder.rst
> @@ -0,0 +1,424 @@
> +.. SPDX-License-Identifier: GPL-2.0
> +
> +.. _stateless_decoder:
> +
> +**************************************************
> +Memory-to-memory Stateless Video Decoder Interface
> +**************************************************
> +
> +A stateless decoder is a decoder that works without retaining any kind of state
> +between processed frames. This means that each frame is decoded independently
> +of any previous and future frames, and that the client is responsible for
> +maintaining the decoding state and providing it to the decoder with each
> +decoding request. This is in contrast to the stateful video decoder interface,
> +where the hardware and driver maintain the decoding state and all the client
> +has to do is to provide the raw encoded stream and dequeue decoded frames in
> +display order.
> +
> +This section describes how user-space ("the client") is expected to communicate
> +with stateless decoders in order to successfully decode an encoded stream.
> +Compared to stateful codecs, the decoder/client sequence is simpler, but the
> +cost of this simplicity is extra complexity in the client which is responsible
> +for maintaining a consistent decoding state.
> +
> +Stateless decoders make use of the :ref:`media-request-api`. A stateless
> +decoder must expose the ``V4L2_BUF_CAP_SUPPORTS_REQUESTS`` capability on its
> +``OUTPUT`` queue when :c:func:`VIDIOC_REQBUFS` or :c:func:`VIDIOC_CREATE_BUFS`
> +are invoked.
> +
> +Depending on the encoded formats supported by the decoder, a single decoded
> +frame may be the result of several decode requests (for instance, H.264 streams
> +with multiple slices per frame). Decoders that support such formats must also
> +expose the ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF`` capability on their
> +``OUTPUT`` queue.
> +
> +Querying capabilities
> +=====================
> +
> +1. To enumerate the set of coded formats supported by the decoder, the client
> + calls :c:func:`VIDIOC_ENUM_FMT` on the ``OUTPUT`` queue.
> +
> + * The driver must always return the full set of supported ``OUTPUT`` formats,
> + irrespective of the format currently set on the ``CAPTURE`` queue.
> +
> + * Simultaneously, the driver must restrain the set of values returned by
> + codec-specific capability controls (such as H.264 profiles) to the set
> + actually supported by the hardware.
> +
> +2. To enumerate the set of supported raw formats, the client calls
> + :c:func:`VIDIOC_ENUM_FMT` on the ``CAPTURE`` queue.
> +
> + * The driver must return only the formats supported for the format currently
> + active on the ``OUTPUT`` queue.
> +
> + * Depending on the currently set ``OUTPUT`` format, the set of supported raw
> + formats may depend on the value of some codec-dependent controls.
> + The client is responsible for making sure that these controls are set
> + before querying the ``CAPTURE`` queue. Failure to do so will result in the
> + default values for these controls being used, and a returned set of formats
> + that may not be usable for the media the client is trying to decode.
> +
> +3. The client may use :c:func:`VIDIOC_ENUM_FRAMESIZES` to detect supported
> + resolutions for a given format, passing desired pixel format in
> + :c:type:`v4l2_frmsizeenum`'s ``pixel_format``.
> +
> +4. Supported profiles and levels for the current ``OUTPUT`` format, if
> + applicable, may be queried using their respective controls via
> + :c:func:`VIDIOC_QUERYCTRL`.
Re-reading this I think we should add a step describing how to check
the capabilities on the OUTPUT queue, e.g.
2. To check that the drivers supports requests and (optionally) holding capture
buffers, the client calls :c:func:`VIDIOC_REQBUFS` on the ``OUTPUT``
queue:
* **Required fields:**
``count``
must be 0, so no buffers are allocated by this operation.
``type``
a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
``memory``
must be ``V4L2_MEMORY_MMAP``.
* **Return fields:**
``capabilities``
capabilities of the queue. The client can confirm that the
V4L2_BUF_CAP_SUPPORTS_REQUESTS and
V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF flags are
set.
> +
> +Initialization
> +==============
> +
> +1. Set the coded format on the ``OUTPUT`` queue via :c:func:`VIDIOC_S_FMT`.
> +
> + * **Required fields:**
> +
> + ``type``
> + a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
> +
> + ``pixelformat``
> + a coded pixel format.
> +
> + ``width``, ``height``
> + coded width and height parsed from the stream.
> +
> + other fields
> + follow standard semantics.
> +
> + .. note::
> +
> + Changing the ``OUTPUT`` format may change the currently set ``CAPTURE``
> + format. The driver will derive a new ``CAPTURE`` format from the
> + ``OUTPUT`` format being set, including resolution, colorimetry
> + parameters, etc. If the client needs a specific ``CAPTURE`` format,
> + it must adjust it afterwards.
> +
> +2. Call :c:func:`VIDIOC_S_EXT_CTRLS` to set all the controls (parsed headers,
> + etc.) required by the ``OUTPUT`` format to enumerate the ``CAPTURE`` formats.
> +
> +3. Call :c:func:`VIDIOC_G_FMT` for ``CAPTURE`` queue to get the format for the
> + destination buffers parsed/decoded from the bytestream.
> +
> + * **Required fields:**
> +
> + ``type``
> + a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
> +
> + * **Returned fields:**
> +
> + ``width``, ``height``
> + frame buffer resolution for the decoded frames.
> +
> + ``pixelformat``
> + pixel format for decoded frames.
> +
> + ``num_planes`` (for _MPLANE ``type`` only)
> + number of planes for pixelformat.
> +
> + ``sizeimage``, ``bytesperline``
> + as per standard semantics; matching frame buffer format.
> +
> + .. note::
> +
> + The value of ``pixelformat`` may be any pixel format supported for the
> + ``OUTPUT`` format, based on the hardware capabilities. It is suggested
> + that the driver chooses the preferred/optimal format for the current
> + configuration. For example, a YUV format may be preferred over an RGB
> + format, if an additional conversion step would be required for RGB.
> +
> +4. *[optional]* Enumerate ``CAPTURE`` formats via :c:func:`VIDIOC_ENUM_FMT` on
> + the ``CAPTURE`` queue. The client may use this ioctl to discover which
> + alternative raw formats are supported for the current ``OUTPUT`` format and
> + select one of them via :c:func:`VIDIOC_S_FMT`.
> +
> + .. note::
> +
> + The driver will return only formats supported for the currently selected
> + ``OUTPUT`` format and currently set controls, even if more formats may be
> + supported by the decoder in general.
> +
> + For example, a decoder may support YUV and RGB formats for
> + resolutions 1920x1088 and lower, but only YUV for higher resolutions (due
> + to hardware limitations). After setting a resolution of 1920x1088 or lower
> + as the ``OUTPUT`` format, :c:func:`VIDIOC_ENUM_FMT` may return a set of
> + YUV and RGB pixel formats, but after setting a resolution higher than
> + 1920x1088, the driver will not return RGB pixel formats, since they are
> + unsupported for this resolution.
> +
> +5. *[optional]* Choose a different ``CAPTURE`` format than suggested via
> + :c:func:`VIDIOC_S_FMT` on ``CAPTURE`` queue. It is possible for the client to
> + choose a different format than selected/suggested by the driver in
> + :c:func:`VIDIOC_G_FMT`.
> +
> + * **Required fields:**
> +
> + ``type``
> + a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
> +
> + ``pixelformat``
> + a raw pixel format.
> +
> + ``width``, ``height``
> + frame buffer resolution of the decoded stream; typically unchanged from
> + what was returned with :c:func:`VIDIOC_G_FMT`, but it may be different
> + if the hardware supports composition and/or scaling.
> +
> + After performing this step, the client must perform step 3 again in order
> + to obtain up-to-date information about the buffers size and layout.
> +
> +6. Allocate source (bytestream) buffers via :c:func:`VIDIOC_REQBUFS` on
> + ``OUTPUT`` queue.
> +
> + * **Required fields:**
> +
> + ``count``
> + requested number of buffers to allocate; greater than zero.
> +
> + ``type``
> + a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
> +
> + ``memory``
> + follows standard semantics.
> +
> + * **Return fields:**
> +
> + ``count``
> + actual number of buffers allocated.
> +
> + * If required, the driver will adjust ``count`` to be equal or bigger to the
> + minimum of required number of ``OUTPUT`` buffers for the given format and
> + requested count. The client must check this value after the ioctl returns
> + to get the actual number of buffers allocated.
> +
> +7. Allocate destination (raw format) buffers via :c:func:`VIDIOC_REQBUFS` on the
> + ``CAPTURE`` queue.
> +
> + * **Required fields:**
> +
> + ``count``
> + requested number of buffers to allocate; greater than zero. The client
> + is responsible for deducing the minimum number of buffers required
> + for the stream to be properly decoded (taking e.g. reference frames
> + into account) and pass an equal or bigger number.
> +
> + ``type``
> + a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
> +
> + ``memory``
> + follows standard semantics. ``V4L2_MEMORY_USERPTR`` is not supported
> + for ``CAPTURE`` buffers.
> +
> + * **Return fields:**
> +
> + ``count``
> + adjusted to allocated number of buffers, in case the codec requires
> + more buffers than requested.
> +
> + * The driver must adjust count to the minimum of required number of
> + ``CAPTURE`` buffers for the current format, stream configuration and
> + requested count. The client must check this value after the ioctl
> + returns to get the number of buffers allocated.
> +
> +8. Allocate requests (likely one per ``OUTPUT`` buffer) via
> + :c:func:`MEDIA_IOC_REQUEST_ALLOC` on the media device.
> +
> +9. Start streaming on both ``OUTPUT`` and ``CAPTURE`` queues via
> + :c:func:`VIDIOC_STREAMON`.
> +
> +Decoding
> +========
> +
> +For each frame, the client is responsible for submitting at least one request to
> +which the following is attached:
> +
> +* The amount of encoded data expected by the codec for its current
> + configuration, as a buffer submitted to the ``OUTPUT`` queue. Typically, this
> + corresponds to one frame worth of encoded data, but some formats may allow (or
> + require) different amounts per unit.
> +* All the metadata needed to decode the submitted encoded data, in the form of
> + controls relevant to the format being decoded.
> +
> +The amount of data and contents of the source ``OUTPUT`` buffer, as well as the
> +controls that must be set on the request, depend on the active coded pixel
> +format and might be affected by codec-specific extended controls, as stated in
> +documentation of each format.
> +
> +If there is a possibility that the decoded frame will require one or more
> +decode requests after the current one in order to be produced, then the client
> +must set the ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag on the ``OUTPUT``
> +buffer. This will result in the (potentially partially) decoded ``CAPTURE``
> +buffer not being made available for dequeueing, and reused for the next decode
> +request if the timestamp of the next ``OUTPUT`` buffer has not changed.
> +
> +A typical frame would thus be decoded using the following sequence:
> +
> +1. Queue an ``OUTPUT`` buffer containing one unit of encoded bytestream data for
> + the decoding request, using :c:func:`VIDIOC_QBUF`.
> +
> + * **Required fields:**
> +
> + ``index``
> + index of the buffer being queued.
> +
> + ``type``
> + type of the buffer.
> +
> + ``bytesused``
> + number of bytes taken by the encoded data frame in the buffer.
> +
> + ``flags``
> + the ``V4L2_BUF_FLAG_REQUEST_FD`` flag must be set. Additionally, if
> + we are not sure that the current decode request is the last one needed
> + to produce a fully decoded frame, then
> + ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` must also be set.
> +
> + ``request_fd``
> + must be set to the file descriptor of the decoding request.
> +
> + ``timestamp``
> + must be set to a unique value per frame. This value will be propagated
> + into the decoded frame's buffer and can also be used to use this frame
> + as the reference of another. If using multiple decode requests per
> + frame, then the timestamps of all the ``OUTPUT`` buffers for a given
> + frame must be identical. If the timestamp changes, then the currently
> + held ``CAPTURE`` buffer will be made available for dequeuing and the
> + current request will work on a new ``CAPTURE`` buffer.
> +
> +2. Set the codec-specific controls for the decoding request, using
> + :c:func:`VIDIOC_S_EXT_CTRLS`.
> +
> + * **Required fields:**
> +
> + ``which``
> + must be ``V4L2_CTRL_WHICH_REQUEST_VAL``.
> +
> + ``request_fd``
> + must be set to the file descriptor of the decoding request.
> +
> + other fields
> + other fields are set as usual when setting controls. The ``controls``
> + array must contain all the codec-specific controls required to decode
> + a frame.
> +
> + .. note::
> +
> + It is possible to specify the controls in different invocations of
> + :c:func:`VIDIOC_S_EXT_CTRLS`, or to overwrite a previously set control, as
> + long as ``request_fd`` and ``which`` are properly set. The controls state
> + at the moment of request submission is the one that will be considered.
> +
> + .. note::
> +
> + The order in which steps 1 and 2 take place is interchangeable.
> +
> +3. Submit the request by invoking :c:func:`MEDIA_REQUEST_IOC_QUEUE` on the
> + request FD.
> +
> + If the request is submitted without an ``OUTPUT`` buffer, or if some of the
> + required controls are missing from the request, then
> + :c:func:`MEDIA_REQUEST_IOC_QUEUE` will return ``-ENOENT``. If more than one
> + ``OUTPUT`` buffer is queued, then it will return ``-EINVAL``.
> + :c:func:`MEDIA_REQUEST_IOC_QUEUE` returning non-zero means that no
> + ``CAPTURE`` buffer will be produced for this request.
> +
> +``CAPTURE`` buffers must not be part of the request, and are queued
> +independently. They are returned in decode order (i.e. the same order as coded
> +frames were submitted to the ``OUTPUT`` queue).
> +
> +Runtime decoding errors are signaled by the dequeued ``CAPTURE`` buffers
> +carrying the ``V4L2_BUF_FLAG_ERROR`` flag. If a decoded reference frame has an
> +error, then all following decoded frames that refer to it also have the
> +``V4L2_BUF_FLAG_ERROR`` flag set, although the decoder will still try to
> +produce (likely corrupted) frames.
> +
> +Buffer management while decoding
> +================================
> +Contrary to stateful decoders, a stateless decoder does not perform any kind of
> +buffer management: it only guarantees that dequeued ``CAPTURE`` buffers can be
> +used by the client for as long as they are not queued again. "Used" here
> +encompasses using the buffer for compositing or display.
> +
> +A dequeued capture buffer can also be used as the reference frame of another
> +buffer.
> +
> +A frame is specified as reference by converting its timestamp into nanoseconds,
> +and storing it into the relevant member of a codec-dependent control structure.
> +The :c:func:`v4l2_timeval_to_ns` function must be used to perform that
> +conversion. The timestamp of a frame can be used to reference it as soon as all
> +its units of encoded data are successfully submitted to the ``OUTPUT`` queue.
> +
> +A decoded buffer containing a reference frame must not be reused as a decoding
> +target until all the frames referencing it have been decoded. The safest way to
> +achieve this is to refrain from queueing a reference buffer until all the
> +decoded frames referencing it have been dequeued. However, if the driver can
> +guarantee that buffers queued to the ``CAPTURE`` queue are processed in queued
> +order, then user-space can take advantage of this guarantee and queue a
> +reference buffer when the following conditions are met:
> +
> +1. All the requests for frames affected by the reference frame have been
> + queued, and
> +
> +2. A sufficient number of ``CAPTURE`` buffers to cover all the decoded
> + referencing frames have been queued.
> +
> +When queuing a decoding request, the driver will increase the reference count of
> +all the resources associated with reference frames. This means that the client
> +can e.g. close the DMABUF file descriptors of reference frame buffers if it
> +won't need them afterwards.
> +
> +Seeking
> +=======
> +In order to seek, the client just needs to submit requests using input buffers
> +corresponding to the new stream position. It must however be aware that
> +resolution may have changed and follow the dynamic resolution change sequence in
> +that case. Also depending on the codec used, picture parameters (e.g. SPS/PPS
> +for H.264) may have changed and the client is responsible for making sure that a
> +valid state is sent to the decoder.
> +
> +The client is then free to ignore any returned ``CAPTURE`` buffer that comes
> +from the pre-seek position.
> +
> +Pausing
> +=======
> +
> +In order to pause, the client can just cease queuing buffers onto the ``OUTPUT``
> +queue. Without source bytestream data, there is no data to process and the codec
> +will remain idle.
> +
> +Dynamic resolution change
> +=========================
> +
> +If the client detects a resolution change in the stream, it will need to perform
> +the initialization sequence again with the new resolution:
> +
> +1. If the last submitted request resulted in a ``CAPTURE`` buffer being
> + held by the use of the ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag, then the
> + last frame is not available on the ``CAPTURE`` queue. In this case, a
> + ``V4L2_DEC_CMD_FLUSH`` command shall be sent. This will make the driver
> + dequeue the held ``CAPTURE`` buffer.
> +
> +2. Wait until all submitted requests have completed and dequeue the
> + corresponding output buffers.
> +
> +3. Call :c:func:`VIDIOC_STREAMOFF` on both the ``OUTPUT`` and ``CAPTURE``
> + queues.
> +
> +4. Free all ``CAPTURE`` buffers by calling :c:func:`VIDIOC_REQBUFS` on the
> + ``CAPTURE`` queue with a buffer count of zero.
> +
> +5. Perform the initialization sequence again (minus the allocation of
> + ``OUTPUT`` buffers), with the new resolution set on the ``OUTPUT`` queue.
> + Note that due to resolution constraints, a different format may need to be
> + picked on the ``CAPTURE`` queue.
> +
> +Drain
> +=====
> +
> +If the last submitted request resulted in a ``CAPTURE`` buffer being
> +held by the use of the ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag, then the
> +last frame is not available on the ``CAPTURE`` queue. In this case, a
> +``V4L2_DEC_CMD_FLUSH`` command shall be sent. This will make the driver
> +dequeue the held ``CAPTURE`` buffer.
As discussed on another patch, can we specify that V4L2_DEC_CMD_FLUSH
is valid (or maybe even must be used) even if
V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF is not used? This would make
clients simpler.
> +
> +After that, in order to drain the stream on a stateless decoder, the client
> +just needs to wait until all the submitted requests are completed.
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCHv2 11/12] media: docs-rst: Document m2m stateless video decoder interface
2019-08-12 11:05 ` [PATCHv2 11/12] media: docs-rst: Document m2m stateless video decoder interface Hans Verkuil
2019-08-15 9:58 ` Alexandre Courbot
@ 2019-08-16 5:49 ` Alexandre Courbot
2019-08-16 6:59 ` Hans Verkuil
1 sibling, 1 reply; 42+ messages in thread
From: Alexandre Courbot @ 2019-08-16 5:49 UTC (permalink / raw)
To: Hans Verkuil
Cc: Linux Media Mailing List, Tomasz Figa, Francois Buergisser,
Ezequiel Garcia, Boris Brezillon
On Mon, Aug 12, 2019 at 8:07 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>
> From: Alexandre Courbot <acourbot@chromium.org>
>
> Documents the protocol that user-space should follow when
> communicating with stateless video decoders.
>
> The stateless video decoding API makes use of the new request and tags
> APIs. While it has been implemented with the Cedrus driver so far, it
> should probably still be considered staging for a short while.
>
> Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
> ---
> Documentation/media/uapi/v4l/dev-mem2mem.rst | 1 +
> .../media/uapi/v4l/dev-stateless-decoder.rst | 424 ++++++++++++++++++
> 2 files changed, 425 insertions(+)
> create mode 100644 Documentation/media/uapi/v4l/dev-stateless-decoder.rst
>
> diff --git a/Documentation/media/uapi/v4l/dev-mem2mem.rst b/Documentation/media/uapi/v4l/dev-mem2mem.rst
> index caa05f5f6380..70953958cee6 100644
> --- a/Documentation/media/uapi/v4l/dev-mem2mem.rst
> +++ b/Documentation/media/uapi/v4l/dev-mem2mem.rst
> @@ -46,3 +46,4 @@ devices are given in the following sections.
> :maxdepth: 1
>
> dev-decoder
> + dev-stateless-decoder
> diff --git a/Documentation/media/uapi/v4l/dev-stateless-decoder.rst b/Documentation/media/uapi/v4l/dev-stateless-decoder.rst
> new file mode 100644
> index 000000000000..4a26646eeec5
> --- /dev/null
> +++ b/Documentation/media/uapi/v4l/dev-stateless-decoder.rst
> @@ -0,0 +1,424 @@
> +.. SPDX-License-Identifier: GPL-2.0
> +
> +.. _stateless_decoder:
> +
> +**************************************************
> +Memory-to-memory Stateless Video Decoder Interface
> +**************************************************
> +
> +A stateless decoder is a decoder that works without retaining any kind of state
> +between processed frames. This means that each frame is decoded independently
> +of any previous and future frames, and that the client is responsible for
> +maintaining the decoding state and providing it to the decoder with each
> +decoding request. This is in contrast to the stateful video decoder interface,
> +where the hardware and driver maintain the decoding state and all the client
> +has to do is to provide the raw encoded stream and dequeue decoded frames in
> +display order.
> +
> +This section describes how user-space ("the client") is expected to communicate
> +with stateless decoders in order to successfully decode an encoded stream.
> +Compared to stateful codecs, the decoder/client sequence is simpler, but the
> +cost of this simplicity is extra complexity in the client which is responsible
> +for maintaining a consistent decoding state.
> +
> +Stateless decoders make use of the :ref:`media-request-api`. A stateless
> +decoder must expose the ``V4L2_BUF_CAP_SUPPORTS_REQUESTS`` capability on its
> +``OUTPUT`` queue when :c:func:`VIDIOC_REQBUFS` or :c:func:`VIDIOC_CREATE_BUFS`
> +are invoked.
> +
> +Depending on the encoded formats supported by the decoder, a single decoded
> +frame may be the result of several decode requests (for instance, H.264 streams
> +with multiple slices per frame). Decoders that support such formats must also
> +expose the ``V4L2_BUF_CAP_SUPPORTS_M2M_HOLD_CAPTURE_BUF`` capability on their
> +``OUTPUT`` queue.
> +
> +Querying capabilities
> +=====================
> +
> +1. To enumerate the set of coded formats supported by the decoder, the client
> + calls :c:func:`VIDIOC_ENUM_FMT` on the ``OUTPUT`` queue.
> +
> + * The driver must always return the full set of supported ``OUTPUT`` formats,
> + irrespective of the format currently set on the ``CAPTURE`` queue.
> +
> + * Simultaneously, the driver must restrain the set of values returned by
> + codec-specific capability controls (such as H.264 profiles) to the set
> + actually supported by the hardware.
> +
> +2. To enumerate the set of supported raw formats, the client calls
> + :c:func:`VIDIOC_ENUM_FMT` on the ``CAPTURE`` queue.
> +
> + * The driver must return only the formats supported for the format currently
> + active on the ``OUTPUT`` queue.
> +
> + * Depending on the currently set ``OUTPUT`` format, the set of supported raw
> + formats may depend on the value of some codec-dependent controls.
> + The client is responsible for making sure that these controls are set
> + before querying the ``CAPTURE`` queue. Failure to do so will result in the
> + default values for these controls being used, and a returned set of formats
> + that may not be usable for the media the client is trying to decode.
> +
> +3. The client may use :c:func:`VIDIOC_ENUM_FRAMESIZES` to detect supported
> + resolutions for a given format, passing desired pixel format in
> + :c:type:`v4l2_frmsizeenum`'s ``pixel_format``.
> +
> +4. Supported profiles and levels for the current ``OUTPUT`` format, if
> + applicable, may be queried using their respective controls via
> + :c:func:`VIDIOC_QUERYCTRL`.
> +
> +Initialization
> +==============
> +
> +1. Set the coded format on the ``OUTPUT`` queue via :c:func:`VIDIOC_S_FMT`.
> +
> + * **Required fields:**
> +
> + ``type``
> + a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
> +
> + ``pixelformat``
> + a coded pixel format.
> +
> + ``width``, ``height``
> + coded width and height parsed from the stream.
> +
> + other fields
> + follow standard semantics.
> +
> + .. note::
> +
> + Changing the ``OUTPUT`` format may change the currently set ``CAPTURE``
> + format. The driver will derive a new ``CAPTURE`` format from the
> + ``OUTPUT`` format being set, including resolution, colorimetry
> + parameters, etc. If the client needs a specific ``CAPTURE`` format,
> + it must adjust it afterwards.
> +
> +2. Call :c:func:`VIDIOC_S_EXT_CTRLS` to set all the controls (parsed headers,
> + etc.) required by the ``OUTPUT`` format to enumerate the ``CAPTURE`` formats.
> +
> +3. Call :c:func:`VIDIOC_G_FMT` for ``CAPTURE`` queue to get the format for the
> + destination buffers parsed/decoded from the bytestream.
> +
> + * **Required fields:**
> +
> + ``type``
> + a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
> +
> + * **Returned fields:**
> +
> + ``width``, ``height``
> + frame buffer resolution for the decoded frames.
> +
> + ``pixelformat``
> + pixel format for decoded frames.
> +
> + ``num_planes`` (for _MPLANE ``type`` only)
> + number of planes for pixelformat.
> +
> + ``sizeimage``, ``bytesperline``
> + as per standard semantics; matching frame buffer format.
> +
> + .. note::
> +
> + The value of ``pixelformat`` may be any pixel format supported for the
> + ``OUTPUT`` format, based on the hardware capabilities. It is suggested
> + that the driver chooses the preferred/optimal format for the current
> + configuration. For example, a YUV format may be preferred over an RGB
> + format, if an additional conversion step would be required for RGB.
> +
> +4. *[optional]* Enumerate ``CAPTURE`` formats via :c:func:`VIDIOC_ENUM_FMT` on
> + the ``CAPTURE`` queue. The client may use this ioctl to discover which
> + alternative raw formats are supported for the current ``OUTPUT`` format and
> + select one of them via :c:func:`VIDIOC_S_FMT`.
> +
> + .. note::
> +
> + The driver will return only formats supported for the currently selected
> + ``OUTPUT`` format and currently set controls, even if more formats may be
> + supported by the decoder in general.
> +
> + For example, a decoder may support YUV and RGB formats for
> + resolutions 1920x1088 and lower, but only YUV for higher resolutions (due
> + to hardware limitations). After setting a resolution of 1920x1088 or lower
> + as the ``OUTPUT`` format, :c:func:`VIDIOC_ENUM_FMT` may return a set of
> + YUV and RGB pixel formats, but after setting a resolution higher than
> + 1920x1088, the driver will not return RGB pixel formats, since they are
> + unsupported for this resolution.
> +
> +5. *[optional]* Choose a different ``CAPTURE`` format than suggested via
> + :c:func:`VIDIOC_S_FMT` on ``CAPTURE`` queue. It is possible for the client to
> + choose a different format than selected/suggested by the driver in
> + :c:func:`VIDIOC_G_FMT`.
> +
> + * **Required fields:**
> +
> + ``type``
> + a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
> +
> + ``pixelformat``
> + a raw pixel format.
> +
> + ``width``, ``height``
> + frame buffer resolution of the decoded stream; typically unchanged from
> + what was returned with :c:func:`VIDIOC_G_FMT`, but it may be different
> + if the hardware supports composition and/or scaling.
> +
> + After performing this step, the client must perform step 3 again in order
> + to obtain up-to-date information about the buffers size and layout.
> +
> +6. Allocate source (bytestream) buffers via :c:func:`VIDIOC_REQBUFS` on
> + ``OUTPUT`` queue.
> +
> + * **Required fields:**
> +
> + ``count``
> + requested number of buffers to allocate; greater than zero.
> +
> + ``type``
> + a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
> +
> + ``memory``
> + follows standard semantics.
> +
> + * **Return fields:**
> +
> + ``count``
> + actual number of buffers allocated.
> +
> + * If required, the driver will adjust ``count`` to be equal or bigger to the
> + minimum of required number of ``OUTPUT`` buffers for the given format and
> + requested count. The client must check this value after the ioctl returns
> + to get the actual number of buffers allocated.
> +
> +7. Allocate destination (raw format) buffers via :c:func:`VIDIOC_REQBUFS` on the
> + ``CAPTURE`` queue.
> +
> + * **Required fields:**
> +
> + ``count``
> + requested number of buffers to allocate; greater than zero. The client
> + is responsible for deducing the minimum number of buffers required
> + for the stream to be properly decoded (taking e.g. reference frames
> + into account) and pass an equal or bigger number.
> +
> + ``type``
> + a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
> +
> + ``memory``
> + follows standard semantics. ``V4L2_MEMORY_USERPTR`` is not supported
> + for ``CAPTURE`` buffers.
> +
> + * **Return fields:**
> +
> + ``count``
> + adjusted to allocated number of buffers, in case the codec requires
> + more buffers than requested.
> +
> + * The driver must adjust count to the minimum of required number of
> + ``CAPTURE`` buffers for the current format, stream configuration and
> + requested count. The client must check this value after the ioctl
> + returns to get the number of buffers allocated.
> +
> +8. Allocate requests (likely one per ``OUTPUT`` buffer) via
> + :c:func:`MEDIA_IOC_REQUEST_ALLOC` on the media device.
> +
> +9. Start streaming on both ``OUTPUT`` and ``CAPTURE`` queues via
> + :c:func:`VIDIOC_STREAMON`.
> +
> +Decoding
> +========
> +
> +For each frame, the client is responsible for submitting at least one request to
> +which the following is attached:
> +
> +* The amount of encoded data expected by the codec for its current
> + configuration, as a buffer submitted to the ``OUTPUT`` queue. Typically, this
> + corresponds to one frame worth of encoded data, but some formats may allow (or
> + require) different amounts per unit.
> +* All the metadata needed to decode the submitted encoded data, in the form of
> + controls relevant to the format being decoded.
> +
> +The amount of data and contents of the source ``OUTPUT`` buffer, as well as the
> +controls that must be set on the request, depend on the active coded pixel
> +format and might be affected by codec-specific extended controls, as stated in
> +documentation of each format.
> +
> +If there is a possibility that the decoded frame will require one or more
> +decode requests after the current one in order to be produced, then the client
> +must set the ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag on the ``OUTPUT``
> +buffer. This will result in the (potentially partially) decoded ``CAPTURE``
> +buffer not being made available for dequeueing, and reused for the next decode
> +request if the timestamp of the next ``OUTPUT`` buffer has not changed.
> +
> +A typical frame would thus be decoded using the following sequence:
> +
> +1. Queue an ``OUTPUT`` buffer containing one unit of encoded bytestream data for
> + the decoding request, using :c:func:`VIDIOC_QBUF`.
> +
> + * **Required fields:**
> +
> + ``index``
> + index of the buffer being queued.
> +
> + ``type``
> + type of the buffer.
> +
> + ``bytesused``
> + number of bytes taken by the encoded data frame in the buffer.
> +
> + ``flags``
> + the ``V4L2_BUF_FLAG_REQUEST_FD`` flag must be set. Additionally, if
> + we are not sure that the current decode request is the last one needed
> + to produce a fully decoded frame, then
> + ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` must also be set.
> +
> + ``request_fd``
> + must be set to the file descriptor of the decoding request.
> +
> + ``timestamp``
> + must be set to a unique value per frame. This value will be propagated
> + into the decoded frame's buffer and can also be used to use this frame
> + as the reference of another. If using multiple decode requests per
> + frame, then the timestamps of all the ``OUTPUT`` buffers for a given
> + frame must be identical. If the timestamp changes, then the currently
> + held ``CAPTURE`` buffer will be made available for dequeuing and the
> + current request will work on a new ``CAPTURE`` buffer.
> +
> +2. Set the codec-specific controls for the decoding request, using
> + :c:func:`VIDIOC_S_EXT_CTRLS`.
> +
> + * **Required fields:**
> +
> + ``which``
> + must be ``V4L2_CTRL_WHICH_REQUEST_VAL``.
> +
> + ``request_fd``
> + must be set to the file descriptor of the decoding request.
> +
> + other fields
> + other fields are set as usual when setting controls. The ``controls``
> + array must contain all the codec-specific controls required to decode
> + a frame.
> +
> + .. note::
> +
> + It is possible to specify the controls in different invocations of
> + :c:func:`VIDIOC_S_EXT_CTRLS`, or to overwrite a previously set control, as
> + long as ``request_fd`` and ``which`` are properly set. The controls state
> + at the moment of request submission is the one that will be considered.
> +
> + .. note::
> +
> + The order in which steps 1 and 2 take place is interchangeable.
> +
> +3. Submit the request by invoking :c:func:`MEDIA_REQUEST_IOC_QUEUE` on the
> + request FD.
> +
> + If the request is submitted without an ``OUTPUT`` buffer, or if some of the
> + required controls are missing from the request, then
> + :c:func:`MEDIA_REQUEST_IOC_QUEUE` will return ``-ENOENT``. If more than one
> + ``OUTPUT`` buffer is queued, then it will return ``-EINVAL``.
> + :c:func:`MEDIA_REQUEST_IOC_QUEUE` returning non-zero means that no
> + ``CAPTURE`` buffer will be produced for this request.
> +
> +``CAPTURE`` buffers must not be part of the request, and are queued
> +independently. They are returned in decode order (i.e. the same order as coded
> +frames were submitted to the ``OUTPUT`` queue).
> +
> +Runtime decoding errors are signaled by the dequeued ``CAPTURE`` buffers
> +carrying the ``V4L2_BUF_FLAG_ERROR`` flag. If a decoded reference frame has an
> +error, then all following decoded frames that refer to it also have the
> +``V4L2_BUF_FLAG_ERROR`` flag set, although the decoder will still try to
> +produce (likely corrupted) frames.
> +
> +Buffer management while decoding
> +================================
> +Contrary to stateful decoders, a stateless decoder does not perform any kind of
> +buffer management: it only guarantees that dequeued ``CAPTURE`` buffers can be
> +used by the client for as long as they are not queued again. "Used" here
> +encompasses using the buffer for compositing or display.
> +
> +A dequeued capture buffer can also be used as the reference frame of another
> +buffer.
> +
> +A frame is specified as reference by converting its timestamp into nanoseconds,
> +and storing it into the relevant member of a codec-dependent control structure.
> +The :c:func:`v4l2_timeval_to_ns` function must be used to perform that
> +conversion. The timestamp of a frame can be used to reference it as soon as all
> +its units of encoded data are successfully submitted to the ``OUTPUT`` queue.
> +
> +A decoded buffer containing a reference frame must not be reused as a decoding
> +target until all the frames referencing it have been decoded. The safest way to
> +achieve this is to refrain from queueing a reference buffer until all the
> +decoded frames referencing it have been dequeued. However, if the driver can
> +guarantee that buffers queued to the ``CAPTURE`` queue are processed in queued
> +order, then user-space can take advantage of this guarantee and queue a
> +reference buffer when the following conditions are met:
> +
> +1. All the requests for frames affected by the reference frame have been
> + queued, and
> +
> +2. A sufficient number of ``CAPTURE`` buffers to cover all the decoded
> + referencing frames have been queued.
> +
> +When queuing a decoding request, the driver will increase the reference count of
> +all the resources associated with reference frames. This means that the client
> +can e.g. close the DMABUF file descriptors of reference frame buffers if it
> +won't need them afterwards.
> +
> +Seeking
> +=======
> +In order to seek, the client just needs to submit requests using input buffers
> +corresponding to the new stream position. It must however be aware that
> +resolution may have changed and follow the dynamic resolution change sequence in
> +that case. Also depending on the codec used, picture parameters (e.g. SPS/PPS
> +for H.264) may have changed and the client is responsible for making sure that a
> +valid state is sent to the decoder.
> +
> +The client is then free to ignore any returned ``CAPTURE`` buffer that comes
> +from the pre-seek position.
> +
> +Pausing
> +=======
> +
> +In order to pause, the client can just cease queuing buffers onto the ``OUTPUT``
> +queue. Without source bytestream data, there is no data to process and the codec
> +will remain idle.
> +
> +Dynamic resolution change
> +=========================
> +
> +If the client detects a resolution change in the stream, it will need to perform
> +the initialization sequence again with the new resolution:
> +
> +1. If the last submitted request resulted in a ``CAPTURE`` buffer being
> + held by the use of the ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag, then the
> + last frame is not available on the ``CAPTURE`` queue. In this case, a
> + ``V4L2_DEC_CMD_FLUSH`` command shall be sent. This will make the driver
> + dequeue the held ``CAPTURE`` buffer.
> +
> +2. Wait until all submitted requests have completed and dequeue the
> + corresponding output buffers.
> +
> +3. Call :c:func:`VIDIOC_STREAMOFF` on both the ``OUTPUT`` and ``CAPTURE``
> + queues.
> +
> +4. Free all ``CAPTURE`` buffers by calling :c:func:`VIDIOC_REQBUFS` on the
> + ``CAPTURE`` queue with a buffer count of zero.
> +
> +5. Perform the initialization sequence again (minus the allocation of
> + ``OUTPUT`` buffers),
We have just hit an issue on the Hantro driver related to this. At the
moment, Hantro will reject calls to VIDIOC_S_FMT on the OUTPUT queue
if buffers are allocated. And indeed, the documentation for
VIDIOC_S_FMT mentions this behavior:
EBUSY
The device is busy and cannot change the format. This could be
because or the device is streaming or buffers are allocated or queued
to the driver.
However in our case it does not make much sense to force reallocating
the OUTPUT buffers if user-space knows that the current ones are still
large enough for the new resolution. Should Hantro be adapted to allow
this, or shall we reword the specification?
Note that if we allow this, we may also allow OUTPUT buffers to be
allocated before the CAPTURE format is set during the initialization
sequence (i.e. move step 6. somewhere after step 2.).
Thoughts?
> with the new resolution set on the ``OUTPUT`` queue.
> + Note that due to resolution constraints, a different format may need to be
> + picked on the ``CAPTURE`` queue.
> +
> +Drain
> +=====
> +
> +If the last submitted request resulted in a ``CAPTURE`` buffer being
> +held by the use of the ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag, then the
> +last frame is not available on the ``CAPTURE`` queue. In this case, a
> +``V4L2_DEC_CMD_FLUSH`` command shall be sent. This will make the driver
> +dequeue the held ``CAPTURE`` buffer.
> +
> +After that, in order to drain the stream on a stateless decoder, the client
> +just needs to wait until all the submitted requests are completed.
> --
> 2.20.1
>
^ permalink raw reply [flat|nested] 42+ messages in thread* Re: [PATCHv2 11/12] media: docs-rst: Document m2m stateless video decoder interface
2019-08-16 5:49 ` Alexandre Courbot
@ 2019-08-16 6:59 ` Hans Verkuil
2019-08-16 7:17 ` Alexandre Courbot
0 siblings, 1 reply; 42+ messages in thread
From: Hans Verkuil @ 2019-08-16 6:59 UTC (permalink / raw)
To: Alexandre Courbot
Cc: Linux Media Mailing List, Tomasz Figa, Francois Buergisser,
Ezequiel Garcia, Boris Brezillon
On 8/16/19 7:49 AM, Alexandre Courbot wrote:
> On Mon, Aug 12, 2019 at 8:07 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>>
>> From: Alexandre Courbot <acourbot@chromium.org>
>>
>> Documents the protocol that user-space should follow when
>> communicating with stateless video decoders.
>>
>> The stateless video decoding API makes use of the new request and tags
>> APIs. While it has been implemented with the Cedrus driver so far, it
>> should probably still be considered staging for a short while.
>>
>> Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
>> ---
>> Documentation/media/uapi/v4l/dev-mem2mem.rst | 1 +
>> .../media/uapi/v4l/dev-stateless-decoder.rst | 424 ++++++++++++++++++
>> 2 files changed, 425 insertions(+)
>> create mode 100644 Documentation/media/uapi/v4l/dev-stateless-decoder.rst
>>
<snip>
>> +Dynamic resolution change
>> +=========================
>> +
>> +If the client detects a resolution change in the stream, it will need to perform
>> +the initialization sequence again with the new resolution:
>> +
>> +1. If the last submitted request resulted in a ``CAPTURE`` buffer being
>> + held by the use of the ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag, then the
>> + last frame is not available on the ``CAPTURE`` queue. In this case, a
>> + ``V4L2_DEC_CMD_FLUSH`` command shall be sent. This will make the driver
>> + dequeue the held ``CAPTURE`` buffer.
>> +
>> +2. Wait until all submitted requests have completed and dequeue the
>> + corresponding output buffers.
>> +
>> +3. Call :c:func:`VIDIOC_STREAMOFF` on both the ``OUTPUT`` and ``CAPTURE``
>> + queues.
>> +
>> +4. Free all ``CAPTURE`` buffers by calling :c:func:`VIDIOC_REQBUFS` on the
>> + ``CAPTURE`` queue with a buffer count of zero.
>> +
>> +5. Perform the initialization sequence again (minus the allocation of
>> + ``OUTPUT`` buffers),
>
> We have just hit an issue on the Hantro driver related to this. At the
> moment, Hantro will reject calls to VIDIOC_S_FMT on the OUTPUT queue
> if buffers are allocated. And indeed, the documentation for
> VIDIOC_S_FMT mentions this behavior:
>
> EBUSY
> The device is busy and cannot change the format. This could be
> because or the device is streaming or buffers are allocated or queued
> to the driver.
>
> However in our case it does not make much sense to force reallocating
> the OUTPUT buffers if user-space knows that the current ones are still
> large enough for the new resolution. Should Hantro be adapted to allow
> this, or shall we reword the specification?
>
> Note that if we allow this, we may also allow OUTPUT buffers to be
> allocated before the CAPTURE format is set during the initialization
> sequence (i.e. move step 6. somewhere after step 2.).
>
> Thoughts?
Drivers can allow S_FMT while buffers are allocated. But it needs to be
done carefully: for MMAP streaming mode the driver will have to check
that the allocated buffers are large enough for the new format (you
probably want to make a helper function for this check), for USERPTR and
DMABUF this needs to be checked in the buf_prepare vb2 callback. This
probably happens already.
Calling S_FMT while streaming is probably not a good idea and should
still result in a EBUSY. Mostly because it is not clear whether a S_FMT
should take immediate effect (thus affecting all already queued buffers)
or only with newly queued buffers. Let's just avoid this situation for
now.
It was always the intention to relax the rules of when you can call S_FMT,
but in most cases it is easier to just prohibit calling S_FMT when buffers
are allocated.
Regards,
Hans
^ permalink raw reply [flat|nested] 42+ messages in thread
* Re: [PATCHv2 11/12] media: docs-rst: Document m2m stateless video decoder interface
2019-08-16 6:59 ` Hans Verkuil
@ 2019-08-16 7:17 ` Alexandre Courbot
0 siblings, 0 replies; 42+ messages in thread
From: Alexandre Courbot @ 2019-08-16 7:17 UTC (permalink / raw)
To: Hans Verkuil
Cc: Linux Media Mailing List, Tomasz Figa, Francois Buergisser,
Ezequiel Garcia, Boris Brezillon
On Fri, Aug 16, 2019 at 3:59 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
>
> On 8/16/19 7:49 AM, Alexandre Courbot wrote:
> > On Mon, Aug 12, 2019 at 8:07 PM Hans Verkuil <hverkuil-cisco@xs4all.nl> wrote:
> >>
> >> From: Alexandre Courbot <acourbot@chromium.org>
> >>
> >> Documents the protocol that user-space should follow when
> >> communicating with stateless video decoders.
> >>
> >> The stateless video decoding API makes use of the new request and tags
> >> APIs. While it has been implemented with the Cedrus driver so far, it
> >> should probably still be considered staging for a short while.
> >>
> >> Signed-off-by: Alexandre Courbot <acourbot@chromium.org>
> >> ---
> >> Documentation/media/uapi/v4l/dev-mem2mem.rst | 1 +
> >> .../media/uapi/v4l/dev-stateless-decoder.rst | 424 ++++++++++++++++++
> >> 2 files changed, 425 insertions(+)
> >> create mode 100644 Documentation/media/uapi/v4l/dev-stateless-decoder.rst
> >>
>
> <snip>
>
> >> +Dynamic resolution change
> >> +=========================
> >> +
> >> +If the client detects a resolution change in the stream, it will need to perform
> >> +the initialization sequence again with the new resolution:
> >> +
> >> +1. If the last submitted request resulted in a ``CAPTURE`` buffer being
> >> + held by the use of the ``V4L2_BUF_FLAG_M2M_HOLD_CAPTURE_BUF`` flag, then the
> >> + last frame is not available on the ``CAPTURE`` queue. In this case, a
> >> + ``V4L2_DEC_CMD_FLUSH`` command shall be sent. This will make the driver
> >> + dequeue the held ``CAPTURE`` buffer.
> >> +
> >> +2. Wait until all submitted requests have completed and dequeue the
> >> + corresponding output buffers.
> >> +
> >> +3. Call :c:func:`VIDIOC_STREAMOFF` on both the ``OUTPUT`` and ``CAPTURE``
> >> + queues.
> >> +
> >> +4. Free all ``CAPTURE`` buffers by calling :c:func:`VIDIOC_REQBUFS` on the
> >> + ``CAPTURE`` queue with a buffer count of zero.
> >> +
> >> +5. Perform the initialization sequence again (minus the allocation of
> >> + ``OUTPUT`` buffers),
> >
> > We have just hit an issue on the Hantro driver related to this. At the
> > moment, Hantro will reject calls to VIDIOC_S_FMT on the OUTPUT queue
> > if buffers are allocated. And indeed, the documentation for
> > VIDIOC_S_FMT mentions this behavior:
> >
> > EBUSY
> > The device is busy and cannot change the format. This could be
> > because or the device is streaming or buffers are allocated or queued
> > to the driver.
> >
> > However in our case it does not make much sense to force reallocating
> > the OUTPUT buffers if user-space knows that the current ones are still
> > large enough for the new resolution. Should Hantro be adapted to allow
> > this, or shall we reword the specification?
> >
> > Note that if we allow this, we may also allow OUTPUT buffers to be
> > allocated before the CAPTURE format is set during the initialization
> > sequence (i.e. move step 6. somewhere after step 2.).
> >
> > Thoughts?
>
> Drivers can allow S_FMT while buffers are allocated. But it needs to be
> done carefully: for MMAP streaming mode the driver will have to check
> that the allocated buffers are large enough for the new format (you
> probably want to make a helper function for this check), for USERPTR and
> DMABUF this needs to be checked in the buf_prepare vb2 callback. This
> probably happens already.
>
> Calling S_FMT while streaming is probably not a good idea and should
> still result in a EBUSY. Mostly because it is not clear whether a S_FMT
> should take immediate effect (thus affecting all already queued buffers)
> or only with newly queued buffers. Let's just avoid this situation for
> now.
Yes, to be clear the scenario I have in mind is allowing S_FMT while
streaming is off, but OUTPUT buffers still allocated. Doing S_FMT when
streaming is on should remain prohibited.
>
> It was always the intention to relax the rules of when you can call S_FMT,
> but in most cases it is easier to just prohibit calling S_FMT when buffers
> are allocated.
>
> Regards,
>
> Hans
^ permalink raw reply [flat|nested] 42+ messages in thread
* [PATCHv2 12/12] media: docs-rst: Document memory-to-memory video encoder interface
2019-08-12 11:05 [PATCHv2 00/12] Stateful/stateless codec core support Hans Verkuil
` (10 preceding siblings ...)
2019-08-12 11:05 ` [PATCHv2 11/12] media: docs-rst: Document m2m stateless video decoder interface Hans Verkuil
@ 2019-08-12 11:05 ` Hans Verkuil
11 siblings, 0 replies; 42+ messages in thread
From: Hans Verkuil @ 2019-08-12 11:05 UTC (permalink / raw)
To: linux-media; +Cc: Tomasz Figa, Hans Verkuil
From: Tomasz Figa <tfiga@chromium.org>
Due to complexity of the video encoding process, the V4L2 drivers of
stateful encoder hardware require specific sequences of V4L2 API calls
to be followed. These include capability enumeration, initialization,
encoding, encode parameters change, drain and reset.
Specifics of the above have been discussed during Media Workshops at
LinuxCon Europe 2012 in Barcelona and then later Embedded Linux
Conference Europe 2014 in Düsseldorf. The de facto Codec API that
originated at those events was later implemented by the drivers we already
have merged in mainline, such as s5p-mfc or coda.
The only thing missing was the real specification included as a part of
Linux Media documentation. Fix it now and document the encoder part of
the Codec API.
Signed-off-by: Tomasz Figa <tfiga@chromium.org>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
Documentation/media/uapi/v4l/dev-encoder.rst | 608 ++++++++++++++++++
Documentation/media/uapi/v4l/dev-mem2mem.rst | 1 +
Documentation/media/uapi/v4l/pixfmt-v4l2.rst | 5 +
Documentation/media/uapi/v4l/v4l2.rst | 2 +
.../media/uapi/v4l/vidioc-encoder-cmd.rst | 51 +-
5 files changed, 647 insertions(+), 20 deletions(-)
create mode 100644 Documentation/media/uapi/v4l/dev-encoder.rst
diff --git a/Documentation/media/uapi/v4l/dev-encoder.rst b/Documentation/media/uapi/v4l/dev-encoder.rst
new file mode 100644
index 000000000000..e9d29d6de67a
--- /dev/null
+++ b/Documentation/media/uapi/v4l/dev-encoder.rst
@@ -0,0 +1,608 @@
+.. SPDX-License-Identifier: GPL-2.0
+
+.. _encoder:
+
+*************************************************
+Memory-to-Memory Stateful Video Encoder Interface
+*************************************************
+
+A stateful video encoder takes raw video frames in display order and encodes
+them into a bytestream. It generates complete chunks of the bytestream, including
+all metadata, headers, etc. The resulting bytestream does not require any
+further post-processing by the client.
+
+Performing software stream processing, header generation etc. in the driver
+in order to support this interface is strongly discouraged. In case such
+operations are needed, use of the Stateless Video Encoder Interface (in
+development) is strongly advised.
+
+Conventions and Notations Used in This Document
+===============================================
+
+1. The general V4L2 API rules apply if not specified in this document
+ otherwise.
+
+2. The meaning of words "must", "may", "should", etc. is as per `RFC
+ 2119 <https://tools.ietf.org/html/rfc2119>`_.
+
+3. All steps not marked "optional" are required.
+
+4. :c:func:`VIDIOC_G_EXT_CTRLS` and :c:func:`VIDIOC_S_EXT_CTRLS` may be used
+ interchangeably with :c:func:`VIDIOC_G_CTRL` and :c:func:`VIDIOC_S_CTRL`,
+ unless specified otherwise.
+
+5. Single-planar API (see :ref:`planar-apis`) and applicable structures may be
+ used interchangeably with multi-planar API, unless specified otherwise,
+ depending on encoder capabilities and following the general V4L2 guidelines.
+
+6. i = [a..b]: sequence of integers from a to b, inclusive, i.e. i =
+ [0..2]: i = 0, 1, 2.
+
+7. Given an ``OUTPUT`` buffer A, then A’ represents a buffer on the ``CAPTURE``
+ queue containing data that resulted from processing buffer A.
+
+Glossary
+========
+
+Refer to :ref:`decoder-glossary`.
+
+State Machine
+=============
+
+.. kernel-render:: DOT
+ :alt: DOT digraph of encoder state machine
+ :caption: Encoder State Machine
+
+ digraph encoder_state_machine {
+ node [shape = doublecircle, label="Encoding"] Encoding;
+
+ node [shape = circle, label="Initialization"] Initialization;
+ node [shape = circle, label="Stopped"] Stopped;
+ node [shape = circle, label="Drain"] Drain;
+ node [shape = circle, label="Reset"] Reset;
+
+ node [shape = point]; qi
+ qi -> Initialization [ label = "open()" ];
+
+ Initialization -> Encoding [ label = "Both queues streaming" ];
+
+ Encoding -> Drain [ label = "V4L2_ENC_CMD_STOP" ];
+ Encoding -> Reset [ label = "VIDIOC_STREAMOFF(CAPTURE)" ];
+ Encoding -> Stopped [ label = "VIDIOC_STREAMOFF(OUTPUT)" ];
+ Encoding -> Encoding;
+
+ Drain -> Stopped [ label = "All CAPTURE\nbuffers dequeued\nor\nVIDIOC_STREAMOFF(OUTPUT)" ];
+ Drain -> Reset [ label = "VIDIOC_STREAMOFF(CAPTURE)" ];
+
+ Reset -> Encoding [ label = "VIDIOC_STREAMON(CAPTURE)" ];
+ Reset -> Initialization [ label = "VIDIOC_REQBUFS(OUTPUT, 0)" ];
+
+ Stopped -> Encoding [ label = "V4L2_ENC_CMD_START\nor\nVIDIOC_STREAMON(OUTPUT)" ];
+ Stopped -> Reset [ label = "VIDIOC_STREAMOFF(CAPTURE)" ];
+ }
+
+Querying Capabilities
+=====================
+
+1. To enumerate the set of coded formats supported by the encoder, the
+ client may call :c:func:`VIDIOC_ENUM_FMT` on ``CAPTURE``.
+
+ * The full set of supported formats will be returned, regardless of the
+ format set on ``OUTPUT``.
+
+2. To enumerate the set of supported raw formats, the client may call
+ :c:func:`VIDIOC_ENUM_FMT` on ``OUTPUT``.
+
+ * Only the formats supported for the format currently active on ``CAPTURE``
+ will be returned.
+
+ * In order to enumerate raw formats supported by a given coded format,
+ the client must first set that coded format on ``CAPTURE`` and then
+ enumerate the formats on ``OUTPUT``.
+
+3. The client may use :c:func:`VIDIOC_ENUM_FRAMESIZES` to detect supported
+ resolutions for a given format, passing desired pixel format in
+ :c:type:`v4l2_frmsizeenum` ``pixel_format``.
+
+ * Values returned by :c:func:`VIDIOC_ENUM_FRAMESIZES` for a coded pixel
+ format will include all possible coded resolutions supported by the
+ encoder for given coded pixel format.
+
+ * Values returned by :c:func:`VIDIOC_ENUM_FRAMESIZES` for a raw pixel format
+ will include all possible frame buffer resolutions supported by the
+ encoder for given raw pixel format and coded format currently set on
+ ``CAPTURE``.
+
+4. Supported profiles and levels for the coded format currently set on
+ ``CAPTURE``, if applicable, may be queried using their respective controls
+ via :c:func:`VIDIOC_QUERYCTRL`.
+
+5. Any additional encoder capabilities may be discovered by querying
+ their respective controls.
+
+Initialization
+==============
+
+1. Set the coded format on the ``CAPTURE`` queue via :c:func:`VIDIOC_S_FMT`
+
+ * **Required fields:**
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``CAPTURE``.
+
+ ``pixelformat``
+ the coded format to be produced.
+
+ ``sizeimage``
+ desired size of ``CAPTURE`` buffers; the encoder may adjust it to
+ match hardware requirements.
+
+ ``width``, ``height``
+ ignored (read-only).
+
+ other fields
+ follow standard semantics.
+
+ * **Return fields:**
+
+ ``sizeimage``
+ adjusted size of ``CAPTURE`` buffers.
+
+ ``width``, ``height``
+ the coded size selected by the encoder based on current state, e.g.
+ ``OUTPUT`` format, selection rectangles, etc. (read-only).
+
+ .. important::
+
+ Changing the ``CAPTURE`` format may change the currently set ``OUTPUT``
+ format. How the new ``OUTPUT`` format is determined is up to the encoder
+ and the client must ensure it matches its needs afterwards.
+
+2. **Optional.** Enumerate supported ``OUTPUT`` formats (raw formats for
+ source) for the selected coded format via :c:func:`VIDIOC_ENUM_FMT`.
+
+ * **Required fields:**
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
+
+ other fields
+ follow standard semantics.
+
+ * **Return fields:**
+
+ ``pixelformat``
+ raw format supported for the coded format currently selected on
+ the ``CAPTURE`` queue.
+
+ other fields
+ follow standard semantics.
+
+3. Set the raw source format on the ``OUTPUT`` queue via
+ :c:func:`VIDIOC_S_FMT`.
+
+ * **Required fields:**
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
+
+ ``pixelformat``
+ raw format of the source.
+
+ ``width``, ``height``
+ source resolution.
+
+ other fields
+ follow standard semantics.
+
+ * **Return fields:**
+
+ ``width``, ``height``
+ may be adjusted to match encoder minimums, maximums and alignment
+ requirements, as required by the currently selected formats, as
+ reported by :c:func:`VIDIOC_ENUM_FRAMESIZES`.
+
+ other fields
+ follow standard semantics.
+
+ * Setting the ``OUTPUT`` format will reset the selection rectangles to their
+ default values, based on the new resolution, as described in the next
+ step.
+
+4. **Optional.** Set the visible resolution for the stream metadata via
+ :c:func:`VIDIOC_S_SELECTION` on the ``OUTPUT`` queue if it is desired
+ to be different than the full OUTPUT resolution.
+
+ * **Required fields:**
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
+
+ ``target``
+ set to ``V4L2_SEL_TGT_CROP``.
+
+ ``r.left``, ``r.top``, ``r.width``, ``r.height``
+ visible rectangle; this must fit within the `V4L2_SEL_TGT_CROP_BOUNDS`
+ rectangle and may be subject to adjustment to match codec and
+ hardware constraints.
+
+ * **Return fields:**
+
+ ``r.left``, ``r.top``, ``r.width``, ``r.height``
+ visible rectangle adjusted by the encoder.
+
+ * The following selection targets are supported on ``OUTPUT``:
+
+ ``V4L2_SEL_TGT_CROP_BOUNDS``
+ equal to the full source frame, matching the active ``OUTPUT``
+ format.
+
+ ``V4L2_SEL_TGT_CROP_DEFAULT``
+ equal to ``V4L2_SEL_TGT_CROP_BOUNDS``.
+
+ ``V4L2_SEL_TGT_CROP``
+ rectangle within the source buffer to be encoded into the
+ ``CAPTURE`` stream; defaults to ``V4L2_SEL_TGT_CROP_DEFAULT``.
+
+ .. note::
+
+ A common use case for this selection target is encoding a source
+ video with a resolution that is not a multiple of a macroblock,
+ e.g. the common 1920x1080 resolution may require the source
+ buffers to be aligned to 1920x1088 for codecs with 16x16 macroblock
+ size. To avoid encoding the padding, the client needs to explicitly
+ configure this selection target to 1920x1080.
+
+ .. warning::
+
+ The encoder may adjust the crop/compose rectangles to the nearest
+ supported ones to meet codec and hardware requirements. The client needs
+ to check the adjusted rectangle returned by :c:func:`VIDIOC_S_SELECTION`.
+
+5. Allocate buffers for both ``OUTPUT`` and ``CAPTURE`` via
+ :c:func:`VIDIOC_REQBUFS`. This may be performed in any order.
+
+ * **Required fields:**
+
+ ``count``
+ requested number of buffers to allocate; greater than zero.
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT`` or
+ ``CAPTURE``.
+
+ other fields
+ follow standard semantics.
+
+ * **Return fields:**
+
+ ``count``
+ actual number of buffers allocated.
+
+ .. warning::
+
+ The actual number of allocated buffers may differ from the ``count``
+ given. The client must check the updated value of ``count`` after the
+ call returns.
+
+ .. note::
+
+ To allocate more than the minimum number of OUTPUT buffers (for pipeline
+ depth), the client may query the ``V4L2_CID_MIN_BUFFERS_FOR_OUTPUT``
+ control to get the minimum number of buffers required, and pass the
+ obtained value plus the number of additional buffers needed in the
+ ``count`` field to :c:func:`VIDIOC_REQBUFS`.
+
+ Alternatively, :c:func:`VIDIOC_CREATE_BUFS` can be used to have more
+ control over buffer allocation.
+
+ * **Required fields:**
+
+ ``count``
+ requested number of buffers to allocate; greater than zero.
+
+ ``type``
+ a ``V4L2_BUF_TYPE_*`` enum appropriate for ``OUTPUT``.
+
+ other fields
+ follow standard semantics.
+
+ * **Return fields:**
+
+ ``count``
+ adjusted to the number of allocated buffers.
+
+6. Begin streaming on both ``OUTPUT`` and ``CAPTURE`` queues via
+ :c:func:`VIDIOC_STREAMON`. This may be performed in any order. The actual
+ encoding process starts when both queues start streaming.
+
+.. note::
+
+ If the client stops the ``CAPTURE`` queue during the encode process and then
+ restarts it again, the encoder will begin generating a stream independent
+ from the stream generated before the stop. The exact constraints depend
+ on the coded format, but may include the following implications:
+
+ * encoded frames produced after the restart must not reference any
+ frames produced before the stop, e.g. no long term references for
+ H.264/HEVC,
+
+ * any headers that must be included in a standalone stream must be
+ produced again, e.g. SPS and PPS for H.264/HEVC.
+
+Encoding
+========
+
+This state is reached after the `Initialization` sequence finishes
+successfully. In this state, the client queues and dequeues buffers to both
+queues via :c:func:`VIDIOC_QBUF` and :c:func:`VIDIOC_DQBUF`, following the
+standard semantics.
+
+The content of encoded ``CAPTURE`` buffers depends on the active coded pixel
+format and may be affected by codec-specific extended controls, as stated
+in the documentation of each format.
+
+Both queues operate independently, following standard behavior of V4L2 buffer
+queues and memory-to-memory devices. In addition, the order of encoded frames
+dequeued from the ``CAPTURE`` queue may differ from the order of queuing raw
+frames to the ``OUTPUT`` queue, due to properties of the selected coded format,
+e.g. frame reordering.
+
+The client must not assume any direct relationship between ``CAPTURE`` and
+``OUTPUT`` buffers and any specific timing of buffers becoming
+available to dequeue. Specifically:
+
+* a buffer queued to ``OUTPUT`` may result in more than one buffer produced on
+ ``CAPTURE`` (if returning an encoded frame allowed the encoder to return a
+ frame that preceded it in display, but succeeded it in the decode order),
+
+* a buffer queued to ``OUTPUT`` may result in a buffer being produced on
+ ``CAPTURE`` later into encode process, and/or after processing further
+ ``OUTPUT`` buffers, or be returned out of order, e.g. if display
+ reordering is used,
+
+* buffers may become available on the ``CAPTURE`` queue without additional
+ buffers queued to ``OUTPUT`` (e.g. during drain or ``EOS``), because of the
+ ``OUTPUT`` buffers queued in the past whose decoding results are only
+ available at later time, due to specifics of the decoding process,
+
+* buffers queued to ``OUTPUT`` may not become available to dequeue instantly
+ after being encoded into a corresponding ``CAPTURE`` buffer, e.g. if the
+ encoder needs to use the frame as a reference for encoding further frames.
+
+.. note::
+
+ To allow matching encoded ``CAPTURE`` buffers with ``OUTPUT`` buffers they
+ originated from, the client can set the ``timestamp`` field of the
+ :c:type:`v4l2_buffer` struct when queuing an ``OUTPUT`` buffer. The
+ ``CAPTURE`` buffer(s), which resulted from encoding that ``OUTPUT`` buffer
+ will have their ``timestamp`` field set to the same value when dequeued.
+
+ In addition to the straightforward case of one ``OUTPUT`` buffer producing
+ one ``CAPTURE`` buffer, the following cases are defined:
+
+ * one ``OUTPUT`` buffer generates multiple ``CAPTURE`` buffers: the same
+ ``OUTPUT`` timestamp will be copied to multiple ``CAPTURE`` buffers,
+
+ * the encoding order differs from the presentation order (i.e. the
+ ``CAPTURE`` buffers are out-of-order compared to the ``OUTPUT`` buffers):
+ ``CAPTURE`` timestamps will not retain the order of ``OUTPUT`` timestamps.
+
+.. note::
+
+ To let the client distinguish between frame types (keyframes, intermediate
+ frames; the exact list of types depends on the coded format), the
+ ``CAPTURE`` buffers will have corresponding flag bits set in their
+ :c:type:`v4l2_buffer` struct when dequeued. See the documentation of
+ :c:type:`v4l2_buffer` and each coded pixel format for exact list of flags
+ and their meanings.
+
+Should an encoding error occur, it will be reported to the client with the level
+of details depending on the encoder capabilities. Specifically:
+
+* the CAPTURE buffer (if any) that contains the results of the failed encode
+ operation will be returned with the V4L2_BUF_FLAG_ERROR flag set,
+
+* if the encoder is able to precisely report the OUTPUT buffer(s) that triggered
+ the error, such buffer(s) will be returned with the V4L2_BUF_FLAG_ERROR flag
+ set.
+
+In case of a fatal failure that does not allow the encoding to continue, any
+further operations on corresponding encoder file handle will return the -EIO
+error code. The client may close the file handle and open a new one, or
+alternatively reinitialize the instance by stopping streaming on both queues,
+releasing all buffers and performing the Initialization sequence again.
+
+Encoding Parameter Changes
+==========================
+
+The client is allowed to use :c:func:`VIDIOC_S_CTRL` to change encoder
+parameters at any time. The availability of parameters is encoder-specific
+and the client must query the encoder to find the set of available controls.
+
+The ability to change each parameter during encoding is encoder-specific, as
+per the standard semantics of the V4L2 control interface. The client may
+attempt to set a control during encoding and if the operation fails with the
+-EBUSY error code, the ``CAPTURE`` queue needs to be stopped for the
+configuration change to be allowed. To do this, it may follow the `Drain`
+sequence to avoid losing the already queued/encoded frames.
+
+The timing of parameter updates is encoder-specific, as per the standard
+semantics of the V4L2 control interface. If the client needs to apply the
+parameters exactly at specific frame, using the Request API
+(:ref:`media-request-api`) should be considered, if supported by the encoder.
+
+Drain
+=====
+
+To ensure that all the queued ``OUTPUT`` buffers have been processed and the
+related ``CAPTURE`` buffers are given to the client, the client must follow the
+drain sequence described below. After the drain sequence ends, the client has
+received all encoded frames for all ``OUTPUT`` buffers queued before the
+sequence was started.
+
+1. Begin the drain sequence by issuing :c:func:`VIDIOC_ENCODER_CMD`.
+
+ * **Required fields:**
+
+ ``cmd``
+ set to ``V4L2_ENC_CMD_STOP``.
+
+ ``flags``
+ set to 0.
+
+ ``pts``
+ set to 0.
+
+ .. warning::
+
+ The sequence can be only initiated if both ``OUTPUT`` and ``CAPTURE``
+ queues are streaming. For compatibility reasons, the call to
+ :c:func:`VIDIOC_ENCODER_CMD` will not fail even if any of the queues is
+ not streaming, but at the same time it will not initiate the `Drain`
+ sequence and so the steps described below would not be applicable.
+
+2. Any ``OUTPUT`` buffers queued by the client before the
+ :c:func:`VIDIOC_ENCODER_CMD` was issued will be processed and encoded as
+ normal. The client must continue to handle both queues independently,
+ similarly to normal encode operation. This includes:
+
+ * queuing and dequeuing ``CAPTURE`` buffers, until a buffer marked with the
+ ``V4L2_BUF_FLAG_LAST`` flag is dequeued,
+
+ .. warning::
+
+ The last buffer may be empty (with :c:type:`v4l2_buffer`
+ ``bytesused`` = 0) and in that case it must be ignored by the client,
+ as it does not contain an encoded frame.
+
+ .. note::
+
+ Any attempt to dequeue more ``CAPTURE`` buffers beyond the buffer
+ marked with ``V4L2_BUF_FLAG_LAST`` will result in a -EPIPE error from
+ :c:func:`VIDIOC_DQBUF`.
+
+ * dequeuing processed ``OUTPUT`` buffers, until all the buffers queued
+ before the ``V4L2_ENC_CMD_STOP`` command are dequeued,
+
+ * dequeuing the ``V4L2_EVENT_EOS`` event, if the client subscribes to it.
+
+ .. note::
+
+ For backwards compatibility, the encoder will signal a ``V4L2_EVENT_EOS``
+ event when the last frame has been encoded and all frames are ready to be
+ dequeued. It is deprecated behavior and the client must not rely on it.
+ The ``V4L2_BUF_FLAG_LAST`` buffer flag should be used instead.
+
+3. Once all ``OUTPUT`` buffers queued before the ``V4L2_ENC_CMD_STOP`` call are
+ dequeued and the last ``CAPTURE`` buffer is dequeued, the encoder is stopped
+ and it will accept, but not process any newly queued ``OUTPUT`` buffers
+ until the client issues any of the following operations:
+
+ * ``V4L2_ENC_CMD_START`` - the encoder will not be reset and will resume
+ operation normally, with all the state from before the drain,
+
+ * a pair of :c:func:`VIDIOC_STREAMOFF` and :c:func:`VIDIOC_STREAMON` on the
+ ``CAPTURE`` queue - the encoder will be reset (see the `Reset` sequence)
+ and then resume encoding,
+
+ * a pair of :c:func:`VIDIOC_STREAMOFF` and :c:func:`VIDIOC_STREAMON` on the
+ ``OUTPUT`` queue - the encoder will resume operation normally, however any
+ source frames queued to the ``OUTPUT`` queue between ``V4L2_ENC_CMD_STOP``
+ and :c:func:`VIDIOC_STREAMOFF` will be discarded.
+
+.. note::
+
+ Once the drain sequence is initiated, the client needs to drive it to
+ completion, as described by the steps above, unless it aborts the process by
+ issuing :c:func:`VIDIOC_STREAMOFF` on any of the ``OUTPUT`` or ``CAPTURE``
+ queues. The client is not allowed to issue ``V4L2_ENC_CMD_START`` or
+ ``V4L2_ENC_CMD_STOP`` again while the drain sequence is in progress and they
+ will fail with -EBUSY error code if attempted.
+
+ For reference, handling of various corner cases is described below:
+
+ * In case of no buffer in the ``OUTPUT`` queue at the time the
+ ``V4L2_ENC_CMD_STOP`` command was issued, the drain sequence completes
+ immediately and the encoder returns an empty ``CAPTURE`` buffer with the
+ ``V4L2_BUF_FLAG_LAST`` flag set.
+
+ * In case of no buffer in the ``CAPTURE`` queue at the time the drain
+ sequence completes, the next time the client queues a ``CAPTURE`` buffer
+ it is returned at once as an empty buffer with the ``V4L2_BUF_FLAG_LAST``
+ flag set.
+
+ * If :c:func:`VIDIOC_STREAMOFF` is called on the ``CAPTURE`` queue in the
+ middle of the drain sequence, the drain sequence is canceled and all
+ ``CAPTURE`` buffers are implicitly returned to the client.
+
+ * If :c:func:`VIDIOC_STREAMOFF` is called on the ``OUTPUT`` queue in the
+ middle of the drain sequence, the drain sequence completes immediately and
+ next ``CAPTURE`` buffer will be returned empty with the
+ ``V4L2_BUF_FLAG_LAST`` flag set.
+
+ Although mandatory, the availability of encoder commands may be queried
+ using :c:func:`VIDIOC_TRY_ENCODER_CMD`.
+
+Reset
+=====
+
+The client may want to request the encoder to reinitialize the encoding, so
+that the following stream data becomes independent from the stream data
+generated before. Depending on the coded format, that may imply that:
+
+* encoded frames produced after the restart must not reference any frames
+ produced before the stop, e.g. no long term references for H.264/HEVC,
+
+* any headers that must be included in a standalone stream must be produced
+ again, e.g. SPS and PPS for H.264/HEVC.
+
+This can be achieved by performing the reset sequence.
+
+1. Perform the `Drain` sequence to ensure all the in-flight encoding finishes
+ and respective buffers are dequeued.
+
+2. Stop streaming on the ``CAPTURE`` queue via :c:func:`VIDIOC_STREAMOFF`. This
+ will return all currently queued ``CAPTURE`` buffers to the client, without
+ valid frame data.
+
+3. Start streaming on the ``CAPTURE`` queue via :c:func:`VIDIOC_STREAMON` and
+ continue with regular encoding sequence. The encoded frames produced into
+ ``CAPTURE`` buffers from now on will contain a standalone stream that can be
+ decoded without the need for frames encoded before the reset sequence,
+ starting at the first ``OUTPUT`` buffer queued after issuing the
+ `V4L2_ENC_CMD_STOP` of the `Drain` sequence.
+
+This sequence may be also used to change encoding parameters for encoders
+without the ability to change the parameters on the fly.
+
+Commit Points
+=============
+
+Setting formats and allocating buffers triggers changes in the behavior of the
+encoder.
+
+1. Setting the format on the ``CAPTURE`` queue may change the set of formats
+ supported/advertised on the ``OUTPUT`` queue. In particular, it also means
+ that the ``OUTPUT`` format may be reset and the client must not rely on the
+ previously set format being preserved.
+
+2. Enumerating formats on the ``OUTPUT`` queue always returns only formats
+ supported for the current ``CAPTURE`` format.
+
+3. Setting the format on the ``OUTPUT`` queue does not change the list of
+ formats available on the ``CAPTURE`` queue. An attempt to set the ``OUTPUT``
+ format that is not supported for the currently selected ``CAPTURE`` format
+ will result in the encoder adjusting the requested ``OUTPUT`` format to a
+ supported one.
+
+4. Enumerating formats on the ``CAPTURE`` queue always returns the full set of
+ supported coded formats, irrespective of the current ``OUTPUT`` format.
+
+5. While buffers are allocated on any of the ``OUTPUT`` or ``CAPTURE`` queues,
+ the client must not change the format on the ``CAPTURE`` queue. Drivers will
+ return the -EBUSY error code for any such format change attempt.
+
+To summarize, setting formats and allocation must always start with the
+``CAPTURE`` queue and the ``CAPTURE`` queue is the master that governs the
+set of supported formats for the ``OUTPUT`` queue.
diff --git a/Documentation/media/uapi/v4l/dev-mem2mem.rst b/Documentation/media/uapi/v4l/dev-mem2mem.rst
index 70953958cee6..43f14ccb675e 100644
--- a/Documentation/media/uapi/v4l/dev-mem2mem.rst
+++ b/Documentation/media/uapi/v4l/dev-mem2mem.rst
@@ -46,4 +46,5 @@ devices are given in the following sections.
:maxdepth: 1
dev-decoder
+ dev-encoder
dev-stateless-decoder
diff --git a/Documentation/media/uapi/v4l/pixfmt-v4l2.rst b/Documentation/media/uapi/v4l/pixfmt-v4l2.rst
index e7b6825657c2..38385472e5bf 100644
--- a/Documentation/media/uapi/v4l/pixfmt-v4l2.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-v4l2.rst
@@ -44,6 +44,11 @@ Single-planar format structure
inside the stream, when fed to a stateful mem2mem decoder, the fields
may be zero to rely on the decoder to detect the right values. For more
details see :ref:`decoder` and format descriptions.
+
+ For compressed formats on the CAPTURE side of a stateful mem2mem
+ encoder, the fields must be zero, since the coded size is expected to
+ be calculated internally by the encoder itself, based on the OUTPUT
+ side. For more details see :ref:`encoder` and format descriptions.
* - __u32
- ``pixelformat``
- The pixel format or type of compression, set by the application.
diff --git a/Documentation/media/uapi/v4l/v4l2.rst b/Documentation/media/uapi/v4l/v4l2.rst
index 97015b9b40b8..e236ea23481b 100644
--- a/Documentation/media/uapi/v4l/v4l2.rst
+++ b/Documentation/media/uapi/v4l/v4l2.rst
@@ -63,6 +63,7 @@ Authors, in alphabetical order:
- Figa, Tomasz <tfiga@chromium.org>
- Documented the memory-to-memory decoder interface.
+ - Documented the memory-to-memory encoder interface.
- H Schimek, Michael <mschimek@gmx.at>
@@ -75,6 +76,7 @@ Authors, in alphabetical order:
- Osciak, Pawel <posciak@chromium.org>
- Documented the memory-to-memory decoder interface.
+ - Documented the memory-to-memory encoder interface.
- Osciak, Pawel <pawel@osciak.com>
diff --git a/Documentation/media/uapi/v4l/vidioc-encoder-cmd.rst b/Documentation/media/uapi/v4l/vidioc-encoder-cmd.rst
index c313ca8b8cb5..88281e707476 100644
--- a/Documentation/media/uapi/v4l/vidioc-encoder-cmd.rst
+++ b/Documentation/media/uapi/v4l/vidioc-encoder-cmd.rst
@@ -51,25 +51,26 @@ To send a command applications must initialize all fields of a struct
``VIDIOC_ENCODER_CMD`` or ``VIDIOC_TRY_ENCODER_CMD`` with a pointer to
this structure.
-The ``cmd`` field must contain the command code. The ``flags`` field is
-currently only used by the STOP command and contains one bit: If the
-``V4L2_ENC_CMD_STOP_AT_GOP_END`` flag is set, encoding will continue
-until the end of the current *Group Of Pictures*, otherwise it will stop
-immediately.
+The ``cmd`` field must contain the command code. Some commands use the
+``flags`` field for additional information.
-A :ref:`read() <func-read>` or :ref:`VIDIOC_STREAMON <VIDIOC_STREAMON>`
-call sends an implicit START command to the encoder if it has not been
-started yet. After a STOP command, :ref:`read() <func-read>` calls will read
+After a STOP command, :ref:`read() <func-read>` calls will read
the remaining data buffered by the driver. When the buffer is empty,
:ref:`read() <func-read>` will return zero and the next :ref:`read() <func-read>`
call will restart the encoder.
+A :ref:`read() <func-read>` or :ref:`VIDIOC_STREAMON <VIDIOC_STREAMON>`
+call sends an implicit START command to the encoder if it has not been
+started yet. Applies to both queues of mem2mem encoders.
+
A :ref:`close() <func-close>` or :ref:`VIDIOC_STREAMOFF <VIDIOC_STREAMON>`
call of a streaming file descriptor sends an implicit immediate STOP to
-the encoder, and all buffered data is discarded.
+the encoder, and all buffered data is discarded. Applies to both queues of
+mem2mem encoders.
These ioctls are optional, not all drivers may support them. They were
-introduced in Linux 2.6.21.
+introduced in Linux 2.6.21. They are, however, mandatory for stateful mem2mem
+encoders (as further documented in :ref:`encoder`).
.. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}|
@@ -109,21 +110,24 @@ introduced in Linux 2.6.21.
- 0
- Start the encoder. When the encoder is already running or paused,
this command does nothing. No flags are defined for this command.
+
+ For a device implementing the :ref:`encoder`, once the drain sequence
+ is initiated with the ``V4L2_ENC_CMD_STOP`` command, it must be driven
+ to completion before this command can be invoked. Any attempt to
+ invoke the command while the drain sequence is in progress will trigger
+ an ``EBUSY`` error code. See :ref:`encoder` for more details.
* - ``V4L2_ENC_CMD_STOP``
- 1
- Stop the encoder. When the ``V4L2_ENC_CMD_STOP_AT_GOP_END`` flag
is set, encoding will continue until the end of the current *Group
Of Pictures*, otherwise encoding will stop immediately. When the
- encoder is already stopped, this command does nothing. mem2mem
- encoders will send a ``V4L2_EVENT_EOS`` event when the last frame
- has been encoded and all frames are ready to be dequeued and will
- set the ``V4L2_BUF_FLAG_LAST`` buffer flag on the last buffer of
- the capture queue to indicate there will be no new buffers
- produced to dequeue. This buffer may be empty, indicated by the
- driver setting the ``bytesused`` field to 0. Once the
- ``V4L2_BUF_FLAG_LAST`` flag was set, the
- :ref:`VIDIOC_DQBUF <VIDIOC_QBUF>` ioctl will not block anymore,
- but return an ``EPIPE`` error code.
+ encoder is already stopped, this command does nothing.
+
+ For a device implementing the :ref:`encoder`, the command will initiate
+ the drain sequence as documented in :ref:`encoder`. No flags or other
+ arguments are accepted in this case. Any attempt to invoke the command
+ again before the sequence completes will trigger an ``EBUSY`` error
+ code.
* - ``V4L2_ENC_CMD_PAUSE``
- 2
- Pause the encoder. When the encoder has not been started yet, the
@@ -152,6 +156,8 @@ introduced in Linux 2.6.21.
- Stop encoding at the end of the current *Group Of Pictures*,
rather than immediately.
+ Does not apply to :ref:`encoder`.
+
Return Value
============
@@ -160,6 +166,11 @@ On success 0 is returned, on error -1 and the ``errno`` variable is set
appropriately. The generic error codes are described at the
:ref:`Generic Error Codes <gen-errors>` chapter.
+EBUSY
+ A drain sequence of a device implementing the :ref:`encoder` is still in
+ progress. It is not allowed to issue another encoder command until it
+ completes.
+
EINVAL
The ``cmd`` field is invalid.
--
2.20.1
^ permalink raw reply related [flat|nested] 42+ messages in thread