diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-05-14 21:04:02 +0200 |
|---|---|---|
| committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2020-05-29 07:24:08 +0000 |
| commit | cf28371c1edd0c6d04c4518cdf3270067d0cf8a7 (patch) | |
| tree | 4d0bda941994274000163d7320197a6ba8e9d565 /src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp | |
| parent | c95aa0e1836f230b2ba3158c65d0767223dd1937 (diff) | |
| parent | 89f92578ece66aaa50e03cacd81434cd18006185 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
examples/multimedia/audiodecoder/audiodecoder.cpp
examples/multimedia/audiodecoder/main.cpp
src/multimedia/playback/qmediaplayer.cpp
Change-Id: I8cf1293023c09069745aa3aa6df49b1e0a8a1c22
Diffstat (limited to 'src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp')
| -rw-r--r-- | src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp index e1468fe34..e8371d766 100644 --- a/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp +++ b/src/plugins/videonode/imx6/qsgvivantevideomaterial.cpp @@ -107,7 +107,7 @@ void QSGVivanteVideoMaterial::updateBlending() { void QSGVivanteVideoMaterial::setCurrentFrame(const QVideoFrame &frame, QSGVideoNode::FrameFlags flags) { QMutexLocker lock(&mFrameMutex); - mNextFrame = frame; + mCurrentFrame = frame; mMappable = mMapError == GL_NO_ERROR && !flags.testFlag(QSGVideoNode::FrameFiltered); #ifdef QT_VIVANTE_VIDEO_DEBUG @@ -124,12 +124,8 @@ void QSGVivanteVideoMaterial::bind() } QMutexLocker lock(&mFrameMutex); - if (mNextFrame.isValid()) { - mCurrentFrame.unmap(); - - mCurrentFrame = mNextFrame; - mCurrentTexture = vivanteMapping(mNextFrame); - } + if (mCurrentFrame.isValid()) + mCurrentTexture = vivanteMapping(mCurrentFrame); else glBindTexture(GL_TEXTURE_2D, mCurrentTexture); } |