From 82d96105cea1bca034119adf54a2614c67a24c13 Mon Sep 17 00:00:00 2001 From: Niels Weber Date: Tue, 22 Apr 2014 12:13:23 +0200 Subject: Fix documentation of qmlvideofx example Make the documentation fit to the current state of the example. Task-number: QTBUG-38121 Change-Id: I3379e3328d07ef8bcdb35a5e3821ab194c3443c4 Reviewed-by: Leena Miettinen Reviewed-by: Sami Makkonen Reviewed-by: Yoann Lopes --- .../video/doc/images/qmlvideofx-camera-glow.jpg | Bin 0 -> 74914 bytes .../video/doc/images/qmlvideofx-camera-glow.png | Bin 250540 -> 0 bytes .../video/doc/images/qmlvideofx-camera-magnify.png | Bin 204923 -> 0 bytes .../video/doc/images/qmlvideofx-camera-wobble.jpg | Bin 0 -> 62992 bytes .../video/doc/images/qmlvideofx-effects-menu.jpg | Bin 0 -> 84990 bytes .../video/doc/images/qmlvideofx-effects-menu.png | Bin 171257 -> 0 bytes .../video/doc/images/qmlvideofx-source-menu.png | Bin 257292 -> 0 bytes .../doc/images/qmlvideofx-video-edgedetection.jpg | Bin 0 -> 108916 bytes .../doc/images/qmlvideofx-video-edgedetection.png | Bin 279883 -> 0 bytes .../video/doc/images/qmlvideofx-video-pagecurl.jpg | Bin 0 -> 61450 bytes .../video/doc/images/qmlvideofx-video-pagecurl.png | Bin 220606 -> 0 bytes examples/multimedia/video/doc/src/qmlvideofx.qdoc | 27 +++++++-------------- 12 files changed, 9 insertions(+), 18 deletions(-) create mode 100644 examples/multimedia/video/doc/images/qmlvideofx-camera-glow.jpg delete mode 100644 examples/multimedia/video/doc/images/qmlvideofx-camera-glow.png delete mode 100644 examples/multimedia/video/doc/images/qmlvideofx-camera-magnify.png create mode 100644 examples/multimedia/video/doc/images/qmlvideofx-camera-wobble.jpg create mode 100644 examples/multimedia/video/doc/images/qmlvideofx-effects-menu.jpg delete mode 100644 examples/multimedia/video/doc/images/qmlvideofx-effects-menu.png delete mode 100644 examples/multimedia/video/doc/images/qmlvideofx-source-menu.png create mode 100644 examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.jpg delete mode 100644 examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.png create mode 100644 examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.jpg delete mode 100644 examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.png diff --git a/examples/multimedia/video/doc/images/qmlvideofx-camera-glow.jpg b/examples/multimedia/video/doc/images/qmlvideofx-camera-glow.jpg new file mode 100644 index 000000000..777ed4ffc Binary files /dev/null and b/examples/multimedia/video/doc/images/qmlvideofx-camera-glow.jpg differ diff --git a/examples/multimedia/video/doc/images/qmlvideofx-camera-glow.png b/examples/multimedia/video/doc/images/qmlvideofx-camera-glow.png deleted file mode 100644 index aca874b6c..000000000 Binary files a/examples/multimedia/video/doc/images/qmlvideofx-camera-glow.png and /dev/null differ diff --git a/examples/multimedia/video/doc/images/qmlvideofx-camera-magnify.png b/examples/multimedia/video/doc/images/qmlvideofx-camera-magnify.png deleted file mode 100644 index c3156ce96..000000000 Binary files a/examples/multimedia/video/doc/images/qmlvideofx-camera-magnify.png and /dev/null differ diff --git a/examples/multimedia/video/doc/images/qmlvideofx-camera-wobble.jpg b/examples/multimedia/video/doc/images/qmlvideofx-camera-wobble.jpg new file mode 100644 index 000000000..980ab0d15 Binary files /dev/null and b/examples/multimedia/video/doc/images/qmlvideofx-camera-wobble.jpg differ diff --git a/examples/multimedia/video/doc/images/qmlvideofx-effects-menu.jpg b/examples/multimedia/video/doc/images/qmlvideofx-effects-menu.jpg new file mode 100644 index 000000000..eb5b90321 Binary files /dev/null and b/examples/multimedia/video/doc/images/qmlvideofx-effects-menu.jpg differ diff --git a/examples/multimedia/video/doc/images/qmlvideofx-effects-menu.png b/examples/multimedia/video/doc/images/qmlvideofx-effects-menu.png deleted file mode 100644 index 507fd7384..000000000 Binary files a/examples/multimedia/video/doc/images/qmlvideofx-effects-menu.png and /dev/null differ diff --git a/examples/multimedia/video/doc/images/qmlvideofx-source-menu.png b/examples/multimedia/video/doc/images/qmlvideofx-source-menu.png deleted file mode 100644 index 661aaa73f..000000000 Binary files a/examples/multimedia/video/doc/images/qmlvideofx-source-menu.png and /dev/null differ diff --git a/examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.jpg b/examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.jpg new file mode 100644 index 000000000..35b36c036 Binary files /dev/null and b/examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.jpg differ diff --git a/examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.png b/examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.png deleted file mode 100644 index cedb314c5..000000000 Binary files a/examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.png and /dev/null differ diff --git a/examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.jpg b/examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.jpg new file mode 100644 index 000000000..5cd8d2bd2 Binary files /dev/null and b/examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.jpg differ diff --git a/examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.png b/examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.png deleted file mode 100644 index 5f5bdfb53..000000000 Binary files a/examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.png and /dev/null differ diff --git a/examples/multimedia/video/doc/src/qmlvideofx.qdoc b/examples/multimedia/video/doc/src/qmlvideofx.qdoc index 80f087e7f..edbd369c0 100644 --- a/examples/multimedia/video/doc/src/qmlvideofx.qdoc +++ b/examples/multimedia/video/doc/src/qmlvideofx.qdoc @@ -46,31 +46,25 @@ advanced functionality - in this case, C++ code is used to calculate the QML frame rate. This value is rendered in QML in a semi-transparent item overlaid on the video content. -Finally, this application demonstrates the use of different top-level QML -files to handle different physical screen sizes. On small-screen devices, -menus are by default hidden, and only appear when summoned by a gesture. -Large-screen devices show a more traditional layout in which menus are -displayed around the video content pane. - The following screenshots show shader effects being applied. In each case, the effect is implemented using a fragment shader. Here we see an edge detection algorithm being applied to a video clip -(\l{http://orange.blender.org/}{Elephant's Dream from blender.org}). -\image qmlvideofx-video-edgedetection.png +(\l{http://durian.blender.org/}{Sintel from blender.org}). +\image qmlvideofx-video-edgedetection.jpg This image shows a page curl effect, applied to the same video clip. -\image qmlvideofx-video-pagecurl.png +\image qmlvideofx-video-pagecurl.jpg Here we see a 'glow' effect (edge detection plus colour quantization) being applied to the camera viewfinder. -\image qmlvideofx-camera-glow.png +\image qmlvideofx-camera-glow.jpg -This image shows a 'lens magnification' effect applied to the viewfinder. -\image qmlvideofx-camera-magnify.png +This image shows a 'wobble' effect applied to the viewfinder. +\image qmlvideofx-camera-wobble.jpg The application includes many more effects than the ones shown here - look -for Effect*.qml files in the list above to see the full range. +for Effect*.qml files in the list of files below to see the full range. \section1 Application structure @@ -197,11 +191,8 @@ vertical dividing line, which can be dragged left / right by the user. Finally, a \l{video/qmlvideofx/qml/qmlvideofx/ParameterPanel.qml}{ParameterPanel} item renders the sliders corresponding to each effect parameter. -Here is the source selection menu: -\image qmlvideofx-source-menu.png - -And here is the effect selection menu: -\image qmlvideofx-effects-menu.png +Here is the effect selection menu: +\image qmlvideofx-effects-menu.jpg \section1 Calculating and displaying QML painting rate -- cgit v1.2.1