summaryrefslogtreecommitdiffstats
path: root/examples/multimediawidgets/customvideosurface
diff options
context:
space:
mode:
Diffstat (limited to 'examples/multimediawidgets/customvideosurface')
-rw-r--r--examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.cpp6
-rw-r--r--examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h2
-rw-r--r--examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.cpp8
-rw-r--r--examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h2
4 files changed, 9 insertions, 9 deletions
diff --git a/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.cpp b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.cpp
index b2dc6331d..0271f023a 100644
--- a/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.cpp
+++ b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.cpp
@@ -73,7 +73,7 @@ void VideoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
Q_UNUSED(option);
Q_UNUSED(widget);
- if (currentFrame.map(QAbstractVideoBuffer::ReadOnly)) {
+ if (currentFrame.map(QVideoFrame::ReadOnly)) {
const QTransform oldTransform = painter->transform();
if (surfaceFormat().scanLineDirection() == QVideoSurfaceFormat::BottomToTop) {
@@ -96,9 +96,9 @@ void VideoItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
}
QList<QVideoFrame::PixelFormat> VideoItem::supportedPixelFormats(
- QAbstractVideoBuffer::HandleType handleType) const
+ QVideoFrame::HandleType handleType) const
{
- if (handleType == QAbstractVideoBuffer::NoHandle) {
+ if (handleType == QVideoFrame::NoHandle) {
return QList<QVideoFrame::PixelFormat>()
<< QVideoFrame::Format_RGB32
<< QVideoFrame::Format_ARGB32
diff --git a/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h
index 2dc121d92..7fff81a2f 100644
--- a/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h
+++ b/examples/multimediawidgets/customvideosurface/customvideoitem/videoitem.h
@@ -70,7 +70,7 @@ public:
//video surface
QList<QVideoFrame::PixelFormat> supportedPixelFormats(
- QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const override;
+ QVideoFrame::HandleType handleType = QVideoFrame::NoHandle) const override;
bool start(const QVideoSurfaceFormat &format) override;
void stop() override;
diff --git a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.cpp
index 9b1d68202..a9b98e06e 100644
--- a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.cpp
+++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.cpp
@@ -63,9 +63,9 @@ VideoWidgetSurface::VideoWidgetSurface(QWidget *widget, QObject *parent)
//! [0]
QList<QVideoFrame::PixelFormat> VideoWidgetSurface::supportedPixelFormats(
- QAbstractVideoBuffer::HandleType handleType) const
+ QVideoFrame::HandleType handleType) const
{
- if (handleType == QAbstractVideoBuffer::NoHandle) {
+ if (handleType == QVideoFrame::NoHandle) {
return QList<QVideoFrame::PixelFormat>()
<< QVideoFrame::Format_RGB32
<< QVideoFrame::Format_ARGB32
@@ -86,7 +86,7 @@ bool VideoWidgetSurface::isFormatSupported(const QVideoSurfaceFormat &format) co
return imageFormat != QImage::Format_Invalid
&& !size.isEmpty()
- && format.handleType() == QAbstractVideoBuffer::NoHandle;
+ && format.handleType() == QVideoFrame::NoHandle;
}
//! [1]
@@ -157,7 +157,7 @@ void VideoWidgetSurface::updateVideoRect()
//! [6]
void VideoWidgetSurface::paint(QPainter *painter)
{
- if (currentFrame.map(QAbstractVideoBuffer::ReadOnly)) {
+ if (currentFrame.map(QVideoFrame::ReadOnly)) {
const QTransform oldTransform = painter->transform();
if (surfaceFormat().scanLineDirection() == QVideoSurfaceFormat::BottomToTop) {
diff --git a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h
index d9765d836..a445cf6d6 100644
--- a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h
+++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidgetsurface.h
@@ -65,7 +65,7 @@ public:
VideoWidgetSurface(QWidget *widget, QObject *parent = 0);
QList<QVideoFrame::PixelFormat> supportedPixelFormats(
- QAbstractVideoBuffer::HandleType handleType = QAbstractVideoBuffer::NoHandle) const override;
+ QVideoFrame::HandleType handleType = QVideoFrame::NoHandle) const override;
bool isFormatSupported(const QVideoSurfaceFormat &format) const override;
bool start(const QVideoSurfaceFormat &format) override;