From 8c27ceff3604b249a9efafbd1bd8b141b79e619d Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Tue, 18 Oct 2016 10:12:27 -0200 Subject: docs: fix locations of several documents that got moved The previous patch renamed several files that are cross-referenced along the Kernel documentation. Adjust the links to point to the right places. Signed-off-by: Mauro Carvalho Chehab --- Documentation/media/uapi/v4l/diff-v4l.rst | 4 ++-- Documentation/media/v4l-drivers/bttv.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Documentation/media') diff --git a/Documentation/media/uapi/v4l/diff-v4l.rst b/Documentation/media/uapi/v4l/diff-v4l.rst index 76b2ecab8657..8209eeb63dd2 100644 --- a/Documentation/media/uapi/v4l/diff-v4l.rst +++ b/Documentation/media/uapi/v4l/diff-v4l.rst @@ -648,12 +648,12 @@ microcode programming. A new interface for MPEG compression and playback devices is documented in :ref:`extended-controls`. .. [#f1] - According to Documentation/devices.txt these should be symbolic links + According to Documentation/admin-guide/devices.rst these should be symbolic links to ``/dev/video0``. Note the original bttv interface is not compatible with V4L or V4L2. .. [#f2] - According to ``Documentation/devices.txt`` a symbolic link to + According to ``Documentation/admin-guide/devices.rst`` a symbolic link to ``/dev/radio0``. .. [#f3] diff --git a/Documentation/media/v4l-drivers/bttv.rst b/Documentation/media/v4l-drivers/bttv.rst index 7abc1c9a261b..bc63b12efafd 100644 --- a/Documentation/media/v4l-drivers/bttv.rst +++ b/Documentation/media/v4l-drivers/bttv.rst @@ -304,10 +304,10 @@ bug. It is very helpful if you can tell where exactly it broke With a hard freeze you probably doesn't find anything in the logfiles. The only way to capture any kernel messages is to hook up a serial console and let some terminal application log the messages. /me uses -screen. See Documentation/serial-console.txt for details on setting +screen. See Documentation/admin-guide/serial-console.rst for details on setting up a serial console. -Read Documentation/oops-tracing.txt to learn how to get any useful +Read Documentation/admin-guide/oops-tracing.rst to learn how to get any useful information out of a register+stack dump printed by the kernel on protection faults (so-called "kernel oops"). -- cgit v1.2.3-55-g7522 From e2a91f4f42018994d7424d405900d17eba6555d0 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 14 Nov 2016 14:32:27 -0200 Subject: docs-rst: fix LaTeX \DURole renewcommand with Sphinx 1.3+ PDF build on Kernel 4.9-rc? returns an error with Sphinx 1.3.x and Sphinx 1.4.x, when trying to solve some cross-references. The solution is to redefine the \DURole macro. However, this is redefined too late. Move such redefinition to LaTeX preamble and bind it to just the Sphinx versions where the error is known to be present. Tested by building the documentation on interactive mode: make PDFLATEX=xelatex -C Documentation/output/./latex Fixes: e61a39baf74d ("[media] index.rst: Fix LaTeX error in interactive mode on Sphinx 1.4.x") Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/conf.py | 6 +++++- Documentation/media/index.rst | 5 ----- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'Documentation/media') diff --git a/Documentation/conf.py b/Documentation/conf.py index bcb1af786e78..db78974aad26 100644 --- a/Documentation/conf.py +++ b/Documentation/conf.py @@ -37,7 +37,7 @@ from load_config import loadConfig extensions = ['kerneldoc', 'rstFlatTable', 'kernel_include', 'cdomain'] # The name of the math extension changed on Sphinx 1.4 -if minor > 3: +if major == 1 and minor > 3: extensions.append("sphinx.ext.imgmath") else: extensions.append("sphinx.ext.pngmath") @@ -332,6 +332,10 @@ latex_elements = { ''' } +# Fix reference escape troubles with Sphinx 1.4.x +if major == 1 and minor > 3: + latex_elements['preamble'] += '\\renewcommand*{\\DUrole}[2]{ #2 }\n' + # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, # author, documentclass [howto, manual, or own class]). diff --git a/Documentation/media/index.rst b/Documentation/media/index.rst index e347a3e7bdef..7f8f0af620ce 100644 --- a/Documentation/media/index.rst +++ b/Documentation/media/index.rst @@ -1,11 +1,6 @@ Linux Media Subsystem Documentation =================================== -.. Sphinx 1.4.x has a definition for DUrole that doesn't work on alltt blocks -.. raw:: latex - - \renewcommand*{\DUrole}[2]{ #2 } - Contents: .. toctree:: -- cgit v1.2.3-55-g7522 From ce998e6fbaf77a0cc9ce5070db64db56c1d4b69a Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 14 Nov 2016 14:32:28 -0200 Subject: subdev-formats.rst: don't use adjustbox on a longtable adjustbox doesn't work on longtables. Also, this causes an error on LaTeX in interactive mode. So, use, instead, a tiny font. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/media/uapi/v4l/subdev-formats.rst | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Documentation/media') diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst index e144370f62a0..282a7467a812 100644 --- a/Documentation/media/uapi/v4l/subdev-formats.rst +++ b/Documentation/media/uapi/v4l/subdev-formats.rst @@ -1526,9 +1526,16 @@ The following table lists existing packed Bayer formats. The data organization is given as an example for the first pixel only. +.. HACK: ideally, we would be using adjustbox here. However, Sphinx +.. is a very bad behaviored guy: if the table has more than 30 cols, +.. it switches to long table, and there's no way to override it. + + .. raw:: latex - \newline\newline\begin{adjustbox}{width=\columnwidth} + \begingroup + \tiny + \setlength{\tabcolsep}{2pt} .. tabularcolumns:: |p{7.6cm}|p{1.6cm}|p{0.7cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}| @@ -2314,7 +2321,7 @@ organization is given as an example for the first pixel only. .. raw:: latex - \end{adjustbox}\newline\newline + \endgroup Packed YUV Formats -- cgit v1.2.3-55-g7522 From 346dabfee054e5ca6cee4ab605640098e6555b6c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 14 Nov 2016 14:32:29 -0200 Subject: subdev-formats.rst: add missing columns to tabularcolumns There are several missing columns on the size specification, causing LaTeX to complain on interactive mode. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/media/uapi/v4l/subdev-formats.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Documentation/media') diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst index 282a7467a812..65105609374b 100644 --- a/Documentation/media/uapi/v4l/subdev-formats.rst +++ b/Documentation/media/uapi/v4l/subdev-formats.rst @@ -1537,7 +1537,7 @@ organization is given as an example for the first pixel only. \tiny \setlength{\tabcolsep}{2pt} -.. tabularcolumns:: |p{7.6cm}|p{1.6cm}|p{0.7cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}|p{0.5cm}| +.. tabularcolumns:: |p{4.0cm}|p{0.7cm}|p{0.3cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}|p{0.22cm}| .. _v4l2-mbus-pixelcode-bayer: -- cgit v1.2.3-55-g7522 From 00e99ed2c84536055761fa5962ae4e6eb95b4090 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 14 Nov 2016 14:32:30 -0200 Subject: convert some images from png to svg SVG images are nicer, as they can easily be scaled. Also, they're written in text, with makes easier to work. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/media/uapi/dvb/intro.rst | 2 +- .../media/uapi/dvb/intro_files/dvbstb.png | Bin 22655 -> 0 bytes .../media/uapi/dvb/intro_files/dvbstb.svg | 651 +++++++++++++++++++++ .../media/uapi/v4l/vidioc-g-selection.rst | 2 +- .../v4l/vidioc-g-selection_files/constraints.png | Bin 3313 -> 0 bytes .../v4l/vidioc-g-selection_files/constraints.svg | 346 +++++++++++ 6 files changed, 999 insertions(+), 2 deletions(-) delete mode 100644 Documentation/media/uapi/dvb/intro_files/dvbstb.png create mode 100644 Documentation/media/uapi/dvb/intro_files/dvbstb.svg delete mode 100644 Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png create mode 100644 Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.svg (limited to 'Documentation/media') diff --git a/Documentation/media/uapi/dvb/intro.rst b/Documentation/media/uapi/dvb/intro.rst index b61081d00a9f..11b96a19a9ab 100644 --- a/Documentation/media/uapi/dvb/intro.rst +++ b/Documentation/media/uapi/dvb/intro.rst @@ -56,7 +56,7 @@ Overview .. _stb_components: .. figure:: intro_files/dvbstb.* - :alt: dvbstb.pdf / dvbstb.png + :alt: dvbstb.pdf / dvbstb.svg :align: center Components of a DVB card/STB diff --git a/Documentation/media/uapi/dvb/intro_files/dvbstb.png b/Documentation/media/uapi/dvb/intro_files/dvbstb.png deleted file mode 100644 index 9b8f372e7afd..000000000000 Binary files a/Documentation/media/uapi/dvb/intro_files/dvbstb.png and /dev/null differ diff --git a/Documentation/media/uapi/dvb/intro_files/dvbstb.svg b/Documentation/media/uapi/dvb/intro_files/dvbstb.svg new file mode 100644 index 000000000000..c4140fb518af --- /dev/null +++ b/Documentation/media/uapi/dvb/intro_files/dvbstb.svg @@ -0,0 +1,651 @@ + +image/svg+xmlAntena +Frontend +CA +Demux +SEC +Audio +Video +TV + \ No newline at end of file diff --git a/Documentation/media/uapi/v4l/vidioc-g-selection.rst b/Documentation/media/uapi/v4l/vidioc-g-selection.rst index 3145a9166bad..6da359e50668 100644 --- a/Documentation/media/uapi/v4l/vidioc-g-selection.rst +++ b/Documentation/media/uapi/v4l/vidioc-g-selection.rst @@ -130,7 +130,7 @@ Selection targets and flags are documented in .. _sel-const-adjust: .. figure:: vidioc-g-selection_files/constraints.* - :alt: constraints.png + :alt: constraints.svg :align: center Size adjustments with constraint flags. diff --git a/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png b/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png deleted file mode 100644 index 20228d2c5504..000000000000 Binary files a/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.svg b/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.svg new file mode 100644 index 000000000000..f710ee46b1f8 --- /dev/null +++ b/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.svg @@ -0,0 +1,346 @@ + +image/svg+xmlV4L2_SEL_FLAG_GE +ORIGINAL +V4L2_SEL_FLAG_LE + \ No newline at end of file -- cgit v1.2.3-55-g7522 From f3902934797b0b00ba8f10bfc377c1bb2789046c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 14 Nov 2016 14:32:31 -0200 Subject: docs-rst: convert gif files to png Right now, media is using two different formats for bitmap images: GIF and PNG. Let's use just one, to make it simpler when building with Sphinx. As PNG is usually better than GIF, let's use it. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/media/uapi/v4l/crop_files/crop.gif | Bin 5967 -> 0 bytes Documentation/media/uapi/v4l/crop_files/crop.png | Bin 0 -> 3334 bytes .../media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif | Bin 4741 -> 0 bytes .../media/uapi/v4l/dev-raw-vbi_files/vbi_525.png | Bin 0 -> 2053 bytes .../media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif | Bin 5095 -> 0 bytes .../media/uapi/v4l/dev-raw-vbi_files/vbi_625.png | Bin 0 -> 2352 bytes .../media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif | Bin 2400 -> 0 bytes .../media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png | Bin 0 -> 906 bytes .../media/uapi/v4l/field-order_files/fieldseq_bt.gif | Bin 25430 -> 0 bytes .../media/uapi/v4l/field-order_files/fieldseq_bt.png | Bin 0 -> 12306 bytes .../media/uapi/v4l/field-order_files/fieldseq_tb.gif | Bin 25323 -> 0 bytes .../media/uapi/v4l/field-order_files/fieldseq_tb.png | Bin 0 -> 12247 bytes 12 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 Documentation/media/uapi/v4l/crop_files/crop.gif create mode 100644 Documentation/media/uapi/v4l/crop_files/crop.png delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif create mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.png delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif create mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.png delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif create mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif create mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.png delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif create mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.png (limited to 'Documentation/media') diff --git a/Documentation/media/uapi/v4l/crop_files/crop.gif b/Documentation/media/uapi/v4l/crop_files/crop.gif deleted file mode 100644 index 3b9e7d836d4b..000000000000 Binary files a/Documentation/media/uapi/v4l/crop_files/crop.gif and /dev/null differ diff --git a/Documentation/media/uapi/v4l/crop_files/crop.png b/Documentation/media/uapi/v4l/crop_files/crop.png new file mode 100644 index 000000000000..225998c395df Binary files /dev/null and b/Documentation/media/uapi/v4l/crop_files/crop.png differ diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif deleted file mode 100644 index 5580b690d504..000000000000 Binary files a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.gif and /dev/null differ diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.png b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.png new file mode 100644 index 000000000000..24937dbec337 Binary files /dev/null and b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.png differ diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif deleted file mode 100644 index 34e3251983c4..000000000000 Binary files a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.gif and /dev/null differ diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.png b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.png new file mode 100644 index 000000000000..25c671af41ad Binary files /dev/null and b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.png differ diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif deleted file mode 100644 index b02434d3b356..000000000000 Binary files a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.gif and /dev/null differ diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png new file mode 100644 index 000000000000..b04ae50385a7 Binary files /dev/null and b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png differ diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif b/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif deleted file mode 100644 index 60e8569a76c9..000000000000 Binary files a/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.gif and /dev/null differ diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.png b/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.png new file mode 100644 index 000000000000..888ce6fed817 Binary files /dev/null and b/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.png differ diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif b/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif deleted file mode 100644 index 718492f1cfc7..000000000000 Binary files a/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.gif and /dev/null differ diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.png b/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.png new file mode 100644 index 000000000000..b69426270b10 Binary files /dev/null and b/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.png differ -- cgit v1.2.3-55-g7522 From 15a04d4e76bd7ba755591f2369c574d8a0a7dc5d Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 14 Nov 2016 14:32:32 -0200 Subject: docs-rst: auto-generate PDF image files The PDF files that contain media images were actually generated offline from their SVG or PNG source files. Sphinx can handle PNG sources automatially. So, let's just drop their PDF counterparts. For SVG, however, Sphinx doesn't produce the right tags to use the TexLive SVG support. Also, the SVG support is done via shell execution, with is not nice. So, while we don't have any support for SVG inside Sphinx core or as an extension, move the logic to build them to Makefile, producing the PDF images on runtime. NOTE: due to the way Sphinx works, the PDF images should be generated inside the Kernel source tree, as otherwise Sphinx won't find it, not obeying what's specified by "O=" makefile parameter. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/Makefile.sphinx | 3 +- Documentation/media/.gitignore | 1 + Documentation/media/Makefile | 29 +- Documentation/media/intro.rst | 4 +- .../media/media_api_files/typical_media_device.pdf | Bin 52895 -> 0 bytes .../media/media_api_files/typical_media_device.svg | 28 - Documentation/media/typical_media_device.svg | 28 + Documentation/media/uapi/dvb/dvbstb.svg | 651 +++++++++++++++++++++ Documentation/media/uapi/dvb/intro.rst | 2 +- .../media/uapi/dvb/intro_files/dvbstb.pdf | Bin 1881 -> 0 bytes .../media/uapi/dvb/intro_files/dvbstb.svg | 651 --------------------- Documentation/media/uapi/v4l/bayer.png | Bin 0 -> 9725 bytes Documentation/media/uapi/v4l/constraints.svg | 346 +++++++++++ Documentation/media/uapi/v4l/crop.png | Bin 0 -> 3334 bytes Documentation/media/uapi/v4l/crop.rst | 4 +- Documentation/media/uapi/v4l/crop_files/crop.pdf | Bin 5846 -> 0 bytes Documentation/media/uapi/v4l/crop_files/crop.png | Bin 3334 -> 0 bytes Documentation/media/uapi/v4l/dev-raw-vbi.rst | 12 +- .../media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf | Bin 3706 -> 0 bytes .../media/uapi/v4l/dev-raw-vbi_files/vbi_525.png | Bin 2053 -> 0 bytes .../media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf | Bin 3996 -> 0 bytes .../media/uapi/v4l/dev-raw-vbi_files/vbi_625.png | Bin 2352 -> 0 bytes .../media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf | Bin 7405 -> 0 bytes .../media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png | Bin 906 -> 0 bytes Documentation/media/uapi/v4l/dev-subdev.rst | 16 +- .../media/uapi/v4l/dev-subdev_files/pipeline.pdf | Bin 20276 -> 0 bytes .../media/uapi/v4l/dev-subdev_files/pipeline.png | Bin 12130 -> 0 bytes .../subdev-image-processing-crop.pdf | Bin 20729 -> 0 bytes .../subdev-image-processing-crop.svg | 63 -- .../subdev-image-processing-full.pdf | Bin 46311 -> 0 bytes .../subdev-image-processing-full.svg | 163 ------ ...ubdev-image-processing-scaling-multi-source.pdf | Bin 36714 -> 0 bytes ...ubdev-image-processing-scaling-multi-source.svg | 116 ---- Documentation/media/uapi/v4l/field-order.rst | 8 +- .../uapi/v4l/field-order_files/fieldseq_bt.pdf | Bin 9185 -> 0 bytes .../uapi/v4l/field-order_files/fieldseq_bt.png | Bin 12306 -> 0 bytes .../uapi/v4l/field-order_files/fieldseq_tb.pdf | Bin 9173 -> 0 bytes .../uapi/v4l/field-order_files/fieldseq_tb.png | Bin 12247 -> 0 bytes Documentation/media/uapi/v4l/fieldseq_bt.png | Bin 0 -> 12306 bytes Documentation/media/uapi/v4l/fieldseq_tb.png | Bin 0 -> 12247 bytes Documentation/media/uapi/v4l/nv12mt.png | Bin 0 -> 1920 bytes Documentation/media/uapi/v4l/nv12mt_example.png | Bin 0 -> 5261 bytes Documentation/media/uapi/v4l/pipeline.png | Bin 0 -> 12130 bytes Documentation/media/uapi/v4l/pixfmt-nv12mt.rst | 4 +- .../media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png | Bin 1920 -> 0 bytes .../v4l/pixfmt-nv12mt_files/nv12mt_example.png | Bin 5261 -> 0 bytes Documentation/media/uapi/v4l/selection-api-003.rst | 2 +- .../uapi/v4l/selection-api-003_files/selection.png | Bin 11716 -> 0 bytes Documentation/media/uapi/v4l/selection.png | Bin 0 -> 11716 bytes Documentation/media/uapi/v4l/subdev-formats.rst | 4 +- .../media/uapi/v4l/subdev-formats_files/bayer.png | Bin 9725 -> 0 bytes .../uapi/v4l/subdev-image-processing-crop.svg | 63 ++ .../uapi/v4l/subdev-image-processing-full.svg | 163 ++++++ ...ubdev-image-processing-scaling-multi-source.svg | 116 ++++ Documentation/media/uapi/v4l/vbi_525.png | Bin 0 -> 2053 bytes Documentation/media/uapi/v4l/vbi_625.png | Bin 0 -> 2352 bytes Documentation/media/uapi/v4l/vbi_hsync.png | Bin 0 -> 906 bytes .../media/uapi/v4l/vidioc-g-selection.rst | 4 +- .../v4l/vidioc-g-selection_files/constraints.svg | 346 ----------- 59 files changed, 1427 insertions(+), 1400 deletions(-) create mode 100644 Documentation/media/.gitignore delete mode 100644 Documentation/media/media_api_files/typical_media_device.pdf delete mode 100644 Documentation/media/media_api_files/typical_media_device.svg create mode 100644 Documentation/media/typical_media_device.svg create mode 100644 Documentation/media/uapi/dvb/dvbstb.svg delete mode 100644 Documentation/media/uapi/dvb/intro_files/dvbstb.pdf delete mode 100644 Documentation/media/uapi/dvb/intro_files/dvbstb.svg create mode 100644 Documentation/media/uapi/v4l/bayer.png create mode 100644 Documentation/media/uapi/v4l/constraints.svg create mode 100644 Documentation/media/uapi/v4l/crop.png delete mode 100644 Documentation/media/uapi/v4l/crop_files/crop.pdf delete mode 100644 Documentation/media/uapi/v4l/crop_files/crop.png delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.png delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.png delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf delete mode 100644 Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf delete mode 100644 Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.png delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf delete mode 100644 Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.png create mode 100644 Documentation/media/uapi/v4l/fieldseq_bt.png create mode 100644 Documentation/media/uapi/v4l/fieldseq_tb.png create mode 100644 Documentation/media/uapi/v4l/nv12mt.png create mode 100644 Documentation/media/uapi/v4l/nv12mt_example.png create mode 100644 Documentation/media/uapi/v4l/pipeline.png delete mode 100644 Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png delete mode 100644 Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png delete mode 100644 Documentation/media/uapi/v4l/selection-api-003_files/selection.png create mode 100644 Documentation/media/uapi/v4l/selection.png delete mode 100644 Documentation/media/uapi/v4l/subdev-formats_files/bayer.png create mode 100644 Documentation/media/uapi/v4l/subdev-image-processing-crop.svg create mode 100644 Documentation/media/uapi/v4l/subdev-image-processing-full.svg create mode 100644 Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg create mode 100644 Documentation/media/uapi/v4l/vbi_525.png create mode 100644 Documentation/media/uapi/v4l/vbi_625.png create mode 100644 Documentation/media/uapi/v4l/vbi_hsync.png delete mode 100644 Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.svg (limited to 'Documentation/media') diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx index ec0c77d028db..a23d3c8b4848 100644 --- a/Documentation/Makefile.sphinx +++ b/Documentation/Makefile.sphinx @@ -54,7 +54,7 @@ loop_cmd = $(echo-cmd) $(cmd_$(1)) # e.g. "media" for the linux-tv book-set at ./Documentation/media quiet_cmd_sphinx = SPHINX $@ --> file://$(abspath $(BUILDDIR)/$3/$4) - cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media all;\ + cmd_sphinx = $(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) $(build)=Documentation/media $2;\ BUILDDIR=$(abspath $(BUILDDIR)) SPHINX_CONF=$(abspath $(srctree)/$(src)/$5/$(SPHINX_CONF)) \ $(SPHINXBUILD) \ -b $2 \ @@ -98,6 +98,7 @@ installmandocs: cleandocs: $(Q)rm -rf $(BUILDDIR) + $(Q)$(MAKE) -C Documentation/media clean endif # HAVE_SPHINX diff --git a/Documentation/media/.gitignore b/Documentation/media/.gitignore new file mode 100644 index 000000000000..a1363379944a --- /dev/null +++ b/Documentation/media/.gitignore @@ -0,0 +1 @@ +*.pdf diff --git a/Documentation/media/Makefile b/Documentation/media/Makefile index a7fb35291f6c..297b85c37ab9 100644 --- a/Documentation/media/Makefile +++ b/Documentation/media/Makefile @@ -10,8 +10,35 @@ FILES = audio.h.rst ca.h.rst dmx.h.rst frontend.h.rst net.h.rst video.h.rst \ TARGETS := $(addprefix $(BUILDDIR)/, $(FILES)) -.PHONY: all +IMAGES = \ + typical_media_device.svg \ + uapi/dvb/dvbstb.svg \ + uapi/v4l/constraints.svg \ + uapi/v4l/subdev-image-processing-full.svg \ + uapi/v4l/subdev-image-processing-scaling-multi-source.svg \ + uapi/v4l/subdev-image-processing-crop.svg \ + +IMGTGT := $(patsubst %.png,%.pdf,$(patsubst %.svg,%.pdf,$(IMAGES))) +IMGPDF := $(patsubst %,$(SRC_DIR)/%,$(IMGTGT)) + +cmd = $(echo-cmd) $(cmd_$(1)) + +quiet_cmd_genpdf = GENPDF $2 + cmd_genpdf = convert $2 $3 + +%.pdf: %.svg + @$(call cmd,genpdf,$<,$@) + +.PHONY: all html epub xml latex + all: $(BUILDDIR) ${TARGETS} +html: all +epub: all +xml: all +latex: $(IMGPDF) all + +clean: + -rm $(IMGTGT) 2>/dev/null $(BUILDDIR): $(Q)mkdir -p $@ diff --git a/Documentation/media/intro.rst b/Documentation/media/intro.rst index f6086c159772..8f7490c9a8ef 100644 --- a/Documentation/media/intro.rst +++ b/Documentation/media/intro.rst @@ -13,8 +13,8 @@ A typical media device hardware is shown at :ref:`typical_media_device`. .. _typical_media_device: -.. figure:: media_api_files/typical_media_device.* - :alt: typical_media_device.svg +.. figure:: typical_media_device.* + :alt: typical_media_device.pdf / typical_media_device.svg :align: center Typical Media Device diff --git a/Documentation/media/media_api_files/typical_media_device.pdf b/Documentation/media/media_api_files/typical_media_device.pdf deleted file mode 100644 index d000d802b20f..000000000000 Binary files a/Documentation/media/media_api_files/typical_media_device.pdf and /dev/null differ diff --git a/Documentation/media/media_api_files/typical_media_device.svg b/Documentation/media/media_api_files/typical_media_device.svg deleted file mode 100644 index f0c82f72c4b6..000000000000 --- a/Documentation/media/media_api_files/typical_media_device.svg +++ /dev/null @@ -1,28 +0,0 @@ - -Audio decoder -Video decoder -Audio encoder -Button Key/IR input logic -EEPROM -Sensor -System Bus -Demux -Conditional Access Module -Video encoder -Radio / Analog TV -Digital TV -PS.: picture is not complete: other blocks may be present -Webcam -Processing blocks -Smartcard -TunerFM/TV -Satellite Equipment Control (SEC) -Demod -I2C Bus (control bus) -Digital TV Frontend - -CPU -PCI, USB, SPI, I2C, ... -Bridge - DMA - diff --git a/Documentation/media/typical_media_device.svg b/Documentation/media/typical_media_device.svg new file mode 100644 index 000000000000..f0c82f72c4b6 --- /dev/null +++ b/Documentation/media/typical_media_device.svg @@ -0,0 +1,28 @@ + +Audio decoder +Video decoder +Audio encoder +Button Key/IR input logic +EEPROM +Sensor +System Bus +Demux +Conditional Access Module +Video encoder +Radio / Analog TV +Digital TV +PS.: picture is not complete: other blocks may be present +Webcam +Processing blocks +Smartcard +TunerFM/TV +Satellite Equipment Control (SEC) +Demod +I2C Bus (control bus) +Digital TV Frontend + +CPU +PCI, USB, SPI, I2C, ... +Bridge + DMA + diff --git a/Documentation/media/uapi/dvb/dvbstb.svg b/Documentation/media/uapi/dvb/dvbstb.svg new file mode 100644 index 000000000000..c4140fb518af --- /dev/null +++ b/Documentation/media/uapi/dvb/dvbstb.svg @@ -0,0 +1,651 @@ + +image/svg+xmlAntena +Frontend +CA +Demux +SEC +Audio +Video +TV + \ No newline at end of file diff --git a/Documentation/media/uapi/dvb/intro.rst b/Documentation/media/uapi/dvb/intro.rst index 11b96a19a9ab..2ed5c23102b4 100644 --- a/Documentation/media/uapi/dvb/intro.rst +++ b/Documentation/media/uapi/dvb/intro.rst @@ -55,7 +55,7 @@ Overview .. _stb_components: -.. figure:: intro_files/dvbstb.* +.. figure:: dvbstb.* :alt: dvbstb.pdf / dvbstb.svg :align: center diff --git a/Documentation/media/uapi/dvb/intro_files/dvbstb.pdf b/Documentation/media/uapi/dvb/intro_files/dvbstb.pdf deleted file mode 100644 index 0fa75d90c3eb..000000000000 Binary files a/Documentation/media/uapi/dvb/intro_files/dvbstb.pdf and /dev/null differ diff --git a/Documentation/media/uapi/dvb/intro_files/dvbstb.svg b/Documentation/media/uapi/dvb/intro_files/dvbstb.svg deleted file mode 100644 index c4140fb518af..000000000000 --- a/Documentation/media/uapi/dvb/intro_files/dvbstb.svg +++ /dev/null @@ -1,651 +0,0 @@ - -image/svg+xmlAntena -Frontend -CA -Demux -SEC -Audio -Video -TV - \ No newline at end of file diff --git a/Documentation/media/uapi/v4l/bayer.png b/Documentation/media/uapi/v4l/bayer.png new file mode 100644 index 000000000000..9b15fb22e817 Binary files /dev/null and b/Documentation/media/uapi/v4l/bayer.png differ diff --git a/Documentation/media/uapi/v4l/constraints.svg b/Documentation/media/uapi/v4l/constraints.svg new file mode 100644 index 000000000000..f710ee46b1f8 --- /dev/null +++ b/Documentation/media/uapi/v4l/constraints.svg @@ -0,0 +1,346 @@ + +image/svg+xmlV4L2_SEL_FLAG_GE +ORIGINAL +V4L2_SEL_FLAG_LE + \ No newline at end of file diff --git a/Documentation/media/uapi/v4l/crop.png b/Documentation/media/uapi/v4l/crop.png new file mode 100644 index 000000000000..225998c395df Binary files /dev/null and b/Documentation/media/uapi/v4l/crop.png differ diff --git a/Documentation/media/uapi/v4l/crop.rst b/Documentation/media/uapi/v4l/crop.rst index 3ea733a8eef8..578c6f3d20f3 100644 --- a/Documentation/media/uapi/v4l/crop.rst +++ b/Documentation/media/uapi/v4l/crop.rst @@ -53,8 +53,8 @@ Cropping Structures .. _crop-scale: -.. figure:: crop_files/crop.* - :alt: crop.pdf / crop.gif +.. figure:: crop.png + :alt: crop.png :align: center Image Cropping, Insertion and Scaling diff --git a/Documentation/media/uapi/v4l/crop_files/crop.pdf b/Documentation/media/uapi/v4l/crop_files/crop.pdf deleted file mode 100644 index c9fb81cd32f3..000000000000 Binary files a/Documentation/media/uapi/v4l/crop_files/crop.pdf and /dev/null differ diff --git a/Documentation/media/uapi/v4l/crop_files/crop.png b/Documentation/media/uapi/v4l/crop_files/crop.png deleted file mode 100644 index 225998c395df..000000000000 Binary files a/Documentation/media/uapi/v4l/crop_files/crop.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi.rst b/Documentation/media/uapi/v4l/dev-raw-vbi.rst index b82d837e4ff1..f81d906137ee 100644 --- a/Documentation/media/uapi/v4l/dev-raw-vbi.rst +++ b/Documentation/media/uapi/v4l/dev-raw-vbi.rst @@ -221,8 +221,8 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT ` does .. _vbi-hsync: -.. figure:: dev-raw-vbi_files/vbi_hsync.* - :alt: vbi_hsync.pdf / vbi_hsync.gif +.. figure:: vbi_hsync.png + :alt: vbi_hsync.png :align: center **Figure 4.1. Line synchronization** @@ -230,8 +230,8 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT ` does .. _vbi-525: -.. figure:: dev-raw-vbi_files/vbi_525.* - :alt: vbi_525.pdf / vbi_525.gif +.. figure:: vbi_525.png + :alt: vbi_525.png :align: center **Figure 4.2. ITU-R 525 line numbering (M/NTSC and M/PAL)** @@ -240,8 +240,8 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT ` does .. _vbi-625: -.. figure:: dev-raw-vbi_files/vbi_625.* - :alt: vbi_625.pdf / vbi_625.gif +.. figure:: vbi_625.png + :alt: vbi_625.png :align: center **Figure 4.3. ITU-R 625 line numbering** diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf deleted file mode 100644 index 0bae28385dfa..000000000000 Binary files a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.pdf and /dev/null differ diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.png b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.png deleted file mode 100644 index 24937dbec337..000000000000 Binary files a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_525.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf deleted file mode 100644 index bf29b95dcd08..000000000000 Binary files a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.pdf and /dev/null differ diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.png b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.png deleted file mode 100644 index 25c671af41ad..000000000000 Binary files a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_625.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf deleted file mode 100644 index 200b668189bf..000000000000 Binary files a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.pdf and /dev/null differ diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png b/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png deleted file mode 100644 index b04ae50385a7..000000000000 Binary files a/Documentation/media/uapi/v4l/dev-raw-vbi_files/vbi_hsync.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/dev-subdev.rst b/Documentation/media/uapi/v4l/dev-subdev.rst index fb4d0d45b216..c18e9c5427ee 100644 --- a/Documentation/media/uapi/v4l/dev-subdev.rst +++ b/Documentation/media/uapi/v4l/dev-subdev.rst @@ -99,8 +99,8 @@ the video sensor and the host image processing hardware. .. _pipeline-scaling: -.. figure:: dev-subdev_files/pipeline.* - :alt: pipeline.pdf / pipeline.png +.. figure:: pipeline.png + :alt: pipeline.png :align: center Image Format Negotiation on Pipelines @@ -404,8 +404,8 @@ selection will refer to the sink pad format dimensions instead. .. _subdev-image-processing-crop: -.. figure:: dev-subdev_files/subdev-image-processing-crop.* - :alt: subdev-image-processing-crop.svg +.. figure:: subdev-image-processing-crop.* + :alt: subdev-image-processing-crop.pdf / subdev-image-processing-crop.svg :align: center **Figure 4.5. Image processing in subdevs: simple crop example** @@ -421,8 +421,8 @@ pad. .. _subdev-image-processing-scaling-multi-source: -.. figure:: dev-subdev_files/subdev-image-processing-scaling-multi-source.* - :alt: subdev-image-processing-scaling-multi-source.svg +.. figure:: subdev-image-processing-scaling-multi-source.* + :alt: subdev-image-processing-scaling-multi-source.pdf / subdev-image-processing-scaling-multi-source.svg :align: center **Figure 4.6. Image processing in subdevs: scaling with multiple sources** @@ -437,8 +437,8 @@ an area at location specified by the source crop rectangle from it. .. _subdev-image-processing-full: -.. figure:: dev-subdev_files/subdev-image-processing-full.* - :alt: subdev-image-processing-full.svg +.. figure:: subdev-image-processing-full.* + :alt: subdev-image-processing-full.pdf / subdev-image-processing-full.svg :align: center **Figure 4.7. Image processing in subdevs: scaling and composition with multiple sinks and sources** diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf deleted file mode 100644 index ee3e37f04b6a..000000000000 Binary files a/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.pdf and /dev/null differ diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png b/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png deleted file mode 100644 index f19b86c2c24d..000000000000 Binary files a/Documentation/media/uapi/v4l/dev-subdev_files/pipeline.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf deleted file mode 100644 index 29a806f839b4..000000000000 Binary files a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.pdf and /dev/null differ diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg deleted file mode 100644 index 18b0f5de9ed2..000000000000 --- a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - sink - crop - selection - - - - - - sink media - bus format - - - source media - bus format - - - - - - - - - - - - - - - - - - - - - pad 1 (source) - - - - - - - - - - - - - pad 0 (sink) - - diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf deleted file mode 100644 index b78a8e8f6b35..000000000000 Binary files a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.pdf and /dev/null differ diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg deleted file mode 100644 index 3322cf4c0093..000000000000 --- a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg +++ /dev/null @@ -1,163 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - pad 0 (sink) - - - pad 2 (source) - - - - - - - - - - - - - - sink media - bus format - - - - - - - - - - - sink compose - selection (scaling) - - - - - - - source media - bus format - - - - - - - - - - - sink compose - bounds selection - - - - - - - - - - - - - pad 1 (sink) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - pad 3 (source) - - - sink - crop - selection - - - source - crop - selection - - - - - - - - - - - - - - - - - - - - - - diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf deleted file mode 100644 index 8f7a95b6eb4d..000000000000 Binary files a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.pdf and /dev/null differ diff --git a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg b/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg deleted file mode 100644 index 2340c0f8bc92..000000000000 --- a/Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - - - - - - - - sink - crop - selection - - - - - - sink media - bus format - - - - - - - - - - - sink compose - selection (scaling) - - - - - - - source - crop - selection - - - source media - bus format - - - - - - - - - - - - - - - - - - - - - pad 1 (source) - - - - - - - - - - - - - pad 0 (sink) - - - - - - - - - - - - - - - - - - - - - - pad 2 (source) - - - - - - - - - - - - diff --git a/Documentation/media/uapi/v4l/field-order.rst b/Documentation/media/uapi/v4l/field-order.rst index 50779a67c3fd..a7e1b4dae343 100644 --- a/Documentation/media/uapi/v4l/field-order.rst +++ b/Documentation/media/uapi/v4l/field-order.rst @@ -141,8 +141,8 @@ enum v4l2_field Field Order, Top Field First Transmitted ======================================== -.. figure:: field-order_files/fieldseq_tb.* - :alt: fieldseq_tb.pdf / fieldseq_tb.gif +.. figure:: fieldseq_tb.png + :alt: fieldseq_tb.png :align: center @@ -151,7 +151,7 @@ Field Order, Top Field First Transmitted Field Order, Bottom Field First Transmitted =========================================== -.. figure:: field-order_files/fieldseq_bt.* - :alt: fieldseq_bt.pdf / fieldseq_bt.gif +.. figure:: fieldseq_bt.png + :alt: fieldseq_bt.png :align: center diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf b/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf deleted file mode 100644 index 26598b23f80d..000000000000 Binary files a/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.pdf and /dev/null differ diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.png b/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.png deleted file mode 100644 index 888ce6fed817..000000000000 Binary files a/Documentation/media/uapi/v4l/field-order_files/fieldseq_bt.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf b/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf deleted file mode 100644 index 4965b22ddb3a..000000000000 Binary files a/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.pdf and /dev/null differ diff --git a/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.png b/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.png deleted file mode 100644 index b69426270b10..000000000000 Binary files a/Documentation/media/uapi/v4l/field-order_files/fieldseq_tb.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/fieldseq_bt.png b/Documentation/media/uapi/v4l/fieldseq_bt.png new file mode 100644 index 000000000000..888ce6fed817 Binary files /dev/null and b/Documentation/media/uapi/v4l/fieldseq_bt.png differ diff --git a/Documentation/media/uapi/v4l/fieldseq_tb.png b/Documentation/media/uapi/v4l/fieldseq_tb.png new file mode 100644 index 000000000000..b69426270b10 Binary files /dev/null and b/Documentation/media/uapi/v4l/fieldseq_tb.png differ diff --git a/Documentation/media/uapi/v4l/nv12mt.png b/Documentation/media/uapi/v4l/nv12mt.png new file mode 100644 index 000000000000..41401860fb73 Binary files /dev/null and b/Documentation/media/uapi/v4l/nv12mt.png differ diff --git a/Documentation/media/uapi/v4l/nv12mt_example.png b/Documentation/media/uapi/v4l/nv12mt_example.png new file mode 100644 index 000000000000..7775f5d7cc46 Binary files /dev/null and b/Documentation/media/uapi/v4l/nv12mt_example.png differ diff --git a/Documentation/media/uapi/v4l/pipeline.png b/Documentation/media/uapi/v4l/pipeline.png new file mode 100644 index 000000000000..f19b86c2c24d Binary files /dev/null and b/Documentation/media/uapi/v4l/pipeline.png differ diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst b/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst index 9f250a1df2f6..c8a77bc79f2f 100644 --- a/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst +++ b/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst @@ -33,7 +33,7 @@ Layout of macroblocks in memory is presented in the following figure. .. _nv12mt: -.. figure:: pixfmt-nv12mt_files/nv12mt.* +.. figure:: nv12mt.png :alt: nv12mt.png :align: center @@ -50,7 +50,7 @@ interleaved. Height of the buffer is aligned to 32. .. _nv12mt_ex: -.. figure:: pixfmt-nv12mt_files/nv12mt_example.* +.. figure:: nv12mt_example.png :alt: nv12mt_example.png :align: center diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png b/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png deleted file mode 100644 index 41401860fb73..000000000000 Binary files a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png b/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png deleted file mode 100644 index 7775f5d7cc46..000000000000 Binary files a/Documentation/media/uapi/v4l/pixfmt-nv12mt_files/nv12mt_example.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/selection-api-003.rst b/Documentation/media/uapi/v4l/selection-api-003.rst index 15cb3b79f12c..207349c17ead 100644 --- a/Documentation/media/uapi/v4l/selection-api-003.rst +++ b/Documentation/media/uapi/v4l/selection-api-003.rst @@ -7,7 +7,7 @@ Selection targets .. _sel-targets-capture: -.. figure:: selection-api-003_files/selection.* +.. figure:: selection.png :alt: selection.png :align: center diff --git a/Documentation/media/uapi/v4l/selection-api-003_files/selection.png b/Documentation/media/uapi/v4l/selection-api-003_files/selection.png deleted file mode 100644 index bfc523eae570..000000000000 Binary files a/Documentation/media/uapi/v4l/selection-api-003_files/selection.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/selection.png b/Documentation/media/uapi/v4l/selection.png new file mode 100644 index 000000000000..bfc523eae570 Binary files /dev/null and b/Documentation/media/uapi/v4l/selection.png differ diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst index 65105609374b..2f9c135dfadd 100644 --- a/Documentation/media/uapi/v4l/subdev-formats.rst +++ b/Documentation/media/uapi/v4l/subdev-formats.rst @@ -1514,14 +1514,12 @@ be named ``MEDIA_BUS_FMT_SRGGB10_2X8_PADHI_LE``. .. _bayer-patterns: -.. figure:: subdev-formats_files/bayer.* +.. figure:: bayer.png :alt: bayer.png :align: center **Figure 4.8 Bayer Patterns** - - The following table lists existing packed Bayer formats. The data organization is given as an example for the first pixel only. diff --git a/Documentation/media/uapi/v4l/subdev-formats_files/bayer.png b/Documentation/media/uapi/v4l/subdev-formats_files/bayer.png deleted file mode 100644 index 9b15fb22e817..000000000000 Binary files a/Documentation/media/uapi/v4l/subdev-formats_files/bayer.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg b/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg new file mode 100644 index 000000000000..18b0f5de9ed2 --- /dev/null +++ b/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + sink + crop + selection + + + + + + sink media + bus format + + + source media + bus format + + + + + + + + + + + + + + + + + + + + + pad 1 (source) + + + + + + + + + + + + + pad 0 (sink) + + diff --git a/Documentation/media/uapi/v4l/subdev-image-processing-full.svg b/Documentation/media/uapi/v4l/subdev-image-processing-full.svg new file mode 100644 index 000000000000..3322cf4c0093 --- /dev/null +++ b/Documentation/media/uapi/v4l/subdev-image-processing-full.svg @@ -0,0 +1,163 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + pad 0 (sink) + + + pad 2 (source) + + + + + + + + + + + + + + sink media + bus format + + + + + + + + + + + sink compose + selection (scaling) + + + + + + + source media + bus format + + + + + + + + + + + sink compose + bounds selection + + + + + + + + + + + + + pad 1 (sink) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + pad 3 (source) + + + sink + crop + selection + + + source + crop + selection + + + + + + + + + + + + + + + + + + + + + + diff --git a/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg b/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg new file mode 100644 index 000000000000..2340c0f8bc92 --- /dev/null +++ b/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + sink + crop + selection + + + + + + sink media + bus format + + + + + + + + + + + sink compose + selection (scaling) + + + + + + + source + crop + selection + + + source media + bus format + + + + + + + + + + + + + + + + + + + + + pad 1 (source) + + + + + + + + + + + + + pad 0 (sink) + + + + + + + + + + + + + + + + + + + + + + pad 2 (source) + + + + + + + + + + + + diff --git a/Documentation/media/uapi/v4l/vbi_525.png b/Documentation/media/uapi/v4l/vbi_525.png new file mode 100644 index 000000000000..24937dbec337 Binary files /dev/null and b/Documentation/media/uapi/v4l/vbi_525.png differ diff --git a/Documentation/media/uapi/v4l/vbi_625.png b/Documentation/media/uapi/v4l/vbi_625.png new file mode 100644 index 000000000000..25c671af41ad Binary files /dev/null and b/Documentation/media/uapi/v4l/vbi_625.png differ diff --git a/Documentation/media/uapi/v4l/vbi_hsync.png b/Documentation/media/uapi/v4l/vbi_hsync.png new file mode 100644 index 000000000000..b04ae50385a7 Binary files /dev/null and b/Documentation/media/uapi/v4l/vbi_hsync.png differ diff --git a/Documentation/media/uapi/v4l/vidioc-g-selection.rst b/Documentation/media/uapi/v4l/vidioc-g-selection.rst index 6da359e50668..deb1f6fb473b 100644 --- a/Documentation/media/uapi/v4l/vidioc-g-selection.rst +++ b/Documentation/media/uapi/v4l/vidioc-g-selection.rst @@ -129,8 +129,8 @@ Selection targets and flags are documented in .. _sel-const-adjust: -.. figure:: vidioc-g-selection_files/constraints.* - :alt: constraints.svg +.. figure:: constraints.* + :alt: constraints.pdf / constraints.svg :align: center Size adjustments with constraint flags. diff --git a/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.svg b/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.svg deleted file mode 100644 index f710ee46b1f8..000000000000 --- a/Documentation/media/uapi/v4l/vidioc-g-selection_files/constraints.svg +++ /dev/null @@ -1,346 +0,0 @@ - -image/svg+xmlV4L2_SEL_FLAG_GE -ORIGINAL -V4L2_SEL_FLAG_LE - \ No newline at end of file -- cgit v1.2.3-55-g7522 From c54b6b37796edbe7eb48756d4be151479ea430ab Mon Sep 17 00:00:00 2001 From: Jonathan Corbet Date: Wed, 16 Nov 2016 15:38:03 -0700 Subject: docs: Avoid warning on cleandocs Recent Makefile changes added an rm command without the requisite "-f", leading to warnings if the files do not exist. Make it be quiet again. Signed-off-by: Jonathan Corbet --- Documentation/media/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/media') diff --git a/Documentation/media/Makefile b/Documentation/media/Makefile index 297b85c37ab9..c22a30b07821 100644 --- a/Documentation/media/Makefile +++ b/Documentation/media/Makefile @@ -38,7 +38,7 @@ xml: all latex: $(IMGPDF) all clean: - -rm $(IMGTGT) 2>/dev/null + -rm -f $(IMGTGT) 2>/dev/null $(BUILDDIR): $(Q)mkdir -p $@ @@ -85,4 +85,4 @@ $(BUILDDIR)/lirc.h.rst: ${UAPI}/lirc.h ${PARSER} $(SRC_DIR)/lirc.h.rst.exception @$($(quiet)gen_rst) cleandocs: - -rm ${TARGETS} + -rm -f ${TARGETS} -- cgit v1.2.3-55-g7522 From 76cf11aa1590f51c49956f088585b2f97d531147 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 30 Nov 2016 08:00:11 -0200 Subject: convert more media images to SVG Using vectorial graphics provide a better visual. As those images are originally using a vectorial graphics input at the pdf files, use them, from an old media tree repository, converting them to SVG. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/media/Makefile | 7 + Documentation/media/uapi/v4l/crop.png | Bin 3334 -> 0 bytes Documentation/media/uapi/v4l/crop.rst | 4 +- Documentation/media/uapi/v4l/crop.svg | 269 +++ Documentation/media/uapi/v4l/dev-raw-vbi.rst | 12 +- Documentation/media/uapi/v4l/field-order.rst | 8 +- Documentation/media/uapi/v4l/fieldseq_bt.png | Bin 12306 -> 0 bytes Documentation/media/uapi/v4l/fieldseq_bt.svg | 2522 ++++++++++++++++++++++++++ Documentation/media/uapi/v4l/fieldseq_tb.png | Bin 12247 -> 0 bytes Documentation/media/uapi/v4l/fieldseq_tb.svg | 2510 +++++++++++++++++++++++++ Documentation/media/uapi/v4l/vbi_525.png | Bin 2053 -> 0 bytes Documentation/media/uapi/v4l/vbi_525.svg | 625 +++++++ Documentation/media/uapi/v4l/vbi_625.png | Bin 2352 -> 0 bytes Documentation/media/uapi/v4l/vbi_625.svg | 651 +++++++ Documentation/media/uapi/v4l/vbi_hsync.png | Bin 906 -> 0 bytes Documentation/media/uapi/v4l/vbi_hsync.svg | 253 +++ 16 files changed, 6849 insertions(+), 12 deletions(-) delete mode 100644 Documentation/media/uapi/v4l/crop.png create mode 100644 Documentation/media/uapi/v4l/crop.svg delete mode 100644 Documentation/media/uapi/v4l/fieldseq_bt.png create mode 100644 Documentation/media/uapi/v4l/fieldseq_bt.svg delete mode 100644 Documentation/media/uapi/v4l/fieldseq_tb.png create mode 100644 Documentation/media/uapi/v4l/fieldseq_tb.svg delete mode 100644 Documentation/media/uapi/v4l/vbi_525.png create mode 100644 Documentation/media/uapi/v4l/vbi_525.svg delete mode 100644 Documentation/media/uapi/v4l/vbi_625.png create mode 100644 Documentation/media/uapi/v4l/vbi_625.svg delete mode 100644 Documentation/media/uapi/v4l/vbi_hsync.png create mode 100644 Documentation/media/uapi/v4l/vbi_hsync.svg (limited to 'Documentation/media') diff --git a/Documentation/media/Makefile b/Documentation/media/Makefile index c22a30b07821..d79afe4d27e9 100644 --- a/Documentation/media/Makefile +++ b/Documentation/media/Makefile @@ -14,9 +14,16 @@ IMAGES = \ typical_media_device.svg \ uapi/dvb/dvbstb.svg \ uapi/v4l/constraints.svg \ + uapi/v4l/crop.svg \ + uapi/v4l/fieldseq_bt.svg \ + uapi/v4l/fieldseq_tb.svg \ uapi/v4l/subdev-image-processing-full.svg \ uapi/v4l/subdev-image-processing-scaling-multi-source.svg \ uapi/v4l/subdev-image-processing-crop.svg \ + uapi/v4l/vbi_525.svg \ + uapi/v4l/vbi_625.svg \ + uapi/v4l/vbi_hsync.svg \ + IMGTGT := $(patsubst %.png,%.pdf,$(patsubst %.svg,%.pdf,$(IMAGES))) IMGPDF := $(patsubst %,$(SRC_DIR)/%,$(IMGTGT)) diff --git a/Documentation/media/uapi/v4l/crop.png b/Documentation/media/uapi/v4l/crop.png deleted file mode 100644 index 225998c395df..000000000000 Binary files a/Documentation/media/uapi/v4l/crop.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/crop.rst b/Documentation/media/uapi/v4l/crop.rst index 578c6f3d20f3..be58894c9c89 100644 --- a/Documentation/media/uapi/v4l/crop.rst +++ b/Documentation/media/uapi/v4l/crop.rst @@ -53,8 +53,8 @@ Cropping Structures .. _crop-scale: -.. figure:: crop.png - :alt: crop.png +.. figure:: crop.* + :alt: crop.pdf / crop.svg :align: center Image Cropping, Insertion and Scaling diff --git a/Documentation/media/uapi/v4l/crop.svg b/Documentation/media/uapi/v4l/crop.svg new file mode 100644 index 000000000000..588bf8bd1ea7 --- /dev/null +++ b/Documentation/media/uapi/v4l/crop.svg @@ -0,0 +1,269 @@ + + + +image/svg+xmlv4l2_cropcap.bounds +v4l2_cropcap.defrect +v4l2_crop.c +v4l2_format + \ No newline at end of file diff --git a/Documentation/media/uapi/v4l/dev-raw-vbi.rst b/Documentation/media/uapi/v4l/dev-raw-vbi.rst index f81d906137ee..baf5f2483927 100644 --- a/Documentation/media/uapi/v4l/dev-raw-vbi.rst +++ b/Documentation/media/uapi/v4l/dev-raw-vbi.rst @@ -221,8 +221,8 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT ` does .. _vbi-hsync: -.. figure:: vbi_hsync.png - :alt: vbi_hsync.png +.. figure:: vbi_hsync.* + :alt: vbi_hsync.pdf / vbi_hsync.svg :align: center **Figure 4.1. Line synchronization** @@ -230,8 +230,8 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT ` does .. _vbi-525: -.. figure:: vbi_525.png - :alt: vbi_525.png +.. figure:: vbi_525.* + :alt: vbi_525.pdf / vbi_525.svg :align: center **Figure 4.2. ITU-R 525 line numbering (M/NTSC and M/PAL)** @@ -240,8 +240,8 @@ and always returns default parameters as :ref:`VIDIOC_G_FMT ` does .. _vbi-625: -.. figure:: vbi_625.png - :alt: vbi_625.png +.. figure:: vbi_625.* + :alt: vbi_625.pdf / vbi_625.svg :align: center **Figure 4.3. ITU-R 625 line numbering** diff --git a/Documentation/media/uapi/v4l/field-order.rst b/Documentation/media/uapi/v4l/field-order.rst index a7e1b4dae343..e05fb1041363 100644 --- a/Documentation/media/uapi/v4l/field-order.rst +++ b/Documentation/media/uapi/v4l/field-order.rst @@ -141,8 +141,8 @@ enum v4l2_field Field Order, Top Field First Transmitted ======================================== -.. figure:: fieldseq_tb.png - :alt: fieldseq_tb.png +.. figure:: fieldseq_tb.* + :alt: fieldseq_tb.pdf / fieldseq_tb.svg :align: center @@ -151,7 +151,7 @@ Field Order, Top Field First Transmitted Field Order, Bottom Field First Transmitted =========================================== -.. figure:: fieldseq_bt.png - :alt: fieldseq_bt.png +.. figure:: fieldseq_bt.* + :alt: fieldseq_bt.pdf / fieldseq_bt.svg :align: center diff --git a/Documentation/media/uapi/v4l/fieldseq_bt.png b/Documentation/media/uapi/v4l/fieldseq_bt.png deleted file mode 100644 index 888ce6fed817..000000000000 Binary files a/Documentation/media/uapi/v4l/fieldseq_bt.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/fieldseq_bt.svg b/Documentation/media/uapi/v4l/fieldseq_bt.svg new file mode 100644 index 000000000000..2de2f187f217 --- /dev/null +++ b/Documentation/media/uapi/v4l/fieldseq_bt.svg @@ -0,0 +1,2522 @@ + + + +image/svg+xmlV4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_ALTERNATE +V4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_BOTTOMV4L2_FIELD_BOTTOMv4l2_buffer.field: +Temporal order, bottom field first transmitted (e.g. M/NTSC) +V4L2_FIELD_TOPV4L2_FIELD_TOP +V4L2_FIELD_INTERLACED / V4L2_FIELD_INTERLACED_BTV4L2_FIELD_INTERLACED_TB (misaligned)V4L2_FIELD_SEQ_BT + \ No newline at end of file diff --git a/Documentation/media/uapi/v4l/fieldseq_tb.png b/Documentation/media/uapi/v4l/fieldseq_tb.png deleted file mode 100644 index b69426270b10..000000000000 Binary files a/Documentation/media/uapi/v4l/fieldseq_tb.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/fieldseq_tb.svg b/Documentation/media/uapi/v4l/fieldseq_tb.svg new file mode 100644 index 000000000000..4e6460b28db7 --- /dev/null +++ b/Documentation/media/uapi/v4l/fieldseq_tb.svg @@ -0,0 +1,2510 @@ + + + +image/svg+xmlV4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_ALTERNATE +v4l2_buffer.field:V4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_TOPV4L2_FIELD_BOTTOM +Temporal order, top field first transmitted (e.g. BG/PAL)V4L2_FIELD_SEQ_TBV4L2_FIELD_INTERLACED_BT (misaligned)V4L2_FIELD_INTERLACED / V4L2_FIELD_INTERLACED_TB + \ No newline at end of file diff --git a/Documentation/media/uapi/v4l/vbi_525.png b/Documentation/media/uapi/v4l/vbi_525.png deleted file mode 100644 index 24937dbec337..000000000000 Binary files a/Documentation/media/uapi/v4l/vbi_525.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/vbi_525.svg b/Documentation/media/uapi/v4l/vbi_525.svg new file mode 100644 index 000000000000..3aee15d57c9a --- /dev/null +++ b/Documentation/media/uapi/v4l/vbi_525.svg @@ -0,0 +1,625 @@ + + + +image/svg+xml(1) +8745691012113226312622712702672682692722732752742662652632642624923156101112784923156101112785242615252622222232328522286231st field2nd field + \ No newline at end of file diff --git a/Documentation/media/uapi/v4l/vbi_625.png b/Documentation/media/uapi/v4l/vbi_625.png deleted file mode 100644 index 25c671af41ad..000000000000 Binary files a/Documentation/media/uapi/v4l/vbi_625.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/vbi_625.svg b/Documentation/media/uapi/v4l/vbi_625.svg new file mode 100644 index 000000000000..d96a2628f305 --- /dev/null +++ b/Documentation/media/uapi/v4l/vbi_625.svg @@ -0,0 +1,651 @@ + + + +image/svg+xml1st field145678323123113102214567832625624623223086213096222nd field +(1) +7654323133123113363353213203193183173163153143133123111822233093093103102433723232424 + \ No newline at end of file diff --git a/Documentation/media/uapi/v4l/vbi_hsync.png b/Documentation/media/uapi/v4l/vbi_hsync.png deleted file mode 100644 index b04ae50385a7..000000000000 Binary files a/Documentation/media/uapi/v4l/vbi_hsync.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/vbi_hsync.svg b/Documentation/media/uapi/v4l/vbi_hsync.svg new file mode 100644 index 000000000000..17ddb5bcb071 --- /dev/null +++ b/Documentation/media/uapi/v4l/vbi_hsync.svg @@ -0,0 +1,253 @@ + + + +image/svg+xmlBlack LevelSync LevelWhite Level +offset +Line synchr. pulseLine blanking + \ No newline at end of file -- cgit v1.2.3-55-g7522 From 16bc3bfb237756f6985a968a0707865abba19222 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 30 Nov 2016 08:00:12 -0200 Subject: svg files: cleanup them Use sans-serif font on all documents, split text lines, ungroup elements, and do other misc cleanups, in order to make all of them to look better, and to have smaller columns inside their lines. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/media/uapi/v4l/crop.svg | 232 +- Documentation/media/uapi/v4l/fieldseq_bt.svg | 3817 ++++++++++---------- Documentation/media/uapi/v4l/fieldseq_tb.svg | 3791 +++++++++---------- .../uapi/v4l/subdev-image-processing-crop.svg | 346 +- .../uapi/v4l/subdev-image-processing-full.svg | 892 ++++- ...ubdev-image-processing-scaling-multi-source.svg | 626 +++- Documentation/media/uapi/v4l/vbi_525.svg | 812 +++-- Documentation/media/uapi/v4l/vbi_625.svg | 717 ++-- Documentation/media/uapi/v4l/vbi_hsync.svg | 238 +- 9 files changed, 6712 insertions(+), 4759 deletions(-) (limited to 'Documentation/media') diff --git a/Documentation/media/uapi/v4l/crop.svg b/Documentation/media/uapi/v4l/crop.svg index 588bf8bd1ea7..dc9a471bae6b 100644 --- a/Documentation/media/uapi/v4l/crop.svg +++ b/Documentation/media/uapi/v4l/crop.svg @@ -19,7 +19,7 @@ sodipodi:docname="crop.svg">image/svg+xmlv4l2_cropcap.bounds + d="m 1492.37,1607.5 1559.25,141.75" />v4l2_cropcap.bounds v4l2_cropcap.defrect + id="g126" + transform="matrix(1.4375794,0,0,1.4375794,-0.12334269,-0.08856738)">v4l2_cropcap.defrect v4l2_crop.c + id="g132" + transform="matrix(1.4375794,0,0,1.4375794,-0.12334269,-0.08856738)">v4l2_crop.c v4l2_format - \ No newline at end of file + id="g138" + transform="matrix(1.4375794,0,0,1.4375794,-0.12334269,-0.08856738)">v4l2_format + + diff --git a/Documentation/media/uapi/v4l/fieldseq_bt.svg b/Documentation/media/uapi/v4l/fieldseq_bt.svg index 2de2f187f217..b195301771ce 100644 --- a/Documentation/media/uapi/v4l/fieldseq_bt.svg +++ b/Documentation/media/uapi/v4l/fieldseq_bt.svg @@ -16,17 +16,7 @@ width="198.48296mm" height="211.89406mm" viewBox="0 0 703.28606 750.80571" - sodipodi:docname="fieldseq_bt.svg">image/svg+xmlimage/svg+xmlV4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_ALTERNATE + id="path4837" + inkscape:connector-curvature="0" />V4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_ALTERNATE +V4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_BOTTOMV4L2_FIELD_BOTTOMv4l2_buffer.field: +Temporal order, bottom field first transmitted (e.g. M/NTSC) +V4L2_FIELD_TOPV4L2_FIELD_TOP +V4L2_FIELD_INTERLACED / V4L2_FIELD_INTERLACED_BTV4L2_FIELD_INTERLACED_TB (misaligned)V4L2_FIELD_SEQ_BT +V4L2_FIELD_TOP +V4L2_FIELD_BOTTOM +V4L2_FIELD_ALTERNATE +V4L2_FIELD_INTERLACED / V4L2_FIELD_INTERLACED_BT V4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_BOTTOMV4L2_FIELD_BOTTOMv4l2_buffer.field: + y="-192.9435" + x="1.5518398 9.5551729 16.226616 22.898062 29.569506 36.240948 43.572334 46.908058 54.911392 61.582836 70.246117 76.917557 80.253281 88.916557 96.247948 104.25128 112.91456 119.586 127.58932 136.25262 144.25595 152.91924 159.59067 166.92206 174.9254 178.26112 182.25679 192.25195 194.91573 200.91524 207.58667 210.25046 212.91423 219.58568 226.25713 232.92856 239.60001" + id="text5866" + style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;" + transform="scale(1,-1)">V4L2_FIELD_INTERLACED_TB (misaligned) Temporal order, bottom field first transmitted (e.g. M/NTSC) + y="-86.653496" + x="5.8034 13.806733 20.478176 27.149622 33.821064 40.492508 47.823895 51.159618 59.162952 65.834396 74.497673 81.169121 89.172447 97.175781 106.511 113.18245 121.18579" + id="text5870" + style="font-variant:normal;font-weight:normal;font-size:11.9989996px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;" + transform="scale(1,-1)">V4L2_FIELD_SEQ_BT V4L2_FIELD_TOPV4L2_FIELD_TOP + y="-316.23969" + x="103.58983 109.09226 113.67899 118.26572 122.85246 127.43919 132.47964 134.77301 140.27545 144.86218 150.81833 155.40506 160.44553 166.86365 188.62184 194.12427 198.711 203.29774 207.88448 212.47121 217.51166 219.80502 225.30746 229.8942 235.85034 240.43707 245.9395 252.35764 257.3981 262.43854 268.85669 375.69293 381.19534 385.78207 390.3688 394.95554 399.54227 404.58273 406.8761 412.37854 416.96527 422.92142 427.50815 433.01059 439.42871 444.46918 449.50961 455.92776 1.551828 7.0542617 11.640993 16.227724 20.814463 25.401194 30.441652 32.735016 38.237442 42.824177 48.780331 53.367065 58.869492 65.287621 70.328079 75.368538 81.786659" + id="text7144" + style="font-variant:normal;font-weight:normal;font-size:8.2495203px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;" + transform="scale(1,-1)">V4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_BOTTOMV4L2_FIELD_BOTTOM V4L2_FIELD_INTERLACED / V4L2_FIELD_INTERLACED_BTV4L2_FIELD_INTERLACED_TB (misaligned)V4L2_FIELD_SEQ_BT - \ No newline at end of file + y="-328.99481" + x="10.054964 14.17972 18.766451 20.597849 25.18458 29.771311 34.358047 38.944778 41.238144 43.531509 48.118244 50.865334 53.158699 55.452068 57.283459 61.870193 63.701588 68.288322" + id="text7148" + style="font-variant:normal;font-weight:normal;font-size:8.2495203px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;" + transform="scale(1,-1)">v4l2_buffer.field: + \ No newline at end of file diff --git a/Documentation/media/uapi/v4l/fieldseq_tb.svg b/Documentation/media/uapi/v4l/fieldseq_tb.svg index 4e6460b28db7..6a7b10ad4ab8 100644 --- a/Documentation/media/uapi/v4l/fieldseq_tb.svg +++ b/Documentation/media/uapi/v4l/fieldseq_tb.svg @@ -16,17 +16,7 @@ width="198.48296mm" height="210.39415mm" viewBox="0 0 703.28607 745.49109" - sodipodi:docname="fieldseq_tb.svg">image/svg+xmlimage/svg+xmlV4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_ALTERNATE + id="path6761" + inkscape:connector-curvature="0" />V4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_ALTERNATE +v4l2_buffer.field:V4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_TOPV4L2_FIELD_BOTTOM +Temporal order, top field first transmitted (e.g. BG/PAL)V4L2_FIELD_SEQ_TBV4L2_FIELD_INTERLACED_BT (misaligned)V4L2_FIELD_INTERLACED / V4L2_FIELD_INTERLACED_TB +V4L2_FIELD_TOP +V4L2_FIELD_BOTTOM +V4L2_FIELD_ALTERNATE +Temporal order, top field first transmitted (e.g. BG/PAL) +V4L2_FIELD_SEQ_TB +V4L2_FIELD_INTERLACED_BT (misaligned) +V4L2_FIELD_INTERLACED / V4L2_FIELD_INTERLACED_TB v4l2_buffer.field:V4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_TOPV4L2_FIELD_BOTTOM + y="-324.69479" + x="10.05469 14.17945 18.766184 20.597576 25.184309 29.771042 34.357777 38.944508 41.237877 43.531242 48.117977 50.865067 53.158432 55.451801 57.283192 61.869926 63.701321 68.288048" + id="text7131" + style="font-variant:normal;font-weight:normal;font-size:8.2495203px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;" + transform="scale(1,-1)">v4l2_buffer.field: Temporal order, top field first transmitted (e.g. BG/PAL)V4L2_FIELD_SEQ_TBV4L2_FIELD_INTERLACED_BT (misaligned)V4L2_FIELD_INTERLACED / V4L2_FIELD_INTERLACED_TB - \ No newline at end of file + y="-311.9397" + x="10.05469 15.55712 20.143852 24.730585 29.317318 33.904053 38.944508 41.237877 46.740307 51.327042 57.283192 61.869926 66.910378 73.328506 95.0867 100.58913 105.17586 109.7626 114.34933 118.93606 123.97652 126.26987 131.77232 136.35905 142.3152 146.90193 152.40436 158.82249 163.86295 168.9034 175.32153 197.12534 202.62778 207.21451 211.80124 216.38797 220.9747 226.01515 228.30853 233.81096 238.39769 244.35384 248.94058 253.98103 260.39917 282.15695 287.65936 292.24609 296.83282 301.41956 306.00629 311.04675 313.34012 318.84256 323.42929 329.38544 333.97217 339.47461 345.89273 350.9332 355.97363 362.39175 384.19559 389.698 394.28473 398.87149 403.45822 408.04495 413.08539 415.37875 420.8812 425.46793 431.42407 436.0108 441.05127 447.46939 469.2276 474.73001 479.31674 483.90347 488.49023 493.07697 498.1174 500.41077 505.91321 510.49994 516.45612 521.04285 526.54523 532.96338 538.00385 543.04431 549.4624" + id="text7135" + style="font-variant:normal;font-weight:normal;font-size:8.2495203px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;" + transform="scale(1,-1)">V4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_TOPV4L2_FIELD_BOTTOMV4L2_FIELD_TOPV4L2_FIELD_BOTTOM + \ No newline at end of file diff --git a/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg b/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg index 18b0f5de9ed2..ba02e6f6214d 100644 --- a/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg +++ b/Documentation/media/uapi/v4l/subdev-image-processing-crop.svg @@ -1,63 +1,313 @@ - - - - - - + + + + + image/svg+xml + + + + + + + + + + - - - + + + - - sink - crop - selection + + sink + crop + selection - - + + - - sink media - bus format + + sink media + bus format - - source media - bus format + + source media + bus format - - - + + + - - - - - - - - + + + + + + + + - - - - + + + + - - pad 1 (source) + + pad 1 (source) - - - - + + + + - - - - + + + + - - pad 0 (sink) + + pad 0 (sink) diff --git a/Documentation/media/uapi/v4l/subdev-image-processing-full.svg b/Documentation/media/uapi/v4l/subdev-image-processing-full.svg index 3322cf4c0093..c82291a4493e 100644 --- a/Documentation/media/uapi/v4l/subdev-image-processing-full.svg +++ b/Documentation/media/uapi/v4l/subdev-image-processing-full.svg @@ -1,163 +1,769 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - pad 0 (sink) + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + pad 0 (sink) - - pad 2 (source) + + pad 2 (source) - - - + + + - - - + + + - - + + - - sink media - bus format + + sink media + bus format - - - - - - - - - - sink compose - selection (scaling) + + + + + + + + + + sink compose + selection (scaling) - - - + + + - - source media - bus format + + source media + bus format - - - - - - - - - - sink compose - bounds selection + + + + + + + + + + sink compose + bounds selection - - - - - - - - - - - - pad 1 (sink) + + + + + + + + + + + + pad 1 (sink) - - - + + + - - - + + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - pad 3 (source) + + + + + + + + + + + + + + + + + + + + + + + + + + pad 3 (source) - - sink - crop - selection + + sink + crop + selection - - source - crop - selection + + source + crop + selection - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg b/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg index 2340c0f8bc92..e7b3786f8a9b 100644 --- a/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg +++ b/Documentation/media/uapi/v4l/subdev-image-processing-scaling-multi-source.svg @@ -1,116 +1,560 @@ - - - - - - + + + + + image/svg+xml + + + + + + + + + + - - - + + + - - sink - crop - selection + + sink + crop + selection - - + + - - sink media - bus format + + sink media + bus format - - - + + + - - - - - - sink compose - selection (scaling) + + + + + + sink compose + selection (scaling) - - - + + + - - source - crop - selection + + source + crop + selection - - source media - bus format + + source media + bus format - - - + + + - - - - - - - - + + + + + + + + - - - - + + + + - - pad 1 (source) + + pad 1 (source) - - - - + + + + - - - - + + + + - - pad 0 (sink) + + pad 0 (sink) - - - - + + + + - - - - - - - - + + + + + + + + - - - - + + + + - - pad 2 (source) + + pad 2 (source) - - - - + + + + - - - - + + + + diff --git a/Documentation/media/uapi/v4l/vbi_525.svg b/Documentation/media/uapi/v4l/vbi_525.svg index 3aee15d57c9a..b05f7777ccf8 100644 --- a/Documentation/media/uapi/v4l/vbi_525.svg +++ b/Documentation/media/uapi/v4l/vbi_525.svg @@ -16,21 +16,7 @@ width="208.73068mm" height="51.395489mm" viewBox="0 0 739.59691 182.11" - sodipodi:docname="vbi_525.svg">image/svg+xmlimage/svg+xml(1) + y="-4035.6582" + x="1621.9453 1642.3999 1676.5522">(1) 8745691012113226312628745691012113226312622712702672682692722732752742662652632642622712702672682692722732752742662652632642624923156101112784923156101112784923156101112784923156101112785245242612615255252622622222222223232323285285222228628623231st field1st field2nd field +874569101211322631262 +271270267268269272273275274266265263264262 +492315610111278 +2nd field + y="-4938.6074" + x="2725.5474 4568.3013 1988.446 2356.9966 1619.8953 3094.0981 3462.6489 4916.3638 4957.3472 5284.9146 5325.8975 5653.4653 5694.4482 3812.7788 4181.3296">492315610111278 +524 +261 +525 +262 +22 +22 +23 +23 +285 +22 +286 +23 +1st field +2nd field \ No newline at end of file diff --git a/Documentation/media/uapi/v4l/vbi_625.svg b/Documentation/media/uapi/v4l/vbi_625.svg index d96a2628f305..c117ddb7bf7e 100644 --- a/Documentation/media/uapi/v4l/vbi_625.svg +++ b/Documentation/media/uapi/v4l/vbi_625.svg @@ -16,21 +16,7 @@ width="209.46608mm" height="51.576824mm" viewBox="0 0 742.20265 182.75252" - sodipodi:docname="vbi_625.svg">image/svg+xmlimage/svg+xml1st field145678323123113102214567832625624623223086213096222nd field + d="m 6636.6552,5109.5899 0,-73.9699" />1st field145678323123113102214567832625624623223086213096222nd field +(1) +7654323133123113363353213203193183173163153143133123111822233093093103102433723232424 +1st field +1456783231231131022 +1456783262562462322 +308 +621 +309 +622 +2nd field +765432313312311 +336335321320319318317316315314313312311 +182223309 +309 +310 +310 +24 +337 +23 +23 (1) + transform="scale(1,-1)" + style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;" + id="text4123" + x="6410.605 6451.7324" + y="-4943.1504">24 7654323133123113363353213203193183173163153143133123111822233093093103102433723232424 - \ No newline at end of file + transform="scale(1,-1)" + style="font-variant:normal;font-weight:normal;font-size:73.96984863px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;" + id="text4127" + x="6410.605 6451.7324" + y="-5054.106">24 + \ No newline at end of file diff --git a/Documentation/media/uapi/v4l/vbi_hsync.svg b/Documentation/media/uapi/v4l/vbi_hsync.svg index 17ddb5bcb071..4d5c0b4f146e 100644 --- a/Documentation/media/uapi/v4l/vbi_hsync.svg +++ b/Documentation/media/uapi/v4l/vbi_hsync.svg @@ -16,29 +16,7 @@ width="192.39857mm" height="146.83536mm" viewBox="0 0 681.72724 520.28277" - sodipodi:docname="vbi_hsync.svg">image/svg+xmlimage/svg+xmlBlack LevelSync LevelWhite Level + d="m 192.004,204.696 274.711,0" />Black LevelSync LevelWhite Level +offset +Line synchr. pulseLine blanking +Line synchr. pulse +Line blanking +Black Level offset + id="text3611" + style="font-variant:normal;font-weight:normal;font-size:20.83772659px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;" + transform="scale(1,-1)" + x="438.29504 452.19382 462.61267 474.19846 484.61731 490.41019 501.99597 513.58173 524.00061 535.58636" + y="-83.096947">Sync Level Line synchr. pulseLine blanking - \ No newline at end of file + id="text3615" + style="font-variant:normal;font-weight:normal;font-size:20.83772659px;font-family:sans-serif;-inkscape-font-specification:sans-serif;writing-mode:lr-tb;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;font-style:normal;font-stretch:normal;" + transform="scale(1,-1)" + x="438.29504 457.96585 469.55164 474.17761 479.97049 491.55627 497.34915 508.93494 520.52069 530.93958 542.52533" + y="-395.66284">White Level + \ No newline at end of file -- cgit v1.2.3-55-g7522 From 2bd658de409da459a4e5028010715628e7f11b52 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 30 Nov 2016 08:00:13 -0200 Subject: docs-rst: nv12mt zigzag images: replace by SVG images Instead of using bitmap images to show the zigzag macroblock parsing, replace it by a SVG ones, with is scalable. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/media/Makefile | 2 + Documentation/media/uapi/v4l/nv12mt.png | Bin 1920 -> 0 bytes Documentation/media/uapi/v4l/nv12mt.svg | 450 +++++++ Documentation/media/uapi/v4l/nv12mt_example.png | Bin 5261 -> 0 bytes Documentation/media/uapi/v4l/nv12mt_example.svg | 1589 +++++++++++++++++++++++ Documentation/media/uapi/v4l/pixfmt-nv12mt.rst | 8 +- 6 files changed, 2045 insertions(+), 4 deletions(-) delete mode 100644 Documentation/media/uapi/v4l/nv12mt.png create mode 100644 Documentation/media/uapi/v4l/nv12mt.svg delete mode 100644 Documentation/media/uapi/v4l/nv12mt_example.png create mode 100644 Documentation/media/uapi/v4l/nv12mt_example.svg (limited to 'Documentation/media') diff --git a/Documentation/media/Makefile b/Documentation/media/Makefile index d79afe4d27e9..ec95286e556c 100644 --- a/Documentation/media/Makefile +++ b/Documentation/media/Makefile @@ -17,6 +17,8 @@ IMAGES = \ uapi/v4l/crop.svg \ uapi/v4l/fieldseq_bt.svg \ uapi/v4l/fieldseq_tb.svg \ + uapi/v4l/nv12mt.svg \ + uapi/v4l/nv12mt_example.svg \ uapi/v4l/subdev-image-processing-full.svg \ uapi/v4l/subdev-image-processing-scaling-multi-source.svg \ uapi/v4l/subdev-image-processing-crop.svg \ diff --git a/Documentation/media/uapi/v4l/nv12mt.png b/Documentation/media/uapi/v4l/nv12mt.png deleted file mode 100644 index 41401860fb73..000000000000 Binary files a/Documentation/media/uapi/v4l/nv12mt.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/nv12mt.svg b/Documentation/media/uapi/v4l/nv12mt.svg new file mode 100644 index 000000000000..21fcccda9723 --- /dev/null +++ b/Documentation/media/uapi/v4l/nv12mt.svg @@ -0,0 +1,450 @@ + +image/svg+xml0 +6 +1 +7 +2 +4 +3 +5 + diff --git a/Documentation/media/uapi/v4l/nv12mt_example.png b/Documentation/media/uapi/v4l/nv12mt_example.png deleted file mode 100644 index 7775f5d7cc46..000000000000 Binary files a/Documentation/media/uapi/v4l/nv12mt_example.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/nv12mt_example.svg b/Documentation/media/uapi/v4l/nv12mt_example.svg new file mode 100644 index 000000000000..d65d989ee73b --- /dev/null +++ b/Documentation/media/uapi/v4l/nv12mt_example.svg @@ -0,0 +1,1589 @@ + +image/svg+xml0 +6 +1 +7 +9 +8 +2 +4 +3 +5 +11 +10 +12 +18 +13 +19 +21 +20 +14 +16 +15 +17 +23 +22 +24 +26 +25 +27 +29 +28 + diff --git a/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst b/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst index c8a77bc79f2f..32d0c8743460 100644 --- a/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst +++ b/Documentation/media/uapi/v4l/pixfmt-nv12mt.rst @@ -33,8 +33,8 @@ Layout of macroblocks in memory is presented in the following figure. .. _nv12mt: -.. figure:: nv12mt.png - :alt: nv12mt.png +.. figure:: nv12mt.* + :alt: nv12mt.pdf / nv12mt.svg :align: center V4L2_PIX_FMT_NV12MT macroblock Z shape memory layout @@ -50,8 +50,8 @@ interleaved. Height of the buffer is aligned to 32. .. _nv12mt_ex: -.. figure:: nv12mt_example.png - :alt: nv12mt_example.png +.. figure:: nv12mt_example.* + :alt: nv12mt_example.pdf / nv12mt_example.svg :align: center Example V4L2_PIX_FMT_NV12MT memory layout of macroblocks -- cgit v1.2.3-55-g7522 From 394709da73bc10f0b2d91495ff2440bc0ede5652 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 30 Nov 2016 08:00:14 -0200 Subject: docs-rst: convert pipeline to SVG format The pipeline image was produced from some dot file that has long missed. Create a pipeline.dot with the graph and convert it to SVG. As we're planning to add future support for graphviz graphics, also store the .dot file on the tree, as this will make easier when we add such Sphinx extension. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/media/Makefile | 1 + Documentation/media/uapi/v4l/dev-subdev.rst | 4 +- Documentation/media/uapi/v4l/pipeline.dot | 12 +++++ Documentation/media/uapi/v4l/pipeline.png | Bin 12130 -> 0 bytes Documentation/media/uapi/v4l/pipeline.svg | 68 ++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 Documentation/media/uapi/v4l/pipeline.dot delete mode 100644 Documentation/media/uapi/v4l/pipeline.png create mode 100644 Documentation/media/uapi/v4l/pipeline.svg (limited to 'Documentation/media') diff --git a/Documentation/media/Makefile b/Documentation/media/Makefile index ec95286e556c..fff8e3b73e25 100644 --- a/Documentation/media/Makefile +++ b/Documentation/media/Makefile @@ -19,6 +19,7 @@ IMAGES = \ uapi/v4l/fieldseq_tb.svg \ uapi/v4l/nv12mt.svg \ uapi/v4l/nv12mt_example.svg \ + uapi/v4l/pipeline.svg \ uapi/v4l/subdev-image-processing-full.svg \ uapi/v4l/subdev-image-processing-scaling-multi-source.svg \ uapi/v4l/subdev-image-processing-crop.svg \ diff --git a/Documentation/media/uapi/v4l/dev-subdev.rst b/Documentation/media/uapi/v4l/dev-subdev.rst index c18e9c5427ee..cd2870180208 100644 --- a/Documentation/media/uapi/v4l/dev-subdev.rst +++ b/Documentation/media/uapi/v4l/dev-subdev.rst @@ -99,8 +99,8 @@ the video sensor and the host image processing hardware. .. _pipeline-scaling: -.. figure:: pipeline.png - :alt: pipeline.png +.. figure:: pipeline.* + :alt: pipeline.pdf / pipeline.svg :align: center Image Format Negotiation on Pipelines diff --git a/Documentation/media/uapi/v4l/pipeline.dot b/Documentation/media/uapi/v4l/pipeline.dot new file mode 100644 index 000000000000..02d7fcf12b26 --- /dev/null +++ b/Documentation/media/uapi/v4l/pipeline.dot @@ -0,0 +1,12 @@ +digraph board { + rankdir=TB + colorscheme=x11 + scaler [label="{ 0} | Host\nScaler | { 1} ", shape=Mrecord, style=filled, fillcolor=lightblue] + frontend [label="{ 0} | Host\nFrontend | { 1}", shape=Mrecord, style=filled, fillcolor=lightblue] + sensor [label="Sensor | { 0}", shape=Mrecord, style=filled, fillcolor=aquamarine] + io [label="{ 0} | V4L I/O", shape=Mrecord, style=filled, fillcolor=aquamarine] + + sensor:sensor_0 -> frontend:frontend_0 [color=blue, label="HQ: 2592x1968\nHS: 1296x984"] + frontend:frontend_1 -> scaler:scaler_0 [color=blue, label="HQ: 2592x1968\nHS: 1296x984"] + scaler:scaler_1 -> io:io_0 [color=blue, label="HQ: 1280x720\nHS: 1280x720"] +} diff --git a/Documentation/media/uapi/v4l/pipeline.png b/Documentation/media/uapi/v4l/pipeline.png deleted file mode 100644 index f19b86c2c24d..000000000000 Binary files a/Documentation/media/uapi/v4l/pipeline.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/pipeline.svg b/Documentation/media/uapi/v4l/pipeline.svg new file mode 100644 index 000000000000..70f4c1b23ca1 --- /dev/null +++ b/Documentation/media/uapi/v4l/pipeline.svg @@ -0,0 +1,68 @@ + + + + + + +board + + +scaler + +0 + +Host +Scaler + +1 + + +io + +0 + +V4L I/O + + +scaler:scaler_1->io:io_0 + + +HQ: 1280x720 +HS: 1280x720 + + +frontend + +0 + +Host +Frontend + +1 + + +frontend:frontend_1->scaler:scaler_0 + + +HQ: 2592x1968 +HS: 1296x984 + + +sensor + +Sensor + +0 + + +sensor:sensor_0->frontend:frontend_0 + + +HQ: 2592x1968 +HS: 1296x984 + + + -- cgit v1.2.3-55-g7522 From 86e6808abbdf302c8e9518e9908ce333ea388351 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 30 Nov 2016 08:00:15 -0200 Subject: docs-rst: replace the selection.png by a SVG image bitmap images don't scale too well. So, replace it by a SVG image, written in inkscape. I'm using the 2009's temporary logo.svg image from 8032b526d1a3 ("linux.conf.au 2009: Tuz"), with a Tasmanian Devil wearing a tux mask. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/media/Makefile | 1 + Documentation/media/uapi/v4l/selection-api-003.rst | 4 +- Documentation/media/uapi/v4l/selection.png | Bin 11716 -> 0 bytes Documentation/media/uapi/v4l/selection.svg | 5812 ++++++++++++++++++++ 4 files changed, 5815 insertions(+), 2 deletions(-) delete mode 100644 Documentation/media/uapi/v4l/selection.png create mode 100644 Documentation/media/uapi/v4l/selection.svg (limited to 'Documentation/media') diff --git a/Documentation/media/Makefile b/Documentation/media/Makefile index fff8e3b73e25..d97e969c3ac0 100644 --- a/Documentation/media/Makefile +++ b/Documentation/media/Makefile @@ -20,6 +20,7 @@ IMAGES = \ uapi/v4l/nv12mt.svg \ uapi/v4l/nv12mt_example.svg \ uapi/v4l/pipeline.svg \ + uapi/v4l/selection.svg \ uapi/v4l/subdev-image-processing-full.svg \ uapi/v4l/subdev-image-processing-scaling-multi-source.svg \ uapi/v4l/subdev-image-processing-crop.svg \ diff --git a/Documentation/media/uapi/v4l/selection-api-003.rst b/Documentation/media/uapi/v4l/selection-api-003.rst index 207349c17ead..21686f93c38f 100644 --- a/Documentation/media/uapi/v4l/selection-api-003.rst +++ b/Documentation/media/uapi/v4l/selection-api-003.rst @@ -7,8 +7,8 @@ Selection targets .. _sel-targets-capture: -.. figure:: selection.png - :alt: selection.png +.. figure:: selection.* + :alt: selection.pdf / selection.svg :align: center Cropping and composing targets diff --git a/Documentation/media/uapi/v4l/selection.png b/Documentation/media/uapi/v4l/selection.png deleted file mode 100644 index bfc523eae570..000000000000 Binary files a/Documentation/media/uapi/v4l/selection.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/selection.svg b/Documentation/media/uapi/v4l/selection.svg new file mode 100644 index 000000000000..d309187af967 --- /dev/null +++ b/Documentation/media/uapi/v4l/selection.svg @@ -0,0 +1,5812 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + CROP_DEFAULT + COMPOSE_PADDED + COMPOSE_ACTIVE + COMPOSE_DEFAULT + COMPOSE_PADDED + COMPOSE_BONDS + CROP_BONDS + overscan area + CROP_ACTIVE + DATA SOURCE + DATA SINK + + -- cgit v1.2.3-55-g7522 From ffbdad94d07f89391563d59f1789deb6c9ab4876 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 30 Nov 2016 08:00:16 -0200 Subject: docs-rst: replace bayer.png by a SVG image SVG images are scalable, with makes easier to output on different formats. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/media/Makefile | 1 + Documentation/media/uapi/v4l/bayer.png | Bin 9725 -> 0 bytes Documentation/media/uapi/v4l/bayer.svg | 984 ++++++++++++++++++++++++ Documentation/media/uapi/v4l/subdev-formats.rst | 4 +- 4 files changed, 987 insertions(+), 2 deletions(-) delete mode 100644 Documentation/media/uapi/v4l/bayer.png create mode 100644 Documentation/media/uapi/v4l/bayer.svg (limited to 'Documentation/media') diff --git a/Documentation/media/Makefile b/Documentation/media/Makefile index d97e969c3ac0..998e8dd49352 100644 --- a/Documentation/media/Makefile +++ b/Documentation/media/Makefile @@ -13,6 +13,7 @@ TARGETS := $(addprefix $(BUILDDIR)/, $(FILES)) IMAGES = \ typical_media_device.svg \ uapi/dvb/dvbstb.svg \ + uapi/v4l/bayer.svg \ uapi/v4l/constraints.svg \ uapi/v4l/crop.svg \ uapi/v4l/fieldseq_bt.svg \ diff --git a/Documentation/media/uapi/v4l/bayer.png b/Documentation/media/uapi/v4l/bayer.png deleted file mode 100644 index 9b15fb22e817..000000000000 Binary files a/Documentation/media/uapi/v4l/bayer.png and /dev/null differ diff --git a/Documentation/media/uapi/v4l/bayer.svg b/Documentation/media/uapi/v4l/bayer.svg new file mode 100644 index 000000000000..fbd4cfb5e6bf --- /dev/null +++ b/Documentation/media/uapi/v4l/bayer.svg @@ -0,0 +1,984 @@ + +image/svg+xmlB +G +G +R +BGGR +B +G +G +R +GBRG +B +G +G +R +RGGB +B +G +G +R +GRBG + \ No newline at end of file diff --git a/Documentation/media/uapi/v4l/subdev-formats.rst b/Documentation/media/uapi/v4l/subdev-formats.rst index 2f9c135dfadd..d6152c907b8b 100644 --- a/Documentation/media/uapi/v4l/subdev-formats.rst +++ b/Documentation/media/uapi/v4l/subdev-formats.rst @@ -1514,8 +1514,8 @@ be named ``MEDIA_BUS_FMT_SRGGB10_2X8_PADHI_LE``. .. _bayer-patterns: -.. figure:: bayer.png - :alt: bayer.png +.. figure:: bayer.* + :alt: bayer.pdf / bayer.svg :align: center **Figure 4.8 Bayer Patterns** -- cgit v1.2.3-55-g7522 From ec868e4ee2bcebb9e4c03979d90e0ac0b79fe05a Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 30 Nov 2016 08:00:17 -0200 Subject: docs-rst: media: build SVG from graphviz files Instead of keeping both SVG and graphviz files, dynamically build SVG from its graphviz sources. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/media/.gitignore | 2 + Documentation/media/Makefile | 20 ++++++--- Documentation/media/uapi/v4l/pipeline.svg | 68 ------------------------------- 3 files changed, 16 insertions(+), 74 deletions(-) delete mode 100644 Documentation/media/uapi/v4l/pipeline.svg (limited to 'Documentation/media') diff --git a/Documentation/media/.gitignore b/Documentation/media/.gitignore index a1363379944a..08b21de3ef94 100644 --- a/Documentation/media/.gitignore +++ b/Documentation/media/.gitignore @@ -1 +1,3 @@ *.pdf +# Files generated from *.dot +uapi/v4l/pipeline.svg diff --git a/Documentation/media/Makefile b/Documentation/media/Makefile index 998e8dd49352..547b4105f826 100644 --- a/Documentation/media/Makefile +++ b/Documentation/media/Makefile @@ -10,6 +10,9 @@ FILES = audio.h.rst ca.h.rst dmx.h.rst frontend.h.rst net.h.rst video.h.rst \ TARGETS := $(addprefix $(BUILDDIR)/, $(FILES)) +DOTS = \ + uapi/v4l/pipeline.dot \ + IMAGES = \ typical_media_device.svg \ uapi/dvb/dvbstb.svg \ @@ -29,8 +32,10 @@ IMAGES = \ uapi/v4l/vbi_625.svg \ uapi/v4l/vbi_hsync.svg \ +DOTTGT := $(patsubst %.dot,%.svg,$(DOTS)) +IMGDOT := $(patsubst %,$(SRC_DIR)/%,$(DOTTGT)) -IMGTGT := $(patsubst %.png,%.pdf,$(patsubst %.svg,%.pdf,$(IMAGES))) +IMGTGT := $(patsubst %.svg,%.pdf,$(IMAGES)) IMGPDF := $(patsubst %,$(SRC_DIR)/%,$(IMGTGT)) cmd = $(echo-cmd) $(cmd_$(1)) @@ -38,19 +43,25 @@ cmd = $(echo-cmd) $(cmd_$(1)) quiet_cmd_genpdf = GENPDF $2 cmd_genpdf = convert $2 $3 +quiet_cmd_gendot = DOT $2 + cmd_gendot = dot -Tsvg $2 > $3 + %.pdf: %.svg @$(call cmd,genpdf,$<,$@) +%.svg: %.dot + @$(call cmd,gendot,$<,$@) + .PHONY: all html epub xml latex -all: $(BUILDDIR) ${TARGETS} +all: $(IMGDOT) $(BUILDDIR) ${TARGETS} html: all epub: all xml: all latex: $(IMGPDF) all clean: - -rm -f $(IMGTGT) 2>/dev/null + -rm -f $(DOTTGT) $(IMGTGT) $(patsubst %,$(SRC_DIR)/%,${TARGETS}) 2>/dev/null $(BUILDDIR): $(Q)mkdir -p $@ @@ -95,6 +106,3 @@ $(BUILDDIR)/cec.h.rst: ${KAPI}/cec.h ${PARSER} $(SRC_DIR)/cec.h.rst.exceptions $(BUILDDIR)/lirc.h.rst: ${UAPI}/lirc.h ${PARSER} $(SRC_DIR)/lirc.h.rst.exceptions @$($(quiet)gen_rst) - -cleandocs: - -rm -f ${TARGETS} diff --git a/Documentation/media/uapi/v4l/pipeline.svg b/Documentation/media/uapi/v4l/pipeline.svg deleted file mode 100644 index 70f4c1b23ca1..000000000000 --- a/Documentation/media/uapi/v4l/pipeline.svg +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - -board - - -scaler - -0 - -Host -Scaler - -1 - - -io - -0 - -V4L I/O - - -scaler:scaler_1->io:io_0 - - -HQ: 1280x720 -HS: 1280x720 - - -frontend - -0 - -Host -Frontend - -1 - - -frontend:frontend_1->scaler:scaler_0 - - -HQ: 2592x1968 -HS: 1296x984 - - -sensor - -Sensor - -0 - - -sensor:sensor_0->frontend:frontend_0 - - -HQ: 2592x1968 -HS: 1296x984 - - - -- cgit v1.2.3-55-g7522 From bf5bfe85ec1e94c58becd3e2cb3385310bc68b81 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 30 Nov 2016 08:00:18 -0200 Subject: docs-rst: media/Makefile: reorganize the rules Better organize the media/Makefile, in order to better split what's related to image conversion from the ones related to parse-headers.pl. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/media/Makefile | 45 +++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 21 deletions(-) (limited to 'Documentation/media') diff --git a/Documentation/media/Makefile b/Documentation/media/Makefile index 547b4105f826..ab05323b779b 100644 --- a/Documentation/media/Makefile +++ b/Documentation/media/Makefile @@ -1,15 +1,7 @@ -# Generate the *.h.rst files from uAPI headers +# Rules to convert DOT and SVG to Sphinx images -PARSER = $(srctree)/Documentation/sphinx/parse-headers.pl -UAPI = $(srctree)/include/uapi/linux -KAPI = $(srctree)/include/linux SRC_DIR=$(srctree)/Documentation/media -FILES = audio.h.rst ca.h.rst dmx.h.rst frontend.h.rst net.h.rst video.h.rst \ - videodev2.h.rst media.h.rst cec.h.rst lirc.h.rst - -TARGETS := $(addprefix $(BUILDDIR)/, $(FILES)) - DOTS = \ uapi/v4l/pipeline.dot \ @@ -52,21 +44,16 @@ quiet_cmd_gendot = DOT $2 %.svg: %.dot @$(call cmd,gendot,$<,$@) -.PHONY: all html epub xml latex - -all: $(IMGDOT) $(BUILDDIR) ${TARGETS} -html: all -epub: all -xml: all -latex: $(IMGPDF) all +# Rules to convert a .h file to inline RST documentation -clean: - -rm -f $(DOTTGT) $(IMGTGT) $(patsubst %,$(SRC_DIR)/%,${TARGETS}) 2>/dev/null +PARSER = $(srctree)/Documentation/sphinx/parse-headers.pl +UAPI = $(srctree)/include/uapi/linux +KAPI = $(srctree)/include/linux -$(BUILDDIR): - $(Q)mkdir -p $@ +FILES = audio.h.rst ca.h.rst dmx.h.rst frontend.h.rst net.h.rst video.h.rst \ + videodev2.h.rst media.h.rst cec.h.rst lirc.h.rst -# Rule to convert a .h file to inline RST documentation +TARGETS := $(addprefix $(BUILDDIR)/, $(FILES)) gen_rst = \ echo ${PARSER} $< $@ $(SRC_DIR)/$(notdir $@).exceptions; \ @@ -106,3 +93,19 @@ $(BUILDDIR)/cec.h.rst: ${KAPI}/cec.h ${PARSER} $(SRC_DIR)/cec.h.rst.exceptions $(BUILDDIR)/lirc.h.rst: ${UAPI}/lirc.h ${PARSER} $(SRC_DIR)/lirc.h.rst.exceptions @$($(quiet)gen_rst) + +# Media build rules + +.PHONY: all html epub xml latex + +all: $(IMGDOT) $(BUILDDIR) ${TARGETS} +html: all +epub: all +xml: all +latex: $(IMGPDF) all + +clean: + -rm -f $(DOTTGT) $(IMGTGT) $(patsubst %,$(SRC_DIR)/%,${TARGETS}) 2>/dev/null + +$(BUILDDIR): + $(Q)mkdir -p $@ -- cgit v1.2.3-55-g7522 From 293fbd4fefec92f5d8e7d8256f9228a9aaf99070 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Wed, 30 Nov 2016 08:00:19 -0200 Subject: docs-rst: fix media cleandocs target The builddir prefix was missing on make cleandocs. Fix it. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Jonathan Corbet --- Documentation/Makefile.sphinx | 2 +- Documentation/media/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Documentation/media') diff --git a/Documentation/Makefile.sphinx b/Documentation/Makefile.sphinx index a23d3c8b4848..707c65337ebf 100644 --- a/Documentation/Makefile.sphinx +++ b/Documentation/Makefile.sphinx @@ -98,7 +98,7 @@ installmandocs: cleandocs: $(Q)rm -rf $(BUILDDIR) - $(Q)$(MAKE) -C Documentation/media clean + $(Q)$(MAKE) BUILDDIR=$(abspath $(BUILDDIR)) -C Documentation/media clean endif # HAVE_SPHINX diff --git a/Documentation/media/Makefile b/Documentation/media/Makefile index ab05323b779b..4d8e2ff378c4 100644 --- a/Documentation/media/Makefile +++ b/Documentation/media/Makefile @@ -105,7 +105,7 @@ xml: all latex: $(IMGPDF) all clean: - -rm -f $(DOTTGT) $(IMGTGT) $(patsubst %,$(SRC_DIR)/%,${TARGETS}) 2>/dev/null + -rm -f $(DOTTGT) $(IMGTGT) ${TARGETS} 2>/dev/null $(BUILDDIR): $(Q)mkdir -p $@ -- cgit v1.2.3-55-g7522 From 7d56f0facd6c1cb4ed2169bb8e65294bfd7783f8 Mon Sep 17 00:00:00 2001 From: Sanjeev Date: Thu, 1 Dec 2016 23:36:00 +0800 Subject: Doc: Correct typo, "Introdution" => "Introduction" This corrects a set of spelling mistakes, probably from an automated conversion. Signed-off-by: Sanjeev Gupta Signed-off-by: Jonathan Corbet --- Documentation/admin-guide/unicode.rst | 4 ++-- Documentation/media/dvb-drivers/intro.rst | 4 ++-- Documentation/media/v4l-drivers/cafe_ccic.rst | 4 ++-- Documentation/process/1.Intro.rst | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'Documentation/media') diff --git a/Documentation/admin-guide/unicode.rst b/Documentation/admin-guide/unicode.rst index 4e5c3df9d55f..7425a3351321 100644 --- a/Documentation/admin-guide/unicode.rst +++ b/Documentation/admin-guide/unicode.rst @@ -9,8 +9,8 @@ The current version can be found at: http://www.lanana.org/docs/unicode/admin-guide/unicode.rst -Introdution ------------ +Introduction +------------ The Linux kernel code has been rewritten to use Unicode to map characters to fonts. By downloading a single Unicode-to-font table, diff --git a/Documentation/media/dvb-drivers/intro.rst b/Documentation/media/dvb-drivers/intro.rst index 7681835ea76d..d6eeb2708b9b 100644 --- a/Documentation/media/dvb-drivers/intro.rst +++ b/Documentation/media/dvb-drivers/intro.rst @@ -1,5 +1,5 @@ -Introdution -=========== +Introduction +============ The main development site and GIT repository for these drivers is https://linuxtv.org. diff --git a/Documentation/media/v4l-drivers/cafe_ccic.rst b/Documentation/media/v4l-drivers/cafe_ccic.rst index b98eb3b7cb4a..94f0f58ebe37 100644 --- a/Documentation/media/v4l-drivers/cafe_ccic.rst +++ b/Documentation/media/v4l-drivers/cafe_ccic.rst @@ -3,8 +3,8 @@ The cafe_ccic driver Author: Jonathan Corbet -Introdution ------------ +Introduction +------------ "cafe_ccic" is a driver for the Marvell 88ALP01 "cafe" CMOS camera controller. This is the controller found in first-generation OLPC systems, diff --git a/Documentation/process/1.Intro.rst b/Documentation/process/1.Intro.rst index 22642b3fe903..e782ae2eef58 100644 --- a/Documentation/process/1.Intro.rst +++ b/Documentation/process/1.Intro.rst @@ -1,5 +1,5 @@ -Introdution -=========== +Introduction +============ Executive summary ----------------- -- cgit v1.2.3-55-g7522