diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:23 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-20 13:17:23 +0100 |
commit | 45cbaf2a8158f5972e3362f7e777d3263d7c7916 (patch) | |
tree | 329c9ccd8d6bb9c2e11d98ed9149c714c04ca987 /src/multimediawidgets | |
parent | cf43124fcbea64f15f0800f090fdf885e08019c7 (diff) | |
parent | 5af70385a0b1a04e10d088f655ee33338ec014c5 (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: Icaf645e271b21320c4cb6269178d9e722092a263
Diffstat (limited to 'src/multimediawidgets')
-rw-r--r-- | src/multimediawidgets/qpaintervideosurface.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/multimediawidgets/qpaintervideosurface.cpp b/src/multimediawidgets/qpaintervideosurface.cpp index 214e5ec7e..6e93e150d 100644 --- a/src/multimediawidgets/qpaintervideosurface.cpp +++ b/src/multimediawidgets/qpaintervideosurface.cpp @@ -191,6 +191,10 @@ QAbstractVideoSurface::Error QVideoSurfaceGenericPainter::paint( m_imageSize.height(), m_frame.bytesPerLine(), m_imageFormat); + // Do not render into ARGB32 images using QPainter. + // Using QImage::Format_ARGB32_Premultiplied is significantly faster. + if (m_imageFormat == QImage::Format_ARGB32) + image = image.convertToFormat(QImage::Format_ARGB32_Premultiplied); const QTransform oldTransform = painter->transform(); QTransform transform = oldTransform; |