diff options
author | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2016-11-30 08:00:14 -0200 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2016-11-30 17:07:29 -0700 |
commit | 394709da73bc10f0b2d91495ff2440bc0ede5652 (patch) | |
tree | 9d86aeed1b05f33fe87db139866517f2ddce1989 | |
parent | 2bd658de409da459a4e5028010715628e7f11b52 (diff) | |
download | linux-394709da73bc10f0b2d91495ff2440bc0ede5652.tar.gz linux-394709da73bc10f0b2d91495ff2440bc0ede5652.tar.bz2 linux-394709da73bc10f0b2d91495ff2440bc0ede5652.zip |
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 <mchehab@s-opensource.com>
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
-rw-r--r-- | Documentation/media/Makefile | 1 | ||||
-rw-r--r-- | Documentation/media/uapi/v4l/dev-subdev.rst | 4 | ||||
-rw-r--r-- | Documentation/media/uapi/v4l/pipeline.dot | 12 | ||||
-rw-r--r-- | Documentation/media/uapi/v4l/pipeline.png | bin | 12130 -> 0 bytes | |||
-rw-r--r-- | Documentation/media/uapi/v4l/pipeline.svg | 68 |
5 files changed, 83 insertions, 2 deletions
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="{<scaler_0> 0} | Host\nScaler | {<scaler_1> 1} ", shape=Mrecord, style=filled, fillcolor=lightblue] + frontend [label="{<frontend_0> 0} | Host\nFrontend | {<frontend_1> 1}", shape=Mrecord, style=filled, fillcolor=lightblue] + sensor [label="Sensor | {<sensor_0> 0}", shape=Mrecord, style=filled, fillcolor=aquamarine] + io [label="{<io_0> 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 Binary files differdeleted file mode 100644 index f19b86c2c24d..000000000000 --- a/Documentation/media/uapi/v4l/pipeline.png +++ /dev/null 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 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" + "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"> +<!-- Generated by graphviz version 2.38.0 (20140413.2041) + --> +<!-- Title: board Pages: 1 --> +<svg width="317pt" height="358pt" + viewBox="0.00 0.00 317.00 358.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"> +<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 354)"> +<title>board</title> +<polygon fill="white" stroke="none" points="-4,4 -4,-354 313,-354 313,4 -4,4"/> +<!-- scaler --> +<g id="node1" class="node"><title>scaler</title> +<path fill="lightblue" stroke="black" d="M154,-103.5C154,-103.5 226,-103.5 226,-103.5 232,-103.5 238,-109.5 238,-115.5 238,-115.5 238,-129.5 238,-129.5 238,-135.5 232,-141.5 226,-141.5 226,-141.5 154,-141.5 154,-141.5 148,-141.5 142,-135.5 142,-129.5 142,-129.5 142,-115.5 142,-115.5 142,-109.5 148,-103.5 154,-103.5"/> +<text text-anchor="middle" x="153.5" y="-118.8" font-family="Times,serif" font-size="14.00">0</text> +<polyline fill="none" stroke="black" points="165,-103.5 165,-141.5 "/> +<text text-anchor="middle" x="190" y="-126.3" font-family="Times,serif" font-size="14.00">Host</text> +<text text-anchor="middle" x="190" y="-111.3" font-family="Times,serif" font-size="14.00">Scaler</text> +<polyline fill="none" stroke="black" points="215,-103.5 215,-141.5 "/> +<text text-anchor="middle" x="226.5" y="-118.8" font-family="Times,serif" font-size="14.00">1</text> +</g> +<!-- io --> +<g id="node4" class="node"><title>io</title> +<path fill="aquamarine" stroke="black" d="M228,-0.5C228,-0.5 290,-0.5 290,-0.5 296,-0.5 302,-6.5 302,-12.5 302,-12.5 302,-24.5 302,-24.5 302,-30.5 296,-36.5 290,-36.5 290,-36.5 228,-36.5 228,-36.5 222,-36.5 216,-30.5 216,-24.5 216,-24.5 216,-12.5 216,-12.5 216,-6.5 222,-0.5 228,-0.5"/> +<text text-anchor="middle" x="227.5" y="-14.8" font-family="Times,serif" font-size="14.00">0</text> +<polyline fill="none" stroke="black" points="239,-0.5 239,-36.5 "/> +<text text-anchor="middle" x="270.5" y="-14.8" font-family="Times,serif" font-size="14.00">V4L I/O</text> +</g> +<!-- scaler->io --> +<g id="edge3" class="edge"><title>scaler:scaler_1->io:io_0</title> +<path fill="none" stroke="blue" d="M227,-103C227,-77.3333 227,-68.5104 227,-47.0547"/> +<polygon fill="blue" stroke="blue" points="230.5,-47 227,-37 223.5,-47 230.5,-47"/> +<text text-anchor="middle" x="268" y="-73.8" font-family="Times,serif" font-size="14.00">HQ: 1280x720</text> +<text text-anchor="middle" x="268" y="-58.8" font-family="Times,serif" font-size="14.00">HS: 1280x720</text> +</g> +<!-- frontend --> +<g id="node2" class="node"><title>frontend</title> +<path fill="lightblue" stroke="black" d="M65.5,-208.5C65.5,-208.5 152.5,-208.5 152.5,-208.5 158.5,-208.5 164.5,-214.5 164.5,-220.5 164.5,-220.5 164.5,-234.5 164.5,-234.5 164.5,-240.5 158.5,-246.5 152.5,-246.5 152.5,-246.5 65.5,-246.5 65.5,-246.5 59.5,-246.5 53.5,-240.5 53.5,-234.5 53.5,-234.5 53.5,-220.5 53.5,-220.5 53.5,-214.5 59.5,-208.5 65.5,-208.5"/> +<text text-anchor="middle" x="65" y="-223.8" font-family="Times,serif" font-size="14.00">0</text> +<polyline fill="none" stroke="black" points="76.5,-208.5 76.5,-246.5 "/> +<text text-anchor="middle" x="109" y="-231.3" font-family="Times,serif" font-size="14.00">Host</text> +<text text-anchor="middle" x="109" y="-216.3" font-family="Times,serif" font-size="14.00">Frontend</text> +<polyline fill="none" stroke="black" points="141.5,-208.5 141.5,-246.5 "/> +<text text-anchor="middle" x="153" y="-223.8" font-family="Times,serif" font-size="14.00">1</text> +</g> +<!-- frontend->scaler --> +<g id="edge2" class="edge"><title>frontend:frontend_1->scaler:scaler_0</title> +<path fill="none" stroke="blue" d="M153,-208C153,-182.333 153,-173.51 153,-152.055"/> +<polygon fill="blue" stroke="blue" points="156.5,-152 153,-142 149.5,-152 156.5,-152"/> +<text text-anchor="middle" x="197" y="-178.8" font-family="Times,serif" font-size="14.00">HQ: 2592x1968</text> +<text text-anchor="middle" x="197" y="-163.8" font-family="Times,serif" font-size="14.00">HS: 1296x984</text> +</g> +<!-- sensor --> +<g id="node3" class="node"><title>sensor</title> +<path fill="aquamarine" stroke="black" d="M12,-313.5C12,-313.5 64,-313.5 64,-313.5 70,-313.5 76,-319.5 76,-325.5 76,-325.5 76,-337.5 76,-337.5 76,-343.5 70,-349.5 64,-349.5 64,-349.5 12,-349.5 12,-349.5 6,-349.5 0,-343.5 0,-337.5 0,-337.5 0,-325.5 0,-325.5 0,-319.5 6,-313.5 12,-313.5"/> +<text text-anchor="middle" x="26.5" y="-327.8" font-family="Times,serif" font-size="14.00">Sensor</text> +<polyline fill="none" stroke="black" points="53,-313.5 53,-349.5 "/> +<text text-anchor="middle" x="64.5" y="-327.8" font-family="Times,serif" font-size="14.00">0</text> +</g> +<!-- sensor->frontend --> +<g id="edge1" class="edge"><title>sensor:sensor_0->frontend:frontend_0</title> +<path fill="none" stroke="blue" d="M65,-313C65,-287.333 65,-278.51 65,-257.055"/> +<polygon fill="blue" stroke="blue" points="68.5001,-257 65,-247 61.5001,-257 68.5001,-257"/> +<text text-anchor="middle" x="109" y="-283.8" font-family="Times,serif" font-size="14.00">HQ: 2592x1968</text> +<text text-anchor="middle" x="109" y="-268.8" font-family="Times,serif" font-size="14.00">HS: 1296x984</text> +</g> +</g> +</svg> |