diff options
author | Niels Weber <niels.weber@digia.com> | 2014-04-22 12:13:23 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-30 18:27:31 +0200 |
commit | 82d96105cea1bca034119adf54a2614c67a24c13 (patch) | |
tree | 9c514976cb4794b6d0e12f5fcde3d145f815a11f | |
parent | 02c0229a058e0779d236bec4c48bdad7d3d78399 (diff) | |
download | qtmultimedia-release.tar.gz |
Fix documentation of qmlvideofx examplev5.3.0-rc1v5.3.0releasebaserock/v5.3.05.3.0
Make the documentation fit to the current state of the example.
Task-number: QTBUG-38121
Change-Id: I3379e3328d07ef8bcdb35a5e3821ab194c3443c4
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
12 files changed, 9 insertions, 18 deletions
diff --git a/examples/multimedia/video/doc/images/qmlvideofx-camera-glow.jpg b/examples/multimedia/video/doc/images/qmlvideofx-camera-glow.jpg Binary files differnew file mode 100644 index 000000000..777ed4ffc --- /dev/null +++ b/examples/multimedia/video/doc/images/qmlvideofx-camera-glow.jpg diff --git a/examples/multimedia/video/doc/images/qmlvideofx-camera-glow.png b/examples/multimedia/video/doc/images/qmlvideofx-camera-glow.png Binary files differdeleted file mode 100644 index aca874b6c..000000000 --- a/examples/multimedia/video/doc/images/qmlvideofx-camera-glow.png +++ /dev/null diff --git a/examples/multimedia/video/doc/images/qmlvideofx-camera-magnify.png b/examples/multimedia/video/doc/images/qmlvideofx-camera-magnify.png Binary files differdeleted file mode 100644 index c3156ce96..000000000 --- a/examples/multimedia/video/doc/images/qmlvideofx-camera-magnify.png +++ /dev/null diff --git a/examples/multimedia/video/doc/images/qmlvideofx-camera-wobble.jpg b/examples/multimedia/video/doc/images/qmlvideofx-camera-wobble.jpg Binary files differnew file mode 100644 index 000000000..980ab0d15 --- /dev/null +++ b/examples/multimedia/video/doc/images/qmlvideofx-camera-wobble.jpg diff --git a/examples/multimedia/video/doc/images/qmlvideofx-effects-menu.jpg b/examples/multimedia/video/doc/images/qmlvideofx-effects-menu.jpg Binary files differnew file mode 100644 index 000000000..eb5b90321 --- /dev/null +++ b/examples/multimedia/video/doc/images/qmlvideofx-effects-menu.jpg diff --git a/examples/multimedia/video/doc/images/qmlvideofx-effects-menu.png b/examples/multimedia/video/doc/images/qmlvideofx-effects-menu.png Binary files differdeleted file mode 100644 index 507fd7384..000000000 --- a/examples/multimedia/video/doc/images/qmlvideofx-effects-menu.png +++ /dev/null diff --git a/examples/multimedia/video/doc/images/qmlvideofx-source-menu.png b/examples/multimedia/video/doc/images/qmlvideofx-source-menu.png Binary files differdeleted file mode 100644 index 661aaa73f..000000000 --- a/examples/multimedia/video/doc/images/qmlvideofx-source-menu.png +++ /dev/null diff --git a/examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.jpg b/examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.jpg Binary files differnew file mode 100644 index 000000000..35b36c036 --- /dev/null +++ b/examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.jpg diff --git a/examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.png b/examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.png Binary files differdeleted file mode 100644 index cedb314c5..000000000 --- a/examples/multimedia/video/doc/images/qmlvideofx-video-edgedetection.png +++ /dev/null diff --git a/examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.jpg b/examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.jpg Binary files differnew file mode 100644 index 000000000..5cd8d2bd2 --- /dev/null +++ b/examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.jpg diff --git a/examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.png b/examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.png Binary files differdeleted file mode 100644 index 5f5bdfb53..000000000 --- a/examples/multimedia/video/doc/images/qmlvideofx-video-pagecurl.png +++ /dev/null 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 |