2017-09-04 20:41:43

by Mauro Carvalho Chehab

[permalink] [raw]
Subject: [PATCH 1/2] docs-rst: media: Don't use \small for V4L2_PIX_FMT_SRGGB10 documentation

From: Sakari Ailus <[email protected]>

There appears to be an issue in using \small in certain cases on Sphinx
1.4 and 1.5. Other format documents don't use \small either, remove it
from here as well.

[[email protected]: kept tabularcolumns - readjusted - and
add a few blank lines for it to display better]
Signed-off-by: Sakari Ailus <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
Documentation/media/uapi/v4l/pixfmt-srggb10p.rst | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst b/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst
index 9e52610aa954..d9e07a4b8b31 100644
--- a/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb10p.rst
@@ -33,12 +33,7 @@ of a small V4L2_PIX_FMT_SBGGR10P image:
**Byte Order.**
Each cell is one byte.

-
-.. raw:: latex
-
- \newline\small
-
-.. tabularcolumns:: |p{2.0cm}|p{1.0cm}|p{1.0cm}|p{1.0cm}|p{1.0cm}|p{10.0cm}|
+.. tabularcolumns:: |p{2.0cm}|p{1.0cm}|p{1.0cm}|p{1.0cm}|p{1.0cm}|p{5.4cm}|

.. flat-table::
:header-rows: 0
@@ -51,6 +46,7 @@ Each cell is one byte.
- B\ :sub:`02high`
- G\ :sub:`03high`
- G\ :sub:`03low`\ (bits 7--6) B\ :sub:`02low`\ (bits 5--4)
+
G\ :sub:`01low`\ (bits 3--2) B\ :sub:`00low`\ (bits 1--0)
* - start + 5:
- G\ :sub:`10high`
@@ -58,6 +54,7 @@ Each cell is one byte.
- G\ :sub:`12high`
- R\ :sub:`13high`
- R\ :sub:`13low`\ (bits 7--6) G\ :sub:`12low`\ (bits 5--4)
+
R\ :sub:`11low`\ (bits 3--2) G\ :sub:`10low`\ (bits 1--0)
* - start + 10:
- B\ :sub:`20high`
@@ -65,6 +62,7 @@ Each cell is one byte.
- B\ :sub:`22high`
- G\ :sub:`23high`
- G\ :sub:`23low`\ (bits 7--6) B\ :sub:`22low`\ (bits 5--4)
+
G\ :sub:`21low`\ (bits 3--2) B\ :sub:`20low`\ (bits 1--0)
* - start + 15:
- G\ :sub:`30high`
@@ -72,8 +70,5 @@ Each cell is one byte.
- G\ :sub:`32high`
- R\ :sub:`33high`
- R\ :sub:`33low`\ (bits 7--6) G\ :sub:`32low`\ (bits 5--4)
+
R\ :sub:`31low`\ (bits 3--2) G\ :sub:`30low`\ (bits 1--0)
-
-.. raw:: latex
-
- \normalsize
--
2.13.5



2017-09-04 20:41:41

by Mauro Carvalho Chehab

[permalink] [raw]
Subject: [PATCH 2/2] media: pixfmt-srggb12p.rst: better format the table for PDF output

Adjust the table to be better displayed on PDF output.

Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
Documentation/media/uapi/v4l/pixfmt-srggb12p.rst | 59 +++++++++---------------
1 file changed, 21 insertions(+), 38 deletions(-)

diff --git a/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst b/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst
index c0541e5acd01..59918a7913fe 100644
--- a/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-srggb12p.rst
@@ -30,6 +30,7 @@ Below is an example of a small V4L2_PIX_FMT_SBGGR12P image:
**Byte Order.**
Each cell is one byte.

+.. tabularcolumns:: |p{2.0cm}|p{1.0cm}|p{1.0cm}|p{2.7cm}|p{1.0cm}|p{1.0cm}|p{2.7cm}|


