summaryrefslogtreecommitdiffstats
path: root/src/multimedia
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-09-10 12:51:43 +0200
committerLars Knoll <lars.knoll@qt.io>2021-09-10 15:34:45 +0200
commit6e96999bb1f61ec4bfdf93ad4438bfdcfdbd9ad7 (patch)
treee6fda0f195e96899a81a2d3fa590ad5dece7b364 /src/multimedia
parentbe6eb6f0c7b0b0bfb036ed268069970c1c9f57dd (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 Pick-to: 6.2 6.2.0 Change-Id: Id3e3d3ff3b0ac996ea6065f24ade0a0920f2b44c Reviewed-by: Piotr Srebrny <piotr.srebrny@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/multimedia')
-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;