diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-03-02 13:11:36 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-03-16 07:41:44 +0000 |
commit | 5671ab651d9c938a0ff2df3a9c0baef9891e7e23 (patch) | |
tree | 4c5c6fde332af93b3d5f5cb4198df1ee0668434a /examples/multimediawidgets/customvideosurface | |
parent | e7702afc9dfa6e69b1b05d68a38248ccc6b6dd87 (diff) |
Move HandleType and MapMode from QAbstractVideoBuffer to QVideoFrame
QAbstractVideoBuffer is a class that is only required inside our
implementation, so we can make it private. This change prepares
for it.
Change-Id: I4ba4542c1eab742f2fc93231e2e5063dbc5d5e94
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'examples/multimediawidgets/customvideosurface')
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; |