summaryrefslogtreecommitdiff
path: root/src/multimedia/video
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/video')
-rw-r--r--src/multimedia/video/qabstractvideosurface.h4
-rw-r--r--src/multimedia/video/qvideoprobe.h2
-rw-r--r--src/multimedia/video/qvideosurfaceformat.cpp2
-rw-r--r--src/multimedia/video/qvideosurfaceformat.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/multimedia/video/qabstractvideosurface.h b/src/multimedia/video/qabstractvideosurface.h
index 391c9e696..c136ba6c1 100644
--- a/src/multimedia/video/qabstractvideosurface.h
+++ b/src/multimedia/video/qabstractvideosurface.h
@@ -68,7 +68,7 @@ public:
~QAbstractVideoSurface();
virtual QList<QVideoFrame::PixelFormat> supportedPixelFormats(
- QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const = 0;
+ QAbstractVideoBuffer::HandleType type = QAbstractVideoBuffer::NoHandle) const = 0;
virtual bool isFormatSupported(const QVideoSurfaceFormat &format) const;
virtual QVideoSurfaceFormat nearestFormat(const QVideoSurfaceFormat &format) const;
@@ -89,7 +89,7 @@ Q_SIGNALS:
void activeChanged(bool active);
void surfaceFormatChanged(const QVideoSurfaceFormat &format);
void supportedFormatsChanged();
- void nativeResolutionChanged(const QSize &);
+ void nativeResolutionChanged(const QSize &resolution);
protected:
void setError(Error error);
diff --git a/src/multimedia/video/qvideoprobe.h b/src/multimedia/video/qvideoprobe.h
index 93ba4d2f5..38f5ca05a 100644
--- a/src/multimedia/video/qvideoprobe.h
+++ b/src/multimedia/video/qvideoprobe.h
@@ -62,7 +62,7 @@ public:
bool isActive() const;
Q_SIGNALS:
- void videoFrameProbed(const QVideoFrame &videoFrame);
+ void videoFrameProbed(const QVideoFrame &frame);
void flush();
private:
diff --git a/src/multimedia/video/qvideosurfaceformat.cpp b/src/multimedia/video/qvideosurfaceformat.cpp
index 384ab4e53..7a703c260 100644
--- a/src/multimedia/video/qvideosurfaceformat.cpp
+++ b/src/multimedia/video/qvideosurfaceformat.cpp
@@ -464,7 +464,7 @@ bool QVideoSurfaceFormat::isMirrored() const
}
/*!
- Sets if the surface is mirrored around its vertical axis.
+ Sets if the surface is \a mirrored around its vertical axis.
This is typically needed for video frames coming from a front camera of a mobile device.
Default value is false.
diff --git a/src/multimedia/video/qvideosurfaceformat.h b/src/multimedia/video/qvideosurfaceformat.h
index 175b199a7..1d1990c77 100644
--- a/src/multimedia/video/qvideosurfaceformat.h
+++ b/src/multimedia/video/qvideosurfaceformat.h
@@ -71,7 +71,7 @@ public:
YCbCr_xvYCC601,
YCbCr_xvYCC709,
YCbCr_JPEG,
-#ifndef qdoc
+#ifndef Q_QDOC
YCbCr_CustomMatrix
#endif
};