starred/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2026-02-04 05:04:33 +00:00
Code Issues 1.1k Packages Projects Releases 20 Wiki Activity

Qt: Include time stretch latency in displayed maximum

Browse Source
This commit is contained in:
Stenzek
2025-12-30 15:37:12 +10:00
parent 4b02270c79
commit f226581460
2 changed files with 66 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
src/duckstation-qt/audiosettingswidget.cpp
View File

@@ -125,6 +125,7 @@ void AudioSettingsWidget::onStretchModeChanged()
.c_str()) .c_str())
.value_or(AudioStreamParameters::DEFAULT_STRETCH_MODE); .value_or(AudioStreamParameters::DEFAULT_STRETCH_MODE);
m_ui.stretchSettings->setEnabled(stretch_mode != AudioStretchMode::Off); m_ui.stretchSettings->setEnabled(stretch_mode != AudioStretchMode::Off);
updateMinimumLatencyLabel();
} }
AudioBackend AudioSettingsWidget::getEffectiveBackend() const AudioBackend AudioSettingsWidget::getEffectiveBackend() const
@@ -210,37 +211,84 @@ void AudioSettingsWidget::queueUpdateDeviceNames()
"OutputDevice", std::move(devices.front().name)); "OutputDevice", std::move(devices.front().name));
} }
updateLatencyLabel(); updateMinimumLatencyLabel();
}; };
}); });
} }
void AudioSettingsWidget::updateLatencyLabel() void AudioSettingsWidget::updateLatencyLabel()
{ {
const u32 config_buffer_ms = const bool minimal_output_latency = m_dialog->getEffectiveBoolValue(
"Audio", "OutputLatencyMinimal", AudioStreamParameters::DEFAULT_OUTPUT_LATENCY_MINIMAL);
const int config_buffer_ms =
m_dialog->getEffectiveIntValue("Audio", "BufferMS", AudioStreamParameters::DEFAULT_BUFFER_MS); m_dialog->getEffectiveIntValue("Audio", "BufferMS", AudioStreamParameters::DEFAULT_BUFFER_MS);
const u32 config_output_latency_ms = const int config_output_latency_ms =
m_dialog->getEffectiveIntValue("Audio", "OutputLatencyMS", AudioStreamParameters::DEFAULT_OUTPUT_LATENCY_MS); minimal_output_latency ?
const bool minimal_output = m_dialog->getEffectiveBoolValue("Audio", "OutputLatencyMinimal", 0 :
AudioStreamParameters::DEFAULT_OUTPUT_LATENCY_MINIMAL); m_dialog->getEffectiveIntValue("Audio", "OutputLatencyMS", AudioStreamParameters::DEFAULT_OUTPUT_LATENCY_MS);
//: Preserve the %1 variable, adapt the latter ms (and/or any possible spaces in between) to your language's ruleset. m_ui.outputLatencyLabel->setText(minimal_output_latency ? tr("N/A") : tr("%1 ms").arg(config_output_latency_ms));
m_ui.outputLatencyLabel->setText(minimal_output ? tr("N/A") : tr("%1 ms").arg(config_output_latency_ms));
m_ui.bufferMSLabel->setText(tr("%1 ms").arg(config_buffer_ms)); m_ui.bufferMSLabel->setText(tr("%1 ms").arg(config_buffer_ms));
const u32 output_latency_ms = minimal_output ? updateMinimumLatencyLabel();
CoreAudioStream::GetMSForBufferSize(SPU::SAMPLE_RATE, m_output_device_latency) : }
config_output_latency_ms;
void AudioSettingsWidget::updateMinimumLatencyLabel()
{
const AudioStretchMode stretch_mode =
CoreAudioStream::ParseStretchMode(m_dialog->getEffectiveStringValue("Audio", "StretchMode").c_str())
.value_or(AudioStreamParameters::DEFAULT_STRETCH_MODE);
const bool minimal_output_latency = m_dialog->getEffectiveBoolValue(
"Audio", "OutputLatencyMinimal", AudioStreamParameters::DEFAULT_OUTPUT_LATENCY_MINIMAL);
const int config_buffer_ms =
m_dialog->getEffectiveIntValue("Audio", "BufferMS", AudioStreamParameters::DEFAULT_BUFFER_MS);
const int config_output_latency_ms =
minimal_output_latency ?
0 :
m_dialog->getEffectiveIntValue("Audio", "OutputLatencyMS", AudioStreamParameters::DEFAULT_OUTPUT_LATENCY_MS);
const int stretch_sequence_length_ms =
(stretch_mode == AudioStretchMode::TimeStretch) ?
m_dialog->getEffectiveIntValue("Audio", "StretchSequenceLengthMS",
AudioStreamParameters::DEFAULT_STRETCH_SEQUENCE_LENGTH) :
0;
const int output_latency_ms =
minimal_output_latency ?
static_cast<int>(CoreAudioStream::GetMSForBufferSize(SPU::SAMPLE_RATE, m_output_device_latency)) :
config_output_latency_ms;
const int total_latency_ms = stretch_sequence_length_ms + config_buffer_ms + output_latency_ms;
if (output_latency_ms > 0) if (output_latency_ms > 0)
{ {
m_ui.bufferingLabel->setText(tr("Maximum Latency: %1 ms (%2 ms buffer + %3 ms output)") if (stretch_sequence_length_ms > 0)
.arg(config_buffer_ms + output_latency_ms) {
.arg(config_buffer_ms) m_ui.bufferingLabel->setText(tr("Maximum Latency: %1 ms (%2 ms stretch + %3 ms buffer + %4 ms output)")
.arg(output_latency_ms)); .arg(total_latency_ms)
.arg(stretch_sequence_length_ms)
.arg(config_buffer_ms)
.arg(output_latency_ms));
}
else
{
m_ui.bufferingLabel->setText(tr("Maximum Latency: %1 ms (%2 ms buffer + %3 ms output)")
.arg(total_latency_ms)
.arg(config_buffer_ms)
.arg(output_latency_ms));
}
} }
else else
{ {
m_ui.bufferingLabel->setText(tr("Maximum Latency: %1 ms (minimum output latency unknown)").arg(config_buffer_ms)); if (stretch_sequence_length_ms > 0)
{
m_ui.bufferingLabel->setText(
tr("Maximum Latency: %1 ms (%2 ms stretch + %3 ms buffer, minimum output latency unknown)")
.arg(total_latency_ms)
.arg(stretch_sequence_length_ms)
.arg(config_buffer_ms));
}
else
{
m_ui.bufferingLabel->setText(tr("Maximum Latency: %1 ms (minimum output latency unknown)").arg(config_buffer_ms));
}
} }
} }
@@ -341,6 +389,7 @@ void AudioSettingsWidget::onStretchSettingsClicked()
QMetaObject::invokeMethod(this, &AudioSettingsWidget::onStretchSettingsClicked, Qt::QueuedConnection); QMetaObject::invokeMethod(this, &AudioSettingsWidget::onStretchSettingsClicked, Qt::QueuedConnection);
}); });
connect(dlg, &QDialog::accepted, this, &AudioSettingsWidget::updateMinimumLatencyLabel);
dlg->open(); dlg->open();
} }

1
src/duckstation-qt/audiosettingswidget.h
View File

@@ -30,6 +30,7 @@ private:
void updateDriverNames(); void updateDriverNames();
void queueUpdateDeviceNames(); void queueUpdateDeviceNames();
void updateLatencyLabel(); void updateLatencyLabel();
void updateMinimumLatencyLabel();
void updateVolumeLabel(); void updateVolumeLabel();
void onMinimalOutputLatencyChecked(Qt::CheckState state); void onMinimalOutputLatencyChecked(Qt::CheckState state);
void onOutputVolumeChanged(int new_value); void onOutputVolumeChanged(int new_value);