asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #45152 from Birdulon/PAlatency4

Browse source 
PulseAudio: Remove `get_latency()` caching
This commit is contained in:
Rémi Verschelde 2023-08-04 16:58:59 +02:00
commit bf8069e801
No known key found for this signature in database
GPG key ID: C3336907360768E1
3 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/classes/AudioServer.xml
View file

@ -132,7 +132,7 @@
<method name="get_output_latency" qualifiers="const">
<return type="float" />
<description>
Returns the audio driver's output latency.
Returns the audio driver's output latency. This can be expensive, it is not recommended to call this every frame.
</description>
</method>
<method name="get_speaker_mode" qualifiers="const">

2
doc/classes/Performance.xml
View file

@ -192,7 +192,7 @@
Number of islands in the 3D physics engine. [i]Lower is better.[/i]
</constant>
<constant name="AUDIO_OUTPUT_LATENCY" value="23" enum="Monitor">
Output latency of the [AudioServer]. [i]Lower is better.[/i]
Output latency of the [AudioServer]. Equivalent to calling [method AudioServer.get_output_latency], it is not recommended to call this every frame.
</constant>
<constant name="NAVIGATION_ACTIVE_MAPS" value="24" enum="Monitor">
Number of active navigation maps in the [NavigationServer3D]. This also includes the two empty default navigation maps created by World2D and World3D.

27
drivers/pulseaudio/audio_driver_pulseaudio.cpp
View file

@ -370,27 +370,24 @@ Error AudioDriverPulseAudio::init() {
}
float AudioDriverPulseAudio::get_latency() {
if (latency == 0) { //only do this once since it's approximate anyway
lock();
lock();
pa_usec_t palat = 0;
if (pa_stream_get_state(pa_str) == PA_STREAM_READY) {
int negative = 0;
pa_usec_t pa_lat = 0;
if (pa_stream_get_state(pa_str) == PA_STREAM_READY) {
int negative = 0;
if (pa_stream_get_latency(pa_str, &palat, &negative) >= 0) {
if (negative) {
palat = 0;
}
if (pa_stream_get_latency(pa_str, &pa_lat, &negative) >= 0) {
if (negative) {
pa_lat = 0;
}
}
if (palat > 0) {
latency = double(palat) / 1000000.0;
}
unlock();
}
if (pa_lat > 0) {
latency = double(pa_lat) / 1000000.0;
}
unlock();
return latency;
}