[git:v4l-utils/master] v4l2-ctl: HDMI only supports EDID 1.3
This is an automatic generated email to let you know that the following patch
were queued at the
http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: v4l2-ctl: HDMI only supports EDID 1.3
Author: Hans Verkuil
Date:Mon Aug 22 09:41:27 2016 +0200
It turns out the HDMI spec requires EDID 1.3 and does not allow 1.4.
So go back to EDID 1.3 for the HDMI EDIDs.
Signed-off-by: Hans Verkuil
utils/v4l2-ctl/v4l2-ctl-edid.cpp | 32
1 file changed, 16 insertions(+), 16 deletions(-)
---
http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=1922b65cff6b5bb5bb3b4f5414ae94a331d5b079
diff --git a/utils/v4l2-ctl/v4l2-ctl-edid.cpp b/utils/v4l2-ctl/v4l2-ctl-edid.cpp
index 7b3483343339..afb9c116bae4 100644
--- a/utils/v4l2-ctl/v4l2-ctl-edid.cpp
+++ b/utils/v4l2-ctl/v4l2-ctl-edid.cpp
@@ -726,7 +726,7 @@ static uint8_t dvid_edid[128] = {
static uint8_t hdmi_edid[256] = {
0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
0x31, 0xd8, 0x34, 0x12, 0x00, 0x00, 0x00, 0x00,
- 0x22, 0x1a, 0x01, 0x04, 0xa2, 0x30, 0x1b, 0x78,
+ 0x22, 0x1a, 0x01, 0x03, 0x80, 0x30, 0x1b, 0x78,
0x1f, 0xee, 0x91, 0xa3, 0x54, 0x4c, 0x99, 0x26,
0x0f, 0x50, 0x54, 0x2f, 0xcf, 0x00, 0x31, 0x59,
0x45, 0x59, 0x81, 0x80, 0x81, 0x40, 0x90, 0x40,
@@ -734,12 +734,12 @@ static uint8_t hdmi_edid[256] = {
0x80, 0x18, 0x71, 0x38, 0x2d, 0x40, 0x58, 0x2c,
0x46, 0x00, 0xe0, 0x0e, 0x11, 0x00, 0x00, 0x1e,
0x00, 0x00, 0x00, 0xfd, 0x00, 0x18, 0x55, 0x18,
- 0x5e, 0x11, 0x04, 0x12, 0x00, 0xf0, 0xf8, 0x38,
- 0xf0, 0x3c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x68,
+ 0x5e, 0x11, 0x00, 0x0a, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x68,
0x64, 0x6d, 0x69, 0x0a, 0x20, 0x20, 0x20, 0x20,
0x20, 0x20, 0x20, 0x20, 0x00, 0x00, 0x00, 0x10,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xf8,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xb3,
0x02, 0x03, 0x2d, 0xf0, 0x4c, 0x10, 0x1f, 0x04,
0x13, 0x22, 0x21, 0x20, 0x05, 0x14, 0x02, 0x11,
@@ -762,7 +762,7 @@ static uint8_t hdmi_edid[256] = {
static uint8_t hdmi_edid_4k_170[256] = {
0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
0x31, 0xd8, 0x34, 0x12, 0x00, 0x00, 0x00, 0x00,
- 0x22, 0x1a, 0x01, 0x04, 0xa2, 0x60, 0x36, 0x78,
+ 0x22, 0x1a, 0x01, 0x03, 0x80, 0x60, 0x36, 0x78,
0x1f, 0xee, 0x91, 0xa3, 0x54, 0x4c, 0x99, 0x26,
0x0f, 0x50, 0x54, 0x2f, 0xcf, 0x00, 0x31, 0x59,
0x45, 0x59, 0x81, 0x80, 0x81, 0x40, 0x90, 0x40,
@@ -770,12 +770,12 @@ static uint8_t hdmi_edid_4k_170[256] = {
0x80, 0x18, 0x71, 0x38, 0x2d, 0x40, 0x58, 0x2c,
0x46, 0x00, 0xc0, 0x1c, 0x32, 0x00, 0x00, 0x1e,
0x00, 0x00, 0x00, 0xfd, 0x00, 0x18, 0x55, 0x18,
- 0x5e, 0x11, 0x04, 0x12, 0x00, 0xf0, 0xf8, 0x38,
- 0xf0, 0x3c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x68,
+ 0x5e, 0x11, 0x00, 0x0a, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x68,
0x64, 0x6d, 0x69, 0x2d, 0x34, 0x6b, 0x2d, 0x31,
0x37, 0x30, 0x0a, 0x20, 0x00, 0x00, 0x00, 0x10,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xed,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xa8,
0x02, 0x03, 0x32, 0xf0, 0x4c, 0x10, 0x1f, 0x04,
0x13, 0x22, 0x21, 0x20, 0x05, 0x14, 0x02, 0x11,
@@ -798,7 +798,7 @@ static uint8_t hdmi_edid_4k_170[256] = {
static uint8_t hdmi_edid_4k_300[256] = {
0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
0x31, 0xd8, 0x34, 0x12, 0x00, 0x00, 0x00, 0x00,
- 0x22, 0x1a, 0x01, 0x04, 0xa2, 0x60, 0x36, 0x78,
+ 0x22, 0x1a, 0x01, 0x03, 0x80, 0x60, 0x36, 0x78,
0x1f, 0xee, 0x91, 0xa3, 0x54, 0x4c, 0x99, 0x26,
0x0f, 0x50, 0x54, 0x2f, 0xcf, 0x00, 0x31, 0x59,
0x45, 0x59, 0x81, 0x80, 0x81, 0x40, 0x90, 0x40,
@@ -806,12 +806,12 @@ static uint8_t hdmi_edid_4k_300[256] = {
0x00, 0x30, 0xf2, 0x70, 0x5a, 0x80, 0xb0, 0x58,
0x8a, 0x00, 0xc0, 0x1c, 0x32, 0x00, 0x00, 0x1e,
0x00, 0x00, 0x00, 0xfd, 0x00, 0x18, 0x55, 0x18,
- 0x87, 0x1e, 0x04, 0x12, 0x01, 0xe0, 0xf8, 0x38,
- 0xf0, 0x3c, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x68,
+ 0x87, 0x1e, 0x00, 0x0a, 0x20, 0x20, 0x20, 0x20,
+ 0x20, 0x20, 0x00, 0x00, 0x00, 0xfc, 0x00, 0x68,
0x64, 0x6d, 0x69, 0x2d, 0x34, 0x6b, 0x2d, 0x33,
0x30, 0x30, 0x0a, 0x20, 0x00, 0x00, 0x00, 0x10,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
- 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x09,
+ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0xb5,
0x02, 0x03, 0x3d, 0xf0, 0x4f, 0x5f, 0x5e, 0x5d,
0x10, 0x1f, 0x04, 0x13, 0x22, 0x21, 0x20, 0x05,
@@ -834,7 +834,7 @@ static uint8_t hdmi_edid_4k_300[256] = {
static uint8_t hdmi_edid_4k_600[256] = {
0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00,
[git:media_tree/master] [media] v4l2-dev.rst: adjust table to fit into page
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] v4l2-dev.rst: adjust table to fit into page
Author: Mauro Carvalho Chehab
Date:Sat Aug 20 09:25:51 2016 -0300
One table here is not being properly displayed on LaTeX
format. Adjust it.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/kapi/v4l2-dev.rst | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/Documentation/media/kapi/v4l2-dev.rst
b/Documentation/media/kapi/v4l2-dev.rst
index cdfcf0bc78be..429883b2f6ef 100644
--- a/Documentation/media/kapi/v4l2-dev.rst
+++ b/Documentation/media/kapi/v4l2-dev.rst
@@ -262,6 +262,7 @@ file operations.
It is a bitmask and the following bits can be set:
+.. tabularcolumns:: |p{5ex}|L|
=
Mask Description
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] docs-rst: v4l2-drivers book: adjust column margins
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] docs-rst: v4l2-drivers book: adjust column margins
Author: Mauro Carvalho Chehab
Date:Sat Aug 20 09:26:42 2016 -0300
A few tables are not properly output on LaTeX format.
Fix them.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/v4l-drivers/cpia2.rst | 3 +
Documentation/media/v4l-drivers/si476x.rst | 116 +++--
2 files changed, 65 insertions(+), 54 deletions(-)
---
diff --git a/Documentation/media/v4l-drivers/cpia2.rst
b/Documentation/media/v4l-drivers/cpia2.rst
index 763705c1f50f..b5125016cfcb 100644
--- a/Documentation/media/v4l-drivers/cpia2.rst
+++ b/Documentation/media/v4l-drivers/cpia2.rst
@@ -55,6 +55,9 @@ may be done automatically by your distribution.
Driver options
~~
+.. tabularcolumns:: |p{13ex}|L|
+
+
==
Option Description
==
diff --git a/Documentation/media/v4l-drivers/si476x.rst
b/Documentation/media/v4l-drivers/si476x.rst
index d5c07bb7524d..677512566f15 100644
--- a/Documentation/media/v4l-drivers/si476x.rst
+++ b/Documentation/media/v4l-drivers/si476x.rst
@@ -31,31 +31,33 @@ The drivers exposes following files:
information. The contents of the file is binary data of the
following layout:
+ .. tabularcolumns:: |p{7ex}|p{12ex}|L|
+
= ==
- Offset NameDescription
+ OffsetName Description
= ==
- 0x00 blend_int Flag, set when stereo separation has
+ 0x00 blend_intFlag, set when stereo separation has
crossed below the blend threshold
- 0x01 hblend_int Flag, set when HiBlend cutoff
+ 0x01 hblend_int Flag, set when HiBlend cutoff
frequency is lower than threshold
- 0x02 hicut_int Flag, set when HiCut cutoff
+ 0x02 hicut_intFlag, set when HiCut cutoff
frequency is lower than threshold
- 0x03 chbw_intFlag, set when channel filter
+ 0x03 chbw_int Flag, set when channel filter
bandwidth is less than threshold
- 0x04 softmute_intFlag indicating that softmute
+ 0x04 softmute_int Flag indicating that softmute
attenuation has increased above
softmute threshold
0x05 smute0 - Audio is not soft muted
1 - Audio is soft muted
- 0x06 smattn Soft mute attenuation level in dB
- 0x07 chbwChannel filter bandwidth in kHz
- 0x08 hicut HiCut cutoff frequency in units of
+ 0x06 smattn Soft mute attenuation level in dB
+ 0x07 chbw Channel filter bandwidth in kHz
+ 0x08 hicutHiCut cutoff frequency in units of
100Hz
- 0x09 hiblend HiBlend cutoff frequency in units
+ 0x09 hiblend HiBlend cutoff frequency in units
of 100 Hz
- 0x10 pilot 0 - Stereo pilot is not present
+ 0x10 pilot0 - Stereo pilot is not present
1 - Stereo pilot is present
- 0x11 stblend Stereo blend in %
+ 0x11 stblend Stereo blend in %
= ==
@@ -63,12 +65,14 @@ The drivers exposes following files:
This file contains statistics about RDS receptions. It's binary data
has the following layout:
+ .. tabularcolumns:: |p{7ex}|p{12ex}|L|
+
= ==
- Offset NameDescription
+ OffsetName Description
= ==
- 0x00 expectedNumber of expected RDS blocks
- 0x02 receivedNumber of received RDS blocks
- 0x04 uncorrectable Number of uncorrectable RDS blocks
+ 0x00 expected Number of expected RDS blocks
+ 0x02 received Number of received RDS blocks
+ 0x04 uncorrectableNumber of uncorrectable RDS blocks
= ==
* /sys/kernel/debug//agc
@@ -77,21 +81,23 @@ The drivers exposes following files:
The layout is:
+ .. tabularcolumns:: |p{7ex}|p{12ex}|L|
+
= == ==
[git:media_tree/master] [media] Fix a few additional tables at uAPI for LaTeX output
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] Fix a few additional tables at uAPI for LaTeX output
Author: Mauro Carvalho Chehab
Date:Fri Aug 19 11:48:14 2016 -0300
There are still a few tables with wrong columns at the uAPI
docs. Fix them.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/dvb/fe-get-info.rst| 2 +-
Documentation/media/uapi/dvb/fe_property_parameters.rst | 5 ++---
Documentation/media/uapi/v4l/buffer.rst | 2 +-
Documentation/media/uapi/v4l/pixfmt-003.rst | 2 +-
Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst | 2 +-
5 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/Documentation/media/uapi/dvb/fe-get-info.rst
b/Documentation/media/uapi/dvb/fe-get-info.rst
index 85973be62b0c..87ff3f62050d 100644
--- a/Documentation/media/uapi/dvb/fe-get-info.rst
+++ b/Documentation/media/uapi/dvb/fe-get-info.rst
@@ -160,7 +160,7 @@ frontend capabilities
Capabilities describe what a frontend can do. Some capabilities are
supported only on some specific frontend types.
-.. tabularcolumns:: |p{5.5cm}|p{12.0cm}|
+.. tabularcolumns:: |p{6.5cm}|p{11.0cm}|
.. _fe-caps:
diff --git a/Documentation/media/uapi/dvb/fe_property_parameters.rst
b/Documentation/media/uapi/dvb/fe_property_parameters.rst
index d7acc72ebbdf..304ac1a3c2ff 100644
--- a/Documentation/media/uapi/dvb/fe_property_parameters.rst
+++ b/Documentation/media/uapi/dvb/fe_property_parameters.rst
@@ -1005,10 +1005,9 @@ Possible values: 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,
12, 13, -1 (AUTO)
Note: Truth table for ``DTV_ISDBT_SOUND_BROADCASTING`` and
``DTV_ISDBT_PARTIAL_RECEPTION`` and ``LAYER[A-C]_SEGMENT_COUNT``
-
.. _isdbt-layer_seg-cnt-table:
-.. flat-table::
+.. flat-table:: Truth table for ISDB-T Sound Broadcasting
:header-rows: 0
:stub-columns: 0
@@ -1101,7 +1100,7 @@ TMCC-structure, as shown in the table below.
.. _isdbt-layer-interleaving-table:
-.. flat-table::
+.. flat-table:: ISDB-T time interleaving modes
:header-rows: 0
:stub-columns: 0
diff --git a/Documentation/media/uapi/v4l/buffer.rst
b/Documentation/media/uapi/v4l/buffer.rst
index 4d315b01c2a4..7bab30b59eae 100644
--- a/Documentation/media/uapi/v4l/buffer.rst
+++ b/Documentation/media/uapi/v4l/buffer.rst
@@ -39,7 +39,7 @@ buffer.
struct v4l2_buffer
==
-.. tabularcolumns:: |p{1.3cm}|p{2.5cm}|p{1.3cm}|p{12.0cm}|
+.. tabularcolumns:: |p{2.8cm}|p{2.5cm}|p{1.3cm}|p{10.5cm}|
.. cssclass:: longtable
diff --git a/Documentation/media/uapi/v4l/pixfmt-003.rst
b/Documentation/media/uapi/v4l/pixfmt-003.rst
index 4a2dbe1095b1..6ec8ce639764 100644
--- a/Documentation/media/uapi/v4l/pixfmt-003.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-003.rst
@@ -49,7 +49,7 @@ describing all planes of that format.
applications.
-.. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}|
+.. tabularcolumns:: |p{4.4cm}|p{5.6cm}|p{7.5cm}|
.. _v4l2-pix-format-mplane:
diff --git a/Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst
b/Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst
index 5b80481d8734..f0d33298f329 100644
--- a/Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst
@@ -229,7 +229,7 @@ still cause this situation.
``V4L2_CTRL_FLAG_HAS_PAYLOAD`` is set for this control.
-.. tabularcolumns:: |p{4.0cm}|p{3.0cm}|p{2.0cm}|p{8.5cm}|
+.. tabularcolumns:: |p{4.0cm}|p{2.0cm}|p{2.0cm}|p{8.5cm}|
.. _v4l2-ext-controls:
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] docs-rst: fix some LaTeX errors when in interactive mode
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] docs-rst: fix some LaTeX errors when in interactive mode
Author: Mauro Carvalho Chehab
Date:Sun Aug 21 14:07:35 2016 -0300
There are several minor issues that are seen when building
PDF on interactive mode.
Fix them.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/dev-sliced-vbi.rst | 2 +-
Documentation/media/uapi/v4l/dev-subdev.rst | 2 +-
Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst | 3 +--
Documentation/media/uapi/v4l/subdev-formats.rst | 6 +++---
Documentation/media/uapi/v4l/vidioc-enumstd.rst | 2 +-
Documentation/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst | 2 +-
Documentation/media/uapi/v4l/vidioc-g-tuner.rst | 4 ++--
7 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/dev-sliced-vbi.rst
b/Documentation/media/uapi/v4l/dev-sliced-vbi.rst
index 074aa3798152..86d2d698d2af 100644
--- a/Documentation/media/uapi/v4l/dev-sliced-vbi.rst
+++ b/Documentation/media/uapi/v4l/dev-sliced-vbi.rst
@@ -255,7 +255,7 @@ Sliced VBI services
.. raw:: latex
-\newline\newline\begin{adjustbox}{width=\columnwidth}
+\begin{adjustbox}{width=\columnwidth}
.. tabularcolumns:: |p{5.0cm}|p{1.4cm}|p{3.0cm}|p{2.5cm}|p{9.0cm}|
diff --git a/Documentation/media/uapi/v4l/dev-subdev.rst
b/Documentation/media/uapi/v4l/dev-subdev.rst
index 7d20c725583d..1045b3c61031 100644
--- a/Documentation/media/uapi/v4l/dev-subdev.rst
+++ b/Documentation/media/uapi/v4l/dev-subdev.rst
@@ -204,7 +204,7 @@ list entity names and pad numbers).
.. raw:: latex
-\newline\newline\begin{adjustbox}{width=\columnwidth}
+\begin{adjustbox}{width=\columnwidth}
.. tabularcolumns::
|p{4.5cm}|p{4.5cm}|p{4.5cm}|p{4.5cm}|p{4.5cm}|p{4.5cm}|p{4.5cm}|
diff --git a/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst
b/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst
index 2180a3ae4c16..4eba72266587 100644
--- a/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst
@@ -16,7 +16,7 @@ next to each other in memory.
.. raw:: latex
-\newline\newline\begin{adjustbox}{width=\columnwidth}
+\begin{adjustbox}{width=\columnwidth}
.. tabularcolumns::
|p{4.5cm}|p{3.3cm}|p{0.7cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{1.7cm}|
@@ -1115,7 +1115,6 @@ either the corresponding ARGB or XRGB format, depending
on the driver.
.. raw:: latex
-\newline\newline
\begin{adjustbox}{width=\columnwidth}
.. tabularcolumns::
|p{4.2cm}|p{1.0cm}|p{0.7cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{1.7cm}|
diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst
b/Documentation/media/uapi/v4l/subdev-formats.rst
index 0b31943bb300..8b1ba4f53b18 100644
--- a/Documentation/media/uapi/v4l/subdev-formats.rst
+++ b/Documentation/media/uapi/v4l/subdev-formats.rst
@@ -159,7 +159,7 @@ The following tables list existing packed RGB formats.
.. it switches to long table, and there's no way to override it.
-.. tabularcolumns::
|p{4.0cm}|p{0.7cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22}|
+.. tabularcolumns::
|p{4.0cm}|p{0.7cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|
.. _v4l2-mbus-pixelcode-rgb:
@@ -2377,7 +2377,7 @@ JEIDA defined bit mapping will be named
.. raw:: latex
-\newline\newline\begin{adjustbox}{width=\columnwidth}
+\begin{adjustbox}{width=\columnwidth}
.. _v4l2-mbus-pixelcode-rgb-lvds:
@@ -3764,7 +3764,7 @@ the following codes.
- d for dummy bits
-.. tabularcolumns::
|p{4.0cm}|p{0.7cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.2
[git:media_tree/master] [media] cec-ioc-receive.rst: one table here should be longtable
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] cec-ioc-receive.rst: one table here should be longtable Author: Mauro Carvalho Chehab Date:Fri Aug 19 22:39:44 2016 -0300 The table is too big to fit into a single page on LaTeX format. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/cec/cec-ioc-receive.rst | 2 ++ 1 file changed, 2 insertions(+) --- diff --git a/Documentation/media/uapi/cec/cec-ioc-receive.rst b/Documentation/media/uapi/cec/cec-ioc-receive.rst index a7074a967f8d..821562bc8c7a 100644 --- a/Documentation/media/uapi/cec/cec-ioc-receive.rst +++ b/Documentation/media/uapi/cec/cec-ioc-receive.rst @@ -77,6 +77,8 @@ result. .. _cec-msg: +.. cssclass:: longtable + .. flat-table:: struct cec_msg :header-rows: 0 :stub-columns: 0 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] subdev-formats.rst: adjust tables size for LaTeX output
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] subdev-formats.rst: adjust tables size for LaTeX output
Author: Mauro Carvalho Chehab
Date:Fri Aug 19 22:30:47 2016 -0300
There are two big tables here that are very hard to adjust its
size.
The first one would fit into one page, but the latex.py logic
at Sphinx auto-switches to longtable when there are more than 30
rows. There's no way to override without coding.
The second one is really big, and won't fit on a single page.
So, it has to use tiny font to fit.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/subdev-formats.rst | 36 -
1 file changed, 30 insertions(+), 6 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst
b/Documentation/media/uapi/v4l/subdev-formats.rst
index a347fcc206db..0b31943bb300 100644
--- a/Documentation/media/uapi/v4l/subdev-formats.rst
+++ b/Documentation/media/uapi/v4l/subdev-formats.rst
@@ -154,18 +154,26 @@ half of the green value) transferred first will be named
The following tables list existing packed RGB formats.
-.. FIXME: I was unable to find a way to use adjustbox or landscape for this
table!
+.. HACK: ideally, we would be using adjustbox here. However, Sphinx
+.. is a very bad behaviored guy: if the table has more than 30 cols,
+.. it switches to long table, and there's no way to override it.
-.. tabularcolumns::
|p{7.6cm}|p{1.6cm}|p{0.7cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{-1.0cm}|
+
+.. tabularcolumns::
|p{4.0cm}|p{0.7cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22}|
.. _v4l2-mbus-pixelcode-rgb:
+.. raw:: latex
+
+\begingroup
+\tiny
+\setlength{\tabcolsep}{2pt}
+
.. flat-table:: RGB formats
:header-rows: 2
:stub-columns: 0
:widths: 36 7 3 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
2 2 2
-
- .. row 1
- Identifier
@@ -2355,6 +2363,10 @@ The following tables list existing packed RGB formats.
- b\ :sub:`0`
+.. raw:: latex
+
+\endgroup
+
On LVDS buses, usually each sample is transferred serialized in seven
time slots per pixel clock, on three (18-bit) or four (24-bit)
differential data pairs at the same time. The remaining bits are used
@@ -3751,13 +3763,22 @@ the following codes.
- d for dummy bits
-.. FIXME: I was unable to find a way to use adjustbox or landscape for this
table!
-.. tabularcolumns::
|p{7.6cm}|p{1.6cm}|p{0.7cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{-1.0cm}|
+.. tabularcolumns::
|p{4.0cm}|p{0.7cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22}|
.. _v4l2-mbus-pixelcode-yuv8:
-.. cssclass:: longtable
+
+.. HACK: ideally, we would be using adjustbox here. However, this
+.. will never work for this table, as, even with tiny font, it is
+.. to big for a single page. So, we need to manually adjust the
+.. size.
+
+.. raw:: latex
+
+\begingroup
+\tiny
+\setlength{\tabcolsep}{2pt}
.. flat-table:: YUV Formats
:header-rows: 2
@@ -11439,6 +11460,9 @@ the following codes.
- v\ :sub:`0`
+.. raw:: latex
+
+ \endgroup
HSV/HSL Formats
^^^
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] extended-controls.rst: avoid going past page with LaTeX
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] extended-controls.rst: avoid going past page with LaTeX Author: Mauro Carvalho Chehab Date:Fri Aug 19 19:23:37 2016 -0300 It is painful to put code/verbatim code in bold. It seems that the only way is to arrange it like: ``foo`` bar At least on LaTeX output, when this happens, the "foo" string is not hidentable/breakable. The entire string should fit into a single line. Add a workaround for this ReST limitation by splitting the foo string into two strings, on separate lines. The output is not the best, but it works. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/v4l/extended-controls.rst | 267 - 1 file changed, 213 insertions(+), 54 deletions(-) --- diff --git a/Documentation/media/uapi/v4l/extended-controls.rst b/Documentation/media/uapi/v4l/extended-controls.rst index 3f0f94a5eeed..9c6aff3e97c1 100644 --- a/Documentation/media/uapi/v4l/extended-controls.rst +++ b/Documentation/media/uapi/v4l/extended-controls.rst @@ -209,7 +209,10 @@ Codec Control IDs .. _v4l2-mpeg-stream-type: -``V4L2_CID_MPEG_STREAM_TYPE (enum v4l2_mpeg_stream_type)`` +``V4L2_CID_MPEG_STREAM_TYPE`` +(enum) + +enum v4l2_mpeg_stream_type - The MPEG-1, -2 or -4 output stream type. One cannot assume anything here. Each hardware MPEG encoder tends to support different subsets of the available MPEG stream types. This control is specific to @@ -282,7 +285,10 @@ Codec Control IDs .. _v4l2-mpeg-stream-vbi-fmt: -``V4L2_CID_MPEG_STREAM_VBI_FMT (enum v4l2_mpeg_stream_vbi_fmt)`` +``V4L2_CID_MPEG_STREAM_VBI_FMT`` +(enum) + +enum v4l2_mpeg_stream_vbi_fmt - Some cards can embed VBI data (e. g. Closed Caption, Teletext) into the MPEG stream. This control selects whether VBI data should be embedded, and if so, what embedding method should be used. The list @@ -316,7 +322,10 @@ Codec Control IDs .. _v4l2-mpeg-audio-sampling-freq: -``V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ (enum v4l2_mpeg_audio_sampling_freq)`` +``V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ`` +(enum) + +enum v4l2_mpeg_audio_sampling_freq - MPEG Audio sampling frequency. Possible values are: @@ -348,7 +357,10 @@ Codec Control IDs .. _v4l2-mpeg-audio-encoding: -``V4L2_CID_MPEG_AUDIO_ENCODING (enum v4l2_mpeg_audio_encoding)`` +``V4L2_CID_MPEG_AUDIO_ENCODING`` +(enum) + +enum v4l2_mpeg_audio_encoding - MPEG Audio encoding. This control is specific to multiplexed MPEG streams. Possible values are: @@ -393,7 +405,10 @@ Codec Control IDs .. _v4l2-mpeg-audio-l1-bitrate: -``V4L2_CID_MPEG_AUDIO_L1_BITRATE (enum v4l2_mpeg_audio_l1_bitrate)`` +``V4L2_CID_MPEG_AUDIO_L1_BITRATE`` +(enum) + +enum v4l2_mpeg_audio_l1_bitrate - MPEG-1/2 Layer I bitrate. Possible values are: @@ -491,7 +506,10 @@ Codec Control IDs .. _v4l2-mpeg-audio-l2-bitrate: -``V4L2_CID_MPEG_AUDIO_L2_BITRATE (enum v4l2_mpeg_audio_l2_bitrate)`` +``V4L2_CID_MPEG_AUDIO_L2_BITRATE`` +(enum) + +enum v4l2_mpeg_audio_l2_bitrate - MPEG-1/2 Layer II bitrate. Possible values are: @@ -589,7 +607,10 @@ Codec Control IDs .. _v4l2-mpeg-audio-l3-bitrate: -``V4L2_CID_MPEG_AUDIO_L3_BITRATE (enum v4l2_mpeg_audio_l3_bitrate)`` +``V4L2_CID_MPEG_AUDIO_L3_BITRATE`` +(enum) + +enum v4l2_mpeg_audio_l3_bitrate - MPEG-1/2 Layer III bitrate. Possible values are: @@ -690,7 +711,10 @@ Codec Control IDs .. _v4l2-mpeg-audio-ac3-bitrate: -``V4L2_CID_MPEG_AUDIO_AC3_BITRATE (enum v4l2_mpeg_audio_ac3_bitrate)`` +``V4L2_CID_MPEG_AUDIO_AC3_BITRATE`` +(enum) + +enum v4l2_mpeg_audio_ac3_bitrate - AC-3 bitrate. Possible values are: @@ -818,7 +842,10 @@ Codec Control IDs .. _v4l2-mpeg-audio-mode: -``V4L2_CID_MPEG_AUDIO_MODE (enum v4l2_mpeg_audio_mode)`` +``V4L2_CID_MPEG_AUDIO_MODE`` +(enum) + +enum v4l2_mpeg_audio_mode - MPEG Audio mode. Possible values are: @@ -856,7 +883,10 @@ Codec Control IDs .. _v4l2-mpeg-audio-mode-extension: -``V4L2_CID_MPEG_AUDIO_MODE_EXTENSION (enum v4l2_mpeg_audio_mode_extension)`` +``V4L2_CID_MPEG_AUDIO_MODE_EXTENSION`` +(enum) + +enum v4l2_mpeg_audio_mode_extension - Joint Stereo audio mode extension. In Layer I and II they indicate which subbands are in intensity stereo. All other subbands are coded in stereo. Layer III is not (yet) supported. Possible values are: @@ -896,7 +926,10 @@ Codec Control IDs .. _v4l2-mpeg-audio-emphasis: -``V4L2_CID_MPEG_AUDIO_EMPHASIS (enum v4l2_mpeg_audio_emphasis)`` +``V4L2_CID_MPEG_AUDIO_EMPHASIS`` +(enum) + +enum v4l2_mpeg_audio_emphasis - Audio Emphasis. Possible values are: @@ -928,7 +961,10 @@ Codec Control IDs .. _v4l2-mpeg-audio-crc: -``V4L2_CID_MPEG_AUDIO_CRC (enum v4l2_mpeg_audio_crc)`` +``V4L2_CID_MPEG_AUDIO_CRC`` +(enum) + +enum v4l2_mpeg_audio_crc - CRC method. Possible values are: @@ -960,7 +996,10 @@ Codec Co
[git:media_tree/master] [media] media-types.rst: adjust tables to fit on LaTeX output
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] media-types.rst: adjust tables to fit on LaTeX output
Author: Mauro Carvalho Chehab
Date:Fri Aug 19 08:20:05 2016 -0300
A few tables at the media uAPI documentation have columns
not well dimentioned. Adjust them.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/mediactl/media-types.rst | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/Documentation/media/uapi/mediactl/media-types.rst
b/Documentation/media/uapi/mediactl/media-types.rst
index c77717b236ce..20f99301bfdb 100644
--- a/Documentation/media/uapi/mediactl/media-types.rst
+++ b/Documentation/media/uapi/mediactl/media-types.rst
@@ -5,9 +5,12 @@
Types and flags used to represent the media graph elements
==
+.. tabularcolumns:: |p{8.0cm}|p{10.5cm}|
.. _media-entity-type:
+.. cssclass:: longtable
+
.. flat-table:: Media entity types
:header-rows: 0
:stub-columns: 0
@@ -15,10 +18,12 @@ Types and flags used to represent the media graph elements
- .. row 1
- .. _MEDIA-ENT-F-UNKNOWN:
+ .. _MEDIA-ENT-F-UNKNOWN:
.. _MEDIA-ENT-F-V4L2-SUBDEV-UNKNOWN:
- - ``MEDIA_ENT_F_UNKNOWN`` and ``MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN``
+ - ``MEDIA_ENT_F_UNKNOWN`` and
+
+ ``MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN``
- Unknown entity. That generally indicates that a driver didn't
initialize properly the entity, with is a Kernel bug
@@ -294,6 +299,8 @@ Types and flags used to represent the media graph elements
its source pad.
+.. tabularcolumns:: |p{5.5cm}|p{12.0cm}|
+
.. _media-entity-flag:
.. flat-table:: Media entity flags
@@ -319,6 +326,7 @@ Types and flags used to represent the media graph elements
- The entity represents a data conector
+.. tabularcolumns:: |p{6.5cm}|p{6.0cm}|p{5.0cm}|
.. _media-intf-type:
@@ -508,6 +516,7 @@ Types and flags used to represent the media graph elements
- typically, /dev/snd/timer
+.. tabularcolumns:: |p{5.5cm}|p{12.0cm}|
.. _media-pad-flag:
@@ -551,6 +560,7 @@ Types and flags used to represent the media graph elements
One and only one of ``MEDIA_PAD_FL_SINK`` and ``MEDIA_PAD_FL_SOURCE``
must be set for every pad.
+.. tabularcolumns:: |p{5.5cm}|p{12.0cm}|
.. _media-link-flag:
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] docs-rst: fix warnings introduced by LaTeX patchset
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] docs-rst: fix warnings introduced by LaTeX patchset
Author: Mauro Carvalho Chehab
Date:Fri Aug 19 11:14:23 2016 -0300
Sphinx is really pedantic with respect to the order where
table tags and references are created. Putting things at
the wrong order causes troubles.
The order that seems to work is:
.. raw:: latex
.. tabularcolumns::
.. _foo_name:
.. cssclass: longtable
.. flat-table::
Reorder the tags to the above order, to avoid troubles, and
fix remaining warnings introduced by media recent patches.
Signed-off-by: Mauro Carvalho Chehab
.../media/uapi/cec/cec-ioc-adap-g-caps.rst | 6 ++--
.../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst| 17 +-
Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 15 +++--
Documentation/media/uapi/cec/cec-ioc-g-mode.rst| 9 ++
Documentation/media/uapi/cec/cec-ioc-receive.rst | 10 +++---
.../media/uapi/mediactl/media-ioc-g-topology.rst | 18 ---
Documentation/media/uapi/v4l/dev-raw-vbi.rst | 6 ++--
Documentation/media/uapi/v4l/dev-subdev.rst| 4 +--
Documentation/media/uapi/v4l/pixfmt-002.rst| 3 +-
Documentation/media/uapi/v4l/pixfmt-003.rst| 7 ++---
Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst | 8 ++---
Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst | 2 +-
Documentation/media/uapi/v4l/pixfmt-reserved.rst | 8 ++---
Documentation/media/uapi/v4l/subdev-formats.rst| 5 ++-
.../media/uapi/v4l/vidioc-dbg-g-chip-info.rst | 12
.../media/uapi/v4l/vidioc-dbg-g-register.rst | 8 ++---
.../media/uapi/v4l/vidioc-decoder-cmd.rst | 8 ++---
Documentation/media/uapi/v4l/vidioc-dqevent.rst| 36 +++---
.../media/uapi/v4l/vidioc-dv-timings-cap.rst | 9 +++---
.../media/uapi/v4l/vidioc-encoder-cmd.rst | 11 +++
Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 9 +++---
.../media/uapi/v4l/vidioc-enum-freq-bands.rst | 8 ++---
Documentation/media/uapi/v4l/vidioc-enuminput.rst | 16 +-
Documentation/media/uapi/v4l/vidioc-enumoutput.rst | 12
Documentation/media/uapi/v4l/vidioc-enumstd.rst| 3 +-
Documentation/media/uapi/v4l/vidioc-g-audio.rst| 12
.../media/uapi/v4l/vidioc-g-dv-timings.rst | 12 +++-
.../media/uapi/v4l/vidioc-g-enc-index.rst | 11 +++
.../media/uapi/v4l/vidioc-g-ext-ctrls.rst | 10 +++---
Documentation/media/uapi/v4l/vidioc-g-fbuf.rst | 10 +++---
.../media/uapi/v4l/vidioc-g-frequency.rst | 4 +--
Documentation/media/uapi/v4l/vidioc-g-jpegcomp.rst | 7 ++---
.../media/uapi/v4l/vidioc-g-modulator.rst | 8 ++---
Documentation/media/uapi/v4l/vidioc-g-parm.rst | 20 ++--
Documentation/media/uapi/v4l/vidioc-g-tuner.rst| 16 +-
Documentation/media/uapi/v4l/vidioc-querycap.rst | 8 ++---
Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 20 ++--
.../media/uapi/v4l/vidioc-s-hw-freq-seek.rst | 4 +--
.../media/uapi/v4l/vidioc-subdev-g-fmt.rst | 8 ++---
.../media/uapi/v4l/vidioc-subscribe-event.rst | 8 ++---
40 files changed, 186 insertions(+), 222 deletions(-)
---
diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst
b/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst
index e0eaadaf2305..89ba813e577c 100644
--- a/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst
@@ -41,11 +41,10 @@ device information, applications call the ioctl with a
pointer to a
struct :ref:`cec_caps `. The driver fills the structure and
returns the information to the application. The ioctl never fails.
+.. tabularcolumns:: |p{1.2cm}|p{2.5cm}|p{13.8cm}|
.. _cec-caps:
-.. tabularcolumns:: |p{1.2cm}|p{2.5cm}|p{13.8cm}|
-
.. flat-table:: struct cec_caps
:header-rows: 0
:stub-columns: 0
@@ -88,11 +87,10 @@ returns the information to the application. The ioctl never
fails.
macro.
+.. tabularcolumns:: |p{4.4cm}|p{2.5cm}|p{10.6cm}|
.. _cec-capabilities:
-.. tabularcolumns:: |p{4.4cm}|p{2.5cm}|p{10.6cm}|
-
.. flat-table:: CEC Capabilities Flags
:header-rows: 0
:stub-columns: 0
diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
b/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
index 959e920eb7c3..42f8e856ec55 100644
--- a/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
@@ -66,11 +66,10 @@ logical addresses are claimed or cleared.
Attempting to call :ref:`ioctl CEC_ADAP_S_LOG_ADDRS `
when
logical address types are already defined will return with error ``EBUSY``.
+.. tabularcolumns:: |p{1.0cm}|p{7.5cm}|p{8.0cm}|
.. _cec-log-addrs:
-.. tabularcolumns:: |p{1.0cm}|p{7.5cm}|p{8.0cm}|
[git:media_tree/master] [media] vidioc-querycap.rst: Better format tables on PDF output
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] vidioc-querycap.rst: Better format tables on PDF output
Author: Mauro Carvalho Chehab
Date:Tue Aug 16 12:07:10 2016 -0300
Both tables on this rst file were not shown right, as they miss
the proper tag (tabularcolumns) to specify the column widths
required for PDF and LaTeX output.
Also, the second table is too big to fit into one page. So,
it should use the longtable class to allow it to be split into
two pages.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/vidioc-querycap.rst | 14 ++
1 file changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/vidioc-querycap.rst
b/Documentation/media/uapi/v4l/vidioc-querycap.rst
index f37fc3badcdf..05d86b2b87dd 100644
--- a/Documentation/media/uapi/v4l/vidioc-querycap.rst
+++ b/Documentation/media/uapi/v4l/vidioc-querycap.rst
@@ -43,11 +43,12 @@ specification the ioctl returns an ``EINVAL`` error code.
.. _v4l2-capability:
+.. tabularcolumns:: |p{1.5cm}|p{2.5cm}|p{13cm}|
+
.. flat-table:: struct v4l2_capability
:header-rows: 0
:stub-columns: 0
-:widths: 1 1 2
-
+:widths: 3 4 20
- .. row 1
@@ -121,7 +122,9 @@ specification the ioctl returns an ``EINVAL`` error code.
``__u32 version = KERNEL_VERSION(0, 8, 1);``
- ``printf ("Version: %u.%u.%u\\n", (version >> 16) & 0xFF, (version >>
8) & 0xFF, version & 0xFF);``
+ ``printf ("Version: %u.%u.%u\\n",``
+
+ ``(version >> 16) & 0xFF, (version >> 8) & 0xFF, version & 0xFF);``
- .. row 6
@@ -169,12 +172,15 @@ specification the ioctl returns an ``EINVAL`` error code.
.. _device-capabilities:
+.. tabularcolumns:: |p{6cm}|p{2.2cm}|p{8.8cm}|
+
+.. cssclass:: longtable
+
.. flat-table:: Device Capabilities Flags
:header-rows: 0
:stub-columns: 0
:widths: 3 1 4
-
- .. row 1
- ``V4L2_CAP_VIDEO_CAPTURE``
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] vidioc-g-sliced-vbi-cap.rst: make tables fit on LaTeX output
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] vidioc-g-sliced-vbi-cap.rst: make tables fit on LaTeX output
Author: Mauro Carvalho Chehab
Date:Fri Aug 19 05:40:55 2016 -0300
The tables don't fit at the page on this file. As noticed
before, Sphinx (or LaTeX?) does a crap job on tables with
cell span, and some work has to be done to make it fit.
Move the see also reference to a footnote, break one paragraph
into two and adjust the table columns to make it visible.
Signed-off-by: Mauro Carvalho Chehab
.../media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst | 30 +-
1 file changed, 23 insertions(+), 7 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst
b/Documentation/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst
index 0d4b6b0044a0..740324e6e5db 100644
--- a/Documentation/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst
@@ -48,7 +48,7 @@ the sliced VBI API is unsupported or ``type`` is invalid.
.. _v4l2-sliced-vbi-cap:
-.. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{2.9cm}|p{2.9cm}|p{2.9cm}|
+.. tabularcolumns:: |p{1.2cm}|p{4.2cm}|p{4.1cm}|p{4.0cm}|p{4.0cm}|
.. flat-table:: struct v4l2_sliced_vbi_cap
:header-rows: 0
@@ -63,6 +63,7 @@ the sliced VBI API is unsupported or ``type`` is invalid.
- ``service_set``
- :cspan:`2` A set of all data services supported by the driver.
+
Equal to the union of all elements of the ``service_lines`` array.
- .. row 2
@@ -74,8 +75,7 @@ the sliced VBI API is unsupported or ``type`` is invalid.
- :cspan:`2` Each element of this array contains a set of data
services the hardware can look for or insert into a particular
scan line. Data services are defined in :ref:`vbi-services`.
- Array indices map to ITU-R line numbers (see also :ref:`vbi-525`
- and :ref:`vbi-625`) as follows:
+ Array indices map to ITU-R line numbers\ [#f1]_ as follows:
- .. row 3
@@ -171,13 +171,21 @@ the sliced VBI API is unsupported or ``type`` is invalid.
- ``reserved``\ [3]
- :cspan:`2` This array is reserved for future extensions.
+
Applications and drivers must set it to zero.
+.. [#f1]
+ See also :ref:`vbi-525` and :ref:`vbi-625`.
-.. _vbi-services:
-.. tabularcolumns:: |p{4.4cm}|p{2.2cm}|p{2.2cm}|p{4.4cm}|p{4.3cm}|
+.. raw:: latex
+
+\newline\newline\begin{adjustbox}{width=\columnwidth}
+
+.. tabularcolumns:: |p{5.0cm}|p{1.4cm}|p{3.0cm}|p{2.5cm}|p{9.0cm}|
+
+.. _vbi-services:
.. flat-table:: Sliced VBI services
:header-rows: 1
@@ -203,7 +211,9 @@ the sliced VBI API is unsupported or ``type`` is invalid.
- 0x0001
- - :ref:`ets300706`, :ref:`itu653`
+ - :ref:`ets300706`,
+
+ :ref:`itu653`
- PAL/SECAM line 7-22, 320-335 (second field 7-22)
@@ -242,7 +252,9 @@ the sliced VBI API is unsupported or ``type`` is invalid.
- 0x4000
- - :ref:`en300294`, :ref:`itu1119`
+ - :ref:`en300294`,
+
+ :ref:`itu1119`
- PAL/SECAM line 23
@@ -270,6 +282,10 @@ the sliced VBI API is unsupported or ``type`` is invalid.
- :cspan:`2` Set of services applicable to 625 line systems.
+.. raw:: latex
+
+\end{adjustbox}\newline\newline
+
Return Value
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] gen-errors.rst fix error table column limits
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] gen-errors.rst fix error table column limits
Author: Mauro Carvalho Chehab
Date:Fri Aug 19 09:46:28 2016 -0300
Fix the generic errors table to avoid column overflows on
LaTeX output.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/gen-errors.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/Documentation/media/uapi/gen-errors.rst
b/Documentation/media/uapi/gen-errors.rst
index d37284d50e56..6e983b9880fc 100644
--- a/Documentation/media/uapi/gen-errors.rst
+++ b/Documentation/media/uapi/gen-errors.rst
@@ -9,7 +9,7 @@ Generic Error Codes
.. _gen-errors:
-.. tabularcolumns:: |p{1.0cm}|p{16.5cm}|
+.. tabularcolumns:: |p{2.5cm}|p{15.0cm}|
.. flat-table:: Generic error codes
:header-rows: 0
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] vidioc-decoder-cmd.rst: better adjust column widths
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] vidioc-decoder-cmd.rst: better adjust column widths
Author: Mauro Carvalho Chehab
Date:Thu Aug 18 13:31:34 2016 -0300
Better adjust the columns for LaTeX output
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
index dad36acbb415..4287e5b21a8b 100644
--- a/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
+++ b/Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst
@@ -58,12 +58,14 @@ introduced in Linux 3.3.
.. _v4l2-decoder-cmd:
-.. tabularcolumns:: |p{2.9cm}|p{2.9cm}|p{5.8cm}|p{2.9cm}|p{3.0cm}|
+.. cssclass:: longtable
+
+.. tabularcolumns:: |p{1.1cm}|p{2.4cm}|p{1.2cm}|p{1.6cm}|p{10.6cm}|
.. flat-table:: struct v4l2_decoder_cmd
:header-rows: 0
:stub-columns: 0
-:widths: 1 1 2 1 1
+:widths: 11 24 12 16 106
- .. row 1
@@ -189,12 +191,12 @@ introduced in Linux 3.3.
.. _decoder-cmds:
-.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|
+.. tabularcolumns:: |p{5.6cm}|p{0.6cm}|p{11.3cm}|
.. flat-table:: Decoder Commands
:header-rows: 0
:stub-columns: 0
-:widths: 3 1 4
+:widths: 56 6 113
- .. row 1
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] fix v4l2-selection-*.rst tables for LaTeX output
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] fix v4l2-selection-*.rst tables for LaTeX output
Author: Mauro Carvalho Chehab
Date:Fri Aug 19 07:34:13 2016 -0300
Adjust the tables there to fit inside the page margins.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/v4l2-selection-flags.rst | 1 +
Documentation/media/uapi/v4l/v4l2-selection-targets.rst | 2 ++
2 files changed, 3 insertions(+)
---
diff --git a/Documentation/media/uapi/v4l/v4l2-selection-flags.rst
b/Documentation/media/uapi/v4l/v4l2-selection-flags.rst
index 3ce3731faf5f..9ef139f8e21d 100644
--- a/Documentation/media/uapi/v4l/v4l2-selection-flags.rst
+++ b/Documentation/media/uapi/v4l/v4l2-selection-flags.rst
@@ -6,6 +6,7 @@
Selection flags
***
+.. tabularcolumns:: |p{5.2cm}|p{2.0cm}|p{6.5cm}|p{1.2cm}|p{1.6cm}|
.. _v4l2-selection-flags-table:
diff --git a/Documentation/media/uapi/v4l/v4l2-selection-targets.rst
b/Documentation/media/uapi/v4l/v4l2-selection-targets.rst
index 7519099a50cd..a82b58f5ebcf 100644
--- a/Documentation/media/uapi/v4l/v4l2-selection-targets.rst
+++ b/Documentation/media/uapi/v4l/v4l2-selection-targets.rst
@@ -12,6 +12,8 @@ of the two interfaces they are used.
.. _v4l2-selection-targets-table:
+.. tabularcolumns:: |p{5.8cm}|p{1.4cm}|p{6.5cm}|p{1.2cm}|p{1.6cm}|
+
.. flat-table:: Selection target definitions
:header-rows: 1
:stub-columns: 0
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] vidioc-g-tuner.rst: Fix tables to fit at LaTeX output
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] vidioc-g-tuner.rst: Fix tables to fit at LaTeX output
Author: Mauro Carvalho Chehab
Date:Fri Aug 19 06:56:43 2016 -0300
Several tables are missing column definitions and/or are too big
to fit into the page. Adjust them.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/vidioc-g-tuner.rst | 32 ++---
1 file changed, 24 insertions(+), 8 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/vidioc-g-tuner.rst
b/Documentation/media/uapi/v4l/vidioc-g-tuner.rst
index 740a4dd0db00..a52efdf94795 100644
--- a/Documentation/media/uapi/v4l/vidioc-g-tuner.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-tuner.rst
@@ -60,8 +60,12 @@ To change the radio frequency the
:ref:`VIDIOC_S_FREQUENCY ` ioctl is available.
+ .. tabularcolumns:: |p{1.3cm}|p{3.0cm}|p{6.6cm}|p{6.6cm}|
+
.. _v4l2-tuner:
+.. cssclass:: longtable
+
.. flat-table:: struct v4l2_tuner
:header-rows: 0
:stub-columns: 0
@@ -83,8 +87,9 @@ To change the radio frequency the
- :cspan:`1`
- Name of the tuner, a NUL-terminated ASCII string. This information
- is intended for the user.
+ Name of the tuner, a NUL-terminated ASCII string.
+
+ This information is intended for the user.
- .. row 3
@@ -230,8 +235,9 @@ To change the radio frequency the
- ``signal``
- - :cspan:`1` The signal strength if known, ranging from 0 to
- 65535. Higher values indicate a better signal.
+ - :cspan:`1` The signal strength if known.
+
+ Ranging from 0 to 65535. Higher values indicate a better signal.
- .. row 16
@@ -239,8 +245,10 @@ To change the radio frequency the
- ``afc``
- - :cspan:`1` Automatic frequency control: When the ``afc`` value
- is negative, the frequency is too low, when positive too high.
+ - :cspan:`1` Automatic frequency control.
+
+ When the ``afc`` value is negative, the frequency is too
+ low, when positive too high.
- .. row 17
@@ -248,8 +256,9 @@ To change the radio frequency the
- ``reserved``\ [4]
- - :cspan:`1` Reserved for future extensions. Drivers and
- applications must set the array to zero.
+ - :cspan:`1` Reserved for future extensions.
+
+ Drivers and applications must set the array to zero.
@@ -301,6 +310,8 @@ To change the radio frequency the
.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|
+.. cssclass:: longtable
+
.. flat-table:: Tuner and Modulator Capability Flags
:header-rows: 0
:stub-columns: 0
@@ -608,7 +619,9 @@ To change the radio frequency the
``MODE_MONO``. Only ``V4L2_TUNER_ANALOG_TV`` tuners support this
mode.
+.. raw:: latex
+\newline\newline\begin{adjustbox}{width=\columnwidth}
.. _tuner-matrix:
@@ -706,6 +719,9 @@ To change the radio frequency the
- Lang1/Lang2 (preferred) or Lang1/Lang1
+.. raw:: latex
+
+\end{adjustbox}\newline\newline
Return Value
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] control.rst: Fix table width
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] control.rst: Fix table width
Author: Mauro Carvalho Chehab
Date:Wed Aug 17 08:58:00 2016 -0300
Manually adjust the table width for it to look nice on PDF output.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/control.rst | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/Documentation/media/uapi/v4l/control.rst
b/Documentation/media/uapi/v4l/control.rst
index 10ab53dd3163..e881cd1f30d6 100644
--- a/Documentation/media/uapi/v4l/control.rst
+++ b/Documentation/media/uapi/v4l/control.rst
@@ -191,10 +191,12 @@ Control IDs
+.. tabularcolumns:: |p{5.5cm}|p{12cm}|
+
.. flat-table::
:header-rows: 0
:stub-columns: 0
-
+:widths: 11 24
- .. row 1
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] docs-rst: remove width hints from pixfmt byte order tables
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] docs-rst: remove width hints from pixfmt byte order tables
Author: Mauro Carvalho Chehab
Date:Wed Aug 17 13:26:23 2016 -0300
Those hints are wrong, and doesn't really improve the look
of those tables. So, keep them only when they're useful.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/pixfmt-grey.rst | 7 ---
Documentation/media/uapi/v4l/pixfmt-m420.rst | 6 --
Documentation/media/uapi/v4l/pixfmt-nv12.rst | 6 --
Documentation/media/uapi/v4l/pixfmt-nv12m.rst| 5 -
Documentation/media/uapi/v4l/pixfmt-nv12mt.rst | 2 --
Documentation/media/uapi/v4l/pixfmt-nv16.rst | 7 ---
Documentation/media/uapi/v4l/pixfmt-nv16m.rst| 7 ---
Documentation/media/uapi/v4l/pixfmt-nv24.rst | 7 ---
Documentation/media/uapi/v4l/pixfmt-sbggr16.rst | 8
Documentation/media/uapi/v4l/pixfmt-sbggr8.rst | 6 --
Documentation/media/uapi/v4l/pixfmt-sdr-cs08.rst | 7 ---
Documentation/media/uapi/v4l/pixfmt-sdr-cs14le.rst | 7 ---
Documentation/media/uapi/v4l/pixfmt-sdr-cu08.rst | 8
Documentation/media/uapi/v4l/pixfmt-sdr-cu16le.rst | 6 --
Documentation/media/uapi/v4l/pixfmt-sdr-ru12le.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-sgbrg8.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-sgrbg8.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-srggb10.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-srggb10alaw8.rst | 2 --
Documentation/media/uapi/v4l/pixfmt-srggb10p.rst | 12
Documentation/media/uapi/v4l/pixfmt-srggb12.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-srggb8.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-uv8.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-uyvy.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-vyuy.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-y10.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-y10b.rst | 8
Documentation/media/uapi/v4l/pixfmt-y12.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-y12i.rst | 5 -
Documentation/media/uapi/v4l/pixfmt-y16-be.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-y16.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-y41p.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-y8i.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-yuv410.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-yuv411p.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-yuv420.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-yuv420m.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-yuv422m.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-yuv422p.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-yuv444m.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-yuyv.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-yvyu.rst | 3 ---
Documentation/media/uapi/v4l/pixfmt-z16.rst | 3 ---
43 files changed, 8 insertions(+), 183 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/pixfmt-grey.rst
b/Documentation/media/uapi/v4l/pixfmt-grey.rst
index 844fb67320be..fef58ca50f66 100644
--- a/Documentation/media/uapi/v4l/pixfmt-grey.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-grey.rst
@@ -6,8 +6,6 @@
V4L2_PIX_FMT_GREY ('GREY')
**
-*man V4L2_PIX_FMT_GREY(2)*
-
Grey-scale image
@@ -20,14 +18,9 @@ which simply contains no Cb or Cr data.
**Byte Order.**
Each cell is one byte.
-
-
-.. tabularcolumns:: |p{5.8cm}|p{2.9cm}|p{2.9cm}|p{2.9cm}|p{3.0cm}|
-
.. flat-table::
:header-rows: 0
:stub-columns: 0
-:widths: 2 1 1 1 1
- .. row 1
diff --git a/Documentation/media/uapi/v4l/pixfmt-m420.rst
b/Documentation/media/uapi/v4l/pixfmt-m420.rst
index ff0ed7abfef3..f4a21a8a6dcc 100644
--- a/Documentation/media/uapi/v4l/pixfmt-m420.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-m420.rst
@@ -6,8 +6,6 @@
V4L2_PIX_FMT_M420 ('M420')
**
-*man V4L2_PIX_FMT_M420(2)*
-
Format with ½ horizontal and vertical chroma resolution, also known as
YUV 4:2:0. Hybrid plane line-interleaved layout.
@@ -32,13 +30,9 @@ the CbCr lines.
Each cell is one byte.
-
-.. tabularcolumns:: |p{5.8cm}|p{2.9cm}|p{2.9cm}|p{2.9cm}|p{3.0cm}|
-
.. flat-table::
:header-rows: 0
:stub-columns: 0
-:widths: 2 1 1 1 1
- .. row 1
diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12.rst
b/Documentation/media/uapi/v4l/pixfmt-nv12.rst
index a5b70b8a1273..6bbdc01362af 100644
--- a/Documentation/media/uapi/v4l/pixfmt-nv12.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-nv12.rst
@@ -7,7 +7,6 @@
V4L2_PIX_FMT_NV12 ('NV12'), V4L2_PIX_FMT_NV21 ('NV21')
**
-*man V
[git:media_tree/master] [media] dev-rds.rst: adjust table dimentions for LaTeX
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] dev-rds.rst: adjust table dimentions for LaTeX
Author: Mauro Carvalho Chehab
Date:Thu Aug 18 08:16:26 2016 -0300
One of the tables has wrong column dimentions. Fix it.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/dev-rds.rst | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/Documentation/media/uapi/v4l/dev-rds.rst
b/Documentation/media/uapi/v4l/dev-rds.rst
index 35117414c86b..841761a3ea59 100644
--- a/Documentation/media/uapi/v4l/dev-rds.rst
+++ b/Documentation/media/uapi/v4l/dev-rds.rst
@@ -170,7 +170,7 @@ RDS datastructures
.. _v4l2-rds-block-codes:
-.. tabularcolumns:: |p{2.2cm}|p{2.2cm}|p{2.2cm}|p{10.9cm}|
+.. tabularcolumns:: |p{5.6cm}|p{2.0cm}|p{1.5cm}|p{7.0cm}|
.. flat-table:: Block defines
:header-rows: 0
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] vidioc-enumstd.rst: fix a broken reference
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] vidioc-enumstd.rst: fix a broken reference Author: Mauro Carvalho Chehab Date:Mon Aug 15 13:05:05 2016 -0300 Somehow, the conversion broke a reference here. Re-add it. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/v4l/vidioc-enumstd.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/Documentation/media/uapi/v4l/vidioc-enumstd.rst b/Documentation/media/uapi/v4l/vidioc-enumstd.rst index 6699b26cdeb4..a936fe32ce9c 100644 --- a/Documentation/media/uapi/v4l/vidioc-enumstd.rst +++ b/Documentation/media/uapi/v4l/vidioc-enumstd.rst @@ -269,7 +269,7 @@ support digital TV. See also the Linux DVB API at .. _video-standards: -.. flat-table:: Video Standards (based on []) +.. flat-table:: Video Standards (based on :ref:`itu470`) :header-rows: 1 :stub-columns: 0 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] vidioc-enumstd.rst: adjust video standards table
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] vidioc-enumstd.rst: adjust video standards table
Author: Mauro Carvalho Chehab
Date:Thu Aug 18 14:55:24 2016 -0300
This table is too big for LaTeX output, and lacks columns
specs for LaTeX format.
Also, it has a hidden column, as there are some cell spans
with the wrong values.
Fix it, so it can be displayed properly on LaTeX/PDF.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/vidioc-enumstd.rst | 23 +++
1 file changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/vidioc-enumstd.rst
b/Documentation/media/uapi/v4l/vidioc-enumstd.rst
index 9d7d77af0161..28f00a027cc7 100644
--- a/Documentation/media/uapi/v4l/vidioc-enumstd.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enumstd.rst
@@ -272,6 +272,12 @@ support digital TV. See also the Linux DVB API at
#define V4L2_STD_ALL(V4L2_STD_525_60|
V4L2_STD_625_50)
+.. raw:: latex
+
+\newline\newline\begin{adjustbox}{width=\columnwidth}
+
+..NTSC/M PAL/M/N /B /D /H
/ISECAM/B/D /K1 /L
+.. tabularcolumns::
|p{2.7cm}|p{2.6cm}|p{3.0cm}|p{3.2cm}|p{3.2cm}|p{2.2cm}|p{1.2cm}|p{3.2cm}|p{3.0cm}|p{2.0cm}|p{2.0cm}|p{2.0cm}|
.. _video-standards:
@@ -312,7 +318,7 @@ support digital TV. See also the Linux DVB API at
- :cspan:`1` 525
- - :cspan:`9` 625
+ - :cspan:`8` 625
- .. row 3
@@ -320,7 +326,7 @@ support digital TV. See also the Linux DVB API at
- :cspan:`1` 1001/3
- - :cspan:`9` 1/25
+ - :cspan:`8` 1/25
- .. row 4
@@ -330,13 +336,17 @@ support digital TV. See also the Linux DVB API at
- 3579611.49 ± 10
- - 4433618.75 ± 5 (3582056.25 ± 5)
+ - 4433618.75 ± 5
+
+ (3582056.25 ± 5)
- :cspan:`3` 4433618.75 ± 5
- 4433618.75 ± 1
- - :cspan:`3` f\ :sub:`OR` = 4406250 ± 2000, f\ :sub:`OB` = 425 ±
2000
+ - :cspan:`2` f\ :sub:`OR` = 4406250 ± 2000,
+
+ f\ :sub:`OB` = 425 ± 2000
- .. row 5
@@ -390,6 +400,11 @@ support digital TV. See also the Linux DVB API at
- 6.5 [#f8]_
+.. raw:: latex
+
+\end{adjustbox}\newline\newline
+
+
Return Value
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] diff-v4l.rst: Make capabilities table fit in LaTeX
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] diff-v4l.rst: Make capabilities table fit in LaTeX
Author: Mauro Carvalho Chehab
Date:Thu Aug 18 11:32:30 2016 -0300
This table has several troubles:
- a duplicated "struct" on its name;
- a reference to a V4L version 1 struct that will never
point to something (as we got rid of V4L1 API a long
time ago);
- misses hints for LaTeX output (column size and longtable
style).
Fix them.
It should be noticed that the first column of this table is
not aligned with the rest. I suspect that this is a bug at
the flat-table extension.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/diff-v4l.rst | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
diff --git a/Documentation/media/uapi/v4l/diff-v4l.rst
b/Documentation/media/uapi/v4l/diff-v4l.rst
index e1e034df514c..93263e477127 100644
--- a/Documentation/media/uapi/v4l/diff-v4l.rst
+++ b/Documentation/media/uapi/v4l/diff-v4l.rst
@@ -95,7 +95,9 @@ and radio devices supporting a set of related functions like
video
capturing, video overlay and VBI capturing. See :ref:`open` for an
introduction.
+.. tabularcolumns:: |p{5.5cm}|p{6.5cm}|p{5.5cm}
+.. cssclass:: longtable
.. flat-table::
:header-rows: 1
@@ -104,7 +106,7 @@ introduction.
- .. row 1
- - struct :c:type:`struct video_capability` ``type``
+ - ``struct video_capability`` ``type``
- struct :ref:`v4l2_capability `
``capabilities`` flags
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] dev-sliced-vbi.rst: Adjust tables on LaTeX output
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] dev-sliced-vbi.rst: Adjust tables on LaTeX output
Author: Mauro Carvalho Chehab
Date:Thu Aug 18 07:38:53 2016 -0300
Better format the tables in a way that will fit inside the
page.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/dev-sliced-vbi.rst | 34 +
1 file changed, 24 insertions(+), 10 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/dev-sliced-vbi.rst
b/Documentation/media/uapi/v4l/dev-sliced-vbi.rst
index 9f348e164782..074aa3798152 100644
--- a/Documentation/media/uapi/v4l/dev-sliced-vbi.rst
+++ b/Documentation/media/uapi/v4l/dev-sliced-vbi.rst
@@ -105,7 +105,9 @@ which may return ``EBUSY`` can be the
struct v4l2_sliced_vbi_format
-
-.. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{2.9cm}|p{2.9cm}|p{2.9cm}|
+.. tabularcolumns:: |p{1.0cm}|p{4.5cm}|p{4.0cm}|p{4.0cm}|p{4.0cm}|
+
+.. cssclass:: longtable
.. flat-table::
:header-rows: 0
@@ -242,8 +244,8 @@ struct v4l2_sliced_vbi_format
- ``reserved``\ [2]
- :cspan:`2` This array is reserved for future extensions.
- Applications and drivers must set it to zero.
+ Applications and drivers must set it to zero.
.. _vbi-services2:
@@ -251,7 +253,11 @@ struct v4l2_sliced_vbi_format
Sliced VBI services
---
-.. tabularcolumns:: |p{4.4cm}|p{2.2cm}|p{2.2cm}|p{4.4cm}|p{4.3cm}|
+.. raw:: latex
+
+\newline\newline\begin{adjustbox}{width=\columnwidth}
+
+.. tabularcolumns:: |p{5.0cm}|p{1.4cm}|p{3.0cm}|p{2.5cm}|p{9.0cm}|
.. flat-table::
:header-rows: 1
@@ -277,7 +283,9 @@ Sliced VBI services
- 0x0001
- - :ref:`ets300706`, :ref:`itu653`
+ - :ref:`ets300706`,
+
+ :ref:`itu653`
- PAL/SECAM line 7-22, 320-335 (second field 7-22)
@@ -316,7 +324,9 @@ Sliced VBI services
- 0x4000
- - :ref:`itu1119`, :ref:`en300294`
+ - :ref:`itu1119`,
+
+ :ref:`en300294`
- PAL/SECAM line 23
@@ -344,6 +354,10 @@ Sliced VBI services
- :cspan:`2` Set of services applicable to 625 line systems.
+.. raw:: latex
+
+\end{adjustbox}\newline\newline
+
Drivers may return an ``EINVAL`` error code when applications attempt to
read or write data without prior format negotiation, after switching the
@@ -561,7 +575,7 @@ number).
struct v4l2_mpeg_vbi_fmt_ivtv
-
-.. tabularcolumns:: |p{3.5cm}|p{3.5cm}|p{3.5cm}|p{7.0cm}|
+.. tabularcolumns:: |p{1.0cm}|p{3.5cm}|p{1.0cm}|p{11.5cm}|
.. flat-table::
:header-rows: 0
@@ -661,7 +675,7 @@ Magic Constants for struct v4l2_mpeg_vbi_fmt_ivtv magic
field
struct v4l2_mpeg_vbi_itv0
-
-.. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}|
+.. tabularcolumns:: |p{4.4cm}|p{2.4cm}|p{10.7cm}|
.. flat-table::
:header-rows: 0
@@ -687,9 +701,9 @@ struct v4l2_mpeg_vbi_itv0
::
linemask[0] b0: line 6 first field
- linemask[0] b17:line 23 first field
- linemask[0] b18:line 6 second field
- linemask[0] b31:line 19 second field
+ linemask[0] b17:line 23 first field
+ linemask[0] b18:line 6 second field
+ linemask[0] b31:line 19 second field
linemask[1] b0: line 20 second field
linemask[1] b3: line 23 second field
linemask[1] b4-b31: unused and set to 0
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] uapi/cec: adjust tables on LaTeX output
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] uapi/cec: adjust tables on LaTeX output
Author: Mauro Carvalho Chehab
Date:Fri Aug 19 09:42:15 2016 -0300
Fix tables to avoid text to overflow the cell limits.
Signed-off-by: Mauro Carvalho Chehab
.../media/uapi/cec/cec-ioc-adap-g-caps.rst | 4 ++--
.../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst| 6 --
Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 23 +-
Documentation/media/uapi/cec/cec-ioc-g-mode.rst| 6 +++---
Documentation/media/uapi/cec/cec-ioc-receive.rst | 6 +++---
5 files changed, 21 insertions(+), 24 deletions(-)
---
diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst
b/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst
index 4e70eae7e6ab..e0eaadaf2305 100644
--- a/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst
@@ -44,7 +44,7 @@ returns the information to the application. The ioctl never
fails.
.. _cec-caps:
-.. tabularcolumns:: |p{1.0cm}|p{1.0cm}|p{15.5cm}|
+.. tabularcolumns:: |p{1.2cm}|p{2.5cm}|p{13.8cm}|
.. flat-table:: struct cec_caps
:header-rows: 0
@@ -91,7 +91,7 @@ returns the information to the application. The ioctl never
fails.
.. _cec-capabilities:
-.. tabularcolumns:: |p{4.4cm}|p{1.5cm}|p{11.6cm}|
+.. tabularcolumns:: |p{4.4cm}|p{2.5cm}|p{10.6cm}|
.. flat-table:: CEC Capabilities Flags
:header-rows: 0
diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
b/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
index 11fac7e24554..959e920eb7c3 100644
--- a/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
@@ -69,7 +69,9 @@ logical address types are already defined will return with
error ``EBUSY``.
.. _cec-log-addrs:
-.. tabularcolumns:: |p{1.0cm}|p{1.0cm}|p{15.5cm}|
+.. tabularcolumns:: |p{1.0cm}|p{7.5cm}|p{8.0cm}|
+
+.. cssclass:: longtable
.. flat-table:: struct cec_log_addrs
:header-rows: 0
@@ -311,7 +313,7 @@ logical address types are already defined will return with
error ``EBUSY``.
.. _cec-log-addr-types:
-.. tabularcolumns:: |p{2.6cm}|p{0.9cm}|p{14.0cm}|
+.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|
.. flat-table:: CEC Logical Address Types
:header-rows: 0
diff --git a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst
b/Documentation/media/uapi/cec/cec-ioc-dqevent.rst
index b4c73ed50509..c27b56881a4a 100644
--- a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-dqevent.rst
@@ -54,7 +54,7 @@ it is guaranteed that the state did change in between the two
events.
.. _cec-event-state-change_s:
-.. tabularcolumns:: |p{1.8cm}|p{1.8cm}|p{13.9cm}|
+.. tabularcolumns:: |p{1.2cm}|p{2.9cm}|p{13.4cm}|
.. flat-table:: struct cec_event_state_change
:header-rows: 0
@@ -82,7 +82,7 @@ it is guaranteed that the state did change in between the two
events.
.. _cec-event-lost-msgs_s:
-.. tabularcolumns:: |p{1.0cm}|p{1.0cm}|p{15.5cm}|
+.. tabularcolumns:: |p{1.0cm}|p{2.0cm}|p{14.5cm}|
.. flat-table:: struct cec_event_lost_msgs
:header-rows: 0
@@ -110,7 +110,7 @@ it is guaranteed that the state did change in between the
two events.
.. _cec-event:
-.. tabularcolumns:: |p{1.6cm}|p{1.6cm}|p{1.6cm}|p{12.7cm}|
+.. tabularcolumns:: |p{1.0cm}|p{4.2cm}|p{2.5cm}|p{8.8cm}|
.. flat-table:: struct cec_event
:header-rows: 0
@@ -124,21 +124,18 @@ it is guaranteed that the state did change in between the
two events.
- ``ts``
- - Timestamp of the event in ns.
+ - :cspan:`1` Timestamp of the event in ns.
+
The timestamp has been taken from the ``CLOCK_MONOTONIC`` clock. To
access
the same clock from userspace use :c:func:`clock_gettime(2)`.
- -
-
- .. row 2
- __u32
- ``event``
- - The CEC event type, see :ref:`cec-events`.
-
- -
+ - :cspan:`1` The CEC event type, see :ref:`cec-events`.
- .. row 3
@@ -146,9 +143,7 @@ it is guaranteed that the state did change in between the
two events.
- ``flags``
- - Event flags, see :ref:`cec-event-flags`.
-
- -
+ - :cspan:`1` Event flags, see :ref:`cec-event-flags`.
- .. row 4
@@ -183,7 +178,7 @@ it is guaranteed that the state did change in between the
two events.
.. _cec-events:
-.. tabularcolumns:: |p{2.6cm}|p{0.9cm}|p{14.0cm}|
+.. tabularcolumns:: |p{5.6cm}|p{0.9cm}|p{11.0cm}|
.. flat-table:: CEC Events Types
:header-rows: 0
@@ -214,7 +209,7 @@ it is guaranteed that the state did change in between the
two events.
.. _cec-event-flags:
-.. tabularcolumns:: |p{4.4cm}|p{1.5cm}|p{11.6cm}|
+.. tabularcolumns:: |p{6.0cm}|p{0.6cm}|p{10.9cm}|
.. flat-table:: CEC Event Flags
:header-rows: 0
diff --git a/Docu
[git:media_tree/master] [media] extended-controls.rst: fix table sizes
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] extended-controls.rst: fix table sizes
Author: Mauro Carvalho Chehab
Date:Wed Aug 17 11:27:22 2016 -0300
Lots of tables at extended-controls.rst need explicit hints for
LaTeX to adjust their widths. Provide that.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/extended-controls.rst | 63 --
1 file changed, 36 insertions(+), 27 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/extended-controls.rst
b/Documentation/media/uapi/v4l/extended-controls.rst
index 782f7f3c2209..3f0f94a5eeed 100644
--- a/Documentation/media/uapi/v4l/extended-controls.rst
+++ b/Documentation/media/uapi/v4l/extended-controls.rst
@@ -291,6 +291,8 @@ Codec Control IDs
+.. tabularcolumns:: |p{6 cm}|p{11.5cm}|
+
.. flat-table::
:header-rows: 0
:stub-columns: 0
@@ -964,6 +966,8 @@ Codec Control IDs
+.. tabularcolumns:: |p{9.0cm}|p{8.5cm}|
+
.. flat-table::
:header-rows: 0
:stub-columns: 0
@@ -1671,6 +1675,8 @@ Codec Control IDs
+.. tabularcolumns:: |p{5.5cm}|p{12.0cm}|
+
.. flat-table::
:header-rows: 0
:stub-columns: 0
@@ -1715,11 +1721,12 @@ Codec Control IDs
+.. tabularcolumns:: |p{14.0cm}|p{3.5cm}|
+
.. flat-table::
:header-rows: 0
:stub-columns: 0
-
- .. row 1
- ``V4L2_MPEG_VIDEO_H264_LOOP_FILTER_MODE_ENABLED``
@@ -1918,6 +1925,8 @@ Codec Control IDs
+.. tabularcolumns:: |p{10.3cm}|p{7.2cm}|
+
.. flat-table::
:header-rows: 0
:stub-columns: 0
@@ -1967,17 +1976,16 @@ Codec Control IDs
.. _v4l2-mpeg-video-h264-sei-fp-arrangement-type:
-``V4L2_CID_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE (enum
v4l2_mpeg_video_h264_sei_fp_arrangement_type)``
+``V4L2_CID_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE`` ``(enum
v4l2_mpeg_video_h264_sei_fp_arrangement_type)``
Frame packing arrangement type for H264 SEI. Applicable to the H264
encoder. Possible values are:
-
+.. tabularcolumns:: |p{12cm}|p{5.5cm}|
.. flat-table::
:header-rows: 0
:stub-columns: 0
-
- .. row 1
- ``V4L2_MPEG_VIDEO_H264_SEI_FP_ARRANGEMENT_TYPE_CHEKERBOARD``
@@ -2023,18 +2031,17 @@ Codec Control IDs
.. _v4l2-mpeg-video-h264-fmo-map-type:
-``V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE (enum
v4l2_mpeg_video_h264_fmo_map_type)``
+``V4L2_CID_MPEG_VIDEO_H264_FMO_MAP_TYPE`` ``(enum
v4l2_mpeg_video_h264_fmo_map_type)``
When using FMO, the map type divides the image in different scan
patterns of macroblocks. Applicable to the H264 encoder. Possible
values are:
-
+.. tabularcolumns:: |p{12.5cm}|p{5.0cm}|
.. flat-table::
:header-rows: 0
:stub-columns: 0
-
- .. row 1
- ``V4L2_MPEG_VIDEO_H264_FMO_MAP_TYPE_INTERLEAVED_SLICES``
@@ -2330,12 +2337,12 @@ MFC 5.1 Control IDs
are:
+.. tabularcolumns:: |p{9.0cm}|p{8.5cm}|
.. flat-table::
:header-rows: 0
:stub-columns: 0
-
- .. row 1
- ``V4L2_MPEG_MFC51_FRAME_SKIP_MODE_DISABLED``
@@ -2455,6 +2462,8 @@ CX2341x Control IDs
+.. tabularcolumns:: |p{14.5cm}|p{3.0cm}|
+
.. flat-table::
:header-rows: 0
:stub-columns: 0
@@ -2679,13 +2688,12 @@ VPX Control IDs
The number of reference pictures for encoding P frames. Possible
values are:
-
+.. tabularcolumns:: |p{7.9cm}|p{9.6cm}|
.. flat-table::
:header-rows: 0
:stub-columns: 0
-
- .. row 1
- ``V4L2_CID_MPEG_VIDEO_VPX_1_REF_FRAME``
@@ -2731,13 +2739,16 @@ VPX Control IDs
``V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_SEL (enum v4l2_vp8_golden_frame_sel)``
Selects the golden frame for encoding. Possible values are:
+.. raw:: latex
+\begin{adjustbox}{width=\columnwidth}
+
+.. tabularcolumns:: |p{11.0cm}|p{10.0cm}|
.. flat-table::
:header-rows: 0
:stub-columns: 0
-
- .. row 1
- ``V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_USE_PREV``
@@ -2750,9 +2761,12 @@ VPX Control IDs
- ``V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_USE_REF_PERIOD``
- Use the previous specific frame indicated by
- V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_REF_PERIOD as a
+ ``V4L2_CID_MPEG_VIDEO_VPX_GOLDEN_FRAME_REF_PERIOD`` as a
golden frame.
+.. raw:: latex
+
+\end{adjustbox}
``V4L2_CID_MPEG_VIDEO_VPX_MIN_QP (integer)``
@@ -2862,13 +2876,12 @@ Camera Control IDs
Determines how the camera measures the amount of light available for
the frame exposure. Possible values are:
-
+.. tabularcolumns:: |p{8.5cm}|p{9.0cm}|
.. flat-table::
:header-rows: 0
:stub-columns: 0
-
- .. row 1
- ``V4L2_EXPOSURE_METERING_AVERAGE``
@@ -2970,13 +2983,12 @@ Camera Control IDs
control may stop updates of the ``V4L2_CID_AUTO_FOCUS_STATUS``
control value.
-
+.. tabularcolumns:: |p{6.5cm}|p{11.0cm}|
.. flat-table::
:header-rows: 0
:stub-columns: 0
-
-
[git:media_tree/master] [media] dev-raw-vbi.rst: add a footnote for the count limits
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] dev-raw-vbi.rst: add a footnote for the count limits Author: Mauro Carvalho Chehab Date:Thu Aug 18 07:06:11 2016 -0300 There's a bug with LaTeX output on flat-tables with Sphinx 1.4.5 that prevents references at a cell span to be broken. As the text is indeed too long, it makes sense to place the reference to the pictures showing the VBI limits as a footnote. That makes the text easier to read and also solves the issue with LaTeX output. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/v4l/dev-raw-vbi.rst | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) --- diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi.rst b/Documentation/media/uapi/v4l/dev-raw-vbi.rst index 95de08b8fbf2..859b5bc8abbb 100644 --- a/Documentation/media/uapi/v4l/dev-raw-vbi.rst +++ b/Documentation/media/uapi/v4l/dev-raw-vbi.rst @@ -196,10 +196,9 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT ` does driver. Anyway, drivers may not support single field capturing and return both count values non-zero. - Both ``count`` values set to zero, or line numbers outside the - bounds depicted in :ref:`vbi-525` and :ref:`vbi-625`, or a - field image covering lines of two fields, are invalid and shall - not be returned by the driver. + Both ``count`` values set to zero, or line numbers are outside the + bounds depicted\ [#f4]_, or a field image covering lines of two + fields, are invalid and shall not be returned by the driver. To initialize the ``start`` and ``count`` fields, applications must first determine the current video standard selection. The @@ -352,3 +351,6 @@ another process. Most VBI services transmit on both fields, but some have different semantics depending on the field number. These cannot be reliable decoded or encoded when ``V4L2_VBI_UNSYNC`` is set. + +.. [#f4] + The valid values ar shown at :ref:`vbi-525` and :ref:`vbi-625`. ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] dev-raw-vbi.rst: adjust table columns for LaTeX output
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] dev-raw-vbi.rst: adjust table columns for LaTeX output
Author: Mauro Carvalho Chehab
Date:Thu Aug 18 07:06:18 2016 -0300
Add the needed tags to fix LaTeX output of the tables there.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/dev-raw-vbi.rst | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi.rst
b/Documentation/media/uapi/v4l/dev-raw-vbi.rst
index 859b5bc8abbb..1b59239c7fb7 100644
--- a/Documentation/media/uapi/v4l/dev-raw-vbi.rst
+++ b/Documentation/media/uapi/v4l/dev-raw-vbi.rst
@@ -102,7 +102,9 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT
` does
.. _v4l2-vbi-format:
-.. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}|
+.. tabularcolumns:: |p{2.4cm}|p{4.4cm}|p{10.7cm}|
+
+.. cssclass:: longtable
.. flat-table:: struct v4l2_vbi_format
:header-rows: 0
@@ -228,7 +230,7 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT
` does
.. _vbifmt-flags:
-.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|
+.. tabularcolumns:: |p{4.0cm}|p{1.5cm}|p{12.0cm}|
.. flat-table:: Raw VBI Format Flags
:header-rows: 0
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] pixfmt-packed-rgb.rst: Fix cell spans
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] pixfmt-packed-rgb.rst: Fix cell spans Author: Mauro Carvalho Chehab Date:Wed Aug 17 11:57:12 2016 -0300 There is an extra column just before eack pack of bits, to improve table reading, but the header file didn't take this into account. Fix it. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst | 78 -- 1 file changed, 42 insertions(+), 36 deletions(-) --- diff --git a/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst b/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst index b1122ce0a8e8..3db34f9d36e6 100644 --- a/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst +++ b/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst @@ -36,10 +36,13 @@ next to each other in memory. - - :cspan:`7` Byte 0 in memory + - - :cspan:`7` Byte 1 + - - :cspan:`7` Byte 2 + - - :cspan:`7` Byte 3 - .. row 2 @@ -202,13 +205,13 @@ next to each other in memory. - b\ :sub:`0` - - - - + - - - - + - - - - + - - - - + - - r\ :sub:`3` @@ -282,7 +285,7 @@ next to each other in memory. - b\ :sub:`0` - - - - + - - r\ :sub:`4` @@ -385,7 +388,7 @@ next to each other in memory. - 'XR15' | (1 << 31) - - - - + - - r\ :sub:`4` @@ -617,34 +620,34 @@ next to each other in memory. - r\ :sub:`0` - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - .. _V4L2-PIX-FMT-ABGR32: @@ -778,21 +781,21 @@ next to each other in memory. - r\ :sub:`0` - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - .. _V4L2-PIX-FMT-ARGB32: @@ -875,21 +878,21 @@ next to each other in memory. - 'BX24' - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - - + - - - r\ :sub:`7` @@ -1117,10 +1120,13 @@ either the corresponding ARGB or XRGB format, depending on the driver. - - :cspan:`7` Byte 0 in memory + - - :cspan:`7` Byte 1 + - - :cspan:`7` Byte 2 + - - :cspan:`7` Byte 3 - .. row 2 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] docs-rst: get rid of code-block inside tables
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] docs-rst: get rid of code-block inside tables
Author: Mauro Carvalho Chehab
Date:Mon Aug 15 17:52:13 2016 -0300
There are two tables with a C code-block inside it. Unfortunately,
that causes LaTeX output to break. Yet, there's nothing special
there, so let's remove the code-block from them.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 5 +
Documentation/media/uapi/v4l/vidioc-querycap.rst | 12 +++-
2 files changed, 4 insertions(+), 13 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
index 4715261631ab..13d5b509a829 100644
--- a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
@@ -105,11 +105,8 @@ one until ``EINVAL`` is returned.
- :cspan:`2`
-
.. _v4l2-fourcc:
- .. code-block:: c
-
- #define v4l2_fourcc(a,b,c,d)
(((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24))
+ ``#define v4l2_fourcc(a,b,c,d)
(((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24))``
Several image formats are already defined by this specification in
:ref:`pixfmt`.
diff --git a/Documentation/media/uapi/v4l/vidioc-querycap.rst
b/Documentation/media/uapi/v4l/vidioc-querycap.rst
index b10fed313f99..f37fc3badcdf 100644
--- a/Documentation/media/uapi/v4l/vidioc-querycap.rst
+++ b/Documentation/media/uapi/v4l/vidioc-querycap.rst
@@ -117,17 +117,11 @@ specification the ioctl returns an ``EINVAL`` error code.
- :cspan:`2`
+ ``#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))``
- .. code-block:: c
+ ``__u32 version = KERNEL_VERSION(0, 8, 1);``
- #define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-
- __u32 version = KERNEL_VERSION(0, 8, 1);
-
- printf ("Version: %u.%u.%u\\n",
- (version >> 16) & 0xFF,
- (version >> 8) & 0xFF,
- version & 0xFF);
+ ``printf ("Version: %u.%u.%u\\n", (version >> 16) & 0xFF, (version >>
8) & 0xFF, version & 0xFF);``
- .. row 6
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] vidioc-g-tuner.rst: improve documentation for tuner type
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] vidioc-g-tuner.rst: improve documentation for tuner type Author: Mauro Carvalho Chehab Date:Fri Aug 19 06:56:36 2016 -0300 The tuner type table misses descriptions for each type. While most of stuff are obvious, the two SDR definitions aren't. So, add descriptions to all of them. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/v4l/vidioc-g-tuner.rst | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) --- diff --git a/Documentation/media/uapi/v4l/vidioc-g-tuner.rst b/Documentation/media/uapi/v4l/vidioc-g-tuner.rst index 762918a1e58a..740a4dd0db00 100644 --- a/Documentation/media/uapi/v4l/vidioc-g-tuner.rst +++ b/Documentation/media/uapi/v4l/vidioc-g-tuner.rst @@ -260,7 +260,7 @@ To change the radio frequency the .. flat-table:: enum v4l2_tuner_type :header-rows: 0 :stub-columns: 0 -:widths: 3 1 4 +:widths: 3 1 6 - .. row 1 @@ -269,7 +269,7 @@ To change the radio frequency the - 1 - - + - Tuner supports radio - .. row 2 @@ -277,7 +277,7 @@ To change the radio frequency the - 2 - - + - Tuner supports analog TV - .. row 3 @@ -285,7 +285,8 @@ To change the radio frequency the - 4 - - + - Tuner controls the A/D and/or D/A block of a +Sofware Digital Radio (SDR) - .. row 4 @@ -293,8 +294,7 @@ To change the radio frequency the - 5 - - - + - Tuner controls the RF part of a Sofware Digital Radio (SDR) .. _tuner-capability: ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] cec-core: Convert it to ReST format
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] cec-core: Convert it to ReST format
Author: Mauro Carvalho Chehab
Date:Fri Aug 19 08:46:13 2016 -0300
There are some things there that aren't ok for ReST format.
Fix them.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/kapi/cec-core.rst | 147 ++
1 file changed, 94 insertions(+), 53 deletions(-)
---
diff --git a/Documentation/media/kapi/cec-core.rst
b/Documentation/media/kapi/cec-core.rst
index 75155fe37153..88c33b53ec13 100644
--- a/Documentation/media/kapi/cec-core.rst
+++ b/Documentation/media/kapi/cec-core.rst
@@ -36,39 +36,50 @@ CEC Adapter
The struct cec_adapter represents the CEC adapter hardware. It is created by
calling cec_allocate_adapter() and deleted by calling cec_delete_adapter():
-struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,
+.. c:function::
+ struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,
void *priv, const char *name, u32 caps, u8 available_las,
struct device *parent);
-void cec_delete_adapter(struct cec_adapter *adap);
+
+.. c:function::
+ void cec_delete_adapter(struct cec_adapter *adap);
To create an adapter you need to pass the following information:
-ops: adapter operations which are called by the CEC framework and that you
-have to implement.
+ops:
+ adapter operations which are called by the CEC framework and that you
+ have to implement.
-priv: will be stored in adap->priv and can be used by the adapter ops.
+priv:
+ will be stored in adap->priv and can be used by the adapter ops.
-name: the name of the CEC adapter. Note: this name will be copied.
+name:
+ the name of the CEC adapter. Note: this name will be copied.
-caps: capabilities of the CEC adapter. These capabilities determine the
+caps:
+ capabilities of the CEC adapter. These capabilities determine the
capabilities of the hardware and which parts are to be handled
by userspace and which parts are handled by kernelspace. The
capabilities are returned by CEC_ADAP_G_CAPS.
-available_las: the number of simultaneous logical addresses that this
+available_las:
+ the number of simultaneous logical addresses that this
adapter can handle. Must be 1 <= available_las <= CEC_MAX_LOG_ADDRS.
-parent: the parent device.
+parent:
+ the parent device.
To register the /dev/cecX device node and the remote control device (if
CEC_CAP_RC is set) you call:
-int cec_register_adapter(struct cec_adapter *adap);
+.. c:function::
+ int cec_register_adapter(struct cec_adapter \*adap);
To unregister the devices call:
-void cec_unregister_adapter(struct cec_adapter *adap);
+.. c:function::
+ void cec_unregister_adapter(struct cec_adapter \*adap);
Note: if cec_register_adapter() fails, then call cec_delete_adapter() to
clean up. But if cec_register_adapter() succeeded, then only call
@@ -83,18 +94,23 @@ Implementing the Low-Level CEC Adapter
The following low-level adapter operations have to be implemented in
your driver:
-struct cec_adap_ops {
- /* Low-level callbacks */
- int (*adap_enable)(struct cec_adapter *adap, bool enable);
- int (*adap_monitor_all_enable)(struct cec_adapter *adap, bool enable);
- int (*adap_log_addr)(struct cec_adapter *adap, u8 logical_addr);
- int (*adap_transmit)(struct cec_adapter *adap, u8 attempts,
-u32 signal_free_time, struct cec_msg *msg);
- void (*adap_log_status)(struct cec_adapter *adap);
+.. c:type:: struct cec_adap_ops
+
+.. code-block:: none
+
+ struct cec_adap_ops
+ {
+ /* Low-level callbacks */
+ int (*adap_enable)(struct cec_adapter *adap, bool enable);
+ int (*adap_monitor_all_enable)(struct cec_adapter *adap, bool
enable);
+ int (*adap_log_addr)(struct cec_adapter *adap, u8 logical_addr);
+ int (*adap_transmit)(struct cec_adapter *adap, u8 attempts,
+ u32 signal_free_time, struct cec_msg
*msg);
+ void (\*adap_log_status)(struct cec_adapter *adap);
- /* High-level callbacks */
- ...
-};
+ /* High-level callbacks */
+ ...
+ };
The three low-level ops deal with various aspects of controlling the CEC
adapter
hardware:
@@ -102,6 +118,7 @@ hardware:
To enable/disable the hardware:
+.. c:function::
int (*adap_enable)(struct cec_adapter *adap, bool enable);
This callback enables or disables the CEC hardware. Enabling the CEC hardware
@@ -115,6 +132,7 @@ Note that adap_enable must return 0 if enable is false.
To enable/disable the 'monitor all' mode:
+.. c:function::
int (*adap_monitor_all_enable)(struct cec_adapter *adap, bool enable);
If enabled, then the adapter s
[git:media_tree/master] [media] adjust remaining tables at DVB uAPI documentation
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] adjust remaining tables at DVB uAPI documentation
Author: Mauro Carvalho Chehab
Date:Fri Aug 19 08:00:44 2016 -0300
There are a few broken tables on LaTeX output at the DVB
uAPI documentation. Fix them.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/dvb/audio-fopen.rst| 2 ++
Documentation/media/uapi/dvb/ca-fopen.rst | 2 ++
Documentation/media/uapi/dvb/dmx-fread.rst | 3 ++-
Documentation/media/uapi/dvb/dmx-fwrite.rst | 2 ++
Documentation/media/uapi/dvb/dmx-set-pes-filter.rst | 2 +-
Documentation/media/uapi/dvb/dmx-start.rst | 2 +-
Documentation/media/uapi/dvb/dmx_types.rst | 1 +
Documentation/media/uapi/dvb/fe-get-info.rst| 1 +
Documentation/media/uapi/dvb/fe-read-status.rst | 1 +
Documentation/media/uapi/dvb/video-fopen.rst| 2 ++
10 files changed, 15 insertions(+), 3 deletions(-)
---
diff --git a/Documentation/media/uapi/dvb/audio-fopen.rst
b/Documentation/media/uapi/dvb/audio-fopen.rst
index ec3b23aa79b3..3ef4fd62ffb6 100644
--- a/Documentation/media/uapi/dvb/audio-fopen.rst
+++ b/Documentation/media/uapi/dvb/audio-fopen.rst
@@ -80,6 +80,8 @@ AUDIO_GET_STATUS. All other call will return with an error
code.
Return Value
+.. tabularcolumns:: |p{2.5cm}|p{15.0cm}|
+
.. flat-table::
:header-rows: 0
:stub-columns: 0
diff --git a/Documentation/media/uapi/dvb/ca-fopen.rst
b/Documentation/media/uapi/dvb/ca-fopen.rst
index f284461cce20..9960fc76189c 100644
--- a/Documentation/media/uapi/dvb/ca-fopen.rst
+++ b/Documentation/media/uapi/dvb/ca-fopen.rst
@@ -79,6 +79,8 @@ the device in this mode will fail, and an error code will be
returned.
Return Value
+.. tabularcolumns:: |p{2.5cm}|p{15.0cm}|
+
.. flat-table::
:header-rows: 0
:stub-columns: 0
diff --git a/Documentation/media/uapi/dvb/dmx-fread.rst
b/Documentation/media/uapi/dvb/dmx-fread.rst
index d25b19e4f696..266c9ca259c9 100644
--- a/Documentation/media/uapi/dvb/dmx-fread.rst
+++ b/Documentation/media/uapi/dvb/dmx-fread.rst
@@ -53,10 +53,11 @@ data. The filtered data is transferred from the driverâs
internal
circular buffer to buf. The maximum amount of data to be transferred is
implied by count.
-
Return Value
+.. tabularcolumns:: |p{2.5cm}|p{15.0cm}|
+
.. flat-table::
:header-rows: 0
:stub-columns: 0
diff --git a/Documentation/media/uapi/dvb/dmx-fwrite.rst
b/Documentation/media/uapi/dvb/dmx-fwrite.rst
index 9efd81a1b5c8..3d76470bef60 100644
--- a/Documentation/media/uapi/dvb/dmx-fwrite.rst
+++ b/Documentation/media/uapi/dvb/dmx-fwrite.rst
@@ -59,6 +59,8 @@ The amount of data to be transferred is implied by count.
Return Value
+.. tabularcolumns:: |p{2.5cm}|p{15.0cm}|
+
.. flat-table::
:header-rows: 0
:stub-columns: 0
diff --git a/Documentation/media/uapi/dvb/dmx-set-pes-filter.rst
b/Documentation/media/uapi/dvb/dmx-set-pes-filter.rst
index addc321011ce..d71db779b6fd 100644
--- a/Documentation/media/uapi/dvb/dmx-set-pes-filter.rst
+++ b/Documentation/media/uapi/dvb/dmx-set-pes-filter.rst
@@ -61,7 +61,7 @@ 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 ` chapter.
-
+.. tabularcolumns:: |p{2.5cm}|p{15.0cm}|
.. flat-table::
:header-rows: 0
diff --git a/Documentation/media/uapi/dvb/dmx-start.rst
b/Documentation/media/uapi/dvb/dmx-start.rst
index 9835d1e78400..959b5eee2647 100644
--- a/Documentation/media/uapi/dvb/dmx-start.rst
+++ b/Documentation/media/uapi/dvb/dmx-start.rst
@@ -53,7 +53,7 @@ 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 ` chapter.
-
+.. tabularcolumns:: |p{2.5cm}|p{15.0cm}|
.. flat-table::
:header-rows: 0
diff --git a/Documentation/media/uapi/dvb/dmx_types.rst
b/Documentation/media/uapi/dvb/dmx_types.rst
index 7a8900af2680..efd564035958 100644
--- a/Documentation/media/uapi/dvb/dmx_types.rst
+++ b/Documentation/media/uapi/dvb/dmx_types.rst
@@ -12,6 +12,7 @@ Demux Data Types
Output for the demux
+.. tabularcolumns:: |p{5.0cm}|p{12.5cm}|
.. _dmx-output:
diff --git a/Documentation/media/uapi/dvb/fe-get-info.rst
b/Documentation/media/uapi/dvb/fe-get-info.rst
index 80644072087f..85973be62b0c 100644
--- a/Documentation/media/uapi/dvb/fe-get-info.rst
+++ b/Documentation/media/uapi/dvb/fe-get-info.rst
@@ -160,6 +160,7 @@ frontend capabilities
Capabilities describe what a frontend can do. Some capabilities are
supported only on some specific frontend types.
+.. tabularcolumns:: |p{5.5cm}|p{12.0cm}|
.. _fe-caps:
diff --git a/Documentation/media/uapi/dvb/fe-read-status.rst
b/Documentation/media/uapi/dvb/fe-read-status.rst
inde
[git:media_tree/master] [media] docs-rst: re-generate typical_media_device.pdf
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] docs-rst: re-generate typical_media_device.pdf Author: Mauro Carvalho Chehab Date:Wed Aug 17 07:21:15 2016 -0300 There are some texts there on the wrong place. Re-generate it from the svg file. Signed-off-by: Mauro Carvalho Chehab .../media/media_api_files/typical_media_device.pdf | Bin 134268 -> 52895 bytes 1 file changed, 0 insertions(+), 0 deletions(-) --- diff --git a/Documentation/media/media_api_files/typical_media_device.pdf b/Documentation/media/media_api_files/typical_media_device.pdf index eb3045813815..d000d802b20f 100644 Binary files a/Documentation/media/media_api_files/typical_media_device.pdf and b/Documentation/media/media_api_files/typical_media_device.pdf differ ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] docs-rst: fix some .. note:: occurrences
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] docs-rst: fix some .. note:: occurrences Author: Mauro Carvalho Chehab Date:Mon Aug 22 09:19:46 2016 -0300 On some places, either an space or the second ':' is missing. Fix them. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/dvb/examples.rst | 2 +- Documentation/media/uapi/v4l/dev-output.rst | 2 +- Documentation/media/uapi/v4l/pixfmt-sbggr16.rst | 2 +- Documentation/media/uapi/v4l/standard.rst | 2 +- Documentation/media/v4l-drivers/zr364xx.rst | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) --- diff --git a/Documentation/media/uapi/dvb/examples.rst b/Documentation/media/uapi/dvb/examples.rst index 9a4ae4b0f3d7..1a94966312c0 100644 --- a/Documentation/media/uapi/dvb/examples.rst +++ b/Documentation/media/uapi/dvb/examples.rst @@ -9,7 +9,7 @@ Examples In this section we would like to present some examples for using the DVB API. -..note:: +.. note:: This section is out of date, and the code below won't even compile. Please refer to the diff --git a/Documentation/media/uapi/v4l/dev-output.rst b/Documentation/media/uapi/v4l/dev-output.rst index 4f1123a0b40d..dfb8207c21cc 100644 --- a/Documentation/media/uapi/v4l/dev-output.rst +++ b/Documentation/media/uapi/v4l/dev-output.rst @@ -16,7 +16,7 @@ device special files named ``/dev/video`` and ``/dev/video0`` to ``/dev/video`` is typically a symbolic link to the preferred video device. -..note:: The same device file names are used also for video capture devices. +.. note:: The same device file names are used also for video capture devices. Querying Capabilities diff --git a/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst b/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst index 58238c06f11e..801b78ccbc25 100644 --- a/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst +++ b/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst @@ -17,7 +17,7 @@ This format is similar to has a depth of 16 bits. The least significant byte is stored at lower memory addresses (little-endian). -..note:: +.. note:: The actual sampling precision may be lower than 16 bits, for example 10 bits per pixel with values in tange 0 to 1023. diff --git a/Documentation/media/uapi/v4l/standard.rst b/Documentation/media/uapi/v4l/standard.rst index 5dd341f18839..2320008f6063 100644 --- a/Documentation/media/uapi/v4l/standard.rst +++ b/Documentation/media/uapi/v4l/standard.rst @@ -41,7 +41,7 @@ output applications call the :ref:`VIDIOC_G_STD ` and *received* standard can be sensed with the :ref:`VIDIOC_QUERYSTD` ioctl. -..note:: +.. note:: The parameter of all these ioctls is a pointer to a :ref:`v4l2_std_id ` type (a standard set), *not* an diff --git a/Documentation/media/v4l-drivers/zr364xx.rst b/Documentation/media/v4l-drivers/zr364xx.rst index d8d1171887cd..f5280e366826 100644 --- a/Documentation/media/v4l-drivers/zr364xx.rst +++ b/Documentation/media/v4l-drivers/zr364xx.rst @@ -5,7 +5,7 @@ site: http://royale.zerezo.com/zr364xx/ mail: roy...@zerezo.com -.. note: +.. note:: This documentation is outdated ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] pixfmt-packed-rgb.rst: adjust tables to fit in LaTeX
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] pixfmt-packed-rgb.rst: adjust tables to fit in LaTeX
Author: Mauro Carvalho Chehab
Date:Wed Aug 17 12:02:12 2016 -0300
Adjust the tables to fit at the LaTeX and PDF outputs.
I wrote a previous patch RFC to show the big table in landscape,
but it makes harder to read on displays.
So, instead, let's use the adjustbox to shrink the size of those
long tables, as the table size can still be visible on screen,
and it is a way better to read in horizontal position and
visible if printed.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst | 37 --
1 file changed, 28 insertions(+), 9 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst
b/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst
index 3db34f9d36e6..af5fac78188f 100644
--- a/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst
@@ -6,11 +6,6 @@
Packed RGB formats
**
-*man Packed RGB formats(2)*
-
-Packed RGB formats
-
-
Description
===
@@ -19,9 +14,14 @@ 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.
+.. raw:: latex
+
+\newline\newline\begin{adjustbox}{width=\columnwidth}
.. _rgb-formats:
+.. tabularcolumns::
|p{4.5cm}|p{3.3cm}|p{0.7cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{1.7cm}|
+
.. flat-table:: Packed RGB Image Formats
:header-rows: 2
:stub-columns: 0
@@ -945,8 +945,11 @@ next to each other in memory.
- b\ :sub:`0`
+.. raw:: latex
+
+\end{adjustbox}\newline\newline
-Bit 7 is the most significant bit.
+.. note:: Bit 7 is the most significant bit.
The usage and value of the alpha bits (a) in the ARGB and ABGR formats
(collectively referred to as alpha formats) depend on the device type
@@ -976,13 +979,16 @@ devices and drivers must ignore those bits, for both
Each cell is one byte.
+.. raw:: latex
-.. tabularcolumns::
|p{2.5cm}|p{1.3cm}|p{1.3cm}|p{1.3cm}|p{1.3cm}|p{1.3cm}|p{1.3cm}|p{1.3cm}|p{1.3cm}|p{1.3cm}|p{1.3cm}|p{1.3cm}|p{0.7cm}|
+\newline\newline\begin{adjustbox}{width=\columnwidth}
-.. flat-table::
+.. tabularcolumns::
|p{4.1cm}|p{1.1cm}|p{1.1cm}|p{1.1cm}|p{1.1cm}|p{1.1cm}|p{1.1cm}|p{1.1cm}|p{1.1cm}|p{1.1cm}|p{1.1cm}|p{1.1cm}|p{1.3cm}|
+
+.. flat-table:: RGB byte order
:header-rows: 0
:stub-columns: 0
-:widths: 2 1 1 1 1 1 1 1 1 1 1 1 1
+:widths: 11 3 3 3 3 3 3 3 3 3 3 3 3
- .. row 1
@@ -1097,6 +1103,9 @@ Each cell is one byte.
- R\ :sub:`33`
+.. raw:: latex
+
+\end{adjustbox}\newline\newline
Formats defined in :ref:`rgb-formats-deprecated` are deprecated and
must not be used by new drivers. They are documented here for reference.
@@ -1106,6 +1115,13 @@ either the corresponding ARGB or XRGB format, depending
on the driver.
.. _rgb-formats-deprecated:
+.. raw:: latex
+
+\newline\newline
+\begin{adjustbox}{width=\columnwidth}
+
+.. tabularcolumns::
|p{4.2cm}|p{1.0cm}|p{0.7cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{1.7cm}|
+
.. flat-table:: Deprecated Packed RGB Image Formats
:header-rows: 2
:stub-columns: 0
@@ -1470,6 +1486,9 @@ either the corresponding ARGB or XRGB format, depending
on the driver.
- b\ :sub:`0`
+.. raw:: latex
+
+\end{adjustbox}\newline\newline
A test utility to determine which RGB formats a driver actually supports
is available from the LinuxTV v4l-dvb repository. See
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] vidioc-dv-timings-cap.rst: Adjust LaTeX columns
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] vidioc-dv-timings-cap.rst: Adjust LaTeX columns
Author: Mauro Carvalho Chehab
Date:Thu Aug 18 13:59:24 2016 -0300
Some tables are not properly displayed on LaTeX. Fix them.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst
b/Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst
index e14e780eb0d1..b2bf4f3a3c25 100644
--- a/Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst
+++ b/Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst
@@ -56,7 +56,7 @@ that doesn't support them will return an ``EINVAL`` error
code.
.. _v4l2-bt-timings-cap:
-.. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}|
+.. tabularcolumns:: |p{1.2cm}|p{3.0cm}|p{13.3cm}|
.. flat-table:: struct v4l2_bt_timings_cap
:header-rows: 0
@@ -136,14 +136,14 @@ that doesn't support them will return an ``EINVAL`` error
code.
- ``reserved``\ [16]
- - Reserved for future extensions. Drivers must set the array to
- zero.
+ - Reserved for future extensions.
+ Drivers must set the array to zero.
.. _v4l2-dv-timings-cap:
-.. tabularcolumns:: |p{3.5cm}|p{3.5cm}|p{7.0cm}|p{3.5cm}|
+.. tabularcolumns:: |p{1.0cm}|p{3.5cm}|p{3.5cm}|p{9.5cm}|
.. flat-table:: struct v4l2_dv_timings_cap
:header-rows: 0
@@ -175,8 +175,9 @@ that doesn't support them will return an ``EINVAL`` error
code.
- ``reserved``\ [2]
- - Reserved for future extensions. Drivers and applications must set
- the array to zero.
+ - Reserved for future extensions.
+
+ Drivers and applications must set the array to zero.
- .. row 4
@@ -203,6 +204,7 @@ that doesn't support them will return an ``EINVAL`` error
code.
-
+.. tabularcolumns:: |p{7.0cm}|p{10.5cm}|
.. _dv-bt-cap-capabilities:
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] buffer.rst: Adjust table columns for LaTeX output
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] buffer.rst: Adjust table columns for LaTeX output
Author: Mauro Carvalho Chehab
Date:Wed Aug 17 20:35:20 2016 -0300
The table columns are not properly displayed. Also, some
tables are too big to fit into just one page. So, fix them,
in order to better display the tables.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/buffer.rst | 20 ++--
1 file changed, 14 insertions(+), 6 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/buffer.rst
b/Documentation/media/uapi/v4l/buffer.rst
index 064bc03b7a1d..4d315b01c2a4 100644
--- a/Documentation/media/uapi/v4l/buffer.rst
+++ b/Documentation/media/uapi/v4l/buffer.rst
@@ -39,12 +39,14 @@ buffer.
struct v4l2_buffer
==
-.. tabularcolumns:: |p{3.5cm}|p{3.5cm}|p{3.5cm}|p{7.0cm}|
+.. tabularcolumns:: |p{1.3cm}|p{2.5cm}|p{1.3cm}|p{12.0cm}|
+
+.. cssclass:: longtable
.. flat-table:: struct v4l2_buffer
:header-rows: 0
:stub-columns: 0
-:widths: 1 1 1 2
+:widths: 1 2 1 10
- .. row 1
@@ -286,6 +288,8 @@ struct v4l2_plane
.. tabularcolumns:: |p{3.5cm}|p{3.5cm}|p{3.5cm}|p{7.0cm}|
+.. cssclass:: longtable
+
.. flat-table::
:header-rows: 0
:stub-columns: 0
@@ -403,12 +407,14 @@ struct v4l2_plane
enum v4l2_buf_type
==
-.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|
+.. cssclass:: longtable
+
+.. tabularcolumns:: |p{7.2cm}|p{0.6cm}|p{9.7cm}|
.. flat-table::
:header-rows: 0
:stub-columns: 0
-:widths: 3 1 4
+:widths: 4 1 9
- .. row 1
@@ -519,7 +525,9 @@ enum v4l2_buf_type
Buffer Flags
-.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|
+.. tabularcolumns:: |p{7.0cm}|p{2.2cm}|p{8.3cm}|
+
+.. cssclass:: longtable
.. flat-table::
:header-rows: 0
@@ -953,7 +961,7 @@ Timecode Types
Timecode Flags
--
-.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|
+.. tabularcolumns:: |p{6.6cm}|p{1.4cm}|p{9.5cm}|
.. flat-table::
:header-rows: 0
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] vidioc-enumstd.rst: remove bullets from sound carrier
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] vidioc-enumstd.rst: remove bullets from sound carrier Author: Mauro Carvalho Chehab Date:Mon Aug 15 13:37:54 2016 -0300 The items at the sound carrier had a bullet. Those are not needed. So, get rid of them. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/v4l/vidioc-enumstd.rst | 25 - 1 file changed, 12 insertions(+), 13 deletions(-) --- diff --git a/Documentation/media/uapi/v4l/vidioc-enumstd.rst b/Documentation/media/uapi/v4l/vidioc-enumstd.rst index a936fe32ce9c..f61f0c6b0723 100644 --- a/Documentation/media/uapi/v4l/vidioc-enumstd.rst +++ b/Documentation/media/uapi/v4l/vidioc-enumstd.rst @@ -330,8 +330,7 @@ support digital TV. See also the Linux DVB API at - 4433618.75 ± 1 - - :cspan:`3` f\ :sub:`OR` = 4406250 ± 2000, f\ :sub:`OB` = 425 - ± 2000 + - :cspan:`3` f\ :sub:`OR` = 4406250 ± 2000, f\ :sub:`OB` = 425 ± 2000 - .. row 5 @@ -363,27 +362,27 @@ support digital TV. See also the Linux DVB API at - Sound carrier relative to vision carrier (MHz) - - + 4.5 + - 4.5 - - + 4.5 + - 4.5 - - + 4.5 + - 4.5 - - + 5.5 ± 0.001 [#f4]_ [#f5]_ [#f6]_ [#f7]_ + - 5.5 ± 0.001 [#f4]_ [#f5]_ [#f6]_ [#f7]_ - - + 6.5 ± 0.001 + - 6.5 ± 0.001 - - + 5.5 + - 5.5 - - + 5.9996 ± 0.0005 + - 5.9996 ± 0.0005 - - + 5.5 ± 0.001 + - 5.5 ± 0.001 - - + 6.5 ± 0.001 + - 6.5 ± 0.001 - - + 6.5 + - 6.5 - - + 6.5 [#f8]_ + - 6.5 [#f8]_ Return Value ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] subdev-formats.rst: adjust most of the tables to fill in page
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] subdev-formats.rst: adjust most of the tables to fill in page
Author: Mauro Carvalho Chehab
Date:Thu Aug 18 10:39:06 2016 -0300
Fix mosto fo the tables there in order to make them fit at the
page size.
There are, however, two exceptions: RGB and YUV big tables,
where adding the raw latex adjustbox caused the tables to not
be properly formatted. I suspect that the problem is because
those are long tables, but not really sure.
The thing is that Sphinx lacks an "adjustbox" tag that would
avoid the raw latex hacks.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/subdev-formats.rst | 5575 ---
1 file changed, 2806 insertions(+), 2769 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst
b/Documentation/media/uapi/v4l/subdev-formats.rst
index 265a6dc5fe92..7d9b55dd6e91 100644
--- a/Documentation/media/uapi/v4l/subdev-formats.rst
+++ b/Documentation/media/uapi/v4l/subdev-formats.rst
@@ -155,12 +155,16 @@ half of the green value) transferred first will be named
The following tables list existing packed RGB formats.
+.. FIXME: I was unable to find a way to use adjustbox or landscape for this
table!
+
+.. tabularcolumns::
|p{7.6cm}|p{1.6cm}|p{0.7cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{-1.0cm}|
.. _v4l2-mbus-pixelcode-rgb:
.. flat-table:: RGB formats
:header-rows: 2
:stub-columns: 0
+:widths: 36 7 3 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
2 2 2
- .. row 1
@@ -249,45 +253,45 @@ The following tables list existing packed RGB formats.
- 0x1016
-
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- r\ :sub:`3`
@@ -320,53 +324,53 @@ The following tables list existing packed RGB formats.
- 0x1001
-
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- 0
@@ -389,53 +393,53 @@ The following tables list existing packed RGB formats.
-
-
-
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- g\ :sub:`3`
@@ -460,53 +464,53 @@ The following tables list existing packed RGB formats.
- 0x1002
-
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- g\ :sub:`3`
@@ -529,53 +533,53 @@ The following tables list existing packed RGB formats.
-
-
-
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+ -
- - -
+
[git:media_tree/master] [media] pixfmt-packed-yuv.rst: adjust tables to fit in LaTeX
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] pixfmt-packed-yuv.rst: adjust tables to fit in LaTeX
Author: Mauro Carvalho Chehab
Date:Wed Aug 17 15:37:48 2016 -0300
Adjust the table to fit at the LaTeX and PDF outputs, just like
what was done with pixfmt-packed-rgb.rst.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst | 26 ++
1 file changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst
b/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst
index 54716455f453..2ffcee5b383b 100644
--- a/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst
@@ -6,18 +6,19 @@
Packed YUV formats
**
-*man Packed YUV formats(2)*
-
-Packed YUV formats
-
-
Description
===
Similar to the packed RGB formats these formats store the Y, Cb and Cr
component of each pixel in one 16 or 32 bit word.
+.. raw:: latex
+
+\newline\newline\begin{adjustbox}{width=\columnwidth}
+.. _rgb-formats:
+
+.. tabularcolumns::
|p{4.5cm}|p{3.3cm}|p{0.7cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{1.7cm}|
.. flat-table:: Packed YUV Image Formats
:header-rows: 2
@@ -309,8 +310,15 @@ component of each pixel in one 16 or 32 bit word.
- Cr\ :sub:`0`
+.. raw:: latex
+
+\end{adjustbox}\newline\newline
+
+.. note::
+
+#) Bit 7 is the most significant bit;
-Bit 7 is the most significant bit. The value of a = alpha bits is
-undefined when reading from the driver, ignored when writing to the
-driver, except when alpha blending has been negotiated for a
-:ref:`Video Overlay ` or :ref:`Video Output Overlay `.
+#) The value of a = alpha bits is undefined when reading from the driver,
+ ignored when writing to the driver, except when alpha blending has
+ been negotiated for a :ref:`Video Overlay ` or
+ :ref:`Video Output Overlay `.
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] pixfmt-nv12mt.rst: use PNG instead of GIF
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] pixfmt-nv12mt.rst: use PNG instead of GIF Author: Mauro Carvalho Chehab Date:Mon Aug 15 11:01:30 2016 -0300 pdflatex doesn't like gif images: None:None: WARNING: no matching candidate for image URI u'media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.*' None:None: WARNING: no matching candidate for image URI u'media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.*' But it works fine with png. So, convert them. As a plus, PNG images are smaller. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/v4l/pixfmt-nv12mt.rst | 4 ++-- .../media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.gif| Bin 2108 -> 0 bytes .../media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png| Bin 0 -> 1920 bytes .../uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.gif | Bin 6858 -> 0 bytes .../uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png | Bin 0 -> 5261 bytes 5 files changed, 2 insertions(+), 2 deletions(-) --- diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst b/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst index 6198941bb814..1e6fdf0194f5 100644 --- a/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst +++ b/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst @@ -36,7 +36,7 @@ Layout of macroblocks in memory is presented in the following figure. .. _nv12mt: .. figure:: pixfmt-nv12mt_files/nv12mt.* -:alt:nv12mt.gif +:alt:nv12mt.png :align: center V4L2_PIX_FMT_NV12MT macroblock Z shape memory layout @@ -53,7 +53,7 @@ interleaved. Height of the buffer is aligned to 32. .. _nv12mt_ex: .. figure:: pixfmt-nv12mt_files/nv12mt_example.* -:alt:nv12mt_example.gif +:alt:nv12mt_example.png :align: center Example V4L2_PIX_FMT_NV12MT memory layout of macroblocks diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.gif b/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.gif deleted file mode 100644 index ef2d4cf8367b.. Binary files a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.gif and /dev/null differ diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png b/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png new file mode 100644 index ..41401860fb73 Binary files /dev/null and b/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png differ diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.gif b/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.gif deleted file mode 100644 index df81d68108ee.. Binary files a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.gif and /dev/null differ diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png b/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png new file mode 100644 index ..7775f5d7cc46 Binary files /dev/null and b/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png differ ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] docs-rst: re-generate vbi_525.pdf and vbi_625.pdf
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] docs-rst: re-generate vbi_525.pdf and vbi_625.pdf Author: Mauro Carvalho Chehab Date:Thu Aug 18 07:18:48 2016 -0300 Originally, each image were one page big, causing them to be displayed on separate pages at the PDF output. Re-generate them from the gif files. Signed-off-by: Mauro Carvalho Chehab .../media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf | Bin 3395 -> 3706 bytes .../media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf | Bin 3683 -> 3996 bytes 2 files changed, 0 insertions(+), 0 deletions(-) --- diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf index 9e72c25b208d..0bae28385dfa 100644 Binary files a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf and b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf differ diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf index 765235e33a4d..bf29b95dcd08 100644 Binary files a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf and b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf differ ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] fe_property_parameters.rst: Adjust column sizes
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] fe_property_parameters.rst: Adjust column sizes
Author: Mauro Carvalho Chehab
Date:Fri Aug 19 07:43:02 2016 -0300
Add position hints for some tables, in order for them to be
shown properly on LaTeX output.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/dvb/fe_property_parameters.rst | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/Documentation/media/uapi/dvb/fe_property_parameters.rst
b/Documentation/media/uapi/dvb/fe_property_parameters.rst
index f776d62523da..d7acc72ebbdf 100644
--- a/Documentation/media/uapi/dvb/fe_property_parameters.rst
+++ b/Documentation/media/uapi/dvb/fe_property_parameters.rst
@@ -1234,6 +1234,7 @@ Reed Solomon (RS) frame mode.
Possible values are:
+.. tabularcolumns:: |p{5.0cm}|p{12.5cm}|
.. _atscmh-rs-frame-mode:
@@ -1395,6 +1396,7 @@ Series Concatenated Convolutional Code Block Mode.
Possible values are:
+.. tabularcolumns:: |p{4.5cm}|p{13.0cm}|
.. _atscmh-sccc-block-mode:
@@ -1687,6 +1689,7 @@ on OFTM-based standards, e. g. DVB-T/T2, ISDB-T, DTMB
enum fe_transmit_mode: Number of carriers per channel
-
+.. tabularcolumns:: |p{5.0cm}|p{12.5cm}|
.. _fe-transmit-mode:
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] adjust some vidioc-*rst tables with wrong columns
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] adjust some vidioc-*rst tables with wrong columns
Author: Mauro Carvalho Chehab
Date:Thu Aug 18 14:31:47 2016 -0300
Adjust simple cases where the columns on some vidioc files
are overriding their neighbours.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/vidioc-dqevent.rst | 2 ++
Documentation/media/uapi/v4l/vidioc-enum-fmt.rst| 4 +++-
Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst | 5 +++--
Documentation/media/uapi/v4l/vidioc-enuminput.rst | 2 ++
Documentation/media/uapi/v4l/vidioc-enumoutput.rst | 2 +-
Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst| 11 +--
Documentation/media/uapi/v4l/vidioc-g-enc-index.rst | 6 +++---
Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst | 14 ++
Documentation/media/uapi/v4l/vidioc-g-fbuf.rst | 4
Documentation/media/uapi/v4l/vidioc-g-fmt.rst | 2 ++
Documentation/media/uapi/v4l/vidioc-g-jpegcomp.rst | 2 +-
Documentation/media/uapi/v4l/vidioc-g-modulator.rst | 10 ++
Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 16
13 files changed, 50 insertions(+), 30 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/vidioc-dqevent.rst
b/Documentation/media/uapi/v4l/vidioc-dqevent.rst
index 6cd5d7068065..ad4b826a2966 100644
--- a/Documentation/media/uapi/v4l/vidioc-dqevent.rst
+++ b/Documentation/media/uapi/v4l/vidioc-dqevent.rst
@@ -183,6 +183,8 @@ call.
.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|
+.. cssclass:: longtable
+
.. flat-table:: Event Types
:header-rows: 0
:stub-columns: 0
diff --git a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
index 6bb30ade6aad..2d1444b0d017 100644
--- a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
@@ -108,7 +108,9 @@ one until ``EINVAL`` is returned.
- :cspan:`2`
.. _v4l2-fourcc:
- ``#define v4l2_fourcc(a,b,c,d)
(((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24))``
+ ``#define v4l2_fourcc(a,b,c,d)``
+
+
``(((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24))``
Several image formats are already defined by this specification in
:ref:`pixfmt`.
diff --git a/Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst
b/Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst
index ea1ccfb43e6d..c6ae6f14c9f6 100644
--- a/Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst
@@ -146,8 +146,9 @@ of the corresponding tuner/modulator is set.
- ``reserved``\ [9]
- - Reserved for future extensions. Applications and drivers must set
- the array to zero.
+ - Reserved for future extensions.
+
+ Applications and drivers must set the array to zero.
diff --git a/Documentation/media/uapi/v4l/vidioc-enuminput.rst
b/Documentation/media/uapi/v4l/vidioc-enuminput.rst
index 6b90a1a3506d..8f0b821bd921 100644
--- a/Documentation/media/uapi/v4l/vidioc-enuminput.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enuminput.rst
@@ -181,6 +181,8 @@ at index zero, incrementing by one until the driver returns
``EINVAL``.
.. _input-status:
+.. tabularcolumns:: |p{4.8cm}|p{2.6cm}|p{10.1cm}|
+
.. flat-table:: Input Status Flags
:header-rows: 0
:stub-columns: 0
diff --git a/Documentation/media/uapi/v4l/vidioc-enumoutput.rst
b/Documentation/media/uapi/v4l/vidioc-enumoutput.rst
index 13939d8d4358..456013fb50a2 100644
--- a/Documentation/media/uapi/v4l/vidioc-enumoutput.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enumoutput.rst
@@ -142,7 +142,7 @@ EINVAL.
.. _output-type:
-.. tabularcolumns:: |p{6.6cm}|p{2.2cm}|p{8.7cm}|
+.. tabularcolumns:: |p{7.0cm}|p{1.8cm}|p{8.7cm}|
.. flat-table:: Output Type
:header-rows: 0
diff --git a/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst
b/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst
index d2ea3bf01fce..58dec578f54d 100644
--- a/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst
@@ -316,11 +316,6 @@ EBUSY
- Description
-- .. row 2
-
- -
- -
-
- .. row 3
- ``V4L2_DV_BT_STD_CEA861``
@@ -346,6 +341,7 @@ EBUSY
- The timings follow the VESA Generalized Timings Formula standard
+.. tabularcolumns:: |p{6.0cm}|p{11.5cm}|
.. _dv-bt-flags:
@@ -360,11 +356,6 @@ EBUSY
- Description
-- .. row 2
-
- -
- -
-
- .. row 3
- ``V4L2_DV_FL_REDUCED_BLANKING``
diff --git a/Documentation/media/uapi/v4l/vidioc-g-enc-index.rst
b/Documentation/media/uapi/v4l/vidioc-g-enc-index.rst
index cb094b589f0e..9cb98a8eaf2d 100644
---
[git:media_tree/master] [media] docs-rst: move cec kAPI documentation to the media book
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] docs-rst: move cec kAPI documentation to the media book
Author: Mauro Carvalho Chehab
Date:Fri Aug 19 08:39:16 2016 -0300
The CEC kAPI documentation should also be part of the media book.
Signed-off-by: Mauro Carvalho Chehab
Documentation/cec.txt | 267 --
Documentation/media/kapi/cec-core.rst | 267 ++
Documentation/media/media_kapi.rst| 1 +
3 files changed, 268 insertions(+), 267 deletions(-)
---
diff --git a/Documentation/cec.txt b/Documentation/cec.txt
deleted file mode 100644
index 75155fe37153..
--- a/Documentation/cec.txt
+++ /dev/null
@@ -1,267 +0,0 @@
-CEC Kernel Support
-==
-
-The CEC framework provides a unified kernel interface for use with HDMI CEC
-hardware. It is designed to handle a multiple types of hardware (receivers,
-transmitters, USB dongles). The framework also gives the option to decide
-what to do in the kernel driver and what should be handled by userspace
-applications. In addition it integrates the remote control passthrough
-feature into the kernel's remote control framework.
-
-
-The CEC Protocol
-
-
-The CEC protocol enables consumer electronic devices to communicate with each
-other through the HDMI connection. The protocol uses logical addresses in the
-communication. The logical address is strictly connected with the functionality
-provided by the device. The TV acting as the communication hub is always
-assigned address 0. The physical address is determined by the physical
-connection between devices.
-
-The CEC framework described here is up to date with the CEC 2.0 specification.
-It is documented in the HDMI 1.4 specification with the new 2.0 bits documented
-in the HDMI 2.0 specification. But for most of the features the freely
available
-HDMI 1.3a specification is sufficient:
-
-http://www.microprocessor.org/HDMISpecification13a.pdf
-
-
-The Kernel Interface
-
-
-CEC Adapter
-
-The struct cec_adapter represents the CEC adapter hardware. It is created by
-calling cec_allocate_adapter() and deleted by calling cec_delete_adapter():
-
-struct cec_adapter *cec_allocate_adapter(const struct cec_adap_ops *ops,
- void *priv, const char *name, u32 caps, u8 available_las,
- struct device *parent);
-void cec_delete_adapter(struct cec_adapter *adap);
-
-To create an adapter you need to pass the following information:
-
-ops: adapter operations which are called by the CEC framework and that you
-have to implement.
-
-priv: will be stored in adap->priv and can be used by the adapter ops.
-
-name: the name of the CEC adapter. Note: this name will be copied.
-
-caps: capabilities of the CEC adapter. These capabilities determine the
- capabilities of the hardware and which parts are to be handled
- by userspace and which parts are handled by kernelspace. The
- capabilities are returned by CEC_ADAP_G_CAPS.
-
-available_las: the number of simultaneous logical addresses that this
- adapter can handle. Must be 1 <= available_las <= CEC_MAX_LOG_ADDRS.
-
-parent: the parent device.
-
-
-To register the /dev/cecX device node and the remote control device (if
-CEC_CAP_RC is set) you call:
-
-int cec_register_adapter(struct cec_adapter *adap);
-
-To unregister the devices call:
-
-void cec_unregister_adapter(struct cec_adapter *adap);
-
-Note: if cec_register_adapter() fails, then call cec_delete_adapter() to
-clean up. But if cec_register_adapter() succeeded, then only call
-cec_unregister_adapter() to clean up, never cec_delete_adapter(). The
-unregister function will delete the adapter automatically once the last user
-of that /dev/cecX device has closed its file handle.
-
-
-Implementing the Low-Level CEC Adapter
---
-
-The following low-level adapter operations have to be implemented in
-your driver:
-
-struct cec_adap_ops {
- /* Low-level callbacks */
- int (*adap_enable)(struct cec_adapter *adap, bool enable);
- int (*adap_monitor_all_enable)(struct cec_adapter *adap, bool enable);
- int (*adap_log_addr)(struct cec_adapter *adap, u8 logical_addr);
- int (*adap_transmit)(struct cec_adapter *adap, u8 attempts,
-u32 signal_free_time, struct cec_msg *msg);
- void (*adap_log_status)(struct cec_adapter *adap);
-
- /* High-level callbacks */
- ...
-};
-
-The three low-level ops deal with various aspects of controlling the CEC
adapter
-hardware:
-
-
-To enable/disable the hardware:
-
- int (*adap_enable)(struct cec_adapter *adap, bool enable);
-
-This callback enables or disables the CEC hardware. Enabling the CEC hardware
-means powering it up in a state where no logical addresses are claimed. This
-op assumes that the physical address (adap->p
[git:media_tree/master] [media] docs-rst: better use the .. note:: tag
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] docs-rst: better use the .. note:: tag Author: Mauro Carvalho Chehab Date:Mon Aug 15 17:49:50 2016 -0300 Change multi-line note tags to be more symetric, e. g. not starting the text together witht the tag. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/cec/cec-func-close.rst | 4 +++- Documentation/media/uapi/cec/cec-func-ioctl.rst | 4 +++- Documentation/media/uapi/cec/cec-func-open.rst | 4 +++- Documentation/media/uapi/cec/cec-func-poll.rst | 4 +++- Documentation/media/uapi/cec/cec-intro.rst | 4 +++- Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst | 4 +++- .../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 4 +++- .../media/uapi/cec/cec-ioc-adap-g-phys-addr.rst | 4 +++- Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 4 +++- Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 4 +++- Documentation/media/uapi/cec/cec-ioc-receive.rst | 4 +++- Documentation/media/uapi/dvb/dvb-fe-read-status.rst | 4 +++- Documentation/media/uapi/dvb/dvbapi.rst | 4 +++- Documentation/media/uapi/dvb/dvbproperty.rst | 4 +++- Documentation/media/uapi/dvb/examples.rst| 4 +++- Documentation/media/uapi/dvb/fe-get-info.rst | 4 +++- Documentation/media/uapi/dvb/fe-read-status.rst | 4 +++- Documentation/media/uapi/dvb/frontend.rst| 4 +++- .../media/uapi/rc/lirc-set-wideband-receiver.rst | 4 +++- Documentation/media/uapi/v4l/audio.rst | 4 +++- Documentation/media/uapi/v4l/buffer.rst | 13 ++--- Documentation/media/uapi/v4l/crop.rst| 12 +--- Documentation/media/uapi/v4l/dev-codec.rst | 4 +++- Documentation/media/uapi/v4l/dev-osd.rst | 4 +++- Documentation/media/uapi/v4l/dev-overlay.rst | 8 ++-- Documentation/media/uapi/v4l/dev-rds.rst | 4 +++- Documentation/media/uapi/v4l/extended-controls.rst | 4 +++- Documentation/media/uapi/v4l/func-mmap.rst | 4 +++- Documentation/media/uapi/v4l/pixfmt-006.rst | 4 +++- Documentation/media/uapi/v4l/pixfmt-007.rst | 12 +--- Documentation/media/uapi/v4l/pixfmt-sbggr16.rst | 4 +++- Documentation/media/uapi/v4l/pixfmt-y16-be.rst | 4 +++- Documentation/media/uapi/v4l/pixfmt-y16.rst | 4 +++- Documentation/media/uapi/v4l/standard.rst| 4 +++- Documentation/media/uapi/v4l/tuner.rst | 4 +++- Documentation/media/uapi/v4l/userp.rst | 4 +++- Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst | 4 +++- Documentation/media/uapi/v4l/vidioc-enum-dv-timings.rst | 4 +++- Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 9 ++--- .../media/uapi/v4l/vidioc-enum-frameintervals.rst| 4 +++- Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst | 4 +++- Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst | 4 +++- Documentation/media/uapi/v4l/vidioc-enumaudioout.rst | 4 +++- Documentation/media/uapi/v4l/vidioc-g-audioout.rst | 4 +++- Documentation/media/uapi/v4l/vidioc-g-edid.rst | 4 +++- Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst | 8 ++-- Documentation/media/uapi/v4l/vidioc-g-modulator.rst | 4 +++- Documentation/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst | 4 +++- Documentation/media/uapi/v4l/vidioc-g-tuner.rst | 8 ++-- Documentation/media/uapi/v4l/vidioc-qbuf.rst | 4 +++- Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst | 4 +++- Documentation/media/uapi/v4l/vidioc-queryctrl.rst| 16 Documentation/media/uapi/v4l/vidioc-querystd.rst | 4 +++- Documentation/media/uapi/v4l/vidioc-streamon.rst | 4 +++- Documentation/media/uapi/v4l/vidioc-subscribe-event.rst | 4 +++- Documentation/media/v4l-drivers/bttv.rst | 1 + 56 files changed, 206 insertions(+), 69 deletions(-) --- diff --git a/Documentation/media/uapi/cec/cec-func-close.rst b/Documentation/media/uapi/cec/cec-func-close.rst index bb94e4358910..bdbb9e545ae4 100644 --- a/Documentation/media/uapi/cec/cec-func-close.rst +++ b/Documentation/media/uapi/cec/cec-func-close.rst @@ -32,7 +32,9 @@ Arguments Description === -.. note:: This documents the proposed CEC API. This API is not yet finalized +.. note:: + + This documents the proposed CEC API. This API is not yet finalized and is currently only available as a staging kernel module. Closes the cec device. Resources associated with the file descriptor are diff --git a/Documentation/media/uapi/cec/cec-func-ioctl.rst b/Documentation/media/uapi/cec/cec-fu
[git:media_tree/master] [media] dev-overlay.rst: don't ident a note
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] dev-overlay.rst: don't ident a note Author: Mauro Carvalho Chehab Date:Wed Aug 17 20:38:52 2016 -0300 There's one note there that it is indented for no good reason. Fix it. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/v4l/dev-overlay.rst | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) --- diff --git a/Documentation/media/uapi/v4l/dev-overlay.rst b/Documentation/media/uapi/v4l/dev-overlay.rst index d47a6bbc2e98..50e2d52fcae6 100644 --- a/Documentation/media/uapi/v4l/dev-overlay.rst +++ b/Documentation/media/uapi/v4l/dev-overlay.rst @@ -238,12 +238,12 @@ exceeded are undefined. [#f3]_ :ref:`VIDIOC_S_FBUF `, :ref:`framebuffer-flags`). -.. note:: +.. note:: - This field was added in Linux 2.6.23, extending the - structure. However the :ref:`VIDIOC_[G|S|TRY]_FMT ` - ioctls, which take a pointer to a :ref:`v4l2_format ` - parent structure with padding bytes at the end, are not affected. + This field was added in Linux 2.6.23, extending the + structure. However the :ref:`VIDIOC_[G|S|TRY]_FMT ` + ioctls, which take a pointer to a :ref:`v4l2_format ` + parent structure with padding bytes at the end, are not affected. .. _v4l2-clip: ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] vidioc-dqevent.rst: adjust two table columns for LaTeX output
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] vidioc-dqevent.rst: adjust two table columns for LaTeX output
Author: Mauro Carvalho Chehab
Date:Thu Aug 18 13:46:03 2016 -0300
There are two tables with mangled columns. Fix it.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/vidioc-dqevent.rst | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/vidioc-dqevent.rst
b/Documentation/media/uapi/v4l/vidioc-dqevent.rst
index 0a84f3a6ed92..6cd5d7068065 100644
--- a/Documentation/media/uapi/v4l/vidioc-dqevent.rst
+++ b/Documentation/media/uapi/v4l/vidioc-dqevent.rst
@@ -42,7 +42,9 @@ call.
.. _v4l2-event:
-.. tabularcolumns:: |p{3.5cm}|p{3.5cm}|p{7.0cm}|p{3.5cm}|
+.. tabularcolumns:: |p{3.0cm}|p{4.3cm}|p{2.5cm}|p{7.7cm}|
+
+.. cssclass: longtable
.. flat-table:: struct v4l2_event
:header-rows: 0
@@ -328,7 +330,7 @@ call.
.. _v4l2-event-ctrl:
-.. tabularcolumns:: |p{3.5cm}|p{3.5cm}|p{7.0cm}|p{3.5cm}|
+.. tabularcolumns:: |p{3.5cm}|p{3.0cm}|p{1.8cm}|p{8.5cm}|
.. flat-table:: struct v4l2_event_ctrl
:header-rows: 0
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] dev-subdev.rst: make table fully visible on LaTeX
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] dev-subdev.rst: make table fully visible on LaTeX
Author: Mauro Carvalho Chehab
Date:Thu Aug 18 09:04:57 2016 -0300
The table there is too big and doesn't have format hints for
LaTeX output.
Fix it.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/dev-subdev.rst | 9 +
1 file changed, 9 insertions(+)
---
diff --git a/Documentation/media/uapi/v4l/dev-subdev.rst
b/Documentation/media/uapi/v4l/dev-subdev.rst
index 5a112eb7a245..b1aed4541bca 100644
--- a/Documentation/media/uapi/v4l/dev-subdev.rst
+++ b/Documentation/media/uapi/v4l/dev-subdev.rst
@@ -204,9 +204,16 @@ list entity names and pad numbers).
.. _sample-pipeline-config:
+.. raw:: latex
+
+\newline\newline\begin{adjustbox}{width=\columnwidth}
+
+.. tabularcolumns::
|p{4.5cm}|p{4.5cm}|p{4.5cm}|p{4.5cm}|p{4.5cm}|p{4.5cm}|p{4.5cm}|
+
.. flat-table:: Sample Pipeline Configuration
:header-rows: 1
:stub-columns: 0
+:widths: 5 5 5 5 5 5 5
- .. row 1
@@ -288,7 +295,9 @@ list entity names and pad numbers).
- *1280x960/SGRBG8_1X8*
+.. raw:: latex
+\end{adjustbox}\newline\newline
1. Initial state. The sensor source pad format is set to its native 3MP
size and V4L2_MBUS_FMT_SGRBG8_1X8 media bus code. Formats on the
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] dev-sliced-vbi.rst: use a footnote for VBI images
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] dev-sliced-vbi.rst: use a footnote for VBI images Author: Mauro Carvalho Chehab Date:Thu Aug 18 07:37:49 2016 -0300 Just like on dvb-raw-vbi.rst, the LaTeX output doesn't work well with cell spans. Also, this is actually a note, so, move it to a footnote. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/v4l/dev-sliced-vbi.rst | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) --- diff --git a/Documentation/media/uapi/v4l/dev-sliced-vbi.rst b/Documentation/media/uapi/v4l/dev-sliced-vbi.rst index 9f59ba6847ec..9f348e164782 100644 --- a/Documentation/media/uapi/v4l/dev-sliced-vbi.rst +++ b/Documentation/media/uapi/v4l/dev-sliced-vbi.rst @@ -155,8 +155,7 @@ struct v4l2_sliced_vbi_format service the driver chooses. Data services are defined in :ref:`vbi-services2`. Array indices - map to ITU-R line numbers (see also :ref:`vbi-525` and - :ref:`vbi-625`) as follows: + map to ITU-R line numbers\ [#f2]_ as follows: - .. row 3 @@ -838,3 +837,6 @@ Line Identifiers for struct v4l2_mpeg_vbi_itv0_line id field .. [#f1] According to :ref:`ETS 300 706 ` lines 6-22 of the first field and lines 5-22 of the second field may carry Teletext data. + +.. [#f2] + See also :ref:`vbi-525` and :ref:`vbi-625`. ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] docs-rst: add tabularcolumns to all tables
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] docs-rst: add tabularcolumns to all tables
Author: Mauro Carvalho Chehab
Date:Wed Aug 17 08:14:19 2016 -0300
LaTeX doesn't handle too well auto-width on tables, and ReST
markup requires an special tag to give it the needed hints.
As we're using A4 paper, we have 17cm of useful spaces. As
most media tables have widths, let's use it to generate the
needed via the following perl script:
my ($line_size, $table_header, $has_cols) = (17.5, 0, 0);
my $out;
my $header = "";
my @widths = ();
sub round { $_[0] > 0 ? int($_[0] + .5) : -int(-$_[0] + .5) }
while (<>) {
if (!$table_header) {
$has_cols = 1 if (m/..\s+tabularcolumns::/);
if (m/..\s+flat-table::/) {
$table_header = 1;
$header = $_;
next;
}
$out .= $_;
next;
}
$header .= $_;
@widths = split(/ /, $1) if (m/:widths:\s+(.*)/);
if (m/^\n$/) {
if (!$has_cols && @widths) {
my ($tot, $t, $i) = (0, 0, 0);
foreach my $v(@widths) { $tot += $v; };
$out .= ".. tabularcolumns:: |";
for ($i = 0; $i < scalar @widths - 1; $i++) {
my $v = $widths[$i];
my $w = round(10 * ($v * $line_size) / $tot) /
10;
$out .= sprintf "p{%.1fcm}|", $w;
$t += $w;
}
my $w = $line_size - $t;
$out .= sprintf "p{%.1fcm}|\n\n", $w;
}
$out .= $header;
$table_header = 0;
$has_cols = 0;
$header = "";
@widths = ();
}
}
print $out;
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst | 4
.../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst| 10 ++
Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 10 ++
Documentation/media/uapi/cec/cec-ioc-g-mode.rst| 6 ++
Documentation/media/uapi/cec/cec-ioc-receive.rst | 6 ++
.../media/uapi/dvb/fe-diseqc-recv-slave-reply.rst | 2 ++
.../media/uapi/dvb/fe-diseqc-send-master-cmd.rst | 2 ++
Documentation/media/uapi/dvb/fe-get-info.rst | 2 ++
Documentation/media/uapi/dvb/fe-type-t.rst | 2 ++
Documentation/media/uapi/gen-errors.rst| 2 ++
.../media/uapi/mediactl/media-ioc-device-info.rst | 2 ++
.../media/uapi/mediactl/media-ioc-enum-entities.rst| 2 ++
.../media/uapi/mediactl/media-ioc-enum-links.rst | 6 ++
.../media/uapi/mediactl/media-ioc-g-topology.rst | 12
Documentation/media/uapi/rc/rc-tables.rst | 2 ++
Documentation/media/uapi/v4l/buffer.rst| 16
Documentation/media/uapi/v4l/dev-raw-vbi.rst | 4
Documentation/media/uapi/v4l/dev-rds.rst | 6 ++
Documentation/media/uapi/v4l/dev-sdr.rst | 2 ++
Documentation/media/uapi/v4l/dev-sliced-vbi.rst| 18 ++
Documentation/media/uapi/v4l/field-order.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-002.rst| 2 ++
Documentation/media/uapi/v4l/pixfmt-003.rst| 4
Documentation/media/uapi/v4l/pixfmt-007.rst| 18 ++
Documentation/media/uapi/v4l/pixfmt-013.rst| 2 ++
Documentation/media/uapi/v4l/pixfmt-grey.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-m420.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-nv12.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-nv12m.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-nv16.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-nv16m.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-nv24.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-reserved.rst | 4
Documentation/media/uapi/v4l/pixfmt-sbggr16.rst| 2 ++
Documentation/media/uapi/v4l/pixfmt-sbggr8.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-sdr-cs08.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-sdr-cs14le.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-sdr-cu08.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-sdr-cu16le.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-sdr-ru12le.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-sgbrg8.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-sgrbg8.rst | 2 ++
Documentation/media/uapi/v4l/pixfmt-srggb10.rst| 2 ++
Documentation/media/uapi/v4l/pixfmt-srggb10p.rst | 2 ++
[git:media_tree/master] [media] docs-rst: add column hints for pixfmt-002 and pixfmt-006
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] docs-rst: add column hints for pixfmt-002 and pixfmt-006
Author: Mauro Carvalho Chehab
Date:Wed Aug 17 11:47:21 2016 -0300
Add column hints for LaTeX to format columns on the tables inside
pixfmt-002.rst and pixfmt-006.rst.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/pixfmt-002.rst | 4 +++-
Documentation/media/uapi/v4l/pixfmt-006.rst | 5 +
2 files changed, 8 insertions(+), 1 deletion(-)
---
diff --git a/Documentation/media/uapi/v4l/pixfmt-002.rst
b/Documentation/media/uapi/v4l/pixfmt-002.rst
index 27d4e78760ba..368da55e5f07 100644
--- a/Documentation/media/uapi/v4l/pixfmt-002.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-002.rst
@@ -7,7 +7,9 @@ Single-planar format structure
.. _v4l2-pix-format:
-.. tabularcolumns:: |p{4.4cm}|p{4.4cm}|p{8.7cm}|
+.. tabularcolumns:: |p{4.0cm}|p{2.5cm}|p{11.0cm}|
+
+.. cssclass:: longtable
.. flat-table:: struct v4l2_pix_format
:header-rows: 0
diff --git a/Documentation/media/uapi/v4l/pixfmt-006.rst
b/Documentation/media/uapi/v4l/pixfmt-006.rst
index 1c8321f9b1fb..56b691300158 100644
--- a/Documentation/media/uapi/v4l/pixfmt-006.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-006.rst
@@ -25,6 +25,7 @@ needs to be filled in.
colorspaces except for BT.2020 which uses limited range R'G'B'
quantization.
+.. tabularcolumns:: |p{6.0cm}|p{11.5cm}|
.. _v4l2-colorspace:
@@ -183,6 +184,8 @@ needs to be filled in.
.. _v4l2-ycbcr-encoding:
+.. tabularcolumns:: |p{6.5cm}|p{11.0cm}|
+
.. flat-table:: V4L2 Y'CbCr Encodings
:header-rows: 1
:stub-columns: 0
@@ -252,6 +255,8 @@ needs to be filled in.
.. _v4l2-quantization:
+.. tabularcolumns:: |p{6.5cm}|p{11.0cm}|
+
.. flat-table:: V4L2 Quantization Methods
:header-rows: 1
:stub-columns: 0
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] atmel-isc: DT binding for Image Sensor Controller driver
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] atmel-isc: DT binding for Image Sensor Controller driver
Author: Songjun Wu
Date:Wed Aug 17 03:05:28 2016 -0300
DT binding documentation for ISC driver.
Acked-by: Rob Herring
Signed-off-by: Songjun Wu
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
.../devicetree/bindings/media/atmel-isc.txt| 65 ++
1 file changed, 65 insertions(+)
---
diff --git a/Documentation/devicetree/bindings/media/atmel-isc.txt
b/Documentation/devicetree/bindings/media/atmel-isc.txt
new file mode 100644
index ..bbe0e87c6188
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/atmel-isc.txt
@@ -0,0 +1,65 @@
+Atmel Image Sensor Controller (ISC)
+--
+
+Required properties for ISC:
+- compatible
+ Must be "atmel,sama5d2-isc".
+- reg
+ Physical base address and length of the registers set for the device.
+- interrupts
+ Should contain IRQ line for the ISC.
+- clocks
+ List of clock specifiers, corresponding to entries in
+ the clock-names property;
+ Please refer to clock-bindings.txt.
+- clock-names
+ Required elements: "hclock", "iscck", "gck".
+- #clock-cells
+ Should be 0.
+- clock-output-names
+ Should be "isc-mck".
+- pinctrl-names, pinctrl-0
+ Please refer to pinctrl-bindings.txt.
+
+ISC supports a single port node with parallel bus. It should contain one
+'port' child node with child 'endpoint' node. Please refer to the bindings
+defined in Documentation/devicetree/bindings/media/video-interfaces.txt.
+
+Example:
+isc: isc@f0008000 {
+ compatible = "atmel,sama5d2-isc";
+ reg = <0xf0008000 0x4000>;
+ interrupts = <46 IRQ_TYPE_LEVEL_HIGH 5>;
+ clocks = <&isc_clk>, <&iscck>, <&isc_gclk>;
+ clock-names = "hclock", "iscck", "gck";
+ #clock-cells = <0>;
+ clock-output-names = "isc-mck";
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_isc_base &pinctrl_isc_data_8bit
&pinctrl_isc_data_9_10 &pinctrl_isc_data_11_12>;
+
+ port {
+ isc_0: endpoint {
+ remote-endpoint = <&ov7740_0>;
+ hsync-active = <1>;
+ vsync-active = <0>;
+ pclk-sample = <1>;
+ };
+ };
+};
+
+i2c1: i2c@fc028000 {
+ ov7740: camera@21 {
+ compatible = "ovti,ov7740";
+ reg = <0x21>;
+ clocks = <&isc>;
+ clock-names = "xvclk";
+ assigned-clocks = <&isc>;
+ assigned-clock-rates = <2400>;
+
+ port {
+ ov7740_0: endpoint {
+ remote-endpoint = <&isc_0>;
+ };
+ };
+ };
+};
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] MAINTAINERS: atmel-isc: add entry for Atmel ISC
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] MAINTAINERS: atmel-isc: add entry for Atmel ISC Author: Songjun Wu Date:Wed Aug 17 03:05:29 2016 -0300 Add the MAINTAINERS' entry for Microchip / Atmel Image Sensor Controller. Signed-off-by: Songjun Wu Acked-by: Nicolas Ferre Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab MAINTAINERS | 8 1 file changed, 8 insertions(+) --- diff --git a/MAINTAINERS b/MAINTAINERS index 20bb1d00098c..21a6f6f4c2d6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7733,6 +7733,14 @@ T: git git://git.monstr.eu/linux-2.6-microblaze.git S: Supported F: arch/microblaze/ +MICROCHIP / ATMEL ISC DRIVER +M: Songjun Wu +L: linux-me...@vger.kernel.org +S: Supported +F: drivers/media/platform/atmel/atmel-isc.c +F: drivers/media/platform/atmel/atmel-isc-regs.h +F: devicetree/bindings/media/atmel-isc.txt + MICROSOFT SURFACE PRO 3 BUTTON DRIVER M: Chen Yu L: platform-driver-...@vger.kernel.org ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] atmel-isc: add the Image Sensor Controller code
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] atmel-isc: add the Image Sensor Controller code Author: Songjun Wu Date:Wed Aug 17 03:05:27 2016 -0300 Add driver for the Image Sensor Controller. It manages incoming data from a parallel based CMOS/CCD sensor. It has an internal image processor, also integrates a triple channel direct memory access controller master interface. Signed-off-by: Songjun Wu Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab drivers/media/platform/Kconfig|1 + drivers/media/platform/Makefile |2 + drivers/media/platform/atmel/Kconfig |9 + drivers/media/platform/atmel/Makefile |1 + drivers/media/platform/atmel/atmel-isc-regs.h | 165 +++ drivers/media/platform/atmel/atmel-isc.c | 1514 + 6 files changed, 1692 insertions(+) --- diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index f25344bc7912..b23db1779808 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -111,6 +111,7 @@ source "drivers/media/platform/s5p-tv/Kconfig" source "drivers/media/platform/am437x/Kconfig" source "drivers/media/platform/xilinx/Kconfig" source "drivers/media/platform/rcar-vin/Kconfig" +source "drivers/media/platform/atmel/Kconfig" config VIDEO_TI_CAL tristate "TI CAL (Camera Adaptation Layer) driver" diff --git a/drivers/media/platform/Makefile b/drivers/media/platform/Makefile index 21771c1a13fb..37b6c75f0b15 100644 --- a/drivers/media/platform/Makefile +++ b/drivers/media/platform/Makefile @@ -58,6 +58,8 @@ obj-$(CONFIG_VIDEO_XILINX)+= xilinx/ obj-$(CONFIG_VIDEO_RCAR_VIN) += rcar-vin/ +obj-$(CONFIG_VIDEO_ATMEL_ISC) += atmel/ + ccflags-y += -I$(srctree)/drivers/media/i2c obj-$(CONFIG_VIDEO_MEDIATEK_VPU) += mtk-vpu/ diff --git a/drivers/media/platform/atmel/Kconfig b/drivers/media/platform/atmel/Kconfig new file mode 100644 index ..867dca22a473 --- /dev/null +++ b/drivers/media/platform/atmel/Kconfig @@ -0,0 +1,9 @@ +config VIDEO_ATMEL_ISC + tristate "ATMEL Image Sensor Controller (ISC) support" + depends on VIDEO_V4L2 && COMMON_CLK && VIDEO_V4L2_SUBDEV_API && HAS_DMA + depends on ARCH_AT91 || COMPILE_TEST + select VIDEOBUF2_DMA_CONTIG + select REGMAP_MMIO + help + This module makes the ATMEL Image Sensor Controller available + as a v4l2 device. \ No newline at end of file diff --git a/drivers/media/platform/atmel/Makefile b/drivers/media/platform/atmel/Makefile new file mode 100644 index ..9d7c999d434d --- /dev/null +++ b/drivers/media/platform/atmel/Makefile @@ -0,0 +1 @@ +obj-$(CONFIG_VIDEO_ATMEL_ISC) += atmel-isc.o diff --git a/drivers/media/platform/atmel/atmel-isc-regs.h b/drivers/media/platform/atmel/atmel-isc-regs.h new file mode 100644 index ..00c449717cde --- /dev/null +++ b/drivers/media/platform/atmel/atmel-isc-regs.h @@ -0,0 +1,165 @@ +#ifndef __ATMEL_ISC_REGS_H +#define __ATMEL_ISC_REGS_H + +#include + +/* ISC Control Enable Register 0 */ +#define ISC_CTRLEN 0x + +/* ISC Control Disable Register 0 */ +#define ISC_CTRLDIS 0x0004 + +/* ISC Control Status Register 0 */ +#define ISC_CTRLSR 0x0008 + +#define ISC_CTRL_CAPTURE BIT(0) +#define ISC_CTRL_UPPRO BIT(1) +#define ISC_CTRL_HISREQBIT(2) +#define ISC_CTRL_HISCLRBIT(3) + +/* ISC Parallel Front End Configuration 0 Register */ +#define ISC_PFE_CFG00x000c + +#define ISC_PFE_CFG0_HPOL_LOW BIT(0) +#define ISC_PFE_CFG0_VPOL_LOW BIT(1) +#define ISC_PFE_CFG0_PPOL_LOW BIT(2) + +#define ISC_PFE_CFG0_MODE_PROGRESSIVE (0x0 << 4) +#define ISC_PFE_CFG0_MODE_MASK GENMASK(6, 4) + +#define ISC_PFE_CFG0_BPS_EIGHT (0x4 << 28) +#define ISC_PFG_CFG0_BPS_NINE (0x3 << 28) +#define ISC_PFG_CFG0_BPS_TEN(0x2 << 28) +#define ISC_PFG_CFG0_BPS_ELEVEN (0x1 << 28) +#define ISC_PFG_CFG0_BPS_TWELVE (0x0 << 28) +#define ISC_PFE_CFG0_BPS_MASK GENMASK(30, 28) + +/* ISC Clock Enable Register */ +#define ISC_CLKEN 0x0018 + +/* ISC Clock Disable Register */ +#define ISC_CLKDIS 0x001c + +/* ISC Clock Status Register */ +#define ISC_CLKSR 0x0020 + +#define ISC_CLK(n) BIT(n) + +/* ISC Clock Configuration Register */ +#define ISC_CLKCFG 0x0024 +#define ISC_CLKCFG_DIV_SHIFT(n) ((n)*16) +#define ISC_CLKCFG_DIV_MASK(n) GENMASK(((n)*16 + 7), (n)*16) +#define ISC_CLKCFG_SEL_SHIFT(n) ((n)*16 + 8) +#define ISC_CLKCFG_SEL_MASK(n) GENMASK(((n)*17 + 8), ((n)*16 + 8)) + +/* ISC Interrupt Enable Register */ +#define ISC_INTEN 0x0028 + +/* ISC Interrupt Disable Register */ +#define ISC_INTDIS 0x002c + +/* ISC Interrupt Mask Register */ +#define ISC_INTMASK 0x0030 + +/* ISC Interrupt Statu
[git:v4l-utils/master] cec-follower: check for Routing Information from TV
This is an automatic generated email to let you know that the following patch
were queued at the
http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: cec-follower: check for Routing Information from TV
Author: Johan Fjeldtvedt
Date:Mon Aug 22 11:06:33 2016 +0200
A TV shall not send a Routing Information message as initiator.
Signed-off-by: Johan Fjeldtvedt
Signed-off-by: Hans Verkuil
utils/cec-follower/cec-processing.cpp | 6 ++
1 file changed, 6 insertions(+)
---
http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=d88ae151130e028c448ea163964eb720f88a0d70
diff --git a/utils/cec-follower/cec-processing.cpp
b/utils/cec-follower/cec-processing.cpp
index 771eb2dc77f8..34d65e4f8f87 100644
--- a/utils/cec-follower/cec-processing.cpp
+++ b/utils/cec-follower/cec-processing.cpp
@@ -408,6 +408,12 @@ static void processMsg(struct node *node, struct cec_msg
&msg, unsigned me)
dev_info("Stream Path is directed to this device\n");
return;
}
+ case CEC_MSG_ROUTING_INFORMATION: {
+ __u8 la = cec_msg_initiator(&msg);
+
+ if (cec_has_tv(1 << la) && la_info[la].phys_addr == 0)
+ warn("TV (0) at 0.0.0.0 sent Routing Information.");
+ }
/* System Information */
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
linuxtv-commits@linuxtv.org
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] cec-funcs.h: fix typo: && should be &
Author: Hans Verkuil
Date:Mon Aug 1 07:29:34 2016 -0300
Fix typo where logical AND was used instead of bitwise AND.
Reported-by: David Binderman
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
include/linux/cec-funcs.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/include/linux/cec-funcs.h b/include/linux/cec-funcs.h
index 82c3d3b7269d..9e054aa168f3 100644
--- a/include/linux/cec-funcs.h
+++ b/include/linux/cec-funcs.h
@@ -227,7 +227,7 @@ static inline void cec_set_digital_service_id(__u8 *msg,
if (digital->service_id_method == CEC_OP_SERVICE_ID_METHOD_BY_CHANNEL) {
*msg++ = (digital->channel.channel_number_fmt << 2) |
(digital->channel.major >> 8);
- *msg++ = digital->channel.major && 0xff;
+ *msg++ = digital->channel.major & 0xff;
*msg++ = digital->channel.minor >> 8;
*msg++ = digital->channel.minor & 0xff;
*msg++ = 0;
@@ -1277,7 +1277,7 @@ static inline void cec_msg_user_control_pressed(struct
cec_msg *msg,
msg->len += 4;
msg->msg[3] = (ui_cmd->channel_identifier.channel_number_fmt <<
2) |
(ui_cmd->channel_identifier.major >> 8);
- msg->msg[4] = ui_cmd->channel_identifier.major && 0xff;
+ msg->msg[4] = ui_cmd->channel_identifier.major & 0xff;
msg->msg[5] = ui_cmd->channel_identifier.minor >> 8;
msg->msg[6] = ui_cmd->channel_identifier.minor & 0xff;
break;
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] [media] cec: add CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK flag
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] cec: add CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK flag
Author: Hans Verkuil
Date:Wed Aug 10 09:24:45 2016 -0300
Currently if none of the requested logical addresses can be claimed, the
framework will fall back to the Unregistered logical address.
Add a flag to enable this explicitly. By default it will just go back to
the unconfigured state.
Usually Unregistered is not something you want since the functionality is
very limited. Unless the application has support for this, it will fail
to work correctly. So require that the application explicitly requests
this.
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
.../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 21 -
drivers/staging/media/cec/cec-adap.c| 4
drivers/staging/media/cec/cec-api.c | 2 +-
include/linux/cec.h | 5 -
4 files changed, 29 insertions(+), 3 deletions(-)
---
diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
b/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
index 04ee90099676..201d4839931c 100644
--- a/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst
@@ -144,7 +144,7 @@ logical address types are already defined will return with
error ``EBUSY``.
- ``flags``
- - Flags. No flags are defined yet, so set this to 0.
+ - Flags. See :ref:`cec-log-addrs-flags` for a list of available flags.
- .. row 7
@@ -201,6 +201,25 @@ logical address types are already defined will return with
error ``EBUSY``.
give the CEC framework more information about the device type, even
though the framework won't use it directly in the CEC message.
+.. _cec-log-addrs-flags:
+
+.. flat-table:: Flags for struct cec_log_addrs
+:header-rows: 0
+:stub-columns: 0
+:widths: 3 1 4
+
+
+- .. _`CEC-LOG-ADDRS-FL-ALLOW-UNREG-FALLBACK`:
+
+ - ``CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK``
+
+ - 1
+
+ - By default if no logical address of the requested type can be
claimed, then
+ it will go back to the unconfigured state. If this flag is set, then
it will
+ fallback to the Unregistered logical address. Note that if the
Unregistered
+ logical address was explicitly requested, then this flag has no
effect.
+
.. _cec-versions:
.. flat-table:: CEC Versions
diff --git a/drivers/staging/media/cec/cec-adap.c
b/drivers/staging/media/cec/cec-adap.c
index 9dcb784b8d6a..2458a6c87642 100644
--- a/drivers/staging/media/cec/cec-adap.c
+++ b/drivers/staging/media/cec/cec-adap.c
@@ -1047,6 +1047,10 @@ static int cec_config_thread_func(void *arg)
dprintk(1, "could not claim LA %d\n", i);
}
+ if (adap->log_addrs.log_addr_mask == 0 &&
+ !(las->flags & CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK))
+ goto unconfigure;
+
configured:
if (adap->log_addrs.log_addr_mask == 0) {
/* Fall back to unregistered */
diff --git a/drivers/staging/media/cec/cec-api.c
b/drivers/staging/media/cec/cec-api.c
index 4e2696a34ddb..6f58ee85eea4 100644
--- a/drivers/staging/media/cec/cec-api.c
+++ b/drivers/staging/media/cec/cec-api.c
@@ -162,7 +162,7 @@ static long cec_adap_s_log_addrs(struct cec_adapter *adap,
struct cec_fh *fh,
return -ENOTTY;
if (copy_from_user(&log_addrs, parg, sizeof(log_addrs)))
return -EFAULT;
- log_addrs.flags = 0;
+ log_addrs.flags &= CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK;
mutex_lock(&adap->lock);
if (!adap->is_configuring &&
(!log_addrs.num_log_addrs || !adap->is_configured) &&
diff --git a/include/linux/cec.h b/include/linux/cec.h
index b3e22893a002..851968e803fa 100644
--- a/include/linux/cec.h
+++ b/include/linux/cec.h
@@ -364,7 +364,7 @@ struct cec_caps {
* @num_log_addrs: how many logical addresses should be claimed. Set by the
* caller.
* @vendor_id: the vendor ID of the device. Set by the caller.
- * @flags: set to 0.
+ * @flags: flags.
* @osd_name: the OSD name of the device. Set by the caller.
* @primary_device_type: the primary device type for each logical address.
* Set by the caller.
@@ -389,6 +389,9 @@ struct cec_log_addrs {
__u8 features[CEC_MAX_LOG_ADDRS][12];
};
+/* Allow a fallback to unregistered */
+#define CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK (1 << 0)
+
/* Events */
/* Event that occurs when the adapter state changes */
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] [media] cec: ignore messages when log_addr_mask == 0
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] cec: ignore messages when log_addr_mask == 0 Author: Hans Verkuil Date:Fri Aug 12 13:32:07 2016 -0300 Most CEC adapters will still receive broadcast messages, even if no logical addresses are claimed. But those messages should only be passed on for monitoring purposes, but not for processing by either kernel or userspace if userspace didn't call CEC_ADAP_S_LOG_ADDRS first. So if adap->log_addrs.log_addr_mask is 0, then just return before passing the received message on to the processing code. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab drivers/staging/media/cec/cec-adap.c | 3 +++ 1 file changed, 3 insertions(+) --- diff --git a/drivers/staging/media/cec/cec-adap.c b/drivers/staging/media/cec/cec-adap.c index 6cc7d7904446..e980ac9c9279 100644 --- a/drivers/staging/media/cec/cec-adap.c +++ b/drivers/staging/media/cec/cec-adap.c @@ -851,6 +851,9 @@ void cec_received_msg(struct cec_adapter *adap, struct cec_msg *msg) if (!valid_la || msg->len <= 1) return; + if (adap->log_addrs.log_addr_mask == 0) + return; + /* * Process the message on the protocol level. If is_reply is true, * then cec_receive_notify() won't pass on the reply to the listener(s) ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] [media] cec: add item to TODO
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] cec: add item to TODO Author: Hans Verkuil Date:Tue Jul 19 08:44:32 2016 -0300 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab drivers/staging/media/cec/TODO | 1 + 1 file changed, 1 insertion(+) --- diff --git a/drivers/staging/media/cec/TODO b/drivers/staging/media/cec/TODO index a10d4f82b954..13224694a8ae 100644 --- a/drivers/staging/media/cec/TODO +++ b/drivers/staging/media/cec/TODO @@ -12,6 +12,7 @@ Hopefully this will happen later in 2016. Other TODOs: +- There are two possible replies to CEC_MSG_INITIATE_ARC. How to handle that? - Add a flag to inhibit passing CEC RC messages to the rc subsystem. Applications should be able to choose this when calling S_LOG_ADDRS. - If the reply field of cec_msg is set then when the reply arrives it ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] [media] cec: improve dqevent documentation
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] cec: improve dqevent documentation Author: Hans Verkuil Date:Wed Aug 10 06:00:53 2016 -0300 The documentation for the cec_event_state_change struct was incomplete. This patch documents what happens in the corner cases. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- diff --git a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst b/Documentation/media/uapi/cec/cec-ioc-dqevent.rst index 7a6d6d00ce19..2e1e73928396 100644 --- a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst +++ b/Documentation/media/uapi/cec/cec-ioc-dqevent.rst @@ -64,7 +64,8 @@ it is guaranteed that the state did change in between the two events. - ``phys_addr`` - - The current physical address. + - The current physical address. This is ``CEC_PHYS_ADDR_INVALID`` if no + valid physical address is set. - .. row 2 @@ -72,7 +73,10 @@ it is guaranteed that the state did change in between the two events. - ``log_addr_mask`` - - The current set of claimed logical addresses. + - The current set of claimed logical addresses. This is 0 if no logical + addresses are claimed or if ``phys_addr`` is ``CEC_PHYS_ADDR_INVALID``. + If bit 15 is set (``1 << CEC_LOG_ADDR_UNREGISTERED``) then this device + has the unregistered logical address. In that case all other bits are 0. ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] [media] cec-edid: check for IEEE identifier
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] cec-edid: check for IEEE identifier Author: Hans Verkuil Date:Thu Aug 18 04:13:42 2016 -0300 The cec_get_edid_spa_location() function did not verify that the IEEE identifier in the Vendor Specific Data Block matched the HDMI-LLC identifier. This could result in the wrong VSDB block being returned. For example, for HDMI 2.0 EDIDs there is also a HDMI Forum VSDB. So check the IEEE identifier as well. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab drivers/media/cec-edid.c | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) --- diff --git a/drivers/media/cec-edid.c b/drivers/media/cec-edid.c index 70018247bdda..5719b991e340 100644 --- a/drivers/media/cec-edid.c +++ b/drivers/media/cec-edid.c @@ -70,7 +70,10 @@ static unsigned int cec_get_edid_spa_location(const u8 *edid, unsigned int size) u8 tag = edid[i] >> 5; u8 len = edid[i] & 0x1f; - if (tag == 3 && len >= 5 && i + len <= end) + if (tag == 3 && len >= 5 && i + len <= end && + edid[i + 1] == 0x03 && + edid[i + 2] == 0x0c && + edid[i + 3] == 0x00) return i + 4; i += len + 1; } while (i < end); ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] [media] pulse8-cec: fix error handling
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] pulse8-cec: fix error handling Author: Hans Verkuil Date:Fri Aug 12 06:46:06 2016 -0300 Support more error codes and fix a bug where MSGCODE_TRANSMIT_FAILED_LINE was mapped to CEC_TX_STATUS_ARB_LOST, which is wrong. Thanks to Pulse-Eight for providing me with the information needed to handle this correctly (I hope). Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab drivers/staging/media/pulse8-cec/pulse8-cec.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) --- diff --git a/drivers/staging/media/pulse8-cec/pulse8-cec.c b/drivers/staging/media/pulse8-cec/pulse8-cec.c index 28f853c80b19..ed8bd95ad6d0 100644 --- a/drivers/staging/media/pulse8-cec/pulse8-cec.c +++ b/drivers/staging/media/pulse8-cec/pulse8-cec.c @@ -114,14 +114,11 @@ static void pulse8_irq_work_handler(struct work_struct *work) cec_transmit_done(pulse8->adap, CEC_TX_STATUS_OK, 0, 0, 0, 0); break; - case MSGCODE_TRANSMIT_FAILED_LINE: - cec_transmit_done(pulse8->adap, CEC_TX_STATUS_ARB_LOST, - 1, 0, 0, 0); - break; case MSGCODE_TRANSMIT_FAILED_ACK: cec_transmit_done(pulse8->adap, CEC_TX_STATUS_NACK, 0, 1, 0, 0); break; + case MSGCODE_TRANSMIT_FAILED_LINE: case MSGCODE_TRANSMIT_FAILED_TIMEOUT_DATA: case MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE: cec_transmit_done(pulse8->adap, CEC_TX_STATUS_ERROR, @@ -170,6 +167,9 @@ static irqreturn_t pulse8_interrupt(struct serio *serio, unsigned char data, case MSGCODE_TRANSMIT_FAILED_TIMEOUT_LINE: schedule_work(&pulse8->work); break; + case MSGCODE_HIGH_ERROR: + case MSGCODE_LOW_ERROR: + case MSGCODE_RECEIVE_FAILED: case MSGCODE_TIMEOUT_ERROR: break; case MSGCODE_COMMAND_ACCEPTED: ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] [media] cec: improve locking
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] cec: improve locking
Author: Hans Verkuil
Date:Tue Aug 2 08:13:57 2016 -0300
- The global lock was used in cec_get_device when it should have
used the devnode lock.
- cec_put_device also took the global lock, but since the release
function takes that lock as well this could lead to a deadlock.
Just don't take the lock here since there is no reason for it.
- cec_devnode_register() should take the global lock when clearing
the bit in the global bitmap.
- In cec_devnode_unregister() place the devnode->(un)register tests
and assignments under the devnode lock as well: this has to be
in a critical block.
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
drivers/staging/media/cec/cec-core.c | 25 ++---
1 file changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/drivers/staging/media/cec/cec-core.c
b/drivers/staging/media/cec/cec-core.c
index 73792d078462..3b1e4d2b190d 100644
--- a/drivers/staging/media/cec/cec-core.c
+++ b/drivers/staging/media/cec/cec-core.c
@@ -51,31 +51,29 @@ int cec_get_device(struct cec_devnode *devnode)
{
/*
* Check if the cec device is available. This needs to be done with
-* the cec_devnode_lock held to prevent an open/unregister race:
+* the devnode->lock held to prevent an open/unregister race:
* without the lock, the device could be unregistered and freed between
* the devnode->registered check and get_device() calls, leading to
* a crash.
*/
- mutex_lock(&cec_devnode_lock);
+ mutex_lock(&devnode->lock);
/*
* return ENXIO if the cec device has been removed
* already or if it is not registered anymore.
*/
if (!devnode->registered) {
- mutex_unlock(&cec_devnode_lock);
+ mutex_unlock(&devnode->lock);
return -ENXIO;
}
/* and increase the device refcount */
get_device(&devnode->dev);
- mutex_unlock(&cec_devnode_lock);
+ mutex_unlock(&devnode->lock);
return 0;
}
void cec_put_device(struct cec_devnode *devnode)
{
- mutex_lock(&cec_devnode_lock);
put_device(&devnode->dev);
- mutex_unlock(&cec_devnode_lock);
}
/* Called when the last user of the cec device exits. */
@@ -84,11 +82,10 @@ static void cec_devnode_release(struct device *cd)
struct cec_devnode *devnode = to_cec_devnode(cd);
mutex_lock(&cec_devnode_lock);
-
/* Mark device node number as free */
clear_bit(devnode->minor, cec_devnode_nums);
-
mutex_unlock(&cec_devnode_lock);
+
cec_delete_adapter(to_cec_adapter(devnode));
}
@@ -160,7 +157,9 @@ static int __must_check cec_devnode_register(struct
cec_devnode *devnode,
cdev_del:
cdev_del(&devnode->cdev);
clr_bit:
+ mutex_lock(&cec_devnode_lock);
clear_bit(devnode->minor, cec_devnode_nums);
+ mutex_unlock(&cec_devnode_lock);
return ret;
}
@@ -177,17 +176,21 @@ static void cec_devnode_unregister(struct cec_devnode
*devnode)
{
struct cec_fh *fh;
+ mutex_lock(&devnode->lock);
+
/* Check if devnode was never registered or already unregistered */
- if (!devnode->registered || devnode->unregistered)
+ if (!devnode->registered || devnode->unregistered) {
+ mutex_unlock(&devnode->lock);
return;
+ }
- mutex_lock(&devnode->lock);
list_for_each_entry(fh, &devnode->fhs, list)
wake_up_interruptible(&fh->wait);
- mutex_unlock(&devnode->lock);
devnode->registered = false;
devnode->unregistered = true;
+ mutex_unlock(&devnode->lock);
+
device_del(&devnode->dev);
cdev_del(&devnode->cdev);
put_device(&devnode->dev);
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] [media] pulse8-cec: set correct Signal Free Time
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] pulse8-cec: set correct Signal Free Time Author: Hans Verkuil Date:Fri Aug 12 06:44:27 2016 -0300 Don't hardcode the signal free time to 3 bit periods, instead use the value for the signal free time as passed in by the CEC framework. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab drivers/staging/media/pulse8-cec/pulse8-cec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/drivers/staging/media/pulse8-cec/pulse8-cec.c b/drivers/staging/media/pulse8-cec/pulse8-cec.c index 94f8590492dc..28f853c80b19 100644 --- a/drivers/staging/media/pulse8-cec/pulse8-cec.c +++ b/drivers/staging/media/pulse8-cec/pulse8-cec.c @@ -388,7 +388,7 @@ static int pulse8_cec_adap_transmit(struct cec_adapter *adap, u8 attempts, int err; cmd[0] = MSGCODE_TRANSMIT_IDLETIME; - cmd[1] = 3; + cmd[1] = signal_free_time; err = pulse8_send_and_wait(pulse8, cmd, 2, MSGCODE_COMMAND_ACCEPTED, 1); cmd[0] = MSGCODE_TRANSMIT_ACK_POLARITY; ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] [media] mtk-vcodec: add HAS_DMA dependency
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] mtk-vcodec: add HAS_DMA dependency Author: Hans Verkuil Date:Sun Aug 14 06:45:54 2016 -0300 This fixes this kbuild test robot error: tree: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master head: 329f4152911c276b074bec75a0443f88821afdb7 commit: c1023ba74fc77dc56dc317bd98f5060aab889ac1 [media] drivers/media/platform/Kconfig: fix VIDEO_MEDIATEK_VCODEC dependency config: m32r-allyesconfig (attached as .config) compiler: m32r-linux-gcc (GCC) 4.9.0 reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross git checkout c1023ba74fc77dc56dc317bd98f5060aab889ac1 # save the attached .config to linux build tree make.cross ARCH=m32r All errors (new ones prefixed by >>): drivers/media/v4l2-core/videobuf2-dma-contig.c: In function 'vb2_dc_get_userptr': >> >> drivers/media/v4l2-core/videobuf2-dma-contig.c:486:2: error: implicit >> >> declaration of function 'dma_get_cache_alignment' >> >> [-Werror=implicit-function-declaration] unsigned long dma_align = dma_get_cache_alignment(); ^ cc1: some warnings being treated as errors This driver depends on HAS_DMA for dma_get_cache_alignment(). Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab drivers/media/platform/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- diff --git a/drivers/media/platform/Kconfig b/drivers/media/platform/Kconfig index f25344bc7912..552b635cfce7 100644 --- a/drivers/media/platform/Kconfig +++ b/drivers/media/platform/Kconfig @@ -169,7 +169,7 @@ config VIDEO_MEDIATEK_VPU config VIDEO_MEDIATEK_VCODEC tristate "Mediatek Video Codec driver" depends on MTK_IOMMU || COMPILE_TEST - depends on VIDEO_DEV && VIDEO_V4L2 + depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA depends on ARCH_MEDIATEK || COMPILE_TEST select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] [media] cec: rename cec_devnode fhs_lock to just lock
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] cec: rename cec_devnode fhs_lock to just lock
Author: Hans Verkuil
Date:Tue Aug 2 08:11:00 2016 -0300
This lock will be used to protect more than just the fhs list.
So rename it to just 'lock'.
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
drivers/staging/media/cec/cec-adap.c | 12 ++--
drivers/staging/media/cec/cec-api.c | 8
drivers/staging/media/cec/cec-core.c | 6 +++---
include/media/cec.h | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
---
diff --git a/drivers/staging/media/cec/cec-adap.c
b/drivers/staging/media/cec/cec-adap.c
index b2393bbacb26..9dcb784b8d6a 100644
--- a/drivers/staging/media/cec/cec-adap.c
+++ b/drivers/staging/media/cec/cec-adap.c
@@ -124,10 +124,10 @@ static void cec_queue_event(struct cec_adapter *adap,
u64 ts = ktime_get_ns();
struct cec_fh *fh;
- mutex_lock(&adap->devnode.fhs_lock);
+ mutex_lock(&adap->devnode.lock);
list_for_each_entry(fh, &adap->devnode.fhs, list)
cec_queue_event_fh(fh, ev, ts);
- mutex_unlock(&adap->devnode.fhs_lock);
+ mutex_unlock(&adap->devnode.lock);
}
/*
@@ -191,12 +191,12 @@ static void cec_queue_msg_monitor(struct cec_adapter
*adap,
u32 monitor_mode = valid_la ? CEC_MODE_MONITOR :
CEC_MODE_MONITOR_ALL;
- mutex_lock(&adap->devnode.fhs_lock);
+ mutex_lock(&adap->devnode.lock);
list_for_each_entry(fh, &adap->devnode.fhs, list) {
if (fh->mode_follower >= monitor_mode)
cec_queue_msg_fh(fh, msg);
}
- mutex_unlock(&adap->devnode.fhs_lock);
+ mutex_unlock(&adap->devnode.lock);
}
/*
@@ -207,12 +207,12 @@ static void cec_queue_msg_followers(struct cec_adapter
*adap,
{
struct cec_fh *fh;
- mutex_lock(&adap->devnode.fhs_lock);
+ mutex_lock(&adap->devnode.lock);
list_for_each_entry(fh, &adap->devnode.fhs, list) {
if (fh->mode_follower == CEC_MODE_FOLLOWER)
cec_queue_msg_fh(fh, msg);
}
- mutex_unlock(&adap->devnode.fhs_lock);
+ mutex_unlock(&adap->devnode.lock);
}
/* Notify userspace of an adapter state change. */
diff --git a/drivers/staging/media/cec/cec-api.c
b/drivers/staging/media/cec/cec-api.c
index 7be7615a0fdf..4e2696a34ddb 100644
--- a/drivers/staging/media/cec/cec-api.c
+++ b/drivers/staging/media/cec/cec-api.c
@@ -508,14 +508,14 @@ static int cec_open(struct inode *inode, struct file
*filp)
filp->private_data = fh;
- mutex_lock(&devnode->fhs_lock);
+ mutex_lock(&devnode->lock);
/* Queue up initial state events */
ev_state.state_change.phys_addr = adap->phys_addr;
ev_state.state_change.log_addr_mask = adap->log_addrs.log_addr_mask;
cec_queue_event_fh(fh, &ev_state, 0);
list_add(&fh->list, &devnode->fhs);
- mutex_unlock(&devnode->fhs_lock);
+ mutex_unlock(&devnode->lock);
return 0;
}
@@ -540,9 +540,9 @@ static int cec_release(struct inode *inode, struct file
*filp)
cec_monitor_all_cnt_dec(adap);
mutex_unlock(&adap->lock);
- mutex_lock(&devnode->fhs_lock);
+ mutex_lock(&devnode->lock);
list_del(&fh->list);
- mutex_unlock(&devnode->fhs_lock);
+ mutex_unlock(&devnode->lock);
/* Unhook pending transmits from this filehandle. */
mutex_lock(&adap->lock);
diff --git a/drivers/staging/media/cec/cec-core.c
b/drivers/staging/media/cec/cec-core.c
index 112a5fae12f5..73792d078462 100644
--- a/drivers/staging/media/cec/cec-core.c
+++ b/drivers/staging/media/cec/cec-core.c
@@ -117,7 +117,7 @@ static int __must_check cec_devnode_register(struct
cec_devnode *devnode,
/* Initialization */
INIT_LIST_HEAD(&devnode->fhs);
- mutex_init(&devnode->fhs_lock);
+ mutex_init(&devnode->lock);
/* Part 1: Find a free minor number */
mutex_lock(&cec_devnode_lock);
@@ -181,10 +181,10 @@ static void cec_devnode_unregister(struct cec_devnode
*devnode)
if (!devnode->registered || devnode->unregistered)
return;
- mutex_lock(&devnode->fhs_lock);
+ mutex_lock(&devnode->lock);
list_for_each_entry(fh, &devnode->fhs, list)
wake_up_interruptible(&fh->wait);
- mutex_unlock(&devnode->fhs_lock);
+ mutex_unlock(&devnode->lock);
devnode->registered = false;
devnode->unregistered = true;
diff --git a/include/media/cec.h b/include/media/cec.h
index dc7854b855f3..fdb5d600e4bb 100644
--- a/include/media/cec.h
+++ b/include/media/cec.h
@@ -57,8 +57,8 @@ struct cec_devnode {
int minor;
bool registered;
bool unregistered;
- struct mutex fhs_lock;
struct list_head fhs;
+ struct
[git:media_tree/fixes] [media] cec-funcs.h: add reply argument for Record On/Off
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] cec-funcs.h: add reply argument for Record On/Off
Author: Hans Verkuil
Date:Wed Aug 10 08:01:38 2016 -0300
A reply parameter is added to the cec_msg_record_on/off functions in
cec-funcs.h. The standard mandates that Record Status shall be replied
to Record On, and it may be replied to Record Off.
Signed-off-by: Johan Fjeldtvedt
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
include/linux/cec-funcs.h | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/include/linux/cec-funcs.h b/include/linux/cec-funcs.h
index 9e054aa168f3..8af613e67633 100644
--- a/include/linux/cec-funcs.h
+++ b/include/linux/cec-funcs.h
@@ -162,10 +162,11 @@ static inline void cec_msg_standby(struct cec_msg *msg)
/* One Touch Record Feature */
-static inline void cec_msg_record_off(struct cec_msg *msg)
+static inline void cec_msg_record_off(struct cec_msg *msg, bool reply)
{
msg->len = 2;
msg->msg[1] = CEC_MSG_RECORD_OFF;
+ msg->reply = reply ? CEC_MSG_RECORD_STATUS : 0;
}
struct cec_op_arib_data {
@@ -323,6 +324,7 @@ static inline void cec_msg_record_on_phys_addr(struct
cec_msg *msg,
}
static inline void cec_msg_record_on(struct cec_msg *msg,
+bool reply,
const struct cec_op_record_src *rec_src)
{
switch (rec_src->type) {
@@ -346,6 +348,7 @@ static inline void cec_msg_record_on(struct cec_msg *msg,
rec_src->ext_phys_addr.phys_addr);
break;
}
+ msg->reply = reply ? CEC_MSG_RECORD_STATUS : 0;
}
static inline void cec_ops_record_on(const struct cec_msg *msg,
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] [media] cec-funcs.h: add missing vendor-specific messages
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] cec-funcs.h: add missing vendor-specific messages
Author: Hans Verkuil
Date:Sat Aug 20 07:54:38 2016 -0300
The cec-funcs.h header was missing support for these three vendor-specific
messages:
CEC_MSG_VENDOR_COMMAND
CEC_MSG_VENDOR_COMMAND_WITH_ID
CEC_MSG_VENDOR_REMOTE_BUTTON_DOWN
Add wrappers for these messages.
I originally postponed adding these wrappers due to the fact that the argument
is
just a byte array which cec-ctl couldn't handle at the time, and then I just
forgot
to add them once the CEC framework was finalized.
It wasn't until an attempt to transmit a vendor specific command was made that I
realized that these wrappers were missing.
Signed-off-by: Hans Verkuil
Signed-off-by: Mauro Carvalho Chehab
include/linux/cec-funcs.h | 69 +++
1 file changed, 69 insertions(+)
---
diff --git a/include/linux/cec-funcs.h b/include/linux/cec-funcs.h
index 8af613e67633..138bbf721e70 100644
--- a/include/linux/cec-funcs.h
+++ b/include/linux/cec-funcs.h
@@ -1144,6 +1144,75 @@ static inline void cec_msg_give_device_vendor_id(struct
cec_msg *msg,
msg->reply = reply ? CEC_MSG_DEVICE_VENDOR_ID : 0;
}
+static inline void cec_msg_vendor_command(struct cec_msg *msg,
+ __u8 size, const __u8 *vendor_cmd)
+{
+ if (size > 14)
+ size = 14;
+ msg->len = 2 + size;
+ msg->msg[1] = CEC_MSG_VENDOR_COMMAND;
+ memcpy(msg->msg + 2, vendor_cmd, size);
+}
+
+static inline void cec_ops_vendor_command(const struct cec_msg *msg,
+ __u8 *size,
+ const __u8 **vendor_cmd)
+{
+ *size = msg->len - 2;
+
+ if (*size > 14)
+ *size = 14;
+ *vendor_cmd = msg->msg + 2;
+}
+
+static inline void cec_msg_vendor_command_with_id(struct cec_msg *msg,
+ __u32 vendor_id, __u8 size,
+ const __u8 *vendor_cmd)
+{
+ if (size > 11)
+ size = 11;
+ msg->len = 5 + size;
+ msg->msg[1] = CEC_MSG_VENDOR_COMMAND_WITH_ID;
+ msg->msg[2] = vendor_id >> 16;
+ msg->msg[3] = (vendor_id >> 8) & 0xff;
+ msg->msg[4] = vendor_id & 0xff;
+ memcpy(msg->msg + 5, vendor_cmd, size);
+}
+
+static inline void cec_ops_vendor_command_with_id(const struct cec_msg *msg,
+ __u32 *vendor_id, __u8 *size,
+ const __u8 **vendor_cmd)
+{
+ *size = msg->len - 5;
+
+ if (*size > 11)
+ *size = 11;
+ *vendor_id = (msg->msg[2] << 16) | (msg->msg[3] << 8) | msg->msg[4];
+ *vendor_cmd = msg->msg + 5;
+}
+
+static inline void cec_msg_vendor_remote_button_down(struct cec_msg *msg,
+__u8 size,
+const __u8 *rc_code)
+{
+ if (size > 14)
+ size = 14;
+ msg->len = 2 + size;
+ msg->msg[1] = CEC_MSG_VENDOR_REMOTE_BUTTON_DOWN;
+ memcpy(msg->msg + 2, rc_code, size);
+}
+
+static inline void cec_ops_vendor_remote_button_down(const struct cec_msg *msg,
+__u8 *size,
+const __u8 **rc_code)
+{
+ *size = msg->len - 2;
+
+ if (*size > 14)
+ *size = 14;
+ *rc_code = msg->msg + 2;
+}
+
static inline void cec_msg_vendor_remote_button_up(struct cec_msg *msg)
{
msg->len = 2;
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/fixes] [media] cec: set unclaimed addresses to CEC_LOG_ADDR_INVALID
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] cec: set unclaimed addresses to CEC_LOG_ADDR_INVALID Author: Hans Verkuil Date:Sun Aug 14 08:27:09 2016 -0300 Up to 4 logical addresses can be claimed. Make sure that any unclaimed logical addresses are set to CEC_LOG_ADDR_INVALID as per the documentation. Take special care in the unregistered case: when falling back to unregistered num_log_addrs may be > 1, so mark those as invalid. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab drivers/staging/media/cec/cec-adap.c | 4 1 file changed, 4 insertions(+) --- diff --git a/drivers/staging/media/cec/cec-adap.c b/drivers/staging/media/cec/cec-adap.c index 2458a6c87642..6cc7d7904446 100644 --- a/drivers/staging/media/cec/cec-adap.c +++ b/drivers/staging/media/cec/cec-adap.c @@ -1056,6 +1056,8 @@ configured: /* Fall back to unregistered */ las->log_addr[0] = CEC_LOG_ADDR_UNREGISTERED; las->log_addr_mask = 1 << las->log_addr[0]; + for (i = 1; i < las->num_log_addrs; i++) + las->log_addr[i] = CEC_LOG_ADDR_INVALID; } adap->is_configured = true; adap->is_configuring = false; @@ -1074,6 +1076,8 @@ configured: cec_report_features(adap, i); cec_report_phys_addr(adap, i); } + for (i = las->num_log_addrs; i < CEC_MAX_LOG_ADDRS; i++) + las->log_addr[i] = CEC_LOG_ADDR_INVALID; mutex_lock(&adap->lock); adap->kthread_config = NULL; mutex_unlock(&adap->lock); ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] Merge remote-tracking branch 'docs-next/docs-next' into devel/docs-next
This is an automatic generated email to let you know that the following patch were queued: Subject: Merge remote-tracking branch 'docs-next/docs-next' into devel/docs-next Author: Mauro Carvalho Chehab Date:Mon Aug 22 21:20:18 2016 -0300 * docs-next/docs-next: (51 commits) docs-rst: add package adjustbox docs-rst: Fix an warning when in interactive mode docs-rst: Use better colors for note/warning/attention boxes docs-rst: conf.py: adjust the size of .. note:: tag docs-rst: add support for LaTeX output doc-rst: migrate ioctl CEC_DQEVENT to c-domain doc-rst: Revert "kernel-doc: fix handling of address_space tags" doc-rst: moved *duplicate* warnings to nitpicky mode doc-rst:c-domain: ref-name of a function declaration doc-rst: add boilerplate to customize c-domain docs: Sphinxify gdb-kernel-debugging.txt and move to dev-tools docs: sphinxify kmemcheck.txt and move to dev-tools docs: sphinxify kmemleak.txt and move it to dev-tools docs: sphinxify ubsan.txt and move it to dev-tools docs: sphinxify kasan.txt and move to dev-tools docs: sphinixfy gcov.txt and move to dev-tools docs: sphinxify kcov.txt and move to dev-tools docs: sphinxify sparse.txt and move to dev-tools docs: sphinxify coccinelle.txt and add it to dev-tools docs: create a new dev-tools directory ... --- ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] pixfmt-007.rst: use Sphinx math:: expressions
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] pixfmt-007.rst: use Sphinx math:: expressions
Author: Mauro Carvalho Chehab
Date:Mon Aug 15 10:47:18 2016 -0300
Enrich math formulas by using the Sphinx math. That will allow
using those formulas on pdf documents as well.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/pixfmt-007.rst | 175 ++--
1 file changed, 114 insertions(+), 61 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/pixfmt-007.rst
b/Documentation/media/uapi/v4l/pixfmt-007.rst
index 95d790cbc152..f097268ffc54 100644
--- a/Documentation/media/uapi/v4l/pixfmt-007.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-007.rst
@@ -74,23 +74,29 @@ SMPTE C set, so this colorspace is sometimes called SMPTE C
as well.
The transfer function defined for SMPTE 170M is the same as the one
defined in Rec. 709.
-L' = -1.099(-L) :sup:`0.45` + 0.099 for L ⤠-0.018
+.. math::
-L' = 4.5L for -0.018 < L < 0.018
+L' = -1.099(-L)^{0.45} + 0.099 \text{, for } L \le-0.018
-L' = 1.099L :sup:`0.45` - 0.099 for L ⥠0.018
+L' = 4.5L \text{, for } -0.018 < L < 0.018
+
+L' = 1.099L^{0.45} - 0.099 \text{, for } L \ge 0.018
Inverse Transfer function:
-L = -((L' - 0.099) / -1.099) :sup:`1/0.45` for L' ⤠-0.081
+.. math::
+
+L = -\left( \frac{L' - 0.099}{-1.099} \right) ^{\frac{1}{0.45}} \text{,
for } L' \le -0.081
-L = L' / 4.5 for -0.081 < L' < 0.081
+L = \frac{L'}{4.5} \text{, for } -0.081 < L' < 0.081
-L = ((L' + 0.099) / 1.099) :sup:`1/0.45` for L' ⥠0.081
+L = \left(\frac{L' + 0.099}{1.099}\right)^{\frac{1}{0.45} } \text{, for }
L' \ge 0.081
The luminance (Y') and color difference (Cb and Cr) are obtained with
the following ``V4L2_YCBCR_ENC_601`` encoding:
+.. math::
+
Y' = 0.299R' + 0.587G' + 0.114B'
Cb = -0.169R' - 0.331G' + 0.5B'
@@ -173,23 +179,29 @@ The full name of this standard is Rec. ITU-R BT.709-5.
Transfer function. Normally L is in the range [0â¦1], but for the
extended gamut xvYCC encoding values outside that range are allowed.
-L' = -1.099(-L) :sup:`0.45` + 0.099 for L ⤠-0.018
+.. math::
-L' = 4.5L for -0.018 < L < 0.018
+L' = -1.099(-L)^{0.45} + 0.099 \text{, for } L \le -0.018
-L' = 1.099L :sup:`0.45` - 0.099 for L ⥠0.018
+L' = 4.5L \text{, for } -0.018 < L < 0.018
+
+L' = 1.099L^{0.45} - 0.099 \text{, for } L \ge 0.018
Inverse Transfer function:
-L = -((L' - 0.099) / -1.099) :sup:`1/0.45` for L' ⤠-0.081
+.. math::
+
+L = -\left( \frac{L' - 0.099}{-1.099} \right)^\frac{1}{0.45} \text{, for }
L' \le -0.081
-L = L' / 4.5 for -0.081 < L' < 0.081
+L = \frac{L'}{4.5}\text{, for } -0.081 < L' < 0.081
-L = ((L' + 0.099) / 1.099) :sup:`1/0.45` for L' ⥠0.081
+L = \left(\frac{L' + 0.099}{1.099}\right)^{\frac{1}{0.45} } \text{, for }
L' \ge 0.081
The luminance (Y') and color difference (Cb and Cr) are obtained with
the following ``V4L2_YCBCR_ENC_709`` encoding:
+.. math::
+
Y' = 0.2126R' + 0.7152G' + 0.0722B'
Cb = -0.1146R' - 0.3854G' + 0.5B'
@@ -214,22 +226,26 @@ similar to the Rec. 709 encoding, but it allows for R',
G' and B' values
that are outside the range [0â¦1]. The resulting Y', Cb and Cr values are
scaled and offset:
-Y' = (219 / 256) * (0.2126R' + 0.7152G' + 0.0722B') + (16 / 256)
+.. math::
+
+Y' = \frac{219}{256} * (0.2126R' + 0.7152G' + 0.0722B') + \frac{16}{256}
-Cb = (224 / 256) * (-0.1146R' - 0.3854G' + 0.5B')
+Cb = \frac{224}{256} * (-0.1146R' - 0.3854G' + 0.5B')
-Cr = (224 / 256) * (0.5R' - 0.4542G' - 0.0458B')
+Cr = \frac{224}{256} * (0.5R' - 0.4542G' - 0.0458B')
The xvYCC 601 encoding (``V4L2_YCBCR_ENC_XV601``, :ref:`xvycc`) is
similar to the BT.601 encoding, but it allows for R', G' and B' values
that are outside the range [0â¦1]. The resulting Y', Cb and Cr values are
scaled and offset:
-Y' = (219 / 256) * (0.299R' + 0.587G' + 0.114B') + (16 / 256)
+.. math::
-Cb = (224 / 256) * (-0.169R' - 0.331G' + 0.5B')
+Y' = \frac{219}{256} * (0.299R' + 0.587G' + 0.114B') + \frac{16}{256}
-Cr = (224 / 256) * (0.5R' - 0.419G' - 0.081B')
+Cb = \frac{224}{256} * (-0.169R' - 0.331G' + 0.5B')
+
+Cr = \frac{224}{256} * (0.5R' - 0.419G' - 0.081B')
Y' is clamped to the range [0â¦1] and Cb and Cr are clamped to the range
[-0.5â¦0.5]. The non-standard xvYCC 709 or xvYCC 601 encodings can be
@@ -304,24 +320,30 @@ These chromaticities are identical to the Rec. 709
colorspace.
Transfer function. Note that negative values for L are only used by the
Y'CbCr conversion.
-L' = -1.055(-L) :sup:`1/2.4` + 0.055 for L < -0.0031308
+.. math::
+
+L' = -1.055(-L)^{\frac{1}{2.4} } + 0.055\text{, for }L < -0.0031308
-L' = 12.92L for -0.0031308 ⤠L ⤠0.0031308
+L' = 12.92L\text{, for }-0.0031308 \le L \le 0.0031308
-L' =
[git:media_tree/master] [media] docs-rst: Convert DVB uAPI to use C function references
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] docs-rst: Convert DVB uAPI to use C function references Author: Mauro Carvalho Chehab Date:Fri Aug 19 16:56:15 2016 -0300 Name all ioctl references and make them match the ioctls that are documented. That will improve the cross-reference index, as it will have all ioctls and syscalls there. While here, improve the documentation, marking the deprecated ioctls, and making the non-deprecated ones more like the rest of the media book. Also, add a notice for ioctls that still require documentation. Signed-off-by: Mauro Carvalho Chehab .../uapi/dvb/audio-bilingual-channel-select.rst| 15 +++ .../media/uapi/dvb/audio-channel-select.rst| 14 +++ .../media/uapi/dvb/audio-clear-buffer.rst | 12 ++ Documentation/media/uapi/dvb/audio-continue.rst| 11 ++--- Documentation/media/uapi/dvb/audio-fclose.rst | 4 +- Documentation/media/uapi/dvb/audio-fopen.rst | 4 +- Documentation/media/uapi/dvb/audio-fwrite.rst | 2 + .../media/uapi/dvb/audio-get-capabilities.rst | 14 +++ Documentation/media/uapi/dvb/audio-get-pts.rst | 14 +++ Documentation/media/uapi/dvb/audio-get-status.rst | 14 +++ Documentation/media/uapi/dvb/audio-pause.rst | 11 ++--- Documentation/media/uapi/dvb/audio-play.rst| 11 ++--- .../media/uapi/dvb/audio-select-source.rst | 14 +++ .../media/uapi/dvb/audio-set-attributes.rst| 16 +++ Documentation/media/uapi/dvb/audio-set-av-sync.rst | 24 --- .../media/uapi/dvb/audio-set-bypass-mode.rst | 25 --- Documentation/media/uapi/dvb/audio-set-ext-id.rst | 15 +++ Documentation/media/uapi/dvb/audio-set-id.rst | 15 +++ Documentation/media/uapi/dvb/audio-set-karaoke.rst | 14 +++ Documentation/media/uapi/dvb/audio-set-mixer.rst | 15 +++ Documentation/media/uapi/dvb/audio-set-mute.rst| 24 --- .../media/uapi/dvb/audio-set-streamtype.rst| 14 +++ Documentation/media/uapi/dvb/audio-stop.rst| 11 ++--- Documentation/media/uapi/dvb/ca-fclose.rst | 18 +++- Documentation/media/uapi/dvb/ca-fopen.rst | 49 -- Documentation/media/uapi/dvb/ca-get-cap.rst| 30 - Documentation/media/uapi/dvb/ca-get-descr-info.rst | 31 -- Documentation/media/uapi/dvb/ca-get-msg.rst| 30 - Documentation/media/uapi/dvb/ca-get-slot-info.rst | 30 - Documentation/media/uapi/dvb/ca-reset.rst | 24 +++ Documentation/media/uapi/dvb/ca-send-msg.rst | 30 - Documentation/media/uapi/dvb/ca-set-descr.rst | 30 - Documentation/media/uapi/dvb/ca-set-pid.rst| 30 - Documentation/media/uapi/dvb/dmx-add-pid.rst | 28 +++-- Documentation/media/uapi/dvb/dmx-fclose.rst| 14 ++- Documentation/media/uapi/dvb/dmx-fopen.rst | 43 --- Documentation/media/uapi/dvb/dmx-fread.rst | 29 - Documentation/media/uapi/dvb/dmx-fwrite.rst| 30 - Documentation/media/uapi/dvb/dmx-get-caps.rst | 31 -- Documentation/media/uapi/dvb/dmx-get-event.rst | 28 +++-- Documentation/media/uapi/dvb/dmx-get-pes-pids.rst | 31 -- Documentation/media/uapi/dvb/dmx-get-stc.rst | 31 +++--- Documentation/media/uapi/dvb/dmx-remove-pid.rst| 28 +++-- .../media/uapi/dvb/dmx-set-buffer-size.rst | 29 +++-- Documentation/media/uapi/dvb/dmx-set-filter.rst| 28 +++-- .../media/uapi/dvb/dmx-set-pes-filter.rst | 27 +++- Documentation/media/uapi/dvb/dmx-set-source.rst| 29 - Documentation/media/uapi/dvb/dmx-start.rst | 22 ++ Documentation/media/uapi/dvb/dmx-stop.rst | 22 ++ .../media/uapi/dvb/fe-diseqc-recv-slave-reply.rst | 6 +-- .../media/uapi/dvb/fe-diseqc-reset-overload.rst| 7 +--- .../media/uapi/dvb/fe-diseqc-send-burst.rst| 6 +-- .../media/uapi/dvb/fe-diseqc-send-master-cmd.rst | 6 +-- .../uapi/dvb/fe-dishnetwork-send-legacy-cmd.rst| 16 +++ .../media/uapi/dvb/fe-enable-high-lnb-voltage.rst | 6 +-- Documentation/media/uapi/dvb/fe-get-event.rst | 35 Documentation/media/uapi/dvb/fe-get-frontend.rst | 30 - Documentation/media/uapi/dvb/fe-get-info.rst | 6 +-- Documentation/media/uapi/dvb/fe-get-property.rst | 9 ++-- Documentation/media/uapi/dvb/fe-read-ber.rst | 30 - .../media/uapi/dvb/fe-read-signal-strength.rst | 31 -- Documentation/media/uapi/dvb/fe-read-snr.rst | 29 - Documentation/media/uapi/dvb/fe-read-status.rst| 6 +-- .../media/uapi/dvb/fe-read-uncorrected-blocks.rst | 31 -- .../media/uapi/dvb/fe-set-f
[git:media_tree/master] [media] docs-rst: fix some .. note:: occurrences
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] docs-rst: fix some .. note:: occurrences
Author: Mauro Carvalho Chehab
Date:Mon Aug 22 10:49:31 2016 -0300
On some places, either an space or the second ':' is missing.
Fix them.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst | 2 +-
Documentation/media/uapi/v4l/subdev-formats.rst| 10 --
2 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst
b/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst
index 6066f13af5b3..36a221753b37 100644
--- a/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst
@@ -16,7 +16,7 @@ component of each pixel in one 16 or 32 bit word.
\newline\newline\begin{adjustbox}{width=\columnwidth}
-.. _yuv-formats:
+.. _packed-yuv-formats:
.. tabularcolumns::
|p{4.5cm}|p{3.3cm}|p{0.7cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.2cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{0.4cm}|p{1.7cm}|
diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst
b/Documentation/media/uapi/v4l/subdev-formats.rst
index 8b1ba4f53b18..52013b55ea80 100644
--- a/Documentation/media/uapi/v4l/subdev-formats.rst
+++ b/Documentation/media/uapi/v4l/subdev-formats.rst
@@ -3763,12 +3763,6 @@ the following codes.
- d for dummy bits
-
-.. tabularcolumns::
|p{4.0cm}|p{0.7cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|
-
-.. _v4l2-mbus-pixelcode-yuv8:
-
-
.. HACK: ideally, we would be using adjustbox here. However, this
.. will never work for this table, as, even with tiny font, it is
.. to big for a single page. So, we need to manually adjust the
@@ -3780,6 +3774,10 @@ the following codes.
\tiny
\setlength{\tabcolsep}{2pt}
+.. tabularcolumns::
|p{4.0cm}|p{0.7cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|
+
+.. _v4l2-mbus-pixelcode-yuv8:
+
.. flat-table:: YUV Formats
:header-rows: 2
:stub-columns: 0
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] index.rst: Fix LaTeX error in interactive mode on Sphinx 1.4.x
This is an automatic generated email to let you know that the following patch
were queued:
Subject: [media] index.rst: Fix LaTeX error in interactive mode on Sphinx 1.4.x
Author: Mauro Carvalho Chehab
Date:Sun Aug 21 15:14:57 2016 -0300
The Sphinx 1.4.x definition for \DUrole is:
\providecommand*{\DUrole}[2]{%
\ifcsname DUrole#1\endcsname%
\csname DUrole#1\endcsname{#2}%
\else% backwards compatibility: try \docutilsrole#1{#2}
\ifcsname docutilsrole#1\endcsname%
\csname docutilsrole#1\endcsname{#2}%
\else%
#2%
\fi%
\fi%
}
This is broken when it is used inside a \begin{alltt} block.
So, replace it by just "#2", as this won't cause troubles, and
it is one of the fallback methods for it.
Signed-off-by: Mauro Carvalho Chehab
Documentation/media/index.rst | 5 +
1 file changed, 5 insertions(+)
---
diff --git a/Documentation/media/index.rst b/Documentation/media/index.rst
index 7f8f0af620ce..e347a3e7bdef 100644
--- a/Documentation/media/index.rst
+++ b/Documentation/media/index.rst
@@ -1,6 +1,11 @@
Linux Media Subsystem Documentation
===
+.. Sphinx 1.4.x has a definition for DUrole that doesn't work on alltt blocks
+.. raw:: latex
+
+ \renewcommand*{\DUrole}[2]{ #2 }
+
Contents:
.. toctree::
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[git:media_tree/master] [media] docs-rst: Convert LIRC uAPI to use C function references
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] docs-rst: Convert LIRC uAPI to use C function references Author: Mauro Carvalho Chehab Date:Fri Aug 19 16:59:31 2016 -0300 Name all ioctl references and make them match the ioctls that are documented. That will improve the cross-reference index, as it will have all ioctls and syscalls there. While here, improve the documentation to make them to look more like the rest of the document. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/rc/lirc-get-features.rst | 6 ++ Documentation/media/uapi/rc/lirc-get-length.rst | 6 ++ Documentation/media/uapi/rc/lirc-get-rec-mode.rst | 11 ++- Documentation/media/uapi/rc/lirc-get-rec-resolution.rst | 6 ++ Documentation/media/uapi/rc/lirc-get-send-mode.rst| 9 + Documentation/media/uapi/rc/lirc-get-timeout.rst | 9 + Documentation/media/uapi/rc/lirc-read.rst | 5 - Documentation/media/uapi/rc/lirc-set-measure-carrier-mode.rst | 6 ++ Documentation/media/uapi/rc/lirc-set-rec-carrier-range.rst| 6 ++ Documentation/media/uapi/rc/lirc-set-rec-carrier.rst | 6 ++ Documentation/media/uapi/rc/lirc-set-rec-timeout-reports.rst | 6 ++ Documentation/media/uapi/rc/lirc-set-rec-timeout.rst | 6 ++ Documentation/media/uapi/rc/lirc-set-send-carrier.rst | 6 ++ Documentation/media/uapi/rc/lirc-set-send-duty-cycle.rst | 6 ++ Documentation/media/uapi/rc/lirc-set-transmitter-mask.rst | 6 ++ Documentation/media/uapi/rc/lirc-set-wideband-receiver.rst| 6 ++ Documentation/media/uapi/rc/lirc-write.rst| 6 -- 17 files changed, 48 insertions(+), 64 deletions(-) --- diff --git a/Documentation/media/uapi/rc/lirc-get-features.rst b/Documentation/media/uapi/rc/lirc-get-features.rst index d0c8a426aa16..79e07b4d44d6 100644 --- a/Documentation/media/uapi/rc/lirc-get-features.rst +++ b/Documentation/media/uapi/rc/lirc-get-features.rst @@ -14,7 +14,8 @@ LIRC_GET_FEATURES - Get the underlying hardware device's features Synopsis -.. c:function:: int ioctl( int fd, int request, __u32 *features) +.. c:function:: int ioctl( int fd, LIRC_GET_FEATURES, __u32 *features) +:name: LIRC_GET_FEATURES Arguments = @@ -22,9 +23,6 @@ Arguments ``fd`` File descriptor returned by open(). -``request`` -LIRC_GET_FEATURES - ``features`` Bitmask with the LIRC features. diff --git a/Documentation/media/uapi/rc/lirc-get-length.rst b/Documentation/media/uapi/rc/lirc-get-length.rst index 44c6e8923b40..8c2747c8d2c9 100644 --- a/Documentation/media/uapi/rc/lirc-get-length.rst +++ b/Documentation/media/uapi/rc/lirc-get-length.rst @@ -14,7 +14,8 @@ LIRC_GET_LENGTH - Retrieves the code length in bits. Synopsis -.. c:function:: int ioctl( int fd, int request, __u32 *length ) +.. c:function:: int ioctl( int fd, LIRC_GET_LENGTH, __u32 *length ) +:name: LIRC_GET_LENGTH Arguments = @@ -22,9 +23,6 @@ Arguments ``fd`` File descriptor returned by open(). -``request`` -LIRC_GET_LENGTH - ``length`` length, in bits diff --git a/Documentation/media/uapi/rc/lirc-get-rec-mode.rst b/Documentation/media/uapi/rc/lirc-get-rec-mode.rst index 445c618771f4..a5023e0194c1 100644 --- a/Documentation/media/uapi/rc/lirc-get-rec-mode.rst +++ b/Documentation/media/uapi/rc/lirc-get-rec-mode.rst @@ -10,12 +10,16 @@ ioctls LIRC_GET_REC_MODE and LIRC_SET_REC_MODE Name -LIRC_GET_REC_MODE/LIRC_GET_REC_MODE - Get/set supported receive modes. +LIRC_GET_REC_MODE/LIRC_SET_REC_MODE - Get/set supported receive modes. Synopsis -.. c:function:: int ioctl( int fd, int request, __u32 rx_modes) +.. c:function:: int ioctl( int fd, LIRC_GET_REC_MODE, __u32 rx_modes) + :name: LIRC_GET_REC_MODE + +.. c:function:: int ioctl( int fd, LIRC_SET_REC_MODE, __u32 rx_modes) + :name: LIRC_SET_REC_MODE Arguments = @@ -23,9 +27,6 @@ Arguments ``fd`` File descriptor returned by open(). -``request`` -LIRC_GET_REC_MODE or LIRC_GET_REC_MODE - ``rx_modes`` Bitmask with the supported transmit modes. diff --git a/Documentation/media/uapi/rc/lirc-get-rec-resolution.rst b/Documentation/media/uapi/rc/lirc-get-rec-resolution.rst index 3ac3a8199c29..6e016edc2bc4 100644 --- a/Documentation/media/uapi/rc/lirc-get-rec-resolution.rst +++ b/Documentation/media/uapi/rc/lirc-get-rec-resolution.rst @@ -14,7 +14,8 @@ LIRC_GET_REC_RESOLUTION - Obtain the value of receive resolution, in microsecond Synopsis -.. c:function:: int ioctl( int fd, int request, __u32 *microseconds) +.. c:function:: int ioctl( int fd, LIRC_GET_REC_RESOLUTION, __u32 *microseconds) +:name: LIRC_GET_REC_RESOLUTION Arguments = @@ -22,9 +23,6 @@ Arguments ``fd``
[git:media_tree/master] [media] docs-next: stop abusing on the cpp domain
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] docs-next: stop abusing on the cpp domain Author: Mauro Carvalho Chehab Date:Fri Aug 19 12:00:43 2016 -0300 Now that we have an override for the c domain that will do the right thing for the Kernel, stop abusing on the cpp domain. Signed-off-by: Mauro Carvalho Chehab Documentation/media/conf_nitpick.py| 33 +++--- Documentation/media/kapi/dtv-core.rst | 2 +- Documentation/media/kapi/v4l2-dev.rst | 4 +-- Documentation/media/kapi/v4l2-fh.rst | 4 +-- Documentation/media/kapi/v4l2-subdev.rst | 2 +- Documentation/media/uapi/cec/cec-func-close.rst| 2 +- Documentation/media/uapi/cec/cec-func-ioctl.rst| 2 +- Documentation/media/uapi/cec/cec-func-open.rst | 2 +- Documentation/media/uapi/cec/cec-func-poll.rst | 2 +- .../media/uapi/cec/cec-ioc-adap-g-caps.rst | 2 +- .../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst| 2 +- .../media/uapi/cec/cec-ioc-adap-g-phys-addr.rst| 2 +- Documentation/media/uapi/cec/cec-ioc-g-mode.rst| 2 +- Documentation/media/uapi/cec/cec-ioc-receive.rst | 2 +- .../uapi/dvb/audio-bilingual-channel-select.rst| 2 +- .../media/uapi/dvb/audio-channel-select.rst| 2 +- .../media/uapi/dvb/audio-clear-buffer.rst | 2 +- Documentation/media/uapi/dvb/audio-continue.rst| 2 +- Documentation/media/uapi/dvb/audio-fclose.rst | 2 +- Documentation/media/uapi/dvb/audio-fopen.rst | 2 +- Documentation/media/uapi/dvb/audio-fwrite.rst | 2 +- .../media/uapi/dvb/audio-get-capabilities.rst | 2 +- Documentation/media/uapi/dvb/audio-get-pts.rst | 2 +- Documentation/media/uapi/dvb/audio-get-status.rst | 2 +- Documentation/media/uapi/dvb/audio-pause.rst | 2 +- Documentation/media/uapi/dvb/audio-play.rst| 2 +- .../media/uapi/dvb/audio-select-source.rst | 2 +- .../media/uapi/dvb/audio-set-attributes.rst| 2 +- Documentation/media/uapi/dvb/audio-set-av-sync.rst | 2 +- .../media/uapi/dvb/audio-set-bypass-mode.rst | 2 +- Documentation/media/uapi/dvb/audio-set-ext-id.rst | 2 +- Documentation/media/uapi/dvb/audio-set-id.rst | 2 +- Documentation/media/uapi/dvb/audio-set-karaoke.rst | 2 +- Documentation/media/uapi/dvb/audio-set-mixer.rst | 2 +- Documentation/media/uapi/dvb/audio-set-mute.rst| 2 +- .../media/uapi/dvb/audio-set-streamtype.rst| 2 +- Documentation/media/uapi/dvb/audio-stop.rst| 2 +- Documentation/media/uapi/dvb/ca-fclose.rst | 2 +- Documentation/media/uapi/dvb/ca-fopen.rst | 2 +- Documentation/media/uapi/dvb/ca-get-cap.rst| 2 +- Documentation/media/uapi/dvb/ca-get-descr-info.rst | 2 +- Documentation/media/uapi/dvb/ca-get-msg.rst| 2 +- Documentation/media/uapi/dvb/ca-get-slot-info.rst | 2 +- Documentation/media/uapi/dvb/ca-reset.rst | 2 +- Documentation/media/uapi/dvb/ca-send-msg.rst | 2 +- Documentation/media/uapi/dvb/ca-set-descr.rst | 2 +- Documentation/media/uapi/dvb/ca-set-pid.rst| 2 +- Documentation/media/uapi/dvb/dmx-add-pid.rst | 2 +- Documentation/media/uapi/dvb/dmx-fclose.rst| 2 +- Documentation/media/uapi/dvb/dmx-fopen.rst | 2 +- Documentation/media/uapi/dvb/dmx-fread.rst | 2 +- Documentation/media/uapi/dvb/dmx-fwrite.rst| 2 +- Documentation/media/uapi/dvb/dmx-get-caps.rst | 2 +- Documentation/media/uapi/dvb/dmx-get-event.rst | 2 +- Documentation/media/uapi/dvb/dmx-get-pes-pids.rst | 2 +- Documentation/media/uapi/dvb/dmx-get-stc.rst | 2 +- Documentation/media/uapi/dvb/dmx-remove-pid.rst| 2 +- .../media/uapi/dvb/dmx-set-buffer-size.rst | 2 +- Documentation/media/uapi/dvb/dmx-set-filter.rst| 2 +- .../media/uapi/dvb/dmx-set-pes-filter.rst | 2 +- Documentation/media/uapi/dvb/dmx-set-source.rst| 2 +- Documentation/media/uapi/dvb/dmx-start.rst | 2 +- Documentation/media/uapi/dvb/dmx-stop.rst | 2 +- .../media/uapi/dvb/fe-diseqc-recv-slave-reply.rst | 2 +- .../media/uapi/dvb/fe-diseqc-reset-overload.rst| 2 +- .../media/uapi/dvb/fe-diseqc-send-burst.rst| 2 +- .../media/uapi/dvb/fe-diseqc-send-master-cmd.rst | 2 +- .../uapi/dvb/fe-dishnetwork-send-legacy-cmd.rst| 2 +- .../media/uapi/dvb/fe-enable-high-lnb-voltage.rst | 2 +- Documentation/media/uapi/dvb/fe-get-event.rst | 2 +- Documentation/media/uapi/dvb/fe-get-frontend.rst | 2 +- Documentation/media/uapi/dvb/fe-get-info.rst | 2 +- Documentation/media/uapi/dvb/fe-get-property.rst | 2 +- Documentation/media/uapi/dvb/fe-read-ber.rst | 2 +- .../media/uapi/dvb/fe-read-signal-strength.rst | 2 +- Documentation/media/uapi/dvb/fe-read-snr.rst | 2 +- Documentation/media/uapi/dvb
[git:media_tree/master] [media] docs-rst: Convert CEC uAPI to use C function references
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] docs-rst: Convert CEC uAPI to use C function references Author: Mauro Carvalho Chehab Date:Fri Aug 19 16:58:14 2016 -0300 Name all ioctl references and make them match the ioctls that are documented. That will improve the cross-reference index, as it will have all ioctls and syscalls there. While here, improve the documentation to make them to look more like the rest of the document. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/cec/cec-func-close.rst | 3 ++- Documentation/media/uapi/cec/cec-func-ioctl.rst | 5 +++-- Documentation/media/uapi/cec/cec-func-open.rst| 1 + Documentation/media/uapi/cec/cec-func-poll.rst| 10 ++ Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst | 6 ++ Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 12 ++-- Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst | 13 +++-- Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 7 ++- Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 13 +++-- Documentation/media/uapi/cec/cec-ioc-receive.rst | 13 +++-- 10 files changed, 47 insertions(+), 36 deletions(-) --- diff --git a/Documentation/media/uapi/cec/cec-func-close.rst b/Documentation/media/uapi/cec/cec-func-close.rst index c763496b243f..8267c31b317d 100644 --- a/Documentation/media/uapi/cec/cec-func-close.rst +++ b/Documentation/media/uapi/cec/cec-func-close.rst @@ -21,12 +21,13 @@ Synopsis .. c:function:: int close( int fd ) +:name: cec-close Arguments = ``fd`` -File descriptor returned by :ref:`open() `. +File descriptor returned by :c:func:`open() `. Description diff --git a/Documentation/media/uapi/cec/cec-func-ioctl.rst b/Documentation/media/uapi/cec/cec-func-ioctl.rst index 116132b19515..9e8dbb118d6a 100644 --- a/Documentation/media/uapi/cec/cec-func-ioctl.rst +++ b/Documentation/media/uapi/cec/cec-func-ioctl.rst @@ -20,16 +20,17 @@ Synopsis .. c:function:: int ioctl( int fd, int request, void *argp ) + :name: cec-ioctl Arguments = ``fd`` -File descriptor returned by :ref:`open() `. +File descriptor returned by :c:func:`open() `. ``request`` CEC ioctl request code as defined in the cec.h header file, for -example :ref:`CEC_ADAP_G_CAPS`. +example :c:func:`CEC_ADAP_G_CAPS`. ``argp`` Pointer to a request-specific structure. diff --git a/Documentation/media/uapi/cec/cec-func-open.rst b/Documentation/media/uapi/cec/cec-func-open.rst index 33e5b5379fa3..af3f5b5c24c6 100644 --- a/Documentation/media/uapi/cec/cec-func-open.rst +++ b/Documentation/media/uapi/cec/cec-func-open.rst @@ -20,6 +20,7 @@ Synopsis .. c:function:: int open( const char *device_name, int flags ) + :name: cec-open Arguments diff --git a/Documentation/media/uapi/cec/cec-func-poll.rst b/Documentation/media/uapi/cec/cec-func-poll.rst index a5225185f98c..5bacb7c6f33b 100644 --- a/Documentation/media/uapi/cec/cec-func-poll.rst +++ b/Documentation/media/uapi/cec/cec-func-poll.rst @@ -21,10 +21,20 @@ Synopsis .. c:function:: int poll( struct pollfd *ufds, unsigned int nfds, int timeout ) + :name: cec-poll Arguments = +``ufds`` + List of FD events to be watched + +``nfds`` + Number of FD efents at the \*ufds array + +``timeout`` + Timeout to wait for events + Description === diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst b/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst index cc68e0dcea7e..14d7f6a19455 100644 --- a/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst +++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst @@ -14,7 +14,8 @@ CEC_ADAP_G_CAPS - Query device capabilities Synopsis -.. c:function:: int ioctl( int fd, int request, struct cec_caps *argp ) +.. c:function:: int ioctl( int fd, CEC_ADAP_G_CAPS, struct cec_caps *argp ) +:name: CEC_ADAP_G_CAPS Arguments = @@ -22,9 +23,6 @@ Arguments ``fd`` File descriptor returned by :ref:`open() `. -``request`` -CEC_ADAP_G_CAPS - ``argp`` diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst b/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst index 9de2a005f6fb..1a920109072c 100644 --- a/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst +++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-log-addrs.rst @@ -17,20 +17,20 @@ CEC_ADAP_G_LOG_ADDRS, CEC_ADAP_S_LOG_ADDRS - Get or set the logical addresses Synopsis -.. c:function:: int ioctl( int fd, int request, struct cec_log_addrs *argp ) +.. c:function:: int ioctl( int fd, CEC_ADAP_G_LOG_ADDRS, struct cec_log_addrs *argp ) + :name: CEC_ADAP_G_LOG_ADDRS +.. c:function:: int ioctl( int fd, CEC_ADAP_S_LOG_ADDRS, struct cec_log_addrs *argp ) + :name: CEC_ADAP_S_LOG_ADDRS A
[git:media_tree/master] [media] docs-rst: Convert MC uAPI to use C function references
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] docs-rst: Convert MC uAPI to use C function references Author: Mauro Carvalho Chehab Date:Fri Aug 19 16:59:55 2016 -0300 Name all ioctl references and make them match the ioctls that are documented. That will improve the cross-reference index, as it will have all ioctls and syscalls there. While here, improve the documentation to make them to look more like the rest of the document. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/mediactl/media-func-close.rst| 4 ++-- Documentation/media/uapi/mediactl/media-func-ioctl.rst| 4 ++-- Documentation/media/uapi/mediactl/media-func-open.rst | 2 +- Documentation/media/uapi/mediactl/media-ioc-device-info.rst | 6 ++ Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst | 6 ++ Documentation/media/uapi/mediactl/media-ioc-enum-links.rst| 6 ++ Documentation/media/uapi/mediactl/media-ioc-g-topology.rst| 6 ++ Documentation/media/uapi/mediactl/media-ioc-setup-link.rst| 6 ++ 8 files changed, 15 insertions(+), 25 deletions(-) --- diff --git a/Documentation/media/uapi/mediactl/media-func-close.rst b/Documentation/media/uapi/mediactl/media-func-close.rst index c13220c2696e..a8f5203afe4b 100644 --- a/Documentation/media/uapi/mediactl/media-func-close.rst +++ b/Documentation/media/uapi/mediactl/media-func-close.rst @@ -21,13 +21,13 @@ Synopsis .. c:function:: int close( int fd ) - +:name: mc-close Arguments = ``fd`` -File descriptor returned by :ref:`open() `. +File descriptor returned by :c:func:`open() `. Description diff --git a/Documentation/media/uapi/mediactl/media-func-ioctl.rst b/Documentation/media/uapi/mediactl/media-func-ioctl.rst index 6fa0a8e65af5..fe072b7c8765 100644 --- a/Documentation/media/uapi/mediactl/media-func-ioctl.rst +++ b/Documentation/media/uapi/mediactl/media-func-ioctl.rst @@ -21,13 +21,13 @@ Synopsis .. c:function:: int ioctl( int fd, int request, void *argp ) - +:name: mc-ioctl Arguments = ``fd`` -File descriptor returned by :ref:`open() `. +File descriptor returned by :c:func:`open() `. ``request`` Media ioctl request code as defined in the media.h header file, for diff --git a/Documentation/media/uapi/mediactl/media-func-open.rst b/Documentation/media/uapi/mediactl/media-func-open.rst index aa77ba32db21..32f53016a9e5 100644 --- a/Documentation/media/uapi/mediactl/media-func-open.rst +++ b/Documentation/media/uapi/mediactl/media-func-open.rst @@ -21,7 +21,7 @@ Synopsis .. c:function:: int open( const char *device_name, int flags ) - +:name: mc-open Arguments = diff --git a/Documentation/media/uapi/mediactl/media-ioc-device-info.rst b/Documentation/media/uapi/mediactl/media-ioc-device-info.rst index e8c97abed394..412014110570 100644 --- a/Documentation/media/uapi/mediactl/media-ioc-device-info.rst +++ b/Documentation/media/uapi/mediactl/media-ioc-device-info.rst @@ -15,7 +15,8 @@ MEDIA_IOC_DEVICE_INFO - Query device information Synopsis -.. c:function:: int ioctl( int fd, int request, struct media_device_info *argp ) +.. c:function:: int ioctl( int fd, MEDIA_IOC_DEVICE_INFO, struct media_device_info *argp ) +:name: MEDIA_IOC_DEVICE_INFO Arguments @@ -24,9 +25,6 @@ Arguments ``fd`` File descriptor returned by :ref:`open() `. -``request`` -MEDIA_IOC_DEVICE_INFO - ``argp`` diff --git a/Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst b/Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst index a621b08187ea..628e91aeda97 100644 --- a/Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst +++ b/Documentation/media/uapi/mediactl/media-ioc-enum-entities.rst @@ -15,7 +15,8 @@ MEDIA_IOC_ENUM_ENTITIES - Enumerate entities and their properties Synopsis -.. c:function:: int ioctl( int fd, int request, struct media_entity_desc *argp ) +.. c:function:: int ioctl( int fd, MEDIA_IOC_ENUM_ENTITIES, struct media_entity_desc *argp ) +:name: MEDIA_IOC_ENUM_ENTITIES Arguments @@ -24,9 +25,6 @@ Arguments ``fd`` File descriptor returned by :ref:`open() `. -``request`` -MEDIA_IOC_ENUM_ENTITIES - ``argp`` diff --git a/Documentation/media/uapi/mediactl/media-ioc-enum-links.rst b/Documentation/media/uapi/mediactl/media-ioc-enum-links.rst index d07629ba44db..c81765f14b9f 100644 --- a/Documentation/media/uapi/mediactl/media-ioc-enum-links.rst +++ b/Documentation/media/uapi/mediactl/media-ioc-enum-links.rst @@ -15,7 +15,8 @@ MEDIA_IOC_ENUM_LINKS - Enumerate all pads and links for a given entity Synopsis -.. c:function:: int ioctl( int fd, int request, struct media_links_enum *argp ) +.. c:function:: int ioctl( int fd, MEDIA_IOC_ENUM_LINKS, struct media_links_enum *argp ) +:name: MEDIA_IOC_ENUM_LINKS Arguments @@ -24,9 +25,6 @@ Arguments
[git:media_tree/master] [media] docs-rst: Convert V4L2 uAPI to use C function references
This is an automatic generated email to let you know that the following patch were queued: Subject: [media] docs-rst: Convert V4L2 uAPI to use C function references Author: Mauro Carvalho Chehab Date:Fri Aug 19 16:53:38 2016 -0300 Name all ioctl references and make them match the ioctls that are documented. That will improve the cross-reference index, as it will have all ioctls and syscalls there. Signed-off-by: Mauro Carvalho Chehab Documentation/media/uapi/v4l/func-close.rst | 2 +- Documentation/media/uapi/v4l/func-ioctl.rst | 2 +- Documentation/media/uapi/v4l/func-mmap.rst | 2 +- Documentation/media/uapi/v4l/func-munmap.rst| 2 +- Documentation/media/uapi/v4l/func-open.rst | 2 +- Documentation/media/uapi/v4l/func-poll.rst | 2 +- Documentation/media/uapi/v4l/func-read.rst | 6 -- Documentation/media/uapi/v4l/func-select.rst| 16 +++- Documentation/media/uapi/v4l/func-write.rst | 6 -- Documentation/media/uapi/v4l/vidioc-create-bufs.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-cropcap.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-dbg-g-chip-info.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-dbg-g-register.rst | 9 - Documentation/media/uapi/v4l/vidioc-decoder-cmd.rst | 11 +++ Documentation/media/uapi/v4l/vidioc-dqevent.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst | 9 + Documentation/media/uapi/v4l/vidioc-encoder-cmd.rst | 9 + Documentation/media/uapi/v4l/vidioc-enum-dv-timings.rst | 9 + Documentation/media/uapi/v4l/vidioc-enum-fmt.rst| 6 ++ .../media/uapi/v4l/vidioc-enum-frameintervals.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-enumaudio.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-enumaudioout.rst| 6 ++ Documentation/media/uapi/v4l/vidioc-enuminput.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-enumoutput.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-enumstd.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-expbuf.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-g-audio.rst | 9 - Documentation/media/uapi/v4l/vidioc-g-audioout.rst | 9 - Documentation/media/uapi/v4l/vidioc-g-crop.rst | 9 - Documentation/media/uapi/v4l/vidioc-g-ctrl.rst | 9 + Documentation/media/uapi/v4l/vidioc-g-dv-timings.rst| 16 +++- Documentation/media/uapi/v4l/vidioc-g-edid.rst | 17 - Documentation/media/uapi/v4l/vidioc-g-enc-index.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst | 15 ++- Documentation/media/uapi/v4l/vidioc-g-fbuf.rst | 9 - Documentation/media/uapi/v4l/vidioc-g-fmt.rst | 11 +++ Documentation/media/uapi/v4l/vidioc-g-frequency.rst | 9 - Documentation/media/uapi/v4l/vidioc-g-input.rst | 9 + Documentation/media/uapi/v4l/vidioc-g-jpegcomp.rst | 9 - Documentation/media/uapi/v4l/vidioc-g-modulator.rst | 9 - Documentation/media/uapi/v4l/vidioc-g-output.rst| 9 + Documentation/media/uapi/v4l/vidioc-g-parm.rst | 9 + Documentation/media/uapi/v4l/vidioc-g-priority.rst | 9 - Documentation/media/uapi/v4l/vidioc-g-selection.rst | 7 ++- .../media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-g-std.rst | 9 - Documentation/media/uapi/v4l/vidioc-g-tuner.rst | 9 - Documentation/media/uapi/v4l/vidioc-log-status.rst | 5 - Documentation/media/uapi/v4l/vidioc-overlay.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-prepare-buf.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-qbuf.rst| 9 + .../media/uapi/v4l/vidioc-query-dv-timings.rst | 9 + Documentation/media/uapi/v4l/vidioc-querybuf.rst| 6 ++ Documentation/media/uapi/v4l/vidioc-querycap.rst| 6 ++ Documentation/media/uapi/v4l/vidioc-queryctrl.rst | 12 ++-- Documentation/media/uapi/v4l/vidioc-querystd.rst| 6 ++ Documentation/media/uapi/v4l/vidioc-reqbufs.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-s-hw-freq-seek.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-streamon.rst| 9 + .../uapi/v4l/vidioc-subdev-enum-frame-interval.rst | 6 ++ .../media/uapi/v4l/vidioc-subdev-enum-frame-size.rst| 6 ++ .../media/uapi/v4l/vidioc-subdev-enum-mbus-code.rst | 6 ++ Documentation/media/uapi/v4l/vidioc-s
[git:media_tree/master] docs-rst: add media documentation to PDF output
This is an automatic generated email to let you know that the following patch
were queued:
Subject: docs-rst: add media documentation to PDF output
Author: Mauro Carvalho Chehab
Date:Tue Aug 16 13:02:40 2016 -0300
Now that the build of PDF output on media got fixed, re-add it
to the Sphinx PDF build.
Partially reverts 3eb6cd6834c3 ('Documentation: exclude
media documentation from pdf generation').
Signed-off-by: Mauro Carvalho Chehab
Documentation/conf.py | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 46e69dba0e3c..c25e95d46272 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -340,6 +340,8 @@ latex_documents = [
'The kernel development community', 'manual'),
('gpu/index', 'gpu.tex', 'Linux GPU Driver Developer\'s Guide',
'The kernel development community', 'manual'),
+('media/index', 'media.tex', 'Linux Media Subsystem Documentation',
+ 'The kernel development community', 'manual'),
]
# The name of an image file (relative to this directory) to place at the top of
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
