From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans Verkuil Date: Fri, 22 Jan 2016 12:22:10 +0000 Subject: Re: [PATCH 1/3] v4l: Merge the YUV and YVU 4:2:0 tri-planar non-contiguous formats docs Message-Id: <56A21EF2.7010208@xs4all.nl> List-Id: References: <1452485264-11328-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> <1452485264-11328-2-git-send-email-laurent.pinchart+renesas@ideasonboard.com> In-Reply-To: <1452485264-11328-2-git-send-email-laurent.pinchart+renesas@ideasonboard.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Laurent Pinchart , linux-media@vger.kernel.org Cc: linux-sh@vger.kernel.org On 01/11/2016 05:07 AM, Laurent Pinchart wrote: > The two formats are very similar, having two separate pages to describe > them is overkill. > > Signed-off-by: Laurent Pinchart Acked-by: Hans Verkuil Thanks! Hans > --- > Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml | 26 ++-- > Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml | 154 --------------------- > Documentation/DocBook/media/v4l/pixfmt.xml | 1 - > 3 files changed, 17 insertions(+), 164 deletions(-) > delete mode 100644 Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml > > diff --git a/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml b/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml > index e781cc61786c..7d13fe96657d 100644 > --- a/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml > +++ b/Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml > @@ -1,35 +1,43 @@ > - > + > > - V4L2_PIX_FMT_YUV420M ('YM12') > + V4L2_PIX_FMT_YUV420M ('YM12'), V4L2_PIX_FMT_YVU420M ('YM21') > &manvol; > > > - V4L2_PIX_FMT_YUV420M > - Variation of V4L2_PIX_FMT_YUV420 > - with planes non contiguous in memory. > + V4L2_PIX_FMT_YUV420M > + V4L2_PIX_FMT_YVU420M > + Variation of V4L2_PIX_FMT_YUV420 and > + V4L2_PIX_FMT_YVU420 with planes non contiguous > + in memory. > > > > Description > > This is a multi-planar format, as opposed to a packed format. > -The three components are separated into three sub- images or planes. > +The three components are separated into three sub-images or planes. > > -The Y plane is first. The Y plane has one byte per pixel. The Cb data > + The Y plane is first. The Y plane has one byte per pixel. > +For V4L2_PIX_FMT_YUV420M the Cb data > constitutes the second plane which is half the width and half > the height of the Y plane (and of the image). Each Cb belongs to four > pixels, a two-by-two square of the image. For example, > Cb0 belongs to Y'00, > Y'01, Y'10, and > Y'11. The Cr data, just like the Cb plane, is > -in the third plane. > +in the third plane. > + > + V4L2_PIX_FMT_YVU420M is the same except > +the Cr data is stored in the second plane and the Cb data in the third plane. > + > > If the Y plane has pad bytes after each row, then the Cb > and Cr planes have half as many pad bytes after their rows. In other > words, two Cx rows (including padding) is exactly as long as one Y row > (including padding). > > - V4L2_PIX_FMT_YUV420M is intended to be > + V4L2_PIX_FMT_YUV420M and > +V4L2_PIX_FMT_YVU420M are intended to be > used only in drivers and applications that support the multi-planar API, > described in . > > diff --git a/Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml b/Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml > deleted file mode 100644 > index 2330667907c7..000000000000 > --- a/Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml > +++ /dev/null > @@ -1,154 +0,0 @@ > - > - > - V4L2_PIX_FMT_YVU420M ('YM21') > - &manvol; > - > - > - V4L2_PIX_FMT_YVU420M > - Variation of V4L2_PIX_FMT_YVU420 > - with planes non contiguous in memory. > - > - > - > - Description > - > - This is a multi-planar format, as opposed to a packed format. > -The three components are separated into three sub-images or planes. > - > -The Y plane is first. The Y plane has one byte per pixel. The Cr data > -constitutes the second plane which is half the width and half > -the height of the Y plane (and of the image). Each Cr belongs to four > -pixels, a two-by-two square of the image. For example, > -Cr0 belongs to Y'00, > -Y'01, Y'10, and > -Y'11. The Cb data, just like the Cr plane, constitutes > -the third plane. > - > - If the Y plane has pad bytes after each row, then the Cr > -and Cb planes have half as many pad bytes after their rows. In other > -words, two Cx rows (including padding) is exactly as long as one Y row > -(including padding). > - > - V4L2_PIX_FMT_YVU420M is intended to be > -used only in drivers and applications that support the multi-planar API, > -described in . > - > - > - <constant>V4L2_PIX_FMT_YVU420M</constant> 4 × 4 > -pixel image > - > - > - Byte Order. > - Each cell is one byte. > - > - > - > - > - > - start0 + 0: > - Y'00 > - Y'01 > - Y'02 > - Y'03 > - > - > - start0 + 4: > - Y'10 > - Y'11 > - Y'12 > - Y'13 > - > - > - start0 + 8: > - Y'20 > - Y'21 > - Y'22 > - Y'23 > - > - > - start0 + 12: > - Y'30 > - Y'31 > - Y'32 > - Y'33 > - > - > - > - start1 + 0: > - Cr00 > - Cr01 > - > - > - start1 + 2: > - Cr10 > - Cr11 > - > - > - > - start2 + 0: > - Cb00 > - Cb01 > - > - > - start2 + 2: > - Cb10 > - Cb11 > - > - > - > - > - > - > - > - > - Color Sample Location. > - > - > - > - > - > - > - 01 > - 23 > - > - > - 0 > - YY > - YY > - > - > - > - C > - C > - > - > - 1 > - YY > - YY > - > - > - > - > - > - 2 > - YY > - YY > - > - > - > - C > - C > - > - > - 3 > - YY > - YY > - > - > - > - > - > - > - > - > - > diff --git a/Documentation/DocBook/media/v4l/pixfmt.xml b/Documentation/DocBook/media/v4l/pixfmt.xml > index d871245d2973..9e77ff353feb 100644 > --- a/Documentation/DocBook/media/v4l/pixfmt.xml > +++ b/Documentation/DocBook/media/v4l/pixfmt.xml > @@ -1628,7 +1628,6 @@ information. > &sub-y41p; > &sub-yuv420; > &sub-yuv420m; > - &sub-yvu420m; > &sub-yuv410; > &sub-yuv422p; > &sub-yuv411p; >