slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Release videoframe on painter stop()

Browse Source 
QVideoSurfaceGLPainter/QVideoSurfaceGlslPainter needs
to release the video frame on stop (just like
QVideoSurfaceGenericPainter already does).

Change-Id: Iaf3eb13eaf51fbc22fab6b1f80db8e8978ac328d
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
This commit is contained in:
Wouter Huysentruit
2014-03-03 20:21:26 +01:00
committed by The Qt Project
parent 5b52c1ebb9
commit 42e032bdc1
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/multimediawidgets/qpaintervideosurface.cpp
View File

@@ -247,6 +247,8 @@ public:
bool isFormatSupported(const QVideoSurfaceFormat &format) const; bool isFormatSupported(const QVideoSurfaceFormat &format) const;
void stop();
QAbstractVideoSurface::Error setCurrentFrame(const QVideoFrame &frame); QAbstractVideoSurface::Error setCurrentFrame(const QVideoFrame &frame);
QAbstractVideoSurface::Error paint( QAbstractVideoSurface::Error paint(
@@ -351,6 +353,12 @@ bool QVideoSurfaceGLPainter::isFormatSupported(const QVideoSurfaceFormat &format
return false; return false;
} }
void QVideoSurfaceGLPainter::stop()
{
m_frame = QVideoFrame();
}
QAbstractVideoSurface::Error QVideoSurfaceGLPainter::setCurrentFrame(const QVideoFrame &frame) QAbstractVideoSurface::Error QVideoSurfaceGLPainter::setCurrentFrame(const QVideoFrame &frame)
{ {
m_frame = frame; m_frame = frame;
@@ -832,6 +840,8 @@ void QVideoSurfaceArbFpPainter::stop()
m_textureCount = 0; m_textureCount = 0;
m_programId = 0; m_programId = 0;
m_handleType = QAbstractVideoBuffer::NoHandle; m_handleType = QAbstractVideoBuffer::NoHandle;
QVideoSurfaceGLPainter::stop();
} }
QAbstractVideoSurface::Error QVideoSurfaceArbFpPainter::paint( QAbstractVideoSurface::Error QVideoSurfaceArbFpPainter::paint(
@@ -1176,6 +1186,8 @@ void QVideoSurfaceGlslPainter::stop()
m_textureCount = 0; m_textureCount = 0;
m_handleType = QAbstractVideoBuffer::NoHandle; m_handleType = QAbstractVideoBuffer::NoHandle;
QVideoSurfaceGLPainter::stop();
} }
QAbstractVideoSurface::Error QVideoSurfaceGlslPainter::paint( QAbstractVideoSurface::Error QVideoSurfaceGlslPainter::paint(