Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

GstEnginePipeline: Use SetStateAsync in finish if needed

Browse Source
This commit is contained in:
Jonas Kvinge 2025-01-15 07:01:43 +01:00
parent ab73eda2be
commit ab558f87b5
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/engine/gstenginepipeline.cpp
View File

@ -176,7 +176,9 @@ GstEnginePipeline::GstEnginePipeline(QObject *parent)
finish_requested_(false), finish_requested_(false),
finished_(false), finished_(false),
set_state_in_progress_(0), set_state_in_progress_(0),
set_state_async_in_progress_(0) { set_state_async_in_progress_(0),
last_set_state_in_progress_(GST_STATE_VOID_PENDING),
last_set_state_async_in_progress_(GST_STATE_VOID_PENDING) {
eq_band_gains_.reserve(kEqBandCount); eq_band_gains_.reserve(kEqBandCount);
for (int i = 0; i < kEqBandCount; ++i) eq_band_gains_ << 0; for (int i = 0; i < kEqBandCount; ++i) eq_band_gains_ << 0;
@ -425,8 +427,13 @@ bool GstEnginePipeline::Finish() {
finished_ = true; finished_ = true;
} }
else { else {
if (set_state_async_in_progress_ > 0 && last_set_state_async_in_progress_ != GST_STATE_NULL) {
SetStateAsync(GST_STATE_NULL);
}
else if ((!IsStateNull() || set_state_in_progress_ > 0) && last_set_state_in_progress_ != GST_STATE_NULL) {
SetState(GST_STATE_NULL); SetState(GST_STATE_NULL);
} }
}
return finished_.value(); return finished_.value();
@ -1794,6 +1801,7 @@ bool GstEnginePipeline::IsStateNull() const {
void GstEnginePipeline::SetStateAsync(const GstState state) { void GstEnginePipeline::SetStateAsync(const GstState state) {
last_set_state_async_in_progress_ = state;
++set_state_async_in_progress_; ++set_state_async_in_progress_;
QMetaObject::invokeMethod(this, "SetStateAsyncSlot", Qt::QueuedConnection, Q_ARG(GstState, state)); QMetaObject::invokeMethod(this, "SetStateAsyncSlot", Qt::QueuedConnection, Q_ARG(GstState, state));
@ -1802,6 +1810,7 @@ void GstEnginePipeline::SetStateAsync(const GstState state) {
void GstEnginePipeline::SetStateAsyncSlot(const GstState state) { void GstEnginePipeline::SetStateAsyncSlot(const GstState state) {
last_set_state_async_in_progress_ = GST_STATE_VOID_PENDING;
--set_state_async_in_progress_; --set_state_async_in_progress_;
SetState(state); SetState(state);
@ -1812,6 +1821,7 @@ QFuture<GstStateChangeReturn> GstEnginePipeline::SetState(const GstState state)
qLog(Debug) << "Setting pipeline" << id() << "state to" << GstStateText(state); qLog(Debug) << "Setting pipeline" << id() << "state to" << GstStateText(state);
last_set_state_in_progress_ = state;
++set_state_in_progress_; ++set_state_in_progress_;
QFutureWatcher<GstStateChangeReturn> *watcher = new QFutureWatcher<GstStateChangeReturn>(); QFutureWatcher<GstStateChangeReturn> *watcher = new QFutureWatcher<GstStateChangeReturn>();
@ -1829,6 +1839,7 @@ QFuture<GstStateChangeReturn> GstEnginePipeline::SetState(const GstState state)
void GstEnginePipeline::SetStateFinishedSlot(const GstState state, const GstStateChangeReturn state_change_return) { void GstEnginePipeline::SetStateFinishedSlot(const GstState state, const GstStateChangeReturn state_change_return) {
last_set_state_in_progress_ = GST_STATE_VOID_PENDING;
--set_state_in_progress_; --set_state_in_progress_;
switch (state_change_return) { switch (state_change_return) {

3
src/engine/gstenginepipeline.h
View File

@ -373,6 +373,9 @@ class GstEnginePipeline : public QObject {
mutex_protected<int> set_state_in_progress_; mutex_protected<int> set_state_in_progress_;
mutex_protected<int> set_state_async_in_progress_; mutex_protected<int> set_state_async_in_progress_;
mutex_protected<GstState> last_set_state_in_progress_;
mutex_protected<GstState> last_set_state_async_in_progress_;
}; };
using GstEnginePipelinePtr = QSharedPointer<GstEnginePipeline>; using GstEnginePipelinePtr = QSharedPointer<GstEnginePipeline>;