summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-09-10 12:51:43 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-09-10 16:57:10 +0000
commit6a1434363c68eae8d0f105555dcfd52566425552 (patch)
tree8fc1e84d1756d055d6b348a0fdd9e309108fb83f
parentce7aa74aa986f1ca65745e92cb80e78841dfef37 (diff)
Don't try to flush a live pipeline
When using a pipeline in a capture session where the input source are live, we can't do a seeking flush. Fixes a regression introduced in 8d5182d03c1967d77ca8da531b004e85bb0892f0 Change-Id: Id3e3d3ff3b0ac996ea6065f24ade0a0920f2b44c Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 6e96999bb1f61ec4bfdf93ad4438bfdcfdbd9ad7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--src/multimedia/platform/gstreamer/common/qgstpipeline.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/multimedia/platform/gstreamer/common/qgstpipeline.cpp b/src/multimedia/platform/gstreamer/common/qgstpipeline.cpp
index 3877694dd..0f98e7d21 100644
--- a/src/multimedia/platform/gstreamer/common/qgstpipeline.cpp
+++ b/src/multimedia/platform/gstreamer/common/qgstpipeline.cpp
@@ -307,7 +307,8 @@ void QGstPipeline::endConfig()
if (d->m_configCounter)
return;
- d->m_pendingFlush = true;
+ if (d->m_flushOnConfigChanges)
+ d->m_pendingFlush = true;
if (d->m_savedState == GST_STATE_PLAYING)
setState(GST_STATE_PLAYING);
d->m_savedState = GST_STATE_NULL;