.. flat-table::
@@ -38,66 +39,48 @@ Each cell is one byte.
:widths: 2 1 1 1 1 1 1


- - .. row 1
-
- - start + 0:
-
+ - - start + 0:
- B\ :sub:`00high`
-
- G\ :sub:`01high`
+ - G\ :sub:`01low`\ (bits 7--4)

- - G\ :sub:`01low`\ (bits 7--4) B\ :sub:`00low`\ (bits 3--0)
-
+ B\ :sub:`00low`\ (bits 3--0)
- B\ :sub:`02high`
-
- G\ :sub:`03high`
+ - G\ :sub:`03low`\ (bits 7--4)

- - G\ :sub:`03low`\ (bits 7--4) B\ :sub:`02low`\ (bits 3--0)
-
- - .. row 2
-
- - start + 6:
+ B\ :sub:`02low`\ (bits 3--0)

+ - - start + 6:
- G\ :sub:`10high`
-
- R\ :sub:`11high`
+ - R\ :sub:`11low`\ (bits 7--4)

- - R\ :sub:`11low`\ (bits 7--4) G\ :sub:`10low`\ (bits 3--0)
-
+ G\ :sub:`10low`\ (bits 3--0)
- G\ :sub:`12high`
-
- R\ :sub:`13high`
+ - R\ :sub:`13low`\ (bits 3--2)

- - R\ :sub:`13low`\ (bits 3--2) G\ :sub:`12low`\ (bits 3--0)
-
- - .. row 3
-
- - start + 12:
-
+ G\ :sub:`12low`\ (bits 3--0)
+ - - start + 12:
- B\ :sub:`20high`
-
- G\ :sub:`21high`
+ - G\ :sub:`21low`\ (bits 7--4)

- - G\ :sub:`21low`\ (bits 7--4) B\ :sub:`20low`\ (bits 3--0)
-
+ B\ :sub:`20low`\ (bits 3--0)
- B\ :sub:`22high`
-
- G\ :sub:`23high`
+ - G\ :sub:`23low`\ (bits 7--4)

- - G\ :sub:`23low`\ (bits 7--4) B\ :sub:`22low`\ (bits 3--0)
-
- - .. row 4
-
- - start + 18:
-
+ B\ :sub:`22low`\ (bits 3--0)
+ - - start + 18:
- G\ :sub:`30high`
-
- R\ :sub:`31high`
+ - R\ :sub:`31low`\ (bits 7--4)

- - R\ :sub:`31low`\ (bits 7--4) G\ :sub:`30low`\ (bits 3--0)
-
+ G\ :sub:`30low`\ (bits 3--0)
- G\ :sub:`32high`
-
- R\ :sub:`33high`
+ - R\ :sub:`33low`\ (bits 3--2)

- - R\ :sub:`33low`\ (bits 3--2) G\ :sub:`32low`\ (bits 3--0)
+ G\ :sub:`32low`\ (bits 3--0)
--
2.13.5


2017-09-05 09:45:33

by Sakari Ailus

[permalink] [raw]
Subject: Re: [PATCH 1/2] docs-rst: media: Don't use \small for V4L2_PIX_FMT_SRGGB10 documentation

Hi Mauro,

On Mon, Sep 04, 2017 at 05:41:27PM -0300, Mauro Carvalho Chehab wrote:
> From: Sakari Ailus <[email protected]>
>
> There appears to be an issue in using \small in certain cases on Sphinx
> 1.4 and 1.5. Other format documents don't use \small either, remove it
> from here as well.
>
> [[email protected]: kept tabularcolumns - readjusted - and
> add a few blank lines for it to display better]
> Signed-off-by: Sakari Ailus <[email protected]>
> Signed-off-by: Mauro Carvalho Chehab <[email protected]>

Thanks!

For both:

Acked-by: Sakari Ailus <[email protected]>

--
Sakari Ailus
e-mail: [email protected]