* [PATCH 1/9] docs-rst: allow generating some LaTeX pages in landscape
2016-08-15 21:21 [PATCH RFC v2 0/9] Make PDF output for media book to work Mauro Carvalho Chehab
@ 2016-08-15 21:21 ` Mauro Carvalho Chehab
2016-08-15 21:21 ` [PATCH RFC v2 2/9] docs-rst: improve output for .. notes:: on LaTeX Mauro Carvalho Chehab
` (7 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2016-08-15 21:21 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Mauro Carvalho Chehab, Jonathan Corbet,
linux-doc
Portrait is too small for some tables used at the media docs.
So, allow documents to tell Sphinx to generate some pages
in landscape by using:
.. raw:: latex
\begin{landscape}
<some stuff>
.. raw:: latex
\end{landscape}
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
Documentation/conf.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 96b7aa66c89c..9ed1a2e39b4f 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -252,16 +252,19 @@ htmlhelp_basename = 'TheLinuxKerneldoc'
latex_elements = {
# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+'papersize': 'a4paper',
# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+'pointsize': '10pt',
# Latex figure (float) alignment
#'figure_align': 'htbp',
+
+# Additional stuff for the LaTeX preamble.
+ 'preamble': '''
+ % Allow generate some pages in landscape
+ \\usepackage{lscape}
+ '''
}
# Grouping the document tree into LaTeX files. List of tuples
--
2.7.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH RFC v2 2/9] docs-rst: improve output for .. notes:: on LaTeX
2016-08-15 21:21 [PATCH RFC v2 0/9] Make PDF output for media book to work Mauro Carvalho Chehab
2016-08-15 21:21 ` [PATCH 1/9] docs-rst: allow generating some LaTeX pages in landscape Mauro Carvalho Chehab
@ 2016-08-15 21:21 ` Mauro Carvalho Chehab
2016-08-15 21:21 ` [PATCH RFC v2 3/9] docs-rst: Don't mangle with UTF-8 chars on LaTeX/PDF output Mauro Carvalho Chehab
` (6 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2016-08-15 21:21 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Mauro Carvalho Chehab, Jonathan Corbet,
linux-doc
The output for those notes are bad in pdf, as they're not
in a box with a different color. Also, it causes the output
to not build if the note is inside a table.
Change its implementation to avoid the above troubles.
The logic there came from:
https://stackoverflow.com/questions/606746/how-to-customize-an-existing-latex-environment-without-interfering-with-other-en
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
Documentation/conf.py | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 9ed1a2e39b4f..bbf2878d9945 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -264,6 +264,29 @@ latex_elements = {
'preamble': '''
% Allow generate some pages in landscape
\\usepackage{lscape}
+
+ % Put notes in gray color and let them be inside a table
+
+ \\definecolor{MyGray}{rgb}{0.80,0.80,0.80}
+
+ \\makeatletter\\newenvironment{graybox}{%
+ \\begin{lrbox}{\\@tempboxa}\\begin{minipage}{\\columnwidth}}{\\end{minipage}\\end{lrbox}%
+ \\colorbox{MyGray}{\\usebox{\\@tempboxa}}
+ }\\makeatother
+
+ \\makeatletter
+ \\renewenvironment{notice}[2]{
+ \\begin{graybox}
+ \\bf\\it
+ \\def\\py@noticetype{#1}
+ \\par\\strong{#2}
+ \\csname py@noticestart@#1\\endcsname
+ }
+ {
+ \\csname py@noticeend@\\py@noticetype\\endcsname
+ \\end{graybox}
+ }
+ \\makeatother
'''
}
--
2.7.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH RFC v2 3/9] docs-rst: Don't mangle with UTF-8 chars on LaTeX/PDF output
2016-08-15 21:21 [PATCH RFC v2 0/9] Make PDF output for media book to work Mauro Carvalho Chehab
2016-08-15 21:21 ` [PATCH 1/9] docs-rst: allow generating some LaTeX pages in landscape Mauro Carvalho Chehab
2016-08-15 21:21 ` [PATCH RFC v2 2/9] docs-rst: improve output for .. notes:: on LaTeX Mauro Carvalho Chehab
@ 2016-08-15 21:21 ` Mauro Carvalho Chehab
2016-08-16 8:27 ` Markus Heiser
2016-08-15 21:21 ` [PATCH RFC v2 4/9] [media] pixfmt-007.rst: use Sphinx math:: expressions Mauro Carvalho Chehab
` (5 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2016-08-15 21:21 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Mauro Carvalho Chehab, Jonathan Corbet,
linux-doc
pdflatex doesn't accept using some UTF-8 chars, like
"equal or less than" or "equal or greater than" chars. However,
the media documents use them. So, we need to use XeLaTeX for
conversion, and a font that accepts such characters.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
Documentation/Makefile.sphinx | 6 +++---
Documentation/conf.py | 11 +++++++++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
index fc29e08085aa..aa7ff32be589 100644
--- a/Documentation/Makefile.sphinx
+++ b/Documentation/Makefile.sphinx
@@ -26,7 +26,7 @@ else ifneq ($(DOCBOOKS),)
else # HAVE_SPHINX
# User-friendly check for pdflatex
-HAVE_PDFLATEX := $(shell if which pdflatex >/dev/null 2>&1; then echo 1; else echo 0; fi)
+HAVE_PDFLATEX := $(shell if which xelatex >/dev/null 2>&1; then echo 1; else echo 0; fi)
# Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
@@ -45,11 +45,11 @@ htmldocs:
pdfdocs:
ifeq ($(HAVE_PDFLATEX),0)
- $(warning The 'pdflatex' command was not found. Make sure you have it installed and in PATH to produce PDF output.)
+ $(warning The 'xelatex' command was not found. Make sure you have it installed and in PATH to produce PDF output.)
@echo " SKIP Sphinx $@ target."
else # HAVE_PDFLATEX
$(call cmd,sphinx,latex)
- $(Q)$(MAKE) -C $(BUILDDIR)/latex
+ $(Q)$(MAKE) PDFLATEX=xelatex -C $(BUILDDIR)/latex
endif # HAVE_PDFLATEX
epubdocs:
diff --git a/Documentation/conf.py b/Documentation/conf.py
index bbf2878d9945..f4469cd0340d 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -260,6 +260,10 @@ latex_elements = {
# Latex figure (float) alignment
#'figure_align': 'htbp',
+# Don't mangle with UTF-8 chars
+'inputenc': '',
+'utf8extra': '',
+
# Additional stuff for the LaTeX preamble.
'preamble': '''
% Allow generate some pages in landscape
@@ -287,6 +291,13 @@ latex_elements = {
\\end{graybox}
}
\\makeatother
+
+ % Use some font with UTF-8 support with XeLaTeX
+ \\usepackage{fontspec}
+ \\setsansfont{DejaVu Serif}
+ \\setromanfont{DejaVu Sans}
+ \\setmonofont{DejaVu Sans Mono}
+
'''
}
--
2.7.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH RFC v2 3/9] docs-rst: Don't mangle with UTF-8 chars on LaTeX/PDF output
2016-08-15 21:21 ` [PATCH RFC v2 3/9] docs-rst: Don't mangle with UTF-8 chars on LaTeX/PDF output Mauro Carvalho Chehab
@ 2016-08-16 8:27 ` Markus Heiser
2016-08-16 9:36 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 18+ messages in thread
From: Markus Heiser @ 2016-08-16 8:27 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Linux Media Mailing List, Mauro Carvalho Chehab, Jonathan Corbet,
linux-doc
Am 15.08.2016 um 23:21 schrieb Mauro Carvalho Chehab <mchehab@s-opensource.com>:
> pdflatex doesn't accept using some UTF-8 chars, like
> "equal or less than" or "equal or greater than" chars. However,
> the media documents use them. So, we need to use XeLaTeX for
> conversion, and a font that accepts such characters.
Right, we should use the XeLaTeX engine. But ...
Sphinx LaTeX output was/is developed for LaTeX, not for XeLaTeX.
E.g. in its defaults it uses "inputenc" and other stuff which
is not a part of XeLaTeX.
* https://github.com/sphinx-doc/sphinx/issues/894#issuecomment-220786426
This patch removes the "inputenc", thats right, but I think over
short/long term we will see more errors related to LaTeX/XeLaTeX
distinction. And we will see that some conversion will break, depending
on the sphinx version we use (There might be some non XeLateX friendly
changes in the sphinx-versions, since it is not tested with XeLaTeX).
Nevertheless, XeLaTeX is the right choice!
My Suggestion is, that you merge this patch on top of Jon's doc-next.
There, we have the sub-folders feature, with we can test book by book
and improve our toolchain.
-- Markus --
>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
> ---
> Documentation/Makefile.sphinx | 6 +++---
> Documentation/conf.py | 11 +++++++++++
> 2 files changed, 14 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
> index fc29e08085aa..aa7ff32be589 100644
> --- a/Documentation/Makefile.sphinx
> +++ b/Documentation/Makefile.sphinx
> @@ -26,7 +26,7 @@ else ifneq ($(DOCBOOKS),)
> else # HAVE_SPHINX
>
> # User-friendly check for pdflatex
> -HAVE_PDFLATEX := $(shell if which pdflatex >/dev/null 2>&1; then echo 1; else echo 0; fi)
> +HAVE_PDFLATEX := $(shell if which xelatex >/dev/null 2>&1; then echo 1; else echo 0; fi)
>
> # Internal variables.
> PAPEROPT_a4 = -D latex_paper_size=a4
> @@ -45,11 +45,11 @@ htmldocs:
>
> pdfdocs:
> ifeq ($(HAVE_PDFLATEX),0)
> - $(warning The 'pdflatex' command was not found. Make sure you have it installed and in PATH to produce PDF output.)
> + $(warning The 'xelatex' command was not found. Make sure you have it installed and in PATH to produce PDF output.)
> @echo " SKIP Sphinx $@ target."
> else # HAVE_PDFLATEX
> $(call cmd,sphinx,latex)
> - $(Q)$(MAKE) -C $(BUILDDIR)/latex
> + $(Q)$(MAKE) PDFLATEX=xelatex -C $(BUILDDIR)/latex
> endif # HAVE_PDFLATEX
>
> epubdocs:
> diff --git a/Documentation/conf.py b/Documentation/conf.py
> index bbf2878d9945..f4469cd0340d 100644
> --- a/Documentation/conf.py
> +++ b/Documentation/conf.py
> @@ -260,6 +260,10 @@ latex_elements = {
> # Latex figure (float) alignment
> #'figure_align': 'htbp',
>
> +# Don't mangle with UTF-8 chars
> +'inputenc': '',
> +'utf8extra': '',
> +
> # Additional stuff for the LaTeX preamble.
> 'preamble': '''
> % Allow generate some pages in landscape
> @@ -287,6 +291,13 @@ latex_elements = {
> \\end{graybox}
> }
> \\makeatother
> +
> + % Use some font with UTF-8 support with XeLaTeX
> + \\usepackage{fontspec}
> + \\setsansfont{DejaVu Serif}
> + \\setromanfont{DejaVu Sans}
> + \\setmonofont{DejaVu Sans Mono}
> +
> '''
> }
>
> --
> 2.7.4
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH RFC v2 3/9] docs-rst: Don't mangle with UTF-8 chars on LaTeX/PDF output
2016-08-16 8:27 ` Markus Heiser
@ 2016-08-16 9:36 ` Mauro Carvalho Chehab
2016-08-16 11:03 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2016-08-16 9:36 UTC (permalink / raw)
To: Markus Heiser
Cc: Linux Media Mailing List, Mauro Carvalho Chehab, Jonathan Corbet,
linux-doc
Em Tue, 16 Aug 2016 10:27:34 +0200
Markus Heiser <markus.heiser@darmarit.de> escreveu:
> Am 15.08.2016 um 23:21 schrieb Mauro Carvalho Chehab <mchehab@s-opensource.com>:
>
> > pdflatex doesn't accept using some UTF-8 chars, like
> > "equal or less than" or "equal or greater than" chars. However,
> > the media documents use them. So, we need to use XeLaTeX for
> > conversion, and a font that accepts such characters.
>
> Right, we should use the XeLaTeX engine. But ...
>
> Sphinx LaTeX output was/is developed for LaTeX, not for XeLaTeX.
Yes, but official support for XeLaTeX was added for 1.5:
https://github.com/agda/agda/commit/a6a437316c9b9d998e6d6d0a6a654a63422a4212
And the change there was really simple: it just adds it to the generated
Makefile.
> E.g. in its defaults it uses "inputenc" and other stuff which
> is not a part of XeLaTeX.
>
> * https://github.com/sphinx-doc/sphinx/issues/894#issuecomment-220786426
>
> This patch removes the "inputenc", thats right, but I think over
> short/long term we will see more errors related to LaTeX/XeLaTeX
> distinction.
Actually, I don't expect troubles at long term, as it is now officially
supported.
> And we will see that some conversion will break, depending
> on the sphinx version we use (There might be some non XeLateX friendly
> changes in the sphinx-versions, since it is not tested with XeLaTeX).
Yeah, we need to double-check backward compatibility, and eventually
disable it on older versions.
I can't easily test version 1.3.x anymore, as Fedora 24 upgraded to
Sphinx 1.4.4. The book builds fine on both 1.4.4 and 1.4.5.
I'll install a Debian Jessie LXC container and double-check if the build
is fine with Sphinx version 1.2.x and check the package requirements.
> Nevertheless, XeLaTeX is the right choice!
>
> My Suggestion is, that you merge this patch on top of Jon's doc-next.
> There, we have the sub-folders feature, with we can test book by book
> and improve our toolchain.
>
> -- Markus --
>
>
> >
> > Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
> > ---
> > Documentation/Makefile.sphinx | 6 +++---
> > Documentation/conf.py | 11 +++++++++++
> > 2 files changed, 14 insertions(+), 3 deletions(-)
> >
> > diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
> > index fc29e08085aa..aa7ff32be589 100644
> > --- a/Documentation/Makefile.sphinx
> > +++ b/Documentation/Makefile.sphinx
> > @@ -26,7 +26,7 @@ else ifneq ($(DOCBOOKS),)
> > else # HAVE_SPHINX
> >
> > # User-friendly check for pdflatex
> > -HAVE_PDFLATEX := $(shell if which pdflatex >/dev/null 2>&1; then echo 1; else echo 0; fi)
> > +HAVE_PDFLATEX := $(shell if which xelatex >/dev/null 2>&1; then echo 1; else echo 0; fi)
> >
> > # Internal variables.
> > PAPEROPT_a4 = -D latex_paper_size=a4
> > @@ -45,11 +45,11 @@ htmldocs:
> >
> > pdfdocs:
> > ifeq ($(HAVE_PDFLATEX),0)
> > - $(warning The 'pdflatex' command was not found. Make sure you have it installed and in PATH to produce PDF output.)
> > + $(warning The 'xelatex' command was not found. Make sure you have it installed and in PATH to produce PDF output.)
> > @echo " SKIP Sphinx $@ target."
> > else # HAVE_PDFLATEX
> > $(call cmd,sphinx,latex)
> > - $(Q)$(MAKE) -C $(BUILDDIR)/latex
> > + $(Q)$(MAKE) PDFLATEX=xelatex -C $(BUILDDIR)/latex
> > endif # HAVE_PDFLATEX
> >
> > epubdocs:
> > diff --git a/Documentation/conf.py b/Documentation/conf.py
> > index bbf2878d9945..f4469cd0340d 100644
> > --- a/Documentation/conf.py
> > +++ b/Documentation/conf.py
> > @@ -260,6 +260,10 @@ latex_elements = {
> > # Latex figure (float) alignment
> > #'figure_align': 'htbp',
> >
> > +# Don't mangle with UTF-8 chars
> > +'inputenc': '',
> > +'utf8extra': '',
> > +
> > # Additional stuff for the LaTeX preamble.
> > 'preamble': '''
> > % Allow generate some pages in landscape
> > @@ -287,6 +291,13 @@ latex_elements = {
> > \\end{graybox}
> > }
> > \\makeatother
> > +
> > + % Use some font with UTF-8 support with XeLaTeX
> > + \\usepackage{fontspec}
> > + \\setsansfont{DejaVu Serif}
> > + \\setromanfont{DejaVu Sans}
> > + \\setmonofont{DejaVu Sans Mono}
> > +
> > '''
> > }
> >
> > --
> > 2.7.4
> >
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-media" in
> > the body of a message to majordomo@vger.kernel.org
> > More majordomo info at http://vger.kernel.org/majordomo-info.html
>
Thanks,
Mauro
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH RFC v2 3/9] docs-rst: Don't mangle with UTF-8 chars on LaTeX/PDF output
2016-08-16 9:36 ` Mauro Carvalho Chehab
@ 2016-08-16 11:03 ` Mauro Carvalho Chehab
2016-08-16 11:48 ` Markus Heiser
2016-08-16 12:16 ` Mauro Carvalho Chehab
0 siblings, 2 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2016-08-16 11:03 UTC (permalink / raw)
To: Markus Heiser
Cc: Linux Media Mailing List, Mauro Carvalho Chehab, Jonathan Corbet,
linux-doc
Em Tue, 16 Aug 2016 06:36:05 -0300
Mauro Carvalho Chehab <mchehab@s-opensource.com> escreveu:
> Em Tue, 16 Aug 2016 10:27:34 +0200
> Markus Heiser <markus.heiser@darmarit.de> escreveu:
>
> > Am 15.08.2016 um 23:21 schrieb Mauro Carvalho Chehab <mchehab@s-opensource.com>:
> >
> > > pdflatex doesn't accept using some UTF-8 chars, like
> > > "equal or less than" or "equal or greater than" chars. However,
> > > the media documents use them. So, we need to use XeLaTeX for
> > > conversion, and a font that accepts such characters.
> >
> > Right, we should use the XeLaTeX engine. But ...
> >
> > Sphinx LaTeX output was/is developed for LaTeX, not for XeLaTeX.
>
> Yes, but official support for XeLaTeX was added for 1.5:
> https://github.com/agda/agda/commit/a6a437316c9b9d998e6d6d0a6a654a63422a4212
>
> And the change there was really simple: it just adds it to the generated
> Makefile.
>
> > E.g. in its defaults it uses "inputenc" and other stuff which
> > is not a part of XeLaTeX.
> >
> > * https://github.com/sphinx-doc/sphinx/issues/894#issuecomment-220786426
> >
> > This patch removes the "inputenc", thats right, but I think over
> > short/long term we will see more errors related to LaTeX/XeLaTeX
> > distinction.
>
> Actually, I don't expect troubles at long term, as it is now officially
> supported.
>
> > And we will see that some conversion will break, depending
> > on the sphinx version we use (There might be some non XeLateX friendly
> > changes in the sphinx-versions, since it is not tested with XeLaTeX).
>
> Yeah, we need to double-check backward compatibility, and eventually
> disable it on older versions.
>
> I can't easily test version 1.3.x anymore, as Fedora 24 upgraded to
> Sphinx 1.4.4. The book builds fine on both 1.4.4 and 1.4.5.
>
> I'll install a Debian Jessie LXC container and double-check if the build
> is fine with Sphinx version 1.2.x and check the package requirements.
Did some tests on Jessie. texlive required 219 packages there, 771MB.
The packages I installed there are:
# 219 packages, 771MB - and includes some non-tex packages, that
# are not present on the minimal LXC container install
texlive-xetex
# 24 packages, 7289kB
python3-sphinx
# 2 packages, 373kB
python3-sphinx-rtd-theme
# Build environment: 19 packages
make gcc
# Fonts
ttf-dejavu
There are 2 issues there that are easy to solve, but would require some
extra logic. I added a quick hack to make them build with xelatex.
See enclosed. The issues are:
1) the name of the math extension changed from sphinx.ext.pngmath to
sphinx.ext.imgmath on Sphinx 1.4. I guess it should be possible to add
some logic at conf.py to change the include depending on the Sphinx
version;
2) the Latex auto-generated Makefile is hardcoded to use pdflatex. So,
I had to manually replace it to xelatex. One easy solution would be to
not use Make -C $BUILDDIR/latex, but to just call xelatex $BUILDDIR/$tex_name.
Also, documentation hits an error. using <q> or <r> makes it build, but
not sure what got missed there, as it has 1205 pages. I suspect that
only the index was broken.
The error happens during document output phase:
[1] [2] (./TheLinuxKernel.toc)
Adding blank page after the table of contents.
[1] [2] [1] [2]
Chapter 1.
[3] [4]
! Misplaced \omit.
\multispan ->\omit
\@multispan
l.407 \hline\end{tabulary}
It resembles this error:
https://www.mail-archive.com/sphinx-dev@googlegroups.com/msg06083.html
So, I suspect it has nothing to do with xelatex, but it is, instead
some Spinx 1.2.x bug when generating cell span output in Latex.
It happened on this part of the LaTeX source code:
\begin{threeparttable}
\capstart\caption{table title}
\begin{tabulary}{\linewidth}{|L|L|L|L|}
\hline
head col 1
&
head col 2
&
head col 3
&
head col 4
\\
\hline
column 1
&
field 1.1
& \multicolumn{2}{l|}{
field 1.2 with autospan
}\\
\hline
column 2
&
field 2.1
& \multirow{2}{*}{ \multicolumn{2}{l|}{
field 2.2 - 3.3
}}\\
\hline\phantomsection\label{kernel-documentation:last-row}
column 3
& & \\
\hline\end{tabulary}
\end{threeparttable}
\end{quote}
Btw, removing the media books and all latex options, using pdflatex
still doesn't build cleanly on 1.2.x:
Package inputenc Warning: inputenc package ignored with utf8 based engines.
)
! Undefined control sequence.
<recently read> \DeclareUnicodeCharacter
l.5 \DeclareUnicodeCharacter
{00A0}{\nobreakspace}
Again, user has to use <q> or <r> to continue the build.
I'll try to install Ubuntu Xenial on a LXC container and repeat the test
there. Xenial seems to use Sphinx 1.3.6, according with:
http://packages.ubuntu.com/search?keywords=python-sphinx
Btw, as now both latest version of Ubuntu and Fedora uses Sphinx
1.4.x, perhaps we could raise the bar and just require Sphinx > 1.4.
Thanks,
Mauro
Quick hack to make it build on Sphinx 1.2.3
diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
index 8aa4fffda860..ce764df3fad5 100644
--- a/Documentation/Makefile.sphinx
+++ b/Documentation/Makefile.sphinx
@@ -50,7 +50,7 @@ ifeq ($(HAVE_PDFLATEX),0)
else # HAVE_PDFLATEX
$(call cmd,sphinx,latex)
(cd $(BUILDDIR); for i in *.rst; do echo >$$i; done)
- $(Q)$(MAKE) PDFLATEX=xelatex -C $(BUILDDIR)/latex
+ (cd $(BUILDDIR)/latex; xelatex TheLinuxKernel.tex)
endif # HAVE_PDFLATEX
epubdocs:
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 2bc91fcc6d1f..0a32d6b493e8 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -28,7 +28,7 @@ sys.path.insert(0, os.path.abspath('sphinx'))
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
-extensions = ['sphinx.ext.imgmath', 'kernel-doc', 'rstFlatTable', 'kernel_include']
+extensions = ['sphinx.ext.pngmath', 'kernel-doc', 'rstFlatTable', 'kernel_include']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH RFC v2 3/9] docs-rst: Don't mangle with UTF-8 chars on LaTeX/PDF output
2016-08-16 11:03 ` Mauro Carvalho Chehab
@ 2016-08-16 11:48 ` Markus Heiser
2016-08-16 16:51 ` Mauro Carvalho Chehab
2016-08-16 12:16 ` Mauro Carvalho Chehab
1 sibling, 1 reply; 18+ messages in thread
From: Markus Heiser @ 2016-08-16 11:48 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Linux Media Mailing List, Mauro Carvalho Chehab, Jonathan Corbet,
linux-doc
Am 16.08.2016 um 13:03 schrieb Mauro Carvalho Chehab <mchehab@s-opensource.com>:
> Em Tue, 16 Aug 2016 06:36:05 -0300
> Mauro Carvalho Chehab <mchehab@s-opensource.com> escreveu:
>
> 2) the Latex auto-generated Makefile is hardcoded to use pdflatex. So,
> I had to manually replace it to xelatex. One easy solution would be to
> not use Make -C $BUILDDIR/latex, but to just call xelatex $BUILDDIR/$tex_name.
I recommend to ship your own tex-Makefile, see:
https://lkml.org/lkml/2016/8/10/114
-- Markus
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH RFC v2 3/9] docs-rst: Don't mangle with UTF-8 chars on LaTeX/PDF output
2016-08-16 11:48 ` Markus Heiser
@ 2016-08-16 16:51 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2016-08-16 16:51 UTC (permalink / raw)
To: Markus Heiser
Cc: Linux Media Mailing List, Mauro Carvalho Chehab, Jonathan Corbet,
linux-doc
Em Tue, 16 Aug 2016 13:48:13 +0200
Markus Heiser <markus.heiser@darmarit.de> escreveu:
> Am 16.08.2016 um 13:03 schrieb Mauro Carvalho Chehab <mchehab@s-opensource.com>:
>
> > Em Tue, 16 Aug 2016 06:36:05 -0300
> > Mauro Carvalho Chehab <mchehab@s-opensource.com> escreveu:
> >
> > 2) the Latex auto-generated Makefile is hardcoded to use pdflatex. So,
> > I had to manually replace it to xelatex. One easy solution would be to
> > not use Make -C $BUILDDIR/latex, but to just call xelatex $BUILDDIR/$tex_name.
>
> I recommend to ship your own tex-Makefile, see:
>
> https://lkml.org/lkml/2016/8/10/114
That makes sense for me, but let the others review what we have so far.
We can later improve and use a makefile for tex. I would prefer to call
the version that will be copied to the output dir with a different name
(like Makefile.tex or Makefile.in), as I found really weird to have a
file called Makefile inside the Kernel tree that contains just a makefile
prototype.
Regards,
Mauro
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH RFC v2 3/9] docs-rst: Don't mangle with UTF-8 chars on LaTeX/PDF output
2016-08-16 11:03 ` Mauro Carvalho Chehab
2016-08-16 11:48 ` Markus Heiser
@ 2016-08-16 12:16 ` Mauro Carvalho Chehab
2016-08-16 12:35 ` Markus Heiser
1 sibling, 1 reply; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2016-08-16 12:16 UTC (permalink / raw)
To: Markus Heiser, Jonathan Corbet
Cc: Linux Media Mailing List, Mauro Carvalho Chehab, linux-doc
Em Tue, 16 Aug 2016 08:03:38 -0300
Mauro Carvalho Chehab <mchehab@s-opensource.com> escreveu:
> Em Tue, 16 Aug 2016 06:36:05 -0300
> Mauro Carvalho Chehab <mchehab@s-opensource.com> escreveu:
> Did some tests on Jessie. texlive required 219 packages there, 771MB.
...
> There are 2 issues there that are easy to solve, but would require some
> extra logic. I added a quick hack to make them build with xelatex.
> See enclosed. The issues are:
>
> 1) the name of the math extension changed from sphinx.ext.pngmath to
> sphinx.ext.imgmath on Sphinx 1.4. I guess it should be possible to add
> some logic at conf.py to change the include depending on the Sphinx
> version;
>
> 2) the Latex auto-generated Makefile is hardcoded to use pdflatex. So,
> I had to manually replace it to xelatex. One easy solution would be to
> not use Make -C $BUILDDIR/latex, but to just call xelatex $BUILDDIR/$tex_name.
...
> I'll try to install Ubuntu Xenial on a LXC container and repeat the test
> there. Xenial seems to use Sphinx 1.3.6, according with:
> http://packages.ubuntu.com/search?keywords=python-sphinx
On Ubuntu Xenial LXC container, I had to install:
texlive-xetex python3-sphinx python3-sphinx-rtd-theme ttf-dejavu make gcc python3-sphinx-rtd-theme
With actually installed 259 packages, 1,6 GB after install (about 800MB
of download).
The only issue there was the name of the math extension, with is also
sphinx.ext.pngmath. On a plus side, I was also able to remove one of the
hacks, by applying the enclosed patch (this doesn't work on 1.4 yet -
I suspect it requires some extra stuff to escape).
So, for me, we're pretty much safe using xelatex, as it works fine for
Sphinx 1.3 and 1.4 (and, with Sphinx 1.2, provided that the user asks to
continue the build, just like what's needed with pdflatex on such
version).
To make it generic, we'll need to patch conf.py to detect the Sphinx
version, and use the right math extension, depending on the version.
Also, as you proposed, Due to Sphinx version is 1.2, we'll need to use a
custom-made Makefile for tex.
As xelatex support was added for version 1.5, we don't need to care
about it.
Jon,
What do you think? Let's move to xelatex?
Thanks,
Mauro
diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
index 8aa4fffda860..aa7ff32be589 100644
--- a/Documentation/Makefile.sphinx
+++ b/Documentation/Makefile.sphinx
@@ -49,7 +49,6 @@ ifeq ($(HAVE_PDFLATEX),0)
@echo " SKIP Sphinx $@ target."
else # HAVE_PDFLATEX
$(call cmd,sphinx,latex)
- (cd $(BUILDDIR); for i in *.rst; do echo >$$i; done)
$(Q)$(MAKE) PDFLATEX=xelatex -C $(BUILDDIR)/latex
endif # HAVE_PDFLATEX
diff --git a/Documentation/conf.py b/Documentation/conf.py
index 2bc91fcc6d1f..0a32d6b493e8 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -28,7 +28,7 @@ sys.path.insert(0, os.path.abspath('sphinx'))
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
-extensions = ['sphinx.ext.imgmath', 'kernel-doc', 'rstFlatTable', 'kernel_include']
+extensions = ['sphinx.ext.pngmath', 'kernel-doc', 'rstFlatTable', 'kernel_include']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
diff --git a/Documentation/sphinx/parse-headers.pl b/Documentation/sphinx/parse-headers.pl
index 34bd9e2630b0..74089b0da798 100755
--- a/Documentation/sphinx/parse-headers.pl
+++ b/Documentation/sphinx/parse-headers.pl
@@ -220,7 +220,7 @@ $data =~ s/\n\s+\n/\n\n/g;
#
# Add escape codes for special characters
#
-$data =~ s,([\_\`\*\<\>\&\\\\:\/\|]),\\$1,g;
+$data =~ s,([\_\`\*\<\>\&\\\\:\/\|\%\$\#\{\}\~\^]),\\$1,g;
$data =~ s,DEPRECATED,**DEPRECATED**,g;
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH RFC v2 3/9] docs-rst: Don't mangle with UTF-8 chars on LaTeX/PDF output
2016-08-16 12:16 ` Mauro Carvalho Chehab
@ 2016-08-16 12:35 ` Markus Heiser
2016-08-16 16:52 ` Mauro Carvalho Chehab
0 siblings, 1 reply; 18+ messages in thread
From: Markus Heiser @ 2016-08-16 12:35 UTC (permalink / raw)
To: Mauro Carvalho Chehab
Cc: Jonathan Corbet, Linux Media Mailing List, Mauro Carvalho Chehab,
linux-doc
Am 16.08.2016 um 14:16 schrieb Mauro Carvalho Chehab <mchehab@s-opensource.com>:
...
> The only issue there was the name of the math extension, with is also
> sphinx.ext.pngmath. On a plus side, I was also able to remove one of the
> hacks, by applying the enclosed patch (this doesn't work on 1.4 yet -
> I suspect it requires some extra stuff to escape).
>
> So, for me, we're pretty much safe using xelatex, as it works fine for
> Sphinx 1.3 and 1.4 (and, with Sphinx 1.2, provided that the user asks to
> continue the build, just like what's needed with pdflatex on such
> version).
>
> To make it generic, we'll need to patch conf.py to detect the Sphinx
> version, and use the right math extension, depending on the version.
> Also, as you proposed, Due to Sphinx version is 1.2, we'll need to use a
> custom-made Makefile for tex.
>
> As xelatex support was added for version 1.5, we don't need to care
> about it.
I haven't checked on which version which math-extension was
replaced. But it is easy to detect the sphinx version in conf.py.
Add these lines to conf.py::
import sphinx
major, minor, patch = map(int, sphinx.__version__.split("."))
The "minor" is what you are looking for.
if minor > 3:
extensions.append("sphinx.ext.imgmath")
else:
extensions.append("sphinx.ext.pngmath")
-- Markus --
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH RFC v2 3/9] docs-rst: Don't mangle with UTF-8 chars on LaTeX/PDF output
2016-08-16 12:35 ` Markus Heiser
@ 2016-08-16 16:52 ` Mauro Carvalho Chehab
0 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2016-08-16 16:52 UTC (permalink / raw)
To: Markus Heiser
Cc: Jonathan Corbet, Linux Media Mailing List, Mauro Carvalho Chehab,
linux-doc
Em Tue, 16 Aug 2016 14:35:16 +0200
Markus Heiser <markus.heiser@darmarit.de> escreveu:
> Am 16.08.2016 um 14:16 schrieb Mauro Carvalho Chehab <mchehab@s-opensource.com>:
>
> ...
> > The only issue there was the name of the math extension, with is also
> > sphinx.ext.pngmath. On a plus side, I was also able to remove one of the
> > hacks, by applying the enclosed patch (this doesn't work on 1.4 yet -
> > I suspect it requires some extra stuff to escape).
> >
> > So, for me, we're pretty much safe using xelatex, as it works fine for
> > Sphinx 1.3 and 1.4 (and, with Sphinx 1.2, provided that the user asks to
> > continue the build, just like what's needed with pdflatex on such
> > version).
> >
> > To make it generic, we'll need to patch conf.py to detect the Sphinx
> > version, and use the right math extension, depending on the version.
> > Also, as you proposed, Due to Sphinx version is 1.2, we'll need to use a
> > custom-made Makefile for tex.
> >
> > As xelatex support was added for version 1.5, we don't need to care
> > about it.
>
> I haven't checked on which version which math-extension was
> replaced. But it is easy to detect the sphinx version in conf.py.
> Add these lines to conf.py::
>
> import sphinx
> major, minor, patch = map(int, sphinx.__version__.split("."))
>
> The "minor" is what you are looking for.
>
> if minor > 3:
> extensions.append("sphinx.ext.imgmath")
> else:
> extensions.append("sphinx.ext.pngmath")
Worked, thanks!
Added on the patch series I submitted.
Regards,
Mauro
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH RFC v2 4/9] [media] pixfmt-007.rst: use Sphinx math:: expressions
2016-08-15 21:21 [PATCH RFC v2 0/9] Make PDF output for media book to work Mauro Carvalho Chehab
` (2 preceding siblings ...)
2016-08-15 21:21 ` [PATCH RFC v2 3/9] docs-rst: Don't mangle with UTF-8 chars on LaTeX/PDF output Mauro Carvalho Chehab
@ 2016-08-15 21:21 ` Mauro Carvalho Chehab
2016-08-15 21:21 ` [PATCH RFC v2 5/9] [media] pixfmt-nv12mt.rst: use PNG instead of GIF Mauro Carvalho Chehab
` (4 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2016-08-15 21:21 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Mauro Carvalho Chehab, Jonathan Corbet,
Mauro Carvalho Chehab, Markus Heiser, linux-doc
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=true, Size: 11478 bytes --]
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 <mchehab@s-opensource.com>
---
Documentation/conf.py | 9 +-
Documentation/media/uapi/v4l/pixfmt-007.rst | 175 ++++++++++++++++++----------
2 files changed, 115 insertions(+), 69 deletions(-)
diff --git a/Documentation/conf.py b/Documentation/conf.py
index f4469cd0340d..e081f56a019c 100644
--- a/Documentation/conf.py
+++ b/Documentation/conf.py
@@ -28,14 +28,7 @@ sys.path.insert(0, os.path.abspath('sphinx'))
# Add any Sphinx extension module names here, as strings. They can be
# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
# ones.
-extensions = ['kernel-doc', 'rstFlatTable', 'kernel_include']
-
-# Gracefully handle missing rst2pdf.
-try:
- import rst2pdf
- extensions += ['rst2pdf.pdfbuilder']
-except ImportError:
- pass
+extensions = ['sphinx.ext.imgmath', 'kernel-doc', 'rstFlatTable', 'kernel_include']
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
diff --git a/Documentation/media/uapi/v4l/pixfmt-007.rst b/Documentation/media/uapi/v4l/pixfmt-007.rst
index 8c946b0c63a0..2ecace31b9f5 100644
--- a/Documentation/media/uapi/v4l/pixfmt-007.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-007.rst
@@ -72,23 +72,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 = L' / 4.5 for -0.081 < L' < 0.081
+ L = -\left( \frac{L' - 0.099}{-1.099} \right) ^{\frac{1}{0.45}} \text{, for } L' \le -0.081
- L = ((L' + 0.099) / 1.099) :sup:`1/0.45` for L' ≥ 0.081
+ L = \frac{L'}{4.5} \text{, for } -0.081 < 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'
@@ -169,23 +175,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 = L' / 4.5 for -0.081 < L' < 0.081
+ L = -\left( \frac{L' - 0.099}{-1.099} \right)^\frac{1}{0.45} \text{, for } L' \le -0.081
- L = ((L' + 0.099) / 1.099) :sup:`1/0.45` for L' ≥ 0.081
+ L = \frac{L'}{4.5}\text{, for } -0.081 < 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'
@@ -210,22 +222,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::
- Cb = (224 / 256) * (-0.1146R' - 0.3854G' + 0.5B')
+ Y' = \frac{219}{256} * (0.2126R' + 0.7152G' + 0.0722B') + \frac{16}{256}
- Cr = (224 / 256) * (0.5R' - 0.4542G' - 0.0458B')
+ Cb = \frac{224}{256} * (-0.1146R' - 0.3854G' + 0.5B')
+
+ 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
@@ -298,24 +314,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' = 12.92L for -0.0031308 ≤ L ≤ 0.0031308
+ L' = -1.055(-L)^{\frac{1}{2.4} } + 0.055\text{, for }L < -0.0031308
- L' = 1.055L :sup:`1/2.4` - 0.055 for 0.0031308 < L ≤ 1
+ L' = 12.92L\text{, for }-0.0031308 \le L \le 0.0031308
+
+ L' = 1.055L ^{\frac{1}{2.4} } - 0.055\text{, for }0.0031308 < L \le 1
Inverse Transfer function:
- L = -((-L' + 0.055) / 1.055) :sup:`2.4` for L' < -0.04045
+.. math::
- L = L' / 12.92 for -0.04045 ≤ L' ≤ 0.04045
+ L = -((-L' + 0.055) / 1.055) ^{2.4}\text{, for }L' < -0.04045
- L = ((L' + 0.055) / 1.055) :sup:`2.4` for L' > 0.04045
+ L = L' / 12.92\text{, for }-0.04045 \le L' \le 0.04045
+
+ L = ((L' + 0.055) / 1.055) ^{2.4}\text{, for }L' > 0.04045
The luminance (Y') and color difference (Cb and Cr) are obtained with
the following ``V4L2_YCBCR_ENC_SYCC`` encoding as defined by
:ref:`sycc`:
+.. math::
+
Y' = 0.2990R' + 0.5870G' + 0.1140B'
Cb = -0.1687R' - 0.3313G' + 0.5B'
@@ -395,15 +417,21 @@ are:
Transfer function:
- L' = L :sup:`1/2.19921875`
+.. math::
+
+ L' = L ^{\frac{1}{2.19921875}}
Inverse Transfer function:
- L = L' :sup:`2.19921875`
+.. math::
+
+ L = L'^{(2.19921875)}
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'
@@ -479,19 +507,25 @@ of the primary colors and the white reference are:
Transfer function (same as Rec. 709):
- L' = 4.5L for 0 ≤ L < 0.018
+.. math::
- L' = 1.099L :sup:`0.45` - 0.099 for 0.018 ≤ L ≤ 1
+ L' = 4.5L\text{, for }0 \le L < 0.018
+
+ L' = 1.099L ^{0.45} - 0.099\text{, for } 0.018 \le L \le 1
Inverse Transfer function:
- L = L' / 4.5 for L' < 0.081
+.. math::
- L = ((L' + 0.099) / 1.099) :sup:`1/0.45` for L' ≥ 0.081
+ L = L' / 4.5\text{, 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_BT2020`` encoding:
+.. math::
+
Y' = 0.2627R' + 0.6780G' + 0.0593B'
Cb = -0.1396R' - 0.3604G' + 0.5B'
@@ -506,23 +540,20 @@ There is also an alternate constant luminance R'G'B' to Yc'CbcCrc
Luma:
- Yc' = (0.2627R + 0.6780G + 0.0593B)'
-
-B' - Yc' ≤ 0:
-
- Cbc = (B' - Yc') / 1.9404
-
-B' - Yc' > 0:
-
- Cbc = (B' - Yc') / 1.5816
-
-R' - Yc' ≤ 0:
-
- Crc = (R' - Y') / 1.7184
-
-R' - Yc' > 0:
-
- Crc = (R' - Y') / 0.9936
+.. math::
+ :nowrap:
+
+ \begin{align*}
+ Yc' = (0.2627R + 0.6780G + 0.0593B)'& \\
+ B' - Yc' \le 0:& \\
+ &Cbc = (B' - Yc') / 1.9404 \\
+ B' - Yc' > 0: & \\
+ &Cbc = (B' - Yc') / 1.5816 \\
+ R' - Yc' \le 0:& \\
+ &Crc = (R' - Y') / 1.7184 \\
+ R' - Yc' > 0:& \\
+ &Crc = (R' - Y') / 0.9936
+ \end{align*}
Yc' is clamped to the range [0…1] and Cbc and Crc are clamped to the
range [-0.5…0.5]. The Yc'CbcCrc quantization is limited range.
@@ -596,11 +627,15 @@ is ``V4L2_XFER_FUNC_DCI_P3``. The default Y'CbCr encoding is
Transfer function:
- L' = L :sup:`1/2.6`
+.. math::
+
+ L' = L^{\frac{1}{2.6}}
Inverse Transfer function:
- L = L' :sup:`2.6`
+.. math::
+
+ L = L'^{(2.6)}
Y'CbCr encoding is not specified. V4L2 defaults to Rec. 709.
@@ -670,19 +705,25 @@ These chromaticities are identical to the SMPTE 170M colorspace.
Transfer function:
- L' = 4L for 0 ≤ L < 0.0228
+.. math::
- L' = 1.1115L :sup:`0.45` - 0.1115 for 0.0228 ≤ L ≤ 1
+ L' = 4L\text{, for } 0 \le L < 0.0228
+
+ L' = 1.1115L ^{0.45} - 0.1115\text{, for } 0.0228 \le L \le 1
Inverse Transfer function:
- L = L' / 4 for 0 ≤ L' < 0.0913
+.. math::
- L = ((L' + 0.1115) / 1.1115) :sup:`1/0.45` for L' ≥ 0.0913
+ L = \frac{L'}{4}\text{, for } 0 \le L' < 0.0913
+
+ L = \left( \frac{L' + 0.1115}{1.1115}\right) ^{\frac{1}{0.45} }\text{, for } L' \ge 0.0913
The luminance (Y') and color difference (Cb and Cr) are obtained with
the following ``V4L2_YCBCR_ENC_SMPTE240M`` encoding:
+.. math::
+
Y' = 0.2122R' + 0.7013G' + 0.0865B'
Cb = -0.1161R' - 0.3839G' + 0.5B'
@@ -762,19 +803,25 @@ reference are:
The transfer function was never properly defined for NTSC 1953. The Rec.
709 transfer function is recommended in the literature:
- L' = 4.5L for 0 ≤ L < 0.018
+.. math::
- L' = 1.099L :sup:`0.45` - 0.099 for 0.018 ≤ L ≤ 1
+ L' = 4.5L\text{, for } 0 \le L < 0.018
+
+ L' = 1.099L ^{0.45} - 0.099\text{, for } 0.018 \le L \le 1
Inverse Transfer function:
- L = L' / 4.5 for L' < 0.081
+.. math::
- L = ((L' + 0.099) / 1.099) :sup:`1/0.45` for L' ≥ 0.081
+ L = \frac{L'}{4.5} \text{, 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'
@@ -852,19 +899,25 @@ are:
The transfer function was never properly defined for this colorspace.
The Rec. 709 transfer function is recommended in the literature:
- L' = 4.5L for 0 ≤ L < 0.018
+.. math::
- L' = 1.099L :sup:`0.45` - 0.099 for 0.018 ≤ L ≤ 1
+ L' = 4.5L\text{, for } 0 \le L < 0.018
+
+ L' = 1.099L ^{0.45} - 0.099\text{, for } 0.018 \le L \le 1
Inverse Transfer function:
- L = L' / 4.5 for L' < 0.081
+.. math::
- L = ((L' + 0.099) / 1.099) :sup:`1/0.45` for L' ≥ 0.081
+ L = \frac{L'}{4.5} \text{, 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'
--
2.7.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH RFC v2 5/9] [media] pixfmt-nv12mt.rst: use PNG instead of GIF
2016-08-15 21:21 [PATCH RFC v2 0/9] Make PDF output for media book to work Mauro Carvalho Chehab
` (3 preceding siblings ...)
2016-08-15 21:21 ` [PATCH RFC v2 4/9] [media] pixfmt-007.rst: use Sphinx math:: expressions Mauro Carvalho Chehab
@ 2016-08-15 21:21 ` Mauro Carvalho Chehab
2016-08-15 21:21 ` [PATCH RFC v2 6/9] [media] vidioc-enumstd.rst: fix a broken reference Mauro Carvalho Chehab
` (3 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2016-08-15 21:21 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Mauro Carvalho Chehab, Jonathan Corbet,
Mauro Carvalho Chehab, Markus Heiser, linux-doc
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 <mchehab@s-opensource.com>
---
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(-)
delete mode 100644 Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.gif
create mode 100644 Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png
delete mode 100644 Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.gif
create mode 100644 Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png
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 ef2d4cf8367b97293eb9139de0f33d0a2ac236be..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2108
zcmb`E`9IT-1IOQ+qvdLI6(2NWh4B$mqGFB~bIqI`Ov+J?J|;e;^kHT0<s--JBgPCv
zu7x><Mr_V?IC8ZjMTMmFsqO3YKYX7*ydJOD<MDd^^g4aU@t7rE6%+#WhX6ZBgTVlR
zmXneK00J5SbQKiP0NMZwMFRu^0GKE#9#K&y0BEbddkFx+MN89D8xEj%D%2fGHaAVR
zFwZ__;pXN>IblWJ*`TR@ettFfwykFz0RpGX8Qtpc((LKc?crMQ<HbDZ-|LNI1e}kG
zilXBK&;$<moL@m$Xij7#IXbF8D4;(mFe@e|JvKHaK7JtN5{CdJCnO{$Ci1R?@glD9
zBf^JbqDNv0Bi9Kdaj~QE*U{AZ@!JW{h)IQog)dT5CbBap|IV4GqF+%8XG@Cb=w$?s
zn989pR96Y>AH8KYFSWD99Kv!>_lN%eRo>u79&dGsPn{QY=Bb|r<LeU>;(6+q+1bsx
zxvy`8-<FrRKYike#s6+@&WpvrwztLNowQ^BZ)l5@UA+&Ry5Qgumm;G6_!E8=|7TPz
z0YLuu%zqyNyF_<Fl9Gvc@1>AZ)6z3Cv$DzebN<eKke6RjNGYQJQ~a=`lvY+wuV7SG
zRWoa9>mJoNG&VJ}9=Ei%vD-U3yExrFy-&D({S>>SJpRz|$mrO(VC>MdmlKl{FQ#T@
zCtuCI77p1x0NyMM-@RX*TKTvp_`JS33@mZJb^Yl4*&(_Qd{8V%hZ`riKuxi}>Dopq
zO>kaLJV^(c{>X$am`p2!XESZ86${gJ4af*Lx;d*6=Zrn{WpL(bjDYWP)L~JMrG&#!
zZ2o<b`}~Wihudi@y~Rz>(6K~22}jLiEO-~AJugyFU8Rq!!S$RJQc{tKru;GgjkKx^
zFd&lbg)hGK?p7)LCkp@qeX0;<>RU3>!h8W=eg6o&nE4(8Lhkxx8flHs7<D_Vv-fdZ
z6(+geLm2ro*KcFlx!A>RsrkEkc^-X~TW61OE-h+0@5963qk?9WuDbC$zlK*#au5C*
zD7^%Y9A^IR@P6g`?lm+1UAyC0%O5K)1Eptk8flOMvr(_T6UzQ|!ub`Li=XY=j<OH&
z@^PYsid%@oX9^bVZ)|Ha)B=fzSr9dlg{|X(8Na1j-y-;Tt%DbSl5JxaQW*;Y>d?Fy
zzsv*}SJoRT^iEPbz9CSR>R!~+@%|b3CiB=5scaWqd0YZwBduRfHnEOJD<`ds=vt`@
zeULk`X^@`eESxaj_5qFpprApz!pV#Yqh{V-zud5;!cfY#{VvN;21&&*dK_lxwQS=+
ziKn#L6o;W2dSyL_s^*P@;0<8OtZscq2{U@#F5lP`yda|x8LVOKT5yNB52{bOZ<vKL
zsL;9nGH#sC^0l>tUP$1Q7!Q+vgdTu|H9S$!C_Y|k6eM|{7L(qs&a9y!lH8$KYht*s
zdB3FxvecONvQarrk5td@Rjh6BatJqiJQZ$bsPpWT6V7Ylo?&DIF_&N1=BJiZ$6oP%
zZdB_r>>SnEGHX@sIdQyb%;**PicwdGuC4T`AN|5lI#Olt9yND}Ncbdfi1})?vD7K#
z1N>KFf}O11Omvp4_5j@U#Fv_kEIHkw5)9wCB^f)sM(s`-JjBc}voaUYxX8gt<Rl3T
zNQ4=S)v?y6CI`{@Z0xV<(F3v4eZADZHoeg&s}@(k?8AoGa%H5cr4CA`G8Twl=O;Go
zVbK*v5VchcuB<X4{RCt#np2cMbq!3ut7w%mCfU@MAkTW9kw{I?vzG+*DmYyo{%Y(h
zQL^52ZImVjv4rCt03|+_tMo0Q>rqP!8Be^mPojpej9Pxfrk6fJ-Gg%2H%yFF&E(qV
zI@>pHuJyjEb5^X}(|8k&G2GLkt(BPaVpGp+l(!+;QpmQ}o?*W2G+0RaobVQuEze%)
z3UG`306VfGT7f(rwcgs~{Qh~pBRRlO@YHBs-w?L=Y;arWuky}%5=;^azquvIH*o=*
zsQiS2LGh4%yDO~Jt@9DQHJ}X>awdgTA}L#H>6nX`$g2WD4to?$A8`b0(d^~rw-5@d
zLH6q~{K2&*`1UU*bgGn?Xx^Y9IYtLz2DJ6^o|L+7M?-B^dEk@-eW*%z7^E<}3J%)$
zJrpIQY2tSA4%y)h`Kh(yc)_l3U^>((>&RtHDeOyrue4eiOrH80Aq_2QIUgju8)EmH
z9tf^vzW{5uLP@g<tex!9uz>PO9gK)bJB?Pnd&Sc3Uctpwby8(|-de8|dI~ZDJ4}ij
z;^wQqme2^??d-!|%xvb;9XmE$*v*1W$FZ{g^6v|5Xg&L9b94b~_X|DG$E8T`4+QHp
zp$)J$n)>?P&I9hKv}N$a{x-(7yg|1+SgtA#PEyJnpoSQ{Q}P}|V2~Sf!AS=xaGOz8
zN1C)dg|5kp(>VCifsAqDmK)F^-R{ubEBeo6ifz<!Sem<LNvQ1}8CPG$+^Z>vR6d@A
zfm{|NR0~nPzz@brvSP1yYuepv<e0&^$}}$vs{c_5A4u>Z&BuG77<H@9F8?-;;kc-e
zy*PN1Zt)d<c5@#4kezL*jZmqUt_jfF(|VF|L*=?p?FSr(_p~91#SCFp`}H|_ovo+W
zzL8~~En_#-IH}YH2J4HK!Y9%W4PQ=_@(+9lYwlr}DQcLk9y2NNy=L;bVJ;pS+}88g
zMc=K)g5jFWNBL7DH@2Ee<ZDAuJ5LKJTg{a&wc$Se>6h#+R()pe)ez@b)6-jzTZcay
JfkA-P{{T*w8|nZ6
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 0000000000000000000000000000000000000000..41401860fb737739658c354c0cb7ca12313a0265
GIT binary patch
literal 1920
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
JC_3vN^#^QHk<b7D
literal 0
HcmV?d00001
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 df81d68108eeb66569417b475984aa634385eebb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 6858
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
V-^XO_BChtj?V@hK$vy-q{tq)sSegI;
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 0000000000000000000000000000000000000000..7775f5d7cc4661b7ec082e7ed5542eddb7dc65de
GIT binary patch
literal 5261
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
HjxqlNW%-jc
literal 0
HcmV?d00001
--
2.7.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH RFC v2 6/9] [media] vidioc-enumstd.rst: fix a broken reference
2016-08-15 21:21 [PATCH RFC v2 0/9] Make PDF output for media book to work Mauro Carvalho Chehab
` (4 preceding siblings ...)
2016-08-15 21:21 ` [PATCH RFC v2 5/9] [media] pixfmt-nv12mt.rst: use PNG instead of GIF Mauro Carvalho Chehab
@ 2016-08-15 21:21 ` Mauro Carvalho Chehab
2016-08-15 21:21 ` [PATCH RFC v2 7/9] [media] vidioc-enumstd.rst: remove bullets from sound carrier Mauro Carvalho Chehab
` (2 subsequent siblings)
8 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2016-08-15 21:21 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Mauro Carvalho Chehab, Jonathan Corbet,
Mauro Carvalho Chehab, Markus Heiser, linux-doc
Somehow, the conversion broke a reference here. Re-add it.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
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
--
2.7.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH RFC v2 7/9] [media] vidioc-enumstd.rst: remove bullets from sound carrier
2016-08-15 21:21 [PATCH RFC v2 0/9] Make PDF output for media book to work Mauro Carvalho Chehab
` (5 preceding siblings ...)
2016-08-15 21:21 ` [PATCH RFC v2 6/9] [media] vidioc-enumstd.rst: fix a broken reference Mauro Carvalho Chehab
@ 2016-08-15 21:21 ` Mauro Carvalho Chehab
2016-08-15 21:21 ` [PATCH RFC v2 8/9] [media] docs-rst: better use the .. note:: tag Mauro Carvalho Chehab
2016-08-15 21:22 ` [PATCH RFC v2 9/9] HACK: make pdfdocs build with media books Mauro Carvalho Chehab
8 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2016-08-15 21:21 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Mauro Carvalho Chehab, Jonathan Corbet,
Mauro Carvalho Chehab, Markus Heiser, linux-doc
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=true, Size: 1558 bytes --]
The items at the sound carrier had a bullet. Those are not needed.
So, get rid of them.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
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` = 4250000
- ± 2000
+ - :cspan:`3` f\ :sub:`OR` = 4406250 ± 2000, f\ :sub:`OB` = 4250000 ± 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
--
2.7.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH RFC v2 8/9] [media] docs-rst: better use the .. note:: tag
2016-08-15 21:21 [PATCH RFC v2 0/9] Make PDF output for media book to work Mauro Carvalho Chehab
` (6 preceding siblings ...)
2016-08-15 21:21 ` [PATCH RFC v2 7/9] [media] vidioc-enumstd.rst: remove bullets from sound carrier Mauro Carvalho Chehab
@ 2016-08-15 21:21 ` Mauro Carvalho Chehab
2016-08-15 21:22 ` [PATCH RFC v2 9/9] HACK: make pdfdocs build with media books Mauro Carvalho Chehab
8 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2016-08-15 21:21 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Mauro Carvalho Chehab, Jonathan Corbet,
Mauro Carvalho Chehab, Markus Heiser, Hans Verkuil, linux-doc
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=true, Size: 48722 bytes --]
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 <mchehab@s-opensource.com>
---
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-func-ioctl.rst
index d0279e6d2734..170bdd56211e 100644
--- a/Documentation/media/uapi/cec/cec-func-ioctl.rst
+++ b/Documentation/media/uapi/cec/cec-func-ioctl.rst
@@ -38,7 +38,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.
The :c:func:`ioctl()` function manipulates cec device parameters. The
diff --git a/Documentation/media/uapi/cec/cec-func-open.rst b/Documentation/media/uapi/cec/cec-func-open.rst
index 38fd7e0cfccd..c83989acfc83 100644
--- a/Documentation/media/uapi/cec/cec-func-open.rst
+++ b/Documentation/media/uapi/cec/cec-func-open.rst
@@ -45,7 +45,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.
To open a cec device applications call :c:func:`open()` with the
diff --git a/Documentation/media/uapi/cec/cec-func-poll.rst b/Documentation/media/uapi/cec/cec-func-poll.rst
index fcab65f6d6b8..5d1e0525056e 100644
--- a/Documentation/media/uapi/cec/cec-func-poll.rst
+++ b/Documentation/media/uapi/cec/cec-func-poll.rst
@@ -29,7 +29,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.
With the :c:func:`poll()` function applications can wait for CEC
diff --git a/Documentation/media/uapi/cec/cec-intro.rst b/Documentation/media/uapi/cec/cec-intro.rst
index afa76f26fdde..4a19ea5323a9 100644
--- a/Documentation/media/uapi/cec/cec-intro.rst
+++ b/Documentation/media/uapi/cec/cec-intro.rst
@@ -3,7 +3,9 @@
Introduction
============
-.. 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.
HDMI connectors provide a single pin for use by the Consumer Electronics
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 eaedc63186e6..2516d4c3a4c8 100644
--- a/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-caps.rst
@@ -31,7 +31,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.
All cec devices must support :ref:`ioctl CEC_ADAP_G_CAPS <CEC_ADAP_G_CAPS>`. To query
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..359f7b3aa91a 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
@@ -35,7 +35,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.
To query the current CEC logical addresses, applications call
diff --git a/Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst b/Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst
index b955d044b334..c50aa3ee1e0d 100644
--- a/Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-adap-g-phys-addr.rst
@@ -34,7 +34,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.
To query the current physical address applications call
diff --git a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst b/Documentation/media/uapi/cec/cec-ioc-dqevent.rst
index 7a6d6d00ce19..36eb4f907d30 100644
--- a/Documentation/media/uapi/cec/cec-ioc-dqevent.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-dqevent.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.
CEC devices can send asynchronous events. These can be retrieved by
diff --git a/Documentation/media/uapi/cec/cec-ioc-g-mode.rst b/Documentation/media/uapi/cec/cec-ioc-g-mode.rst
index f0084d892db6..c0e851f357d0 100644
--- a/Documentation/media/uapi/cec/cec-ioc-g-mode.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-g-mode.rst
@@ -30,7 +30,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.
By default any filehandle can use :ref:`CEC_TRANSMIT`, but in order to prevent
diff --git a/Documentation/media/uapi/cec/cec-ioc-receive.rst b/Documentation/media/uapi/cec/cec-ioc-receive.rst
index ae5a39ade45f..7167a90209df 100644
--- a/Documentation/media/uapi/cec/cec-ioc-receive.rst
+++ b/Documentation/media/uapi/cec/cec-ioc-receive.rst
@@ -33,7 +33,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.
To receive a CEC message the application has to fill in the
diff --git a/Documentation/media/uapi/dvb/dvb-fe-read-status.rst b/Documentation/media/uapi/dvb/dvb-fe-read-status.rst
index fcffaa7e1463..76c20612b274 100644
--- a/Documentation/media/uapi/dvb/dvb-fe-read-status.rst
+++ b/Documentation/media/uapi/dvb/dvb-fe-read-status.rst
@@ -17,7 +17,9 @@ using :ref:`FE_READ_STATUS`.
Signal statistics are provided via
:ref:`FE_GET_PROPERTY`.
-.. note:: Most statistics require the demodulator to be fully locked
+.. note::
+
+ Most statistics require the demodulator to be fully locked
(e. g. with FE_HAS_LOCK bit set). See
:ref:`Frontend statistics indicators <frontend-stat-properties>` for
more details.
diff --git a/Documentation/media/uapi/dvb/dvbapi.rst b/Documentation/media/uapi/dvb/dvbapi.rst
index 48e61aba741e..37680137e3f2 100644
--- a/Documentation/media/uapi/dvb/dvbapi.rst
+++ b/Documentation/media/uapi/dvb/dvbapi.rst
@@ -8,7 +8,9 @@
Part II - Digital TV API
########################
-.. note:: This API is also known as **DVB API**, although it is generic
+.. note::
+
+ This API is also known as **DVB API**, although it is generic
enough to support all digital TV standards.
**Version 5.10**
diff --git a/Documentation/media/uapi/dvb/dvbproperty.rst b/Documentation/media/uapi/dvb/dvbproperty.rst
index cd0511b06c2c..a5a859a45381 100644
--- a/Documentation/media/uapi/dvb/dvbproperty.rst
+++ b/Documentation/media/uapi/dvb/dvbproperty.rst
@@ -20,7 +20,9 @@ Also, the union didn't have any space left to be expanded without
breaking userspace. So, the decision was to deprecate the legacy
union/struct based approach, in favor of a properties set approach.
-.. note:: On Linux DVB API version 3, setting a frontend were done via
+.. note::
+
+ On Linux DVB API version 3, setting a frontend were done via
:ref:`struct dvb_frontend_parameters <dvb-frontend-parameters>`.
This got replaced on version 5 (also called "S2API", as this API were
added originally_enabled to provide support for DVB-S2), because the
diff --git a/Documentation/media/uapi/dvb/examples.rst b/Documentation/media/uapi/dvb/examples.rst
index bf0a8617de92..9a4ae4b0f3d7 100644
--- a/Documentation/media/uapi/dvb/examples.rst
+++ b/Documentation/media/uapi/dvb/examples.rst
@@ -9,7 +9,9 @@ Examples
In this section we would like to present some examples for using the DVB
API.
-..note:: This section is out of date, and the code below won't even
+..note::
+
+ This section is out of date, and the code below won't even
compile. Please refer to the
`libdvbv5 <https://linuxtv.org/docs/libdvbv5/index.html>`__ for
updated/recommended examples.
diff --git a/Documentation/media/uapi/dvb/fe-get-info.rst b/Documentation/media/uapi/dvb/fe-get-info.rst
index bb6c32e47ce8..dfc7644f9dac 100644
--- a/Documentation/media/uapi/dvb/fe-get-info.rst
+++ b/Documentation/media/uapi/dvb/fe-get-info.rst
@@ -144,7 +144,9 @@ struct dvb_frontend_info
- Capabilities supported by the frontend
-.. note:: The frequencies are specified in Hz for Terrestrial and Cable
+.. note::
+
+ The frequencies are specified in Hz for Terrestrial and Cable
systems. They're specified in kHz for Satellite systems
diff --git a/Documentation/media/uapi/dvb/fe-read-status.rst b/Documentation/media/uapi/dvb/fe-read-status.rst
index 624ed9d06488..defe30d036ec 100644
--- a/Documentation/media/uapi/dvb/fe-read-status.rst
+++ b/Documentation/media/uapi/dvb/fe-read-status.rst
@@ -40,7 +40,9 @@ used to check about the locking status of the frontend after being
tuned. The ioctl takes a pointer to an integer where the status will be
written.
-.. note:: The size of status is actually sizeof(enum fe_status), with
+.. note::
+
+ The size of status is actually sizeof(enum fe_status), with
varies according with the architecture. This needs to be fixed in the
future.
diff --git a/Documentation/media/uapi/dvb/frontend.rst b/Documentation/media/uapi/dvb/frontend.rst
index 48c5cd487ce7..e051a9012540 100644
--- a/Documentation/media/uapi/dvb/frontend.rst
+++ b/Documentation/media/uapi/dvb/frontend.rst
@@ -29,7 +29,9 @@ The frontend can be accessed through ``/dev/dvb/adapter?/frontend?``.
Data types and ioctl definitions can be accessed by including
``linux/dvb/frontend.h`` in your application.
-.. note:: Transmission via the internet (DVB-IP) is not yet handled by this
+.. note::
+
+ Transmission via the internet (DVB-IP) is not yet handled by this
API but a future extension is possible.
On Satellite systems, the API support for the Satellite Equipment
diff --git a/Documentation/media/uapi/rc/lirc-set-wideband-receiver.rst b/Documentation/media/uapi/rc/lirc-set-wideband-receiver.rst
index cffb01fd1042..b9d582fd7df1 100644
--- a/Documentation/media/uapi/rc/lirc-set-wideband-receiver.rst
+++ b/Documentation/media/uapi/rc/lirc-set-wideband-receiver.rst
@@ -42,7 +42,9 @@ that prevents them to be used with some remotes. Wide band receiver might
also be more precise. On the other hand its disadvantage it usually
reduced range of reception.
-.. note:: Wide band receiver might be implictly enabled if you enable
+.. note::
+
+ Wide band receiver might be implictly enabled if you enable
carrier reports. In that case it will be disabled as soon as you disable
carrier reports. Trying to disable wide band receiver while carrier
reports are active will do nothing.
diff --git a/Documentation/media/uapi/v4l/audio.rst b/Documentation/media/uapi/v4l/audio.rst
index 4dd11345866c..b8059fb05372 100644
--- a/Documentation/media/uapi/v4l/audio.rst
+++ b/Documentation/media/uapi/v4l/audio.rst
@@ -37,7 +37,9 @@ The :ref:`VIDIOC_G_AUDIO <VIDIOC_G_AUDIO>` and
:ref:`VIDIOC_G_AUDOUT <VIDIOC_G_AUDOUT>` ioctls report the current
audio input and output, respectively.
-.. note:: Note that, unlike :ref:`VIDIOC_G_INPUT <VIDIOC_G_INPUT>` and
+.. note::
+
+ Note that, unlike :ref:`VIDIOC_G_INPUT <VIDIOC_G_INPUT>` and
:ref:`VIDIOC_G_OUTPUT <VIDIOC_G_OUTPUT>` these ioctls return a
structure as :ref:`VIDIOC_ENUMAUDIO` and
:ref:`VIDIOC_ENUMAUDOUT <VIDIOC_ENUMAUDOUT>` do, not just an index.
diff --git a/Documentation/media/uapi/v4l/buffer.rst b/Documentation/media/uapi/v4l/buffer.rst
index 5deb4a46f992..f75f959b960b 100644
--- a/Documentation/media/uapi/v4l/buffer.rst
+++ b/Documentation/media/uapi/v4l/buffer.rst
@@ -166,12 +166,15 @@ struct v4l2_buffer
output device because the application did not pass new data in
time.
- .. note:: This may count the frames received e.g. over USB, without
+ .. note::
+
+ This may count the frames received e.g. over USB, without
taking into account the frames dropped by the remote hardware due
to limited compression throughput or bus bandwidth. These devices
identify by not enumerating any video standards, see
:ref:`standard`.
+
- .. row 10
- __u32
@@ -299,7 +302,9 @@ struct v4l2_plane
``bytesused`` will be set to the size of the plane (see the
``length`` field of this struct) by the driver.
- .. note:: Note that the actual image data starts at ``data_offset``
+ .. note::
+
+ Note that the actual image data starts at ``data_offset``
which may not be 0.
- .. row 2
@@ -371,7 +376,9 @@ struct v4l2_plane
field when ``type`` refers to a capture stream, applications when
it refers to an output stream.
- .. note:: That data_offset is included in ``bytesused``. So the
+ .. note::
+
+ That data_offset is included in ``bytesused``. So the
size of the image in the plane is ``bytesused``-``data_offset``
at offset ``data_offset`` from the start of the plane.
diff --git a/Documentation/media/uapi/v4l/crop.rst b/Documentation/media/uapi/v4l/crop.rst
index 0913822347af..4622884b06ea 100644
--- a/Documentation/media/uapi/v4l/crop.rst
+++ b/Documentation/media/uapi/v4l/crop.rst
@@ -15,7 +15,9 @@ offset into a video signal.
Applications can use the following API to select an area in the video
signal, query the default area and the hardware limits.
-.. note:: Despite their name, the :ref:`VIDIOC_CROPCAP <VIDIOC_CROPCAP>`,
+.. note::
+
+ Despite their name, the :ref:`VIDIOC_CROPCAP <VIDIOC_CROPCAP>`,
:ref:`VIDIOC_G_CROP <VIDIOC_G_CROP>` and :ref:`VIDIOC_S_CROP
<VIDIOC_G_CROP>` ioctls apply to input as well as output devices.
@@ -38,7 +40,9 @@ support scaling or the :ref:`VIDIOC_G_CROP <VIDIOC_G_CROP>` and
:ref:`VIDIOC_S_CROP <VIDIOC_G_CROP>` ioctls. Their size (and position
where applicable) will be fixed in this case.
-.. note:: All capture and output devices must support the
+.. note::
+
+ All capture and output devices must support the
:ref:`VIDIOC_CROPCAP <VIDIOC_CROPCAP>` ioctl such that applications
can determine if scaling takes place.
@@ -144,7 +148,9 @@ reopening a device, such that piping data into or out of a device will
work without special preparations. More advanced applications should
ensure the parameters are suitable before starting I/O.
-.. note:: On the next two examples, a video capture device is assumed;
+.. note::
+
+ On the next two examples, a video capture device is assumed;
change ``V4L2_BUF_TYPE_VIDEO_CAPTURE`` for other types of device.
Example: Resetting the cropping parameters
diff --git a/Documentation/media/uapi/v4l/dev-codec.rst b/Documentation/media/uapi/v4l/dev-codec.rst
index dfb20328e34d..d9f218449ddd 100644
--- a/Documentation/media/uapi/v4l/dev-codec.rst
+++ b/Documentation/media/uapi/v4l/dev-codec.rst
@@ -21,7 +21,9 @@ for both capture and output to start the codec.
Video compression codecs use the MPEG controls to setup their codec
parameters
-.. note:: The MPEG controls actually support many more codecs than
+.. note::
+
+ The MPEG controls actually support many more codecs than
just MPEG. See :ref:`mpeg-controls`.
Memory-to-memory devices can often be used as a shared resource: you can
diff --git a/Documentation/media/uapi/v4l/dev-osd.rst b/Documentation/media/uapi/v4l/dev-osd.rst
index fadda131f020..4e1ee79ec334 100644
--- a/Documentation/media/uapi/v4l/dev-osd.rst
+++ b/Documentation/media/uapi/v4l/dev-osd.rst
@@ -16,7 +16,9 @@ this interface, which borrows structures and ioctls of the
The OSD function is accessible through the same character special file
as the :ref:`Video Output <capture>` function.
-.. note:: The default function of such a ``/dev/video`` device is video
+.. note::
+
+ The default function of such a ``/dev/video`` device is video
capturing or output. The OSD function is only available after calling
the :ref:`VIDIOC_S_FMT <VIDIOC_G_FMT>` ioctl.
diff --git a/Documentation/media/uapi/v4l/dev-overlay.rst b/Documentation/media/uapi/v4l/dev-overlay.rst
index 92b4471b0c6e..d47a6bbc2e98 100644
--- a/Documentation/media/uapi/v4l/dev-overlay.rst
+++ b/Documentation/media/uapi/v4l/dev-overlay.rst
@@ -19,7 +19,9 @@ video into a window.
Video overlay devices are accessed through the same character special
files as :ref:`video capture <capture>` devices.
-.. note:: The default function of a ``/dev/video`` device is video
+.. note::
+
+ The default function of a ``/dev/video`` device is video
capturing. The overlay function is only available after calling
the :ref:`VIDIOC_S_FMT <VIDIOC_G_FMT>` ioctl.
@@ -236,7 +238,9 @@ exceeded are undefined. [#f3]_
:ref:`VIDIOC_S_FBUF <VIDIOC_G_FBUF>`,
:ref:`framebuffer-flags`).
- .. note:: This field was added in Linux 2.6.23, extending the
+ .. note::
+
+ This field was added in Linux 2.6.23, extending the
structure. However the :ref:`VIDIOC_[G|S|TRY]_FMT <VIDIOC_G_FMT>`
ioctls, which take a pointer to a :ref:`v4l2_format <v4l2-format>`
parent structure with padding bytes at the end, are not affected.
diff --git a/Documentation/media/uapi/v4l/dev-rds.rst b/Documentation/media/uapi/v4l/dev-rds.rst
index cd6ad63cb90b..fa32538d4c1f 100644
--- a/Documentation/media/uapi/v4l/dev-rds.rst
+++ b/Documentation/media/uapi/v4l/dev-rds.rst
@@ -14,7 +14,9 @@ at devices capable of receiving and/or transmitting RDS information.
For more information see the core RDS standard :ref:`iec62106` and the
RBDS standard :ref:`nrsc4`.
-.. note:: Note that the RBDS standard as is used in the USA is almost
+.. note::
+
+ Note that the RBDS standard as is used in the USA is almost
identical to the RDS standard. Any RDS decoder/encoder can also handle
RBDS. Only some of the fields have slightly different meanings. See the
RBDS standard for more information.
diff --git a/Documentation/media/uapi/v4l/extended-controls.rst b/Documentation/media/uapi/v4l/extended-controls.rst
index 71071d73747d..782f7f3c2209 100644
--- a/Documentation/media/uapi/v4l/extended-controls.rst
+++ b/Documentation/media/uapi/v4l/extended-controls.rst
@@ -184,7 +184,9 @@ Codec Control Reference
Below all controls within the Codec control class are described. First
the generic controls, then controls specific for certain hardware.
-.. note:: These controls are applicable to all codecs and not just MPEG. The
+.. note::
+
+ These controls are applicable to all codecs and not just MPEG. The
defines are prefixed with V4L2_CID_MPEG/V4L2_MPEG as the controls
were originally made for MPEG codecs and later extended to cover all
encoding formats.
diff --git a/Documentation/media/uapi/v4l/func-mmap.rst b/Documentation/media/uapi/v4l/func-mmap.rst
index c156fb7b7422..639fef5b4f78 100644
--- a/Documentation/media/uapi/v4l/func-mmap.rst
+++ b/Documentation/media/uapi/v4l/func-mmap.rst
@@ -78,7 +78,9 @@ Arguments
``MAP_SHARED`` allows applications to share the mapped memory with
other (e. g. child-) processes.
- .. note:: The Linux ``videobuf`` module which is used by some
+ .. note::
+
+ The Linux ``videobuf`` module which is used by some
drivers supports only ``MAP_SHARED``. ``MAP_PRIVATE`` requests
copy-on-write semantics. V4L2 applications should not set the
``MAP_PRIVATE``, ``MAP_DENYWRITE``, ``MAP_EXECUTABLE`` or ``MAP_ANON``
diff --git a/Documentation/media/uapi/v4l/pixfmt-006.rst b/Documentation/media/uapi/v4l/pixfmt-006.rst
index 987b9a8a9eb4..1c8321f9b1fb 100644
--- a/Documentation/media/uapi/v4l/pixfmt-006.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-006.rst
@@ -19,7 +19,9 @@ colorspace field of struct :ref:`v4l2_pix_format <v4l2-pix-format>`
or struct :ref:`v4l2_pix_format_mplane <v4l2-pix-format-mplane>`
needs to be filled in.
-.. note:: The default R'G'B' quantization is full range for all
+.. note::
+
+ The default R'G'B' quantization is full range for all
colorspaces except for BT.2020 which uses limited range R'G'B'
quantization.
diff --git a/Documentation/media/uapi/v4l/pixfmt-007.rst b/Documentation/media/uapi/v4l/pixfmt-007.rst
index 2ecace31b9f5..8d4f1033663f 100644
--- a/Documentation/media/uapi/v4l/pixfmt-007.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-007.rst
@@ -569,7 +569,9 @@ projectors that use the DCI-P3 colorspace. The default transfer function
is ``V4L2_XFER_FUNC_DCI_P3``. The default Y'CbCr encoding is
``V4L2_YCBCR_ENC_709``.
-.. note:: Note that this colorspace does not specify a
+.. note::
+
+ Note that this colorspace does not specify a
Y'CbCr encoding since it is not meant to be encoded to Y'CbCr. So this
default Y'CbCr encoding was picked because it is the HDTV encoding. The
default Y'CbCr quantization is limited range. The chromaticities of the
@@ -795,7 +797,9 @@ reference are:
- 0.316
-.. note:: This colorspace uses Illuminant C instead of D65 as the white
+.. note::
+
+ This colorspace uses Illuminant C instead of D65 as the white
reference. To correctly convert an image in this colorspace to another
that uses D65 you need to apply a chromatic adaptation algorithm such as
the Bradford method.
@@ -941,7 +945,9 @@ reference are identical to sRGB. The transfer function use is
with full range quantization where Y' is scaled to [0…255] and Cb/Cr are
scaled to [-128…128] and then clipped to [-128…127].
-.. note:: The JPEG standard does not actually store colorspace
+.. note::
+
+ The JPEG standard does not actually store colorspace
information. So if something other than sRGB is used, then the driver
will have to set that information explicitly. Effectively
``V4L2_COLORSPACE_JPEG`` can be considered to be an abbreviation for
diff --git a/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst b/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst
index 14446ed7f650..7f295b48748c 100644
--- a/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-sbggr16.rst
@@ -19,7 +19,9 @@ This format is similar to
has a depth of 16 bits. The least significant byte is stored at lower
memory addresses (little-endian).
-..note:: The actual sampling precision may be lower than 16 bits,
+..note::
+
+ The actual sampling precision may be lower than 16 bits,
for example 10 bits per pixel with values in tange 0 to 1023.
**Byte Order.**
diff --git a/Documentation/media/uapi/v4l/pixfmt-y16-be.rst b/Documentation/media/uapi/v4l/pixfmt-y16-be.rst
index 37fa099c16a6..b16874951f0f 100644
--- a/Documentation/media/uapi/v4l/pixfmt-y16-be.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-y16-be.rst
@@ -17,7 +17,9 @@ Description
This is a grey-scale image with a depth of 16 bits per pixel. The most
significant byte is stored at lower memory addresses (big-endian).
-.. note:: Tthe actual sampling precision may be lower than 16 bits, for
+.. note::
+
+ The actual sampling precision may be lower than 16 bits, for
example 10 bits per pixel with values in range 0 to 1023.
**Byte Order.**
diff --git a/Documentation/media/uapi/v4l/pixfmt-y16.rst b/Documentation/media/uapi/v4l/pixfmt-y16.rst
index 4c41c042188b..10e2824da147 100644
--- a/Documentation/media/uapi/v4l/pixfmt-y16.rst
+++ b/Documentation/media/uapi/v4l/pixfmt-y16.rst
@@ -17,7 +17,9 @@ Description
This is a grey-scale image with a depth of 16 bits per pixel. The least
significant byte is stored at lower memory addresses (little-endian).
-.. note:: The actual sampling precision may be lower than 16 bits, for
+.. note::
+
+ The actual sampling precision may be lower than 16 bits, for
example 10 bits per pixel with values in range 0 to 1023.
**Byte Order.**
diff --git a/Documentation/media/uapi/v4l/standard.rst b/Documentation/media/uapi/v4l/standard.rst
index c4f678f545ec..5dd341f18839 100644
--- a/Documentation/media/uapi/v4l/standard.rst
+++ b/Documentation/media/uapi/v4l/standard.rst
@@ -41,7 +41,9 @@ output applications call the :ref:`VIDIOC_G_STD <VIDIOC_G_STD>` and
*received* standard can be sensed with the
:ref:`VIDIOC_QUERYSTD` ioctl.
-..note:: The parameter of all these ioctls is a pointer to a
+..note::
+
+ The parameter of all these ioctls is a pointer to a
:ref:`v4l2_std_id <v4l2-std-id>` type (a standard set), *not* an
index into the standard enumeration. Drivers must implement all video
standard ioctls when the device has one or more video inputs or outputs.
diff --git a/Documentation/media/uapi/v4l/tuner.rst b/Documentation/media/uapi/v4l/tuner.rst
index 37eb4b9b95fb..c3df65c2e320 100644
--- a/Documentation/media/uapi/v4l/tuner.rst
+++ b/Documentation/media/uapi/v4l/tuner.rst
@@ -28,7 +28,9 @@ struct :ref:`v4l2_tuner <v4l2-tuner>` returned by :ref:`VIDIOC_G_TUNER <VIDIOC_G
also contains signal status information applicable when the tuner of the
current video or radio input is queried.
-.. note:: :ref:`VIDIOC_S_TUNER <VIDIOC_G_TUNER>` does not switch the
+.. note::
+
+ :ref:`VIDIOC_S_TUNER <VIDIOC_G_TUNER>` does not switch the
current tuner, when there is more than one at all. The tuner is solely
determined by the current video input. Drivers must support both ioctls
and set the ``V4L2_CAP_TUNER`` flag in the struct :ref:`v4l2_capability
diff --git a/Documentation/media/uapi/v4l/userp.rst b/Documentation/media/uapi/v4l/userp.rst
index 1d8b14bd4cdc..0371e068c50b 100644
--- a/Documentation/media/uapi/v4l/userp.rst
+++ b/Documentation/media/uapi/v4l/userp.rst
@@ -88,7 +88,9 @@ To start and stop capturing or output applications call the
:ref:`VIDIOC_STREAMON <VIDIOC_STREAMON>` and
:ref:`VIDIOC_STREAMOFF <VIDIOC_STREAMON>` ioctl.
-.. note:: ref:`VIDIOC_STREAMOFF <VIDIOC_STREAMON>` removes all buffers from
+.. note::
+
+ ref:`VIDIOC_STREAMOFF <VIDIOC_STREAMON>` removes all buffers from
both queues and unlocks all buffers as a side effect. Since there is no
notion of doing anything "now" on a multitasking system, if an
application needs to synchronize with another event it should examine
diff --git a/Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst b/Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst
index 6e05957013bb..c390412d5aa9 100644
--- a/Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst
+++ b/Documentation/media/uapi/v4l/vidioc-dv-timings-cap.rst
@@ -39,7 +39,9 @@ initialize the ``pad`` field to 0, zero the reserved array of struct
``VIDIOC_DV_TIMINGS_CAP`` ioctl on a video node and the driver will fill
in the structure.
-.. note:: Drivers may return different values after
+.. note::
+
+ Drivers may return different values after
switching the video input or output.
When implemented by the driver DV capabilities of subdevices can be
diff --git a/Documentation/media/uapi/v4l/vidioc-enum-dv-timings.rst b/Documentation/media/uapi/v4l/vidioc-enum-dv-timings.rst
index 3ba75d3fb93c..764d6cea601c 100644
--- a/Documentation/media/uapi/v4l/vidioc-enum-dv-timings.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-dv-timings.rst
@@ -49,7 +49,9 @@ error code when the index is out of bounds. To enumerate all supported
DV timings, applications shall begin at index zero, incrementing by one
until the driver returns ``EINVAL``.
-.. note:: Drivers may enumerate a different set of DV timings after
+.. note::
+
+ Drivers may enumerate a different set of DV timings after
switching the video input or output.
When implemented by the driver DV timings of subdevices can be queried
diff --git a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
index 90996f69d6ae..4715261631ab 100644
--- a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
@@ -40,7 +40,9 @@ fill the rest of the structure or return an ``EINVAL`` error code. All
formats are enumerable by beginning at index zero and incrementing by
one until ``EINVAL`` is returned.
-.. note:: After switching input or output the list of enumerated image
+.. note::
+
+ After switching input or output the list of enumerated image
formats may be different.
@@ -51,7 +53,6 @@ one until ``EINVAL`` is returned.
:stub-columns: 0
:widths: 1 1 2
-
- .. row 1
- __u32
@@ -113,7 +114,9 @@ one until ``EINVAL`` is returned.
Several image formats are already defined by this specification in
:ref:`pixfmt`.
- .. attention:: These codes are not the same as those used
+ .. attention::
+
+ These codes are not the same as those used
in the Windows world.
- .. row 7
diff --git a/Documentation/media/uapi/v4l/vidioc-enum-frameintervals.rst b/Documentation/media/uapi/v4l/vidioc-enum-frameintervals.rst
index ceae6003039e..9c22a3a6938f 100644
--- a/Documentation/media/uapi/v4l/vidioc-enum-frameintervals.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-frameintervals.rst
@@ -73,7 +73,9 @@ the device supports. Only for the ``V4L2_FRMIVAL_TYPE_DISCRETE`` type
does it make sense to increase the index value to receive more frame
intervals.
-.. note:: The order in which the frame intervals are returned has no
+.. note::
+
+ The order in which the frame intervals are returned has no
special meaning. In particular does it not say anything about potential
default frame intervals.
diff --git a/Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst b/Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst
index 8b268354d442..6e2adf6c23a3 100644
--- a/Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-framesizes.rst
@@ -72,7 +72,9 @@ the ``type`` field to determine the type of frame size enumeration the
device supports. Only for the ``V4L2_FRMSIZE_TYPE_DISCRETE`` type does
it make sense to increase the index value to receive more frame sizes.
-.. note:: The order in which the frame sizes are returned has no special
+.. note::
+
+ The order in which the frame sizes are returned has no special
meaning. In particular does it not say anything about potential default
format sizes.
diff --git a/Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst b/Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst
index 00ab5e19cc1d..ccf308bd9423 100644
--- a/Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-freq-bands.rst
@@ -129,7 +129,9 @@ of the corresponding tuner/modulator is set.
- :cspan:`2` The supported modulation systems of this frequency
band. See :ref:`band-modulation`.
- .. note:: Currently only one modulation system per frequency band
+ .. note::
+
+ Currently only one modulation system per frequency band
is supported. More work will need to be done if multiple
modulation systems are possible. Contact the linux-media
mailing list
diff --git a/Documentation/media/uapi/v4l/vidioc-enumaudioout.rst b/Documentation/media/uapi/v4l/vidioc-enumaudioout.rst
index cde1db55834f..3112b43242f2 100644
--- a/Documentation/media/uapi/v4l/vidioc-enumaudioout.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enumaudioout.rst
@@ -41,7 +41,9 @@ structure or return an ``EINVAL`` error code when the index is out of
bounds. To enumerate all audio outputs applications shall begin at index
zero, incrementing by one until the driver returns ``EINVAL``.
-.. note:: Connectors on a TV card to loop back the received audio signal
+.. note::
+
+ Connectors on a TV card to loop back the received audio signal
to a sound card are not audio outputs in this sense.
See :ref:`VIDIOC_G_AUDIOout <VIDIOC_G_AUDOUT>` for a description of struct
diff --git a/Documentation/media/uapi/v4l/vidioc-g-audioout.rst b/Documentation/media/uapi/v4l/vidioc-g-audioout.rst
index b1c1bfeb251e..c9e9a550e86d 100644
--- a/Documentation/media/uapi/v4l/vidioc-g-audioout.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-audioout.rst
@@ -51,7 +51,9 @@ return the ``EINVAL`` error code when the index is out of bounds. This is a
write-only ioctl, it does not return the current audio output attributes
as ``VIDIOC_G_AUDOUT`` does.
-.. note:: Connectors on a TV card to loop back the received audio signal
+.. note::
+
+ Connectors on a TV card to loop back the received audio signal
to a sound card are not audio outputs in this sense.
diff --git a/Documentation/media/uapi/v4l/vidioc-g-edid.rst b/Documentation/media/uapi/v4l/vidioc-g-edid.rst
index 1a982b68a72f..b881098b8964 100644
--- a/Documentation/media/uapi/v4l/vidioc-g-edid.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-edid.rst
@@ -67,7 +67,9 @@ total number of available EDID blocks and it will return 0 without
copying any data. This is an easy way to discover how many EDID blocks
there are.
-.. note:: If there are no EDID blocks available at all, then
+.. note::
+
+ If there are no EDID blocks available at all, then
the driver will set ``blocks`` to 0 and it returns 0.
To set the EDID blocks of a receiver the application has to fill in the
diff --git a/Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst b/Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst
index 39e24ad4b825..c91039b16d49 100644
--- a/Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-ext-ctrls.rst
@@ -127,7 +127,9 @@ still cause this situation.
to a value large enough to store the payload result and ``ENOSPC`` is
returned.
- .. note:: For string controls, this ``size`` field should
+ .. note::
+
+ For string controls, this ``size`` field should
not be confused with the length of the string. This field refers
to the size of the memory that contains the string. The actual
*length* of the string may well be much smaller.
@@ -265,7 +267,9 @@ still cause this situation.
control and ``V4L2_CTRL_WHICH_DEF_VAL`` will return the default
value of the control.
- .. note:: You can only get the default value of the control,
+ .. note::
+
+ You can only get the default value of the control,
you cannot set or try it.
For backwards compatibility you can also use a control class here
diff --git a/Documentation/media/uapi/v4l/vidioc-g-modulator.rst b/Documentation/media/uapi/v4l/vidioc-g-modulator.rst
index a2e8c73f0678..fcb2e4896d4d 100644
--- a/Documentation/media/uapi/v4l/vidioc-g-modulator.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-modulator.rst
@@ -130,7 +130,9 @@ To change the radio frequency the
shall be modulated. It contains a set of flags as defined in
:ref:`modulator-txsubchans`.
- .. note:: The tuner ``rxsubchans`` flags are reused, but the
+ .. note::
+
+ The tuner ``rxsubchans`` flags are reused, but the
semantics are different. Video output devices
are assumed to have an analog or PCM audio input with 1-3
channels. The ``txsubchans`` flags select one or more channels
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 f1f661d0200c..f3db6f677650 100644
--- a/Documentation/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-sliced-vbi-cap.rst
@@ -40,7 +40,9 @@ output device, applications initialize the ``type`` field of a struct
driver fills in the remaining fields or returns an ``EINVAL`` error code if
the sliced VBI API is unsupported or ``type`` is invalid.
-.. note:: The ``type`` field was added, and the ioctl changed from read-only
+.. note::
+
+ The ``type`` field was added, and the ioctl changed from read-only
to write-read, in Linux 2.6.19.
diff --git a/Documentation/media/uapi/v4l/vidioc-g-tuner.rst b/Documentation/media/uapi/v4l/vidioc-g-tuner.rst
index 614db06b8b4b..d209736d6a53 100644
--- a/Documentation/media/uapi/v4l/vidioc-g-tuner.rst
+++ b/Documentation/media/uapi/v4l/vidioc-g-tuner.rst
@@ -391,7 +391,9 @@ To change the radio frequency the
carrier for a monaural secondary language. Only
``V4L2_TUNER_ANALOG_TV`` tuners can have this capability.
- .. note:: The ``V4L2_TUNER_CAP_LANG2`` and ``V4L2_TUNER_CAP_SAP``
+ .. note::
+
+ The ``V4L2_TUNER_CAP_LANG2`` and ``V4L2_TUNER_CAP_SAP``
flags are synonyms. ``V4L2_TUNER_CAP_SAP`` applies when the tuner
supports the ``V4L2_STD_NTSC_M`` video standard.
@@ -502,7 +504,9 @@ To change the radio frequency the
- The tuner receives a Second Audio Program.
- .. note:: The ``V4L2_TUNER_SUB_LANG2`` and ``V4L2_TUNER_SUB_SAP``
+ .. note::
+
+ The ``V4L2_TUNER_SUB_LANG2`` and ``V4L2_TUNER_SUB_SAP``
flags are synonyms. The ``V4L2_TUNER_SUB_SAP`` flag applies
when the current video standard is ``V4L2_STD_NTSC_M``.
diff --git a/Documentation/media/uapi/v4l/vidioc-qbuf.rst b/Documentation/media/uapi/v4l/vidioc-qbuf.rst
index 3b927f36fb5b..31c360d7d1a6 100644
--- a/Documentation/media/uapi/v4l/vidioc-qbuf.rst
+++ b/Documentation/media/uapi/v4l/vidioc-qbuf.rst
@@ -137,7 +137,9 @@ EIO
``VIDIOC_DQBUF`` failed due to an internal error. Can also indicate
temporary problems like signal loss.
- .. note:: The driver might dequeue an (empty) buffer despite returning
+ .. note::
+
+ The driver might dequeue an (empty) buffer despite returning
an error, or even stop capturing. Reusing such buffer may be unsafe
though and its details (e.g. ``index``) may not be returned either.
It is recommended that drivers indicate recoverable errors by setting
diff --git a/Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst b/Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst
index 416d8d604af4..6a87f44cdf3f 100644
--- a/Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst
+++ b/Documentation/media/uapi/v4l/vidioc-query-dv-timings.rst
@@ -39,7 +39,9 @@ similar to sensing the video standard. To do so, applications call
:ref:`v4l2_dv_timings <v4l2-dv-timings>`. Once the hardware detects
the timings, it will fill in the timings structure.
-.. note:: Drivers shall *not* switch timings automatically if new
+.. note::
+
+ Drivers shall *not* switch timings automatically if new
timings are detected. Instead, drivers should send the
``V4L2_EVENT_SOURCE_CHANGE`` event (if they support this) and expect
that userspace will take action by calling :ref:`VIDIOC_QUERY_DV_TIMINGS`.
diff --git a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
index 8d6e61a7284d..937ce9e32a79 100644
--- a/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
+++ b/Documentation/media/uapi/v4l/vidioc-queryctrl.rst
@@ -84,7 +84,9 @@ fills the rest of the structure or returns an ``EINVAL`` error code when the
:ref:`v4l2_queryctrl <v4l2-queryctrl>` ``minimum`` to ``maximum``,
inclusive.
-.. note:: It is possible for ``VIDIOC_QUERYMENU`` to return
+.. note::
+
+ It is possible for ``VIDIOC_QUERYMENU`` to return
an ``EINVAL`` error code for some indices between ``minimum`` and
``maximum``. In that case that particular menu item is not supported by
this driver. Also note that the ``minimum`` value is not necessarily 0.
@@ -188,7 +190,9 @@ See also the examples in :ref:`control`.
``_BITMASK``, ``_MENU`` or ``_INTEGER_MENU`` control. Not valid
for other types of controls.
- .. note:: Drivers reset controls to their default value only when
+ .. note::
+
+ Drivers reset controls to their default value only when
the driver is first loaded, never afterwards.
- .. row 8
@@ -306,7 +310,9 @@ See also the examples in :ref:`control`.
``_BOOLEAN``, ``_BITMASK``, ``_MENU``, ``_INTEGER_MENU``, ``_U8``
or ``_U16`` control. Not valid for other types of controls.
- .. note:: Drivers reset controls to their default value only when
+ .. note::
+
+ Drivers reset controls to their default value only when
the driver is first loaded, never afterwards.
- .. row 8
@@ -728,7 +734,9 @@ See also the examples in :ref:`control`.
case the hardware calculates the gain value based on the lighting
conditions which can change over time.
- .. note:: Setting a new value for a volatile control will have no
+ .. note::
+
+ Setting a new value for a volatile control will have no
effect and no ``V4L2_EVENT_CTRL_CH_VALUE`` will be sent, unless
the ``V4L2_CTRL_FLAG_EXECUTE_ON_WRITE`` flag (see below) is
also set. Otherwise the new value will just be ignored.
diff --git a/Documentation/media/uapi/v4l/vidioc-querystd.rst b/Documentation/media/uapi/v4l/vidioc-querystd.rst
index b4a4e222c7b0..cb03d249417c 100644
--- a/Documentation/media/uapi/v4l/vidioc-querystd.rst
+++ b/Documentation/media/uapi/v4l/vidioc-querystd.rst
@@ -43,7 +43,9 @@ will return V4L2_STD_UNKNOWN. When detection is not possible or fails,
the set must contain all standards supported by the current video input
or output.
-.. note:: Drivers shall *not* switch the video standard
+.. note::
+
+ Drivers shall *not* switch the video standard
automatically if a new video standard is detected. Instead, drivers
should send the ``V4L2_EVENT_SOURCE_CHANGE`` event (if they support
this) and expect that userspace will take action by calling
diff --git a/Documentation/media/uapi/v4l/vidioc-streamon.rst b/Documentation/media/uapi/v4l/vidioc-streamon.rst
index bb23745ebcaf..7fa4362f9a81 100644
--- a/Documentation/media/uapi/v4l/vidioc-streamon.rst
+++ b/Documentation/media/uapi/v4l/vidioc-streamon.rst
@@ -76,7 +76,9 @@ then 0 is returned. Nothing happens in the case of ``VIDIOC_STREAMON``,
but ``VIDIOC_STREAMOFF`` will return queued buffers to their starting
state as mentioned above.
-.. note:: Applications can be preempted for unknown periods right before
+.. note::
+
+ Applications can be preempted for unknown periods right before
or after the ``VIDIOC_STREAMON`` or ``VIDIOC_STREAMOFF`` calls, there is
no notion of starting or stopping "now". Buffer timestamps can be used
to synchronize with other events.
diff --git a/Documentation/media/uapi/v4l/vidioc-subscribe-event.rst b/Documentation/media/uapi/v4l/vidioc-subscribe-event.rst
index 3f28e8c47960..86b16faa41bb 100644
--- a/Documentation/media/uapi/v4l/vidioc-subscribe-event.rst
+++ b/Documentation/media/uapi/v4l/vidioc-subscribe-event.rst
@@ -54,7 +54,9 @@ using the :ref:`VIDIOC_DQEVENT` ioctl.
- Type of the event, see :ref:`event-type`.
- .. note:: ``V4L2_EVENT_ALL`` can be used with
+ .. note::
+
+ ``V4L2_EVENT_ALL`` can be used with
:ref:`VIDIOC_UNSUBSCRIBE_EVENT <VIDIOC_SUBSCRIBE_EVENT>` for
unsubscribing all events at once.
diff --git a/Documentation/media/v4l-drivers/bttv.rst b/Documentation/media/v4l-drivers/bttv.rst
index f78c135b40e7..7abc1c9a261b 100644
--- a/Documentation/media/v4l-drivers/bttv.rst
+++ b/Documentation/media/v4l-drivers/bttv.rst
@@ -586,6 +586,7 @@ Cards
-----
.. note::
+
For a more updated list, please check
https://linuxtv.org/wiki/index.php/Hardware_Device_Information
--
2.7.4
^ permalink raw reply related [flat|nested] 18+ messages in thread* [PATCH RFC v2 9/9] HACK: make pdfdocs build with media books
2016-08-15 21:21 [PATCH RFC v2 0/9] Make PDF output for media book to work Mauro Carvalho Chehab
` (7 preceding siblings ...)
2016-08-15 21:21 ` [PATCH RFC v2 8/9] [media] docs-rst: better use the .. note:: tag Mauro Carvalho Chehab
@ 2016-08-15 21:22 ` Mauro Carvalho Chehab
8 siblings, 0 replies; 18+ messages in thread
From: Mauro Carvalho Chehab @ 2016-08-15 21:22 UTC (permalink / raw)
To: Linux Media Mailing List
Cc: Mauro Carvalho Chehab, Mauro Carvalho Chehab, Jonathan Corbet,
Mauro Carvalho Chehab, Markus Heiser, linux-doc
---------------------------------
PLEASE DO NOT APPLY THIS UPSTREAM
---------------------------------
This hack addresses two issues with pdf generation from media
books:
1) Sphinx doesn't do the right thing if a block of code
is inside a table. This sounds a Sphinx bug. Perhaps it
can be fixed by preloading some LaTeX code.
2) the file output doesn't do the right thing for PDF.
This is likely due to the lack of some escape chars when
generating the output rst file.
This hack makes the document to build fully.
Please notice that tables are not built well yet, as most are too
big. We can very likely fix several of them by rotating the page
to landscape.
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
---
Documentation/Makefile.sphinx | 1 +
Documentation/media/uapi/v4l/vidioc-enum-fmt.rst | 8 ++++----
Documentation/media/uapi/v4l/vidioc-querycap.rst | 20 ++++++++++----------
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx
index aa7ff32be589..8aa4fffda860 100644
--- a/Documentation/Makefile.sphinx
+++ b/Documentation/Makefile.sphinx
@@ -49,6 +49,7 @@ ifeq ($(HAVE_PDFLATEX),0)
@echo " SKIP Sphinx $@ target."
else # HAVE_PDFLATEX
$(call cmd,sphinx,latex)
+ (cd $(BUILDDIR); for i in *.rst; do echo >$$i; done)
$(Q)$(MAKE) PDFLATEX=xelatex -C $(BUILDDIR)/latex
endif # HAVE_PDFLATEX
diff --git a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
index 4715261631ab..7df7bee142b6 100644
--- a/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
+++ b/Documentation/media/uapi/v4l/vidioc-enum-fmt.rst
@@ -107,10 +107,10 @@ one until ``EINVAL`` is returned.
.. _v4l2-fourcc:
- .. code-block:: c
-
- #define v4l2_fourcc(a,b,c,d) (((__u32)(a)<<0)|((__u32)(b)<<8)|((__u32)(c)<<16)|((__u32)(d)<<24))
-
+.. .. code-block:: c
+..
+.. #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..96ea81344696 100644
--- a/Documentation/media/uapi/v4l/vidioc-querycap.rst
+++ b/Documentation/media/uapi/v4l/vidioc-querycap.rst
@@ -118,16 +118,16 @@ specification the ioctl returns an ``EINVAL`` error code.
- :cspan:`2`
- .. code-block:: c
-
- #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);
+.. .. code-block:: c
+..
+.. #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);
- .. row 6
--
2.7.4
^ permalink raw reply related [flat|nested] 18+ messages in thread
