diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-03 15:34:21 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-06-03 15:34:21 +0200 |
| commit | 58a304824abbff8f1bf3d5031c1799de91869190 (patch) | |
| tree | a092b1400a82b86acee4e2771bfc2f27630f0261 /src/gsttools/qgstvideorenderersink.cpp | |
| parent | afca8928ce8e4113a224e57fa30a3b4bc5a2db47 (diff) | |
| parent | 293566a1841151cf0a374af7016a396c943ab96e (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Id1638836ea3faf16c4ba39119029522b2afbe803
Diffstat (limited to 'src/gsttools/qgstvideorenderersink.cpp')
| -rw-r--r-- | src/gsttools/qgstvideorenderersink.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gsttools/qgstvideorenderersink.cpp b/src/gsttools/qgstvideorenderersink.cpp index 49016b952..5f71d342c 100644 --- a/src/gsttools/qgstvideorenderersink.cpp +++ b/src/gsttools/qgstvideorenderersink.cpp @@ -686,7 +686,8 @@ void QGstVideoRendererSink::handleShowPrerollChange(GObject *o, GParamSpec *p, g if (!showPrerollFrame) { GstState state = GST_STATE_VOID_PENDING; - gst_element_get_state(GST_ELEMENT(sink), &state, NULL, GST_CLOCK_TIME_NONE); + GstClockTime timeout = 10000000; // 10 ms + gst_element_get_state(GST_ELEMENT(sink), &state, NULL, timeout); // show-preroll-frame being set to 'false' while in GST_STATE_PAUSED means // the QMediaPlayer was stopped from the paused state. // We need to flush the current frame. |