diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/doc/qtmultimedia.qdocconf | 6 | ||||
| -rw-r--r-- | src/multimedia/doc/src/multimedia-overview.qdoc | 20 | ||||
| -rw-r--r-- | src/multimedia/doc/src/videooverview.qdoc | 9 |
3 files changed, 13 insertions, 22 deletions
diff --git a/src/multimedia/doc/qtmultimedia.qdocconf b/src/multimedia/doc/qtmultimedia.qdocconf index 7e9a97b54..09af5077a 100644 --- a/src/multimedia/doc/qtmultimedia.qdocconf +++ b/src/multimedia/doc/qtmultimedia.qdocconf @@ -48,8 +48,10 @@ exampledirs += ../../../examples \ snippets \ ../../multimediawidgets/doc/snippets -manifestmeta.highlighted.names = "QtMultimedia/QML Video Shader Effects Example" \ - "QtMultimedia/Media Player Example" +manifestmeta.highlighted.names = "QtMultimedia/QML Media Player Example" \ + "QtMultimedia/Media Player Example" \ + "QtMultimedia/Camera Example" \ + "QtMultimedia/QML Recorder Example" \ headerdirs += ../.. 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 diff --git a/src/multimedia/doc/src/videooverview.qdoc b/src/multimedia/doc/src/videooverview.qdoc index a842db6b6..1856fe2ac 100644 --- a/src/multimedia/doc/src/videooverview.qdoc +++ b/src/multimedia/doc/src/videooverview.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2015 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -56,10 +56,9 @@ And an example with QGraphicsVideoItem: You can use \l VideoOutput to render content that is provided by either a \l MediaPlayer or a \l Camera. The VideoOutput is a visual -component that can be transformed or acted upon by shaders (as the -\l {QML Video Shader Effects Example} shows), while all media decoding -and playback control is handled by the \l MediaPlayer or \l CaptureSession. -\l Video has also been provided for convenience. +component that can be embedded into a QQuickScene or \l Window, while +all media decoding and playback control is handled by the \l MediaPlayer +or \l CaptureSession. \l Video has also been provided for convenience. \section2 Working with Low Level Video Frames |