Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

GstEnginePipeline: Fix buffering

This commit is contained in:
Jonas Kvinge 2024-08-11 14:52:00 +02:00
parent e93f14248a
commit 222001bc13
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/engine/gstenginepipeline.cpp
View File

@ -1132,6 +1132,7 @@ void GstEnginePipeline::PadAddedCallback(GstElement *element, GstPad *pad, gpoin
instance->pipeline_connected_ = true; instance->pipeline_connected_ = true;
if (instance->pending_seek_nanosec_ != -1 && instance->pipeline_active_) { if (instance->pending_seek_nanosec_ != -1 && instance->pipeline_active_) {
QMetaObject::invokeMethod(instance, "Seek", Qt::QueuedConnection, Q_ARG(qint64, instance->pending_seek_nanosec_)); QMetaObject::invokeMethod(instance, "Seek", Qt::QueuedConnection, Q_ARG(qint64, instance->pending_seek_nanosec_));
instance->pending_seek_nanosec_ = -1;
} }
} }
@ -1676,9 +1677,10 @@ void GstEnginePipeline::StateChangedMessageReceived(GstMessage *msg) {
} }
} }
if (pipeline_active_) { if (pipeline_active_ && !buffering_) {
if (pending_seek_nanosec_ != -1 && new_state == GST_STATE_PAUSED) { if (pending_seek_nanosec_ != -1 && new_state == GST_STATE_PAUSED) {
SeekAsync(pending_seek_nanosec_); SeekAsync(pending_seek_nanosec_);
pending_seek_nanosec_ = -1;
} }
else if (pending_state_ != GST_STATE_NULL) { else if (pending_state_ != GST_STATE_NULL) {
SetStateAsync(pending_state_); SetStateAsync(pending_state_);
@ -1704,19 +1706,29 @@ void GstEnginePipeline::BufferingMessageReceived(GstMessage *msg) {
const GstState current_state = state(); const GstState current_state = state();
if (percent == 0 && current_state == GST_STATE_PLAYING && !buffering_) { if (percent < 100 && !buffering_) {
qLog(Debug) << "Buffering started"; qLog(Debug) << "Buffering started";
buffering_ = true; buffering_ = true;
emit BufferingStarted(); emit BufferingStarted();
if (current_state == GST_STATE_PLAYING) {
SetStateAsync(GST_STATE_PAUSED); SetStateAsync(GST_STATE_PAUSED);
if (pending_state_ == GST_STATE_NULL) {
pending_state_ = current_state;
}
}
} }
else if (percent == 100 && buffering_) { else if (percent == 100 && buffering_) {
qLog(Debug) << "Buffering finished"; qLog(Debug) << "Buffering finished";
buffering_ = false; buffering_ = false;
emit BufferingFinished(); emit BufferingFinished();
if (pending_seek_nanosec_ != -1) {
SetStateAsync(GST_STATE_PLAYING); SeekAsync(pending_seek_nanosec_);
pending_seek_nanosec_ = -1;
}
else if (pending_state_ != GST_STATE_NULL) {
SetStateAsync(pending_state_);
pending_state_ = GST_STATE_NULL;
}
} }
else if (buffering_) { else if (buffering_) {
emit BufferingProgress(percent); emit BufferingProgress(percent);