diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-05-17 15:32:00 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-05-18 08:44:35 +0000 |
| commit | 76bcf3c97513638cda46b1f488c53a749eb3888d (patch) | |
| tree | 3ff50760d39fc5242422f35f58eb2a5bc0ccf802 /src/multimedia/doc | |
| parent | 7b2e6ea598a15a81ad1ed15c5392472db4c23b7f (diff) | |
Merge QCameraImageProcessing into QCamera
At the same time remove the colorFilter property. Color
filters are at most a post-processing effect and should
not be part of QCamera itself. The support for the filters
was in any case missing pretty much everywhere (except
gst-photography, which is not supported by most cameras today).
Change-Id: I59306cc75470b11490feeb910c26a414d796f9f1
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/multimedia/doc')
| -rw-r--r-- | src/multimedia/doc/snippets/multimedia-snippets/camera.cpp | 9 | ||||
| -rw-r--r-- | src/multimedia/doc/src/cameraoverview.qdoc | 8 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp index 1f2273002..353aacadd 100644 --- a/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp +++ b/src/multimedia/doc/snippets/multimedia-snippets/camera.cpp @@ -45,7 +45,6 @@ #include "qmediadevices.h" #include "qmediacapturesession.h" #include "qcameraimagecapture.h" -#include "qcameraimageprocessing.h" #include "qvideosink.h" #include "QtMultmediaWidgets/qvideowidget.h> #include <QtGui/qscreen.h> @@ -231,13 +230,9 @@ void camera_blah() void cameraimageprocessing() { - //! [Camera image whitebalance] camera = new QCamera; - QCameraImageProcessing *imageProcessing = camera->imageProcessing(); - - if (imageProcessing->isAvailable()) { - imageProcessing->setWhiteBalanceMode(QCameraImageProcessing::WhiteBalanceFluorescent); - } + //! [Camera image whitebalance] + camera->setWhiteBalanceMode(QCamera::WhiteBalanceFluorescent); //! [Camera image whitebalance] } diff --git a/src/multimedia/doc/src/cameraoverview.qdoc b/src/multimedia/doc/src/cameraoverview.qdoc index 4128c14eb..4b1a7ca92 100644 --- a/src/multimedia/doc/src/cameraoverview.qdoc +++ b/src/multimedia/doc/src/cameraoverview.qdoc @@ -259,10 +259,10 @@ the hardware may also double as a torch. \target camera_image_processing \section3 Image Processing -The QCameraImageProcessing class lets you adjust the image processing -part of the pipeline. This includes the \l {QCameraImageProcessing::WhiteBalanceMode}{white balance} -(or color temperature), \l {QCameraImageProcessing::contrast()}{contrast}, and -\l {QCameraImageProcessing::saturation()}{saturation}. +The QCamera class lets you adjust the image processing +part of the pipeline. This includes the \l {QCamera::WhiteBalanceMode}{white balance} +(or color temperature), \l {QCamera::contrast()}{contrast}, and +\l {QCamera::saturation()}{saturation}. Most cameras support automatic settings for all of these, so you shouldn't need to adjust them unless the user wants a specific setting. |