diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-09-17 12:55:03 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-09-20 17:29:15 +0000 |
commit | 87143a294566ca12331d15d8afb0423462be7047 (patch) | |
tree | 34ae611c23bc2c5229fb33a2b96b463233fee45f /src/multimedia/doc/src/multimedia-overview.qdoc | |
parent | f01259068ee35f76fd641dadcd358c28b752a88c (diff) |
Add some basic docs for the media player and recorder examples
Hook up those examples in the correct places, remove a stale
link to the qmlvideofx example and fix the highlighted examples
list to include four examples, showing playback and capture for
both C++ and QML.
Change-Id: I79177b7f398c418ab3ba723e9ff2cd5ef3de1cf6
Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io>
(cherry picked from commit d750ae98cd3b13d96eb9865a1eb0ec328278de14)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/multimedia/doc/src/multimedia-overview.qdoc')
-rw-r--r-- | src/multimedia/doc/src/multimedia-overview.qdoc | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/src/multimedia/doc/src/multimedia-overview.qdoc b/src/multimedia/doc/src/multimedia-overview.qdoc index b7e6c92dc..07f5bbc7c 100644 --- a/src/multimedia/doc/src/multimedia-overview.qdoc +++ b/src/multimedia/doc/src/multimedia-overview.qdoc @@ -119,36 +119,26 @@ For some quick recipes, see this table: \row \li Video Playback \li \l{Media Player Example}{player}, + \l{QML Media Player Example}{mediaplayer} \l{QML Video Example}{qmlvideo}, - \l{QML Video Shader Effects Example}{qmlvideofx} \li \l MediaPlayer, \l VideoOutput, \l Video \li QMediaPlayer, QVideoWidget, QGraphicsVideoItem \row - \li Video Processing - \li \l {QML Video Example}{qmlvideofx} - \li \l {MediaPlayer}, \l VideoOutput - \li QMediaPlayer, QVideoFrame - \row - \li Accessing camera viewfinder + \li Capturing audio and video \li \l {Camera Example}{camera}, - \l {QML Camera Example}{declarative-camera} + \l {QML Recorder Example}{recorder} \li \l Camera, \l VideoOutput \li QCamera, QVideoWidget, QGraphicsVideoItem \row - \li Viewfinder processing - \li - \li \l Camera, \l VideoOutput - \li QCamera, QVideoFrame - \row \li Capturing photos \li \l {Camera Example}{camera}, - \l {QML Camera Example}{declarative-camera} + \l {QML Recorder Example}{recorder} \li \l Camera \li QCamera, QImageCapture \row \li Capturing movies \li \l {Camera Example}{camera}, - \l {QML Camera Example}{declarative-camera} + \l {QML Recorder Example}{recorder} \li \l Camera \li QCamera, QMediaRecorder \endtable |