* [PATCH] media: v4l2-dev/ioctl: Fix document for VIDIOC_QUERYCAP
@ 2020-07-20 9:29 Jian-Jia Su
2020-07-20 19:45 ` Helen Koike
0 siblings, 1 reply; 3+ messages in thread
From: Jian-Jia Su @ 2020-07-20 9:29 UTC (permalink / raw)
To: linux-media
Cc: Mauro Carvalho Chehab, Hans Verkuil, Helen Koike,
Laurent Pinchart, Jian-Jia Su, Niklas Söderlund,
linux-kernel
V4L2_CAP_VIDEO_M2M is documented as 0x00004000
V4L2_CAP_VIDEO_M2M_MPLANE is documented as 0x00008000
This is different from the definition in include/uapi/linux/videodev2.h
Signed-off-by: Jian-Jia Su <jjsu@chromium.org>
---
Documentation/userspace-api/media/v4l/vidioc-querycap.rst | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Documentation/userspace-api/media/v4l/vidioc-querycap.rst b/Documentation/userspace-api/media/v4l/vidioc-querycap.rst
index 666ac4d420519..90347367ef06a 100644
--- a/Documentation/userspace-api/media/v4l/vidioc-querycap.rst
+++ b/Documentation/userspace-api/media/v4l/vidioc-querycap.rst
@@ -168,11 +168,11 @@ specification the ioctl returns an ``EINVAL`` error code.
- The device supports the :ref:`multi-planar API <planar-apis>`
through the :ref:`Video Output <output>` interface.
* - ``V4L2_CAP_VIDEO_M2M``
- - 0x00004000
+ - 0x00008000
- The device supports the single-planar API through the Video
Memory-To-Memory interface.
* - ``V4L2_CAP_VIDEO_M2M_MPLANE``
- - 0x00008000
+ - 0x00004000
- The device supports the :ref:`multi-planar API <planar-apis>`
through the Video Memory-To-Memory interface.
* - ``V4L2_CAP_VIDEO_OVERLAY``
--
2.28.0.rc0.105.gf9edc3c819-goog
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] media: v4l2-dev/ioctl: Fix document for VIDIOC_QUERYCAP
2020-07-20 9:29 [PATCH] media: v4l2-dev/ioctl: Fix document for VIDIOC_QUERYCAP Jian-Jia Su
@ 2020-07-20 19:45 ` Helen Koike
2020-07-27 9:18 ` Alexandre Courbot
0 siblings, 1 reply; 3+ messages in thread
From: Helen Koike @ 2020-07-20 19:45 UTC (permalink / raw)
To: Jian-Jia Su, linux-media
Cc: Mauro Carvalho Chehab, Hans Verkuil, Helen Koike,
Laurent Pinchart, Niklas Söderlund, linux-kernel
Hi,
On 7/20/20 6:29 AM, Jian-Jia Su wrote:
> V4L2_CAP_VIDEO_M2M is documented as 0x00004000
> V4L2_CAP_VIDEO_M2M_MPLANE is documented as 0x00008000
> This is different from the definition in include/uapi/linux/videodev2.h
>
Nice catch, they are swapped in the docs indeed.
From videodev2.h:
/* Is a video mem-to-mem device that supports multiplanar formats */
#define V4L2_CAP_VIDEO_M2M_MPLANE 0x00004000
/* Is a video mem-to-mem device */
#define V4L2_CAP_VIDEO_M2M 0x00008000
> Signed-off-by: Jian-Jia Su <jjsu@chromium.org>
Reviewed-by: Helen Koike <helen.koike@collabora.com>
Regards,
Helen
> ---
> Documentation/userspace-api/media/v4l/vidioc-querycap.rst | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/userspace-api/media/v4l/vidioc-querycap.rst b/Documentation/userspace-api/media/v4l/vidioc-querycap.rst
> index 666ac4d420519..90347367ef06a 100644
> --- a/Documentation/userspace-api/media/v4l/vidioc-querycap.rst
> +++ b/Documentation/userspace-api/media/v4l/vidioc-querycap.rst
> @@ -168,11 +168,11 @@ specification the ioctl returns an ``EINVAL`` error code.
> - The device supports the :ref:`multi-planar API <planar-apis>`
> through the :ref:`Video Output <output>` interface.
> * - ``V4L2_CAP_VIDEO_M2M``
> - - 0x00004000
> + - 0x00008000
> - The device supports the single-planar API through the Video
> Memory-To-Memory interface.
> * - ``V4L2_CAP_VIDEO_M2M_MPLANE``
> - - 0x00008000
> + - 0x00004000
> - The device supports the :ref:`multi-planar API <planar-apis>`
> through the Video Memory-To-Memory interface.
> * - ``V4L2_CAP_VIDEO_OVERLAY``
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] media: v4l2-dev/ioctl: Fix document for VIDIOC_QUERYCAP
2020-07-20 19:45 ` Helen Koike
@ 2020-07-27 9:18 ` Alexandre Courbot
0 siblings, 0 replies; 3+ messages in thread
From: Alexandre Courbot @ 2020-07-27 9:18 UTC (permalink / raw)
To: Helen Koike
Cc: Jian-Jia Su, Linux Media Mailing List, Mauro Carvalho Chehab,
Hans Verkuil, Helen Koike, Laurent Pinchart,
Niklas Söderlund, LKML
On Tue, Jul 21, 2020 at 4:45 AM Helen Koike <helen@koikeco.de> wrote:
>
> Hi,
>
> On 7/20/20 6:29 AM, Jian-Jia Su wrote:
> > V4L2_CAP_VIDEO_M2M is documented as 0x00004000
> > V4L2_CAP_VIDEO_M2M_MPLANE is documented as 0x00008000
> > This is different from the definition in include/uapi/linux/videodev2.h
> >
>
> Nice catch, they are swapped in the docs indeed.
>
> From videodev2.h:
>
> /* Is a video mem-to-mem device that supports multiplanar formats */
> #define V4L2_CAP_VIDEO_M2M_MPLANE 0x00004000
> /* Is a video mem-to-mem device */
> #define V4L2_CAP_VIDEO_M2M 0x00008000
>
> > Signed-off-by: Jian-Jia Su <jjsu@chromium.org>
>
> Reviewed-by: Helen Koike <helen.koike@collabora.com>
FWIW,
Reviewed-by: Alexandre Courbot <acourbot@chromium.org>
>
> Regards,
> Helen
>
> > ---
> > Documentation/userspace-api/media/v4l/vidioc-querycap.rst | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/Documentation/userspace-api/media/v4l/vidioc-querycap.rst b/Documentation/userspace-api/media/v4l/vidioc-querycap.rst
> > index 666ac4d420519..90347367ef06a 100644
> > --- a/Documentation/userspace-api/media/v4l/vidioc-querycap.rst
> > +++ b/Documentation/userspace-api/media/v4l/vidioc-querycap.rst
> > @@ -168,11 +168,11 @@ specification the ioctl returns an ``EINVAL`` error code.
> > - The device supports the :ref:`multi-planar API <planar-apis>`
> > through the :ref:`Video Output <output>` interface.
> > * - ``V4L2_CAP_VIDEO_M2M``
> > - - 0x00004000
> > + - 0x00008000
> > - The device supports the single-planar API through the Video
> > Memory-To-Memory interface.
> > * - ``V4L2_CAP_VIDEO_M2M_MPLANE``
> > - - 0x00008000
> > + - 0x00004000
> > - The device supports the :ref:`multi-planar API <planar-apis>`
> > through the Video Memory-To-Memory interface.
> > * - ``V4L2_CAP_VIDEO_OVERLAY``
> >
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-07-27 9:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-20 9:29 [PATCH] media: v4l2-dev/ioctl: Fix document for VIDIOC_QUERYCAP Jian-Jia Su
2020-07-20 19:45 ` Helen Koike
2020-07-27 9:18 ` Alexandre Courbot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).