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

GstEngine/GstEnginePipeline: support gap-less playback w/ loudness-normalizing gain

Browse Source 
Ok, it does appear that it is that simple.

In principle this (even the non-update case) results in volume jumps,
so maybe we'll want gradual gain change...

Notably, i thought we'd always seek if the pipeline
was already operating on the same URL as the new one,
but apparently only for adjacent songs?
This commit is contained in:
Roman Lebedev 2023-07-09 22:29:08 +03:00 committed by Jonas Kvinge
parent f81816b0cd
commit 4bd993b1e3
3 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/engine/gstengine.cpp
View File

@ -190,9 +190,9 @@ bool GstEngine::Load(const QUrl &media_url, const QUrl &stream_url, const Engine
crossfade = false; crossfade = false;
} }
if (!crossfade && current_pipeline_ && current_pipeline_->stream_url() == stream_url && current_pipeline_->ebur128_loudness_normalizing_gain_db() == ebur128_loudness_normalizing_gain_db_ && change & EngineBase::TrackChangeType::Auto) { if (!crossfade && current_pipeline_ && current_pipeline_->stream_url() == stream_url && change & EngineBase::TrackChangeType::Auto) {
// We're not crossfading, and the pipeline is already playing the URI we want, so just do nothing. // We're not crossfading, and the pipeline is already playing the URI we want, so just do nothing.
// FIXME: can we handle changing of loudness-normalizing gain here? current_pipeline_->SetEBUR128LoudnessNormalizingGain_dB(ebur128_loudness_normalizing_gain_db_);
return true; return true;
} }

21
src/engine/gstenginepipeline.cpp
View File

@ -602,9 +602,7 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
return false; return false;
} }
auto dB_to_mult = [](const double gain_dB) { return std::pow(10., gain_dB / 20.); }; UpdateEBUR128LoudnessNormalizingGaindB();
g_object_set(G_OBJECT(ebur128_volume_), "volume", dB_to_mult(ebur128_loudness_normalizing_gain_db_), nullptr);
eventprobe_ = ebur128_volume_; eventprobe_ = ebur128_volume_;
} }
@ -1535,6 +1533,23 @@ bool GstEnginePipeline::Seek(const qint64 nanosec) {
} }
void GstEnginePipeline::SetEBUR128LoudnessNormalizingGain_dB(const double ebur128_loudness_normalizing_gain_db) {
ebur128_loudness_normalizing_gain_db_ = ebur128_loudness_normalizing_gain_db;
UpdateEBUR128LoudnessNormalizingGaindB();
}
void GstEnginePipeline::UpdateEBUR128LoudnessNormalizingGaindB() {
if (ebur128_volume_) {
auto dB_to_mult = [](const double gain_dB) { return std::pow(10., gain_dB / 20.); };
g_object_set(G_OBJECT(ebur128_volume_), "volume", dB_to_mult(ebur128_loudness_normalizing_gain_db_), nullptr);
}
}
void GstEnginePipeline::SetVolume(const uint volume_percent) { void GstEnginePipeline::SetVolume(const uint volume_percent) {
if (volume_) { if (volume_) {

2
src/engine/gstenginepipeline.h
View File

@ -87,6 +87,7 @@ class GstEnginePipeline : public QObject {
// Control the music playback // Control the music playback
QFuture<GstStateChangeReturn> SetState(const GstState state); QFuture<GstStateChangeReturn> SetState(const GstState state);
Q_INVOKABLE bool Seek(const qint64 nanosec); Q_INVOKABLE bool Seek(const qint64 nanosec);
void SetEBUR128LoudnessNormalizingGain_dB(const double ebur128_loudness_normalizing_gain_db);
void SetVolume(const uint volume_percent); void SetVolume(const uint volume_percent);
void SetStereoBalance(const float value); void SetStereoBalance(const float value);
void SetEqualizerParams(const int preamp, const QList<int> &band_gains); void SetEqualizerParams(const int preamp, const QList<int> &band_gains);
@ -175,6 +176,7 @@ class GstEnginePipeline : public QObject {
static QString ParseStrTag(GstTagList *list, const char *tag); static QString ParseStrTag(GstTagList *list, const char *tag);
static guint ParseUIntTag(GstTagList *list, const char *tag); static guint ParseUIntTag(GstTagList *list, const char *tag);
void UpdateEBUR128LoudnessNormalizingGaindB();
void UpdateStereoBalance(); void UpdateStereoBalance();
void UpdateEqualizer(); void UpdateEqualizer();