[PATCH] some progress for html output
From: Johannes Stezenbach
Date: Sun Mar 06 2016 - 17:55:19 EST
---
_static/borderless.css | 3 --
_static/v4l2tables.css | 9 +++++
_templates/layout.html | 9 +----
packed-rgb.rst | 88 +++++++++++++++++++++++++++++-----------------
pixfmt-yuyv.rst | 2 +-
v4l-table-within-table.rst | 72 +++++++++++++++++++------------------
6 files changed, 105 insertions(+), 78 deletions(-)
delete mode 100644 _static/borderless.css
create mode 100644 _static/v4l2tables.css
diff --git a/_static/borderless.css b/_static/borderless.css
deleted file mode 100644
index bfd4b01..0000000
--- a/_static/borderless.css
+++ /dev/null
@@ -1,3 +0,0 @@
-table#table-borderless {
- border: 1px solid black;
-}
diff --git a/_static/v4l2tables.css b/_static/v4l2tables.css
new file mode 100644
index 0000000..c045e45
--- /dev/null
+++ b/_static/v4l2tables.css
@@ -0,0 +1,9 @@
+table.noborder {
+ border: 1px solid black;
+ background: white;
+ white-space: nowrap;
+}
+
+table.noborder td, table.noborder th {
+ padding: 0px;
+}
diff --git a/_templates/layout.html b/_templates/layout.html
index b6bf12b..637332d 100644
--- a/_templates/layout.html
+++ b/_templates/layout.html
@@ -1,9 +1,2 @@
{% extends "!layout.html" %}
-{% block tables %}
-<style>
-table#table-borderless {
- border: 1px solid black;
-}
-</style>
-{{ super() }}
-{% endblock %}
+{% set css_files = css_files + ["_static/v4l2tables.css"] %}
diff --git a/packed-rgb.rst b/packed-rgb.rst
index 352b91c..b4fcf3e 100644
--- a/packed-rgb.rst
+++ b/packed-rgb.rst
@@ -9,25 +9,46 @@ graphics frame buffers. They occupy 8, 16, 24 or 32 bits per pixel.
These are all packed-pixel formats, meaning all the data for a pixel lie
next to each other in memory.
-.. csv-table:: Table: Packed RGB Image Formats
- :header: Identifier,Code, ,Byte 0 in memory,Byte 1,Byte 2,Byte 3
+.. table:: Packed RGB Image Formats
+ :class: noborder
- ``V4L2_PIX_FMT_RGB332``,'RGB1',,r\ :sub:`2`,r\ :sub:`1`,r\ :sub:`0`,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,b\ :sub:`1`,b\ :sub:`0`
- ``V4L2_PIX_FMT_ARGB444``,'AR12',,g\ :sub:`3`,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,b\ :sub:`3`,b\ :sub:`2`,b\ :sub:`1`,b\ :sub:`0`,,a\ :sub:`3`,a\ :sub:`2`,a\ :sub:`1`,a\ :sub:`0`,r\ :sub:`3`,r\ :sub:`2`,r\ :sub:`1`,r\ :sub:`0`
- ``V4L2_PIX_FMT_XRGB444``,'XR12',,g\ :sub:`3`,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,b\ :sub:`3`,b\ :sub:`2`,b\ :sub:`1`,b\ :sub:`0`,,-,-,-,-,r\ :sub:`3`,r\ :sub:`2`,r\ :sub:`1`,r\ :sub:`0`
- ``V4L2_PIX_FMT_ARGB555``,'AR15',,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,b\ :sub:`4`,b\ :sub:`3`,b\ :sub:`2`,b\ :sub:`1`,b\ :sub:`0`,,a,r\ :sub:`4`,r\ :sub:`3`,r\ :sub:`2`,r\ :sub:`1`,r\ :sub:`0`,g\ :sub:`4`,g\ :sub:`3`
- ``V4L2_PIX_FMT_XRGB555``,'XR15',,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,b\ :sub:`4`,b\ :sub:`3`,b\ :sub:`2`,b\ :sub:`1`,b\ :sub:`0`,,-,r\ :sub:`4`,r\ :sub:`3`,r\ :sub:`2`,r\ :sub:`1`,r\ :sub:`0`,g\ :sub:`4`,g\ :sub:`3`
- ``V4L2_PIX_FMT_RGB565``,'RGBP',,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,b\ :sub:`4`,b\ :sub:`3`,b\ :sub:`2`,b\ :sub:`1`,b\ :sub:`0`,,r\ :sub:`4`,r\ :sub:`3`,r\ :sub:`2`,r\ :sub:`1`,r\ :sub:`0`,g\ :sub:`5`,g\ :sub:`4`,g\ :sub:`3`
- ``V4L2_PIX_FMT_ARGB555X``,'AR15' | (1<<31),,a,r\ :sub:`4`,r\ :sub:`3`,r\ :sub:`2`,r\ :sub:`1`,r\ :sub:`0`,g\ :sub:`4`,g\ :sub:`3`,,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,b\ :sub:`4`,b\ :sub:`3`,b\ :sub:`2`,b\ :sub:`1`,b\ :sub:`0`
- ``V4L2_PIX_FMT_XRGB555X``,'XR15' | (1<<31),,-,r\ :sub:`4`,r\ :sub:`3`,r\ :sub:`2`,r\ :sub:`1`,r\ :sub:`0`,g\ :sub:`4`,g\ :sub:`3`,,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,b\ :sub:`4`,b\ :sub:`3`,b\ :sub:`2`,b\ :sub:`1`,b\ :sub:`0`
- ``V4L2_PIX_FMT_RGB565X``,'RGBR',,r\ :sub:`4`,r\ :sub:`3`,r\ :sub:`2`,r\ :sub:`1`,r\ :sub:`0`,g\ :sub:`5`,g\ :sub:`4`,g\ :sub:`3`,,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,b\ :sub:`4`,b\ :sub:`3`,b\ :sub:`2`,b\ :sub:`1`,b\ :sub:`0`
- ``V4L2_PIX_FMT_BGR24``,'BGR3',,b\ :sub:`7`,b\ :sub:`6`,b\ :sub:`5`,b\ :sub:`4`,b\ :sub:`3`,b\ :sub:`2`,b\ :sub:`1`,b\ :sub:`0`,,g\ :sub:`7`,g\ :sub:`6`,g\ :sub:`5`,g\ :sub:`4`,g\ :sub:`3`,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,,r\ :sub:`7`,r\ :sub:`6`,r\ :sub:`5`,r\ :sub:`4`,r\ :sub:`3`,r\ :sub:`2`,r\ :sub:`1`,r\ :sub:`0`
- ``V4L2_PIX_FMT_RGB24``,'RGB3',,r\ :sub:`7`,r\ :sub:`6`,r\ :sub:`5`,r\ :sub:`4`,r\ :sub:`3`,r\ :sub:`2`,r\ :sub:`1`,r\ :sub:`0`,,g\ :sub:`7`,g\ :sub:`6`,g\ :sub:`5`,g\ :sub:`4`,g\ :sub:`3`,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,,b\ :sub:`7`,b\ :sub:`6`,b\ :sub:`5`,b\ :sub:`4`,b\ :sub:`3`,b\ :sub:`2`,b\ :sub:`1`,b\ :sub:`0`
- ``V4L2_PIX_FMT_BGR666``,'BGRH',,b\ :sub:`5`,b\ :sub:`4`,b\ :sub:`3`,b\ :sub:`2`,b\ :sub:`1`,b\ :sub:`0`,g\ :sub:`5`,g\ :sub:`4`,,g\ :sub:`3`,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,r\ :sub:`5`,r\ :sub:`4`,r\ :sub:`3`,r\ :sub:`2`,,r\ :sub:`1`,r\ :sub:`0`,-,-,-,-,-,-,,-,-,-,-,-,-,-,-
- ``V4L2_PIX_FMT_ABGR32``,'AR24',,b\ :sub:`7`,b\ :sub:`6`,b\ :sub:`5`,b\ :sub:`4`,b\ :sub:`3`,b\ :sub:`2`,b\ :sub:`1`,b\ :sub:`0`,,g\ :sub:`7`,g\ :sub:`6`,g\ :sub:`5`,g\ :sub:`4`,g\ :sub:`3`,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,,r\ :sub:`7`,r\ :sub:`6`,r\ :sub:`5`,r\ :sub:`4`,r\ :sub:`3`,r\ :sub:`2`,r\ :sub:`1`,r\ :sub:`0`,,a\ :sub:`7`,a\ :sub:`6`,a\ :sub:`5`,a\ :sub:`4`,a\ :sub:`3`,a\ :sub:`2`,a\ :sub:`1`,a\ :sub:`0`
- ``V4L2_PIX_FMT_XBGR32``,'XR24',,b\ :sub:`7`,b\ :sub:`6`,b\ :sub:`5`,b\ :sub:`4`,b\ :sub:`3`,b\ :sub:`2`,b\ :sub:`1`,b\ :sub:`0`,,g\ :sub:`7`,g\ :sub:`6`,g\ :sub:`5`,g\ :sub:`4`,g\ :sub:`3`,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,,r\ :sub:`7`,r\ :sub:`6`,r\ :sub:`5`,r\ :sub:`4`,r\ :sub:`3`,r\ :sub:`2`,r\ :sub:`1`,r\ :sub:`0`,,-,-,-,-,-,-,-,-
- ``V4L2_PIX_FMT_ARGB32``,'BA24',,a\ :sub:`7`,a\ :sub:`6`,a\ :sub:`5`,a\ :sub:`4`,a\ :sub:`3`,a\ :sub:`2`,a\ :sub:`1`,a\ :sub:`0`,,r\ :sub:`7`,r\ :sub:`6`,r\ :sub:`5`,r\ :sub:`4`,r\ :sub:`3`,r\ :sub:`2`,r\ :sub:`1`,r\ :sub:`0`,,g\ :sub:`7`,g\ :sub:`6`,g\ :sub:`5`,g\ :sub:`4`,g\ :sub:`3`,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,,b\ :sub:`7`,b\ :sub:`6`,b\ :sub:`5`,b\ :sub:`4`,b\ :sub:`3`,b\ :sub:`2`,b\ :sub:`1`,b\ :sub:`0`
- ``V4L2_PIX_FMT_XRGB32``,'BX24',,-,-,-,-,-,-,-,-,,r\ :sub:`7`,r\ :sub:`6`,r\ :sub:`5`,r\ :sub:`4`,r\ :sub:`3`,r\ :sub:`2`,r\ :sub:`1`,r\ :sub:`0`,,g\ :sub:`7`,g\ :sub:`6`,g\ :sub:`5`,g\ :sub:`4`,g\ :sub:`3`,g\ :sub:`2`,g\ :sub:`1`,g\ :sub:`0`,,b\ :sub:`7`,b\ :sub:`6`,b\ :sub:`5`,b\ :sub:`4`,b\ :sub:`3`,b\ :sub:`2`,b\ :sub:`1`,b\ :sub:`0`
+ +-----------------------------+-----------------------+-----+------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------+
+ | Identifier | Code | | Byte 0 in memory | Byte 1 | Byte 2 | Byte 3 |
+ | | +-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | | | Bit | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | Bit | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | Bit | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | Bit | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 |
+ +=============================+=======================+=====+====================+===============+===============+===============+===============+===============+===============+===============+=====+===============+===============+===============+===============+===============+===============+===============+===============+=====+===============+===============+===============+===============+===============+===============+===============+===============+=====+===============+===============+===============+===============+===============+===============+===============+===============+
+ | ``V4L2_PIX_FMT_RGB332`` | 'RGB1' | | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | b\ :sub:`1` | b\ :sub:`0` | | | | | | | | | | | | | | | | | | | | | | | | | | | |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_ARGB444`` | 'AR12' | | g\ :sub:`3` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | a\ :sub:`3` | a\ :sub:`2` | a\ :sub:`1` | a\ :sub:`0` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | | | | | | | | | | | | | | | | | | |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_XRGB444`` | 'XR12' | | g\ :sub:`3` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | \- | \- | \- | \- | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | | | | | | | | | | | | | | | | | | |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_ARGB555`` | 'AR15' | | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | a | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | g\ :sub:`4` | g\ :sub:`3` | | | | | | | | | | | | | | | | | | |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_XRGB555`` | 'XR15' | | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | \- | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | g\ :sub:`4` | g\ :sub:`3` | | | | | | | | | | | | | | | | | | |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_RGB565`` | 'RGBP' | | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | g\ :sub:`5` | g\ :sub:`4` | g\ :sub:`3` | | | | | | | | | | | | | | | | | | |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_ARGB555X`` | 'AR15' | (1 << 31) | | a | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | g\ :sub:`4` | g\ :sub:`3` | | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | | | | | | | | | | | | | | | | | |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_XRGB555X`` | 'XR15' | (1 << 31) | | \- | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | g\ :sub:`4` | g\ :sub:`3` | | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | | | | | | | | | | | | | | | | | |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_RGB565X`` | 'RGBR' | | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | g\ :sub:`5` | g\ :sub:`4` | g\ :sub:`3` | | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | | | | | | | | | | | | | | | | | |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_BGR24`` | 'BGR3' | | b\ :sub:`7` | b\ :sub:`6` | b\ :sub:`5` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | g\ :sub:`7` | g\ :sub:`6` | g\ :sub:`5` | g\ :sub:`4` | g\ :sub:`3` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | | r\ :sub:`7` | r\ :sub:`6` | r\ :sub:`5` | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | | | | | | | | | |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_RGB24`` | 'RGB3' | | r\ :sub:`7` | r\ :sub:`6` | r\ :sub:`5` | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | | g\ :sub:`7` | g\ :sub:`6` | g\ :sub:`5` | g\ :sub:`4` | g\ :sub:`3` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | | b\ :sub:`7` | b\ :sub:`6` | b\ :sub:`5` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | | | | | | | | |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_BGR666`` | 'BGRH' | | b\ :sub:`5` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | g\ :sub:`5` | g\ :sub:`4` | | g\ :sub:`3` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | r\ :sub:`5` | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | | r\ :sub:`1` | r\ :sub:`0` | \- | \- | \- | \- | \- | \- | | \- | \- | \- | \- | \- | \- | \- | \- |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_ABGR32`` | 'AR24' | | b\ :sub:`7` | b\ :sub:`6` | b\ :sub:`5` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | g\ :sub:`7` | g\ :sub:`6` | g\ :sub:`5` | g\ :sub:`4` | g\ :sub:`3` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | | r\ :sub:`7` | r\ :sub:`6` | r\ :sub:`5` | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | | a\ :sub:`7` | a\ :sub:`6` | a\ :sub:`5` | a\ :sub:`4` | a\ :sub:`3` | a\ :sub:`2` | a\ :sub:`1` | a\ :sub:`0` |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_XBGR32`` | 'XR24' | | b\ :sub:`7` | b\ :sub:`6` | b\ :sub:`5` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | g\ :sub:`7` | g\ :sub:`6` | g\ :sub:`5` | g\ :sub:`4` | g\ :sub:`3` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | | r\ :sub:`7` | r\ :sub:`6` | r\ :sub:`5` | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | | \- | \- | \- | \- | \- | \- | \- | \- |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_ARGB32`` | 'BA24' | | a\ :sub:`7` | a\ :sub:`6` | a\ :sub:`5` | a\ :sub:`4` | a\ :sub:`3` | a\ :sub:`2` | a\ :sub:`1` | a\ :sub:`0` | | r\ :sub:`7` | r\ :sub:`6` | r\ :sub:`5` | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | | g\ :sub:`7` | g\ :sub:`6` | g\ :sub:`5` | g\ :sub:`4` | g\ :sub:`3` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | | b\ :sub:`7` | b\ :sub:`6` | b\ :sub:`5` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_XRGB32`` | 'BX24' | | \- | \- | \- | \- | \- | \- | \- | \- | | r\ :sub:`7` | r\ :sub:`6` | r\ :sub:`5` | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | | g\ :sub:`7` | g\ :sub:`6` | g\ :sub:`5` | g\ :sub:`4` | g\ :sub:`3` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | | b\ :sub:`7` | b\ :sub:`6` | b\ :sub:`5` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` |
+ +-----------------------------+-----------------------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
Bit 7 is the most significant bit.
@@ -74,21 +95,24 @@ They are documented here for reference. The meaning of their alpha bits
(a) is ill-defined and interpreted as in either the corresponding ARGB
or XRGB format, depending on the driver.
-+----------------------------+----------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
-| Identifier | Code | | Byte 0 in memory | Byte 1 | Byte 2 | Byte 3 |
-+============================+==========+=====+====================+===============+===============+===============+===============+===============+===============+===============+====+===============+===============+===============+===============+===============+===============+===============+===============+====+===============+===============+===============+===============+===============+===============+===============+===============+====+===============+===============+===============+===============+===============+===============+===============+===============+
-| ``V4L2_PIX_FMT_RGB444`` | 'R444' | | g\ :sub:`3` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | a\ :sub:`3` | a\ :sub:`2` | a\ :sub:`1` | a\ :sub:`0` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` |
-+----------------------------+----------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
-| ``V4L2_PIX_FMT_RGB555`` | 'RGBO' | | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | a | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | g\ :sub:`4` | g\ :sub:`3` |
-+----------------------------+----------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
-| ``V4L2_PIX_FMT_RGB555X`` | 'RGBQ' | | a | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | g\ :sub:`4` | g\ :sub:`3` | | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` |
-+----------------------------+----------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
-| ``V4L2_PIX_FMT_BGR32`` | 'BGR4' | | b\ :sub:`7` | b\ :sub:`6` | b\ :sub:`5` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | g\ :sub:`7` | g\ :sub:`6` | g\ :sub:`5` | g\ :sub:`4` | g\ :sub:`3` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | | r\ :sub:`7` | r\ :sub:`6` | r\ :sub:`5` | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | | a\ :sub:`7` | a\ :sub:`6` | a\ :sub:`5` | a\ :sub:`4` | a\ :sub:`3` | a\ :sub:`2` | a\ :sub:`1` | a\ :sub:`0` |
-+----------------------------+----------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
-| ``V4L2_PIX_FMT_RGB32`` | 'RGB4' | | a\ :sub:`7` | a\ :sub:`6` | a\ :sub:`5` | a\ :sub:`4` | a\ :sub:`3` | a\ :sub:`2` | a\ :sub:`1` | a\ :sub:`0` | | r\ :sub:`7` | r\ :sub:`6` | r\ :sub:`5` | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | | g\ :sub:`7` | g\ :sub:`6` | g\ :sub:`5` | g\ :sub:`4` | g\ :sub:`3` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | | b\ :sub:`7` | b\ :sub:`6` | b\ :sub:`5` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` |
-+----------------------------+----------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+.. table:: Deprecated Packed RGB Image Formats
+ :class: noborder
-Table: Deprecated Packed RGB Image Formats
+ +----------------------------+----------+-----+------------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------------+-------------------------------------------------------------------------------------------------------------------------------+
+ | Identifier | Code | | Byte 0 in memory | Byte 1 | Byte 2 | Byte 3 |
+ | | +-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | | | Bit | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | Bit | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | Bit | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 | Bit | 7 | 6 | 5 | 4 | 3 | 2 | 1 | 0 |
+ +============================+==========+=====+====================+===============+===============+===============+===============+===============+===============+===============+=====+===============+===============+===============+===============+===============+===============+===============+===============+=====+===============+===============+===============+===============+===============+===============+===============+===============+=====+===============+===============+===============+===============+===============+===============+===============+===============+
+ | ``V4L2_PIX_FMT_RGB444`` | 'R444' | | g\ :sub:`3` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | a\ :sub:`3` | a\ :sub:`2` | a\ :sub:`1` | a\ :sub:`0` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | | | | | | | | | | | | | | | | | | |
+ +----------------------------+----------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_RGB555`` | 'RGBO' | | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | a | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | g\ :sub:`4` | g\ :sub:`3` | | | | | | | | | | | | | | | | | | |
+ +----------------------------+----------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_RGB555X`` | 'RGBQ' | | a | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | g\ :sub:`4` | g\ :sub:`3` | | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | | | | | | | | | | | | | | | | | |
+ +----------------------------+----------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_BGR32`` | 'BGR4' | | b\ :sub:`7` | b\ :sub:`6` | b\ :sub:`5` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` | | g\ :sub:`7` | g\ :sub:`6` | g\ :sub:`5` | g\ :sub:`4` | g\ :sub:`3` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | | r\ :sub:`7` | r\ :sub:`6` | r\ :sub:`5` | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | | a\ :sub:`7` | a\ :sub:`6` | a\ :sub:`5` | a\ :sub:`4` | a\ :sub:`3` | a\ :sub:`2` | a\ :sub:`1` | a\ :sub:`0` |
+ +----------------------------+----------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
+ | ``V4L2_PIX_FMT_RGB32`` | 'RGB4' | | a\ :sub:`7` | a\ :sub:`6` | a\ :sub:`5` | a\ :sub:`4` | a\ :sub:`3` | a\ :sub:`2` | a\ :sub:`1` | a\ :sub:`0` | | r\ :sub:`7` | r\ :sub:`6` | r\ :sub:`5` | r\ :sub:`4` | r\ :sub:`3` | r\ :sub:`2` | r\ :sub:`1` | r\ :sub:`0` | | g\ :sub:`7` | g\ :sub:`6` | g\ :sub:`5` | g\ :sub:`4` | g\ :sub:`3` | g\ :sub:`2` | g\ :sub:`1` | g\ :sub:`0` | | b\ :sub:`7` | b\ :sub:`6` | b\ :sub:`5` | b\ :sub:`4` | b\ :sub:`3` | b\ :sub:`2` | b\ :sub:`1` | b\ :sub:`0` |
+ +----------------------------+----------+-----+--------------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+-----+---------------+---------------+---------------+---------------+---------------+---------------+---------------+---------------+
A test utility to determine which RGB formats a driver actually supports
is available from the LinuxTV v4l-dvb repository. See V4L-DVB for access
diff --git a/pixfmt-yuyv.rst b/pixfmt-yuyv.rst
index 9ec268d..9e4b6dd 100644
--- a/pixfmt-yuyv.rst
+++ b/pixfmt-yuyv.rst
@@ -11,7 +11,7 @@ In this format each four bytes is two pixels. Each four bytes is two
Y's, a Cb and a Cr. Each Y goes to one of the pixels, and the Cb and Cr
belong to both pixels. As you can see, the Cr and Cb components have
half the horizontal resolution of the Y component.
-``V4L2_PIX_FMT_YUYV `` is known in the Windows environment as YUY2.
+``V4L2_PIX_FMT_YUYV`` is known in the Windows environment as YUY2.
**Byte Order..**
diff --git a/v4l-table-within-table.rst b/v4l-table-within-table.rst
index d2a6079..c8e1b21 100644
--- a/v4l-table-within-table.rst
+++ b/v4l-table-within-table.rst
@@ -1,37 +1,41 @@
V4l2 CID table example
======================
-============================== ============== =========
-ID Type Definition
-============================== ============== =========
-V4L2_CID_COLOR_KILLER boolean Enable the color killer (i. e. force a black & white image in case of a weak video signal).
-V4L2_CID_COLORFX enum Selects a color effect. The following values are defined:
-
- ============================== =====================
- Value Definition
- ============================== =====================
- V4L2_COLORFX_NONE Color effect is disabled.
- V4L2_COLORFX_ANTIQUE An aging (old photo) effect.
- V4L2_COLORFX_ART_FREEZE Frost color effect.
- V4L2_COLORFX_AQUA Water color, cool tone.
- V4L2_COLORFX_BW Black and white.
- V4L2_COLORFX_EMBOSS Emboss, the highlights and shadows replace light/dark
- boundaries and low contrast areas are set to a gray background.
- V4L2_COLORFX_GRASS_GREEN Grass green.
- V4L2_COLORFX_NEGATIVE Negative.
- V4L2_COLORFX_SEPIA Sepia tone.
- V4L2_COLORFX_SKETCH Sketch.
- V4L2_COLORFX_SKIN_WHITEN Skin whiten.
- V4L2_COLORFX_SKY_BLUE Sky blue.
- V4L2_COLORFX_SOLARIZATION Solarization, the image is partially reversed in tone, only
- color values above or below a certain threshold are inverted.
- V4L2_COLORFX_SILHOUETTE Silhouette (outline).
- V4L2_COLORFX_VIVID Vivid colors.
- V4L2_COLORFX_SET_CBCR The Cb and Cr chroma components are replaced by fixed coefficients
- determined by V4L2_CID_COLORFX_CBCR control.
- ============================== =====================
-V4L2_CID_COLORFX_CBCR integer Determines the Cb and Cr coefficients for V4L2_COLORFX_SET_CBCR
- color effect. Bits [7:0] of the supplied 32 bit value are interpreted as
- Cr component, bits [15:8] as Cb component and bits [31:16] must be zero.
-V4L2_CID_AUTOBRIGHTNESS boolean Enable Automatic Brightness.
-============================== ============== =========
+.. tabularcolumns:: |l|l|p{20cm}|
+.. table::
+ :class: noborder
+
+ ============================== ============== =========
+ ID Type Definition
+ ============================== ============== =========
+ V4L2_CID_COLOR_KILLER boolean Enable the color killer (i. e. force a black & white image in case of a weak video signal).
+ V4L2_CID_COLORFX enum Selects a color effect. The following values are defined:
+
+ ============================== =====================
+ Value Definition
+ ============================== =====================
+ V4L2_COLORFX_NONE Color effect is disabled.
+ V4L2_COLORFX_ANTIQUE An aging (old photo) effect.
+ V4L2_COLORFX_ART_FREEZE Frost color effect.
+ V4L2_COLORFX_AQUA Water color, cool tone.
+ V4L2_COLORFX_BW Black and white.
+ V4L2_COLORFX_EMBOSS Emboss, the highlights and shadows replace light/dark
+ boundaries and low contrast areas are set to a gray background.
+ V4L2_COLORFX_GRASS_GREEN Grass green.
+ V4L2_COLORFX_NEGATIVE Negative.
+ V4L2_COLORFX_SEPIA Sepia tone.
+ V4L2_COLORFX_SKETCH Sketch.
+ V4L2_COLORFX_SKIN_WHITEN Skin whiten.
+ V4L2_COLORFX_SKY_BLUE Sky blue.
+ V4L2_COLORFX_SOLARIZATION Solarization, the image is partially reversed in tone, only
+ color values above or below a certain threshold are inverted.
+ V4L2_COLORFX_SILHOUETTE Silhouette (outline).
+ V4L2_COLORFX_VIVID Vivid colors.
+ V4L2_COLORFX_SET_CBCR The Cb and Cr chroma components are replaced by fixed coefficients
+ determined by V4L2_CID_COLORFX_CBCR control.
+ ============================== =====================
+ V4L2_CID_COLORFX_CBCR integer Determines the Cb and Cr coefficients for V4L2_COLORFX_SET_CBCR
+ color effect. Bits [7:0] of the supplied 32 bit value are interpreted as
+ Cr component, bits [15:8] as Cb component and bits [31:16] must be zero.
+ V4L2_CID_AUTOBRIGHTNESS boolean Enable Automatic Brightness.
+ ============================== ============== =========
--
2.7.0
--bp/iNruPH9dso1Pn--