summaryrefslogtreecommitdiffstats
path: root/src/multimedia/video/qvideoprobe.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/multimedia/video/qvideoprobe.cpp')
-rw-r--r--src/multimedia/video/qvideoprobe.cpp20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/multimedia/video/qvideoprobe.cpp b/src/multimedia/video/qvideoprobe.cpp
index d9d0d6587..49d78c4a6 100644
--- a/src/multimedia/video/qvideoprobe.cpp
+++ b/src/multimedia/video/qvideoprobe.cpp
@@ -103,8 +103,10 @@ QVideoProbe::~QVideoProbe()
{
if (d->source) {
// Disconnect
- if (d->probee)
+ if (d->probee) {
disconnect(d->probee.data(), SIGNAL(videoFrameProbed(QVideoFrame)), this, SIGNAL(videoFrameProbed(QVideoFrame)));
+ disconnect(d->probee.data(), SIGNAL(flush()), this, SIGNAL(flush()));
+ }
d->source.data()->service()->releaseControl(d->probee.data());
}
}
@@ -132,6 +134,7 @@ bool QVideoProbe::setSource(QMediaObject *source)
if (d->source) {
Q_ASSERT(d->probee);
disconnect(d->probee.data(), SIGNAL(videoFrameProbed(QVideoFrame)), this, SIGNAL(videoFrameProbed(QVideoFrame)));
+ disconnect(d->probee.data(), SIGNAL(flush()), this, SIGNAL(flush()));
d->source.data()->service()->releaseControl(d->probee.data());
d->source.clear();
d->probee.clear();
@@ -145,6 +148,7 @@ bool QVideoProbe::setSource(QMediaObject *source)
if (d->probee) {
connect(d->probee.data(), SIGNAL(videoFrameProbed(QVideoFrame)), this, SIGNAL(videoFrameProbed(QVideoFrame)));
+ connect(d->probee.data(), SIGNAL(flush()), this, SIGNAL(flush()));
d->source = source;
}
}
@@ -190,4 +194,18 @@ bool QVideoProbe::isActive() const
return d->probee != 0;
}
+/*!
+ \fn QVideoProbe::videoFrameProbed(const QVideoFrame &frame)
+
+ This signal should be emitted when a video frame is processed in the
+ media service.
+*/
+
+/*!
+ \fn QVideoProbe::flush()
+
+ This signal should be emitted when it is required to release all frames.
+ Application must release all outstanding references to video frames.
+*/
+
QT_END_NAMESPACE