diff mbox series

[FFmpeg-devel,2/3] avdevice/pulse_audio_dec: reduce default fragment size

Message ID 20220611181604.5297-2-cus@passwd.hu
State New
Headers show
Series [FFmpeg-devel,1/3] Revert "avdevice/pulse_audio_dec: only set adjust latency flag if fragment_size is not set" | expand


Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Marton Balint June 11, 2022, 6:16 p.m. UTC
Reduces default fragment size from the pulse audio default of 2 sec to 50 ms.
This also has an effect on the size of the returned frames, which will be
around 50 ms as well, making timestamps more accurate.

This should fix the regression in ticket #9776.

Pulseaudio timestamps for monitor sources are still pretty inaccurate for me,
but I don't see how else should we query latencies from the library.

Signed-off-by: Marton Balint <cus@passwd.hu>
 doc/indevs.texi               | 4 ++--
 libavdevice/pulse_audio_dec.c | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)
diff mbox series


diff --git a/doc/indevs.texi b/doc/indevs.texi
index 9d8020311a..1141da26d1 100644
--- a/doc/indevs.texi
+++ b/doc/indevs.texi
@@ -1292,8 +1292,8 @@  Specify the channels in use, by default 2 (stereo) is set.
 Specify the number of bytes per frame, by default it is set to 1024.
 @item fragment_size
-Specify the minimal buffering fragment in PulseAudio, it will affect the
-audio latency. By default it is unset.
+Specify the size in bytes of the minimal buffering fragment in PulseAudio, it
+will affect the audio latency. By default it is set to 50 ms amount of data.
 @item wallclock
 Set the initial PTS using the current time. Default is 1.
diff --git a/libavdevice/pulse_audio_dec.c b/libavdevice/pulse_audio_dec.c
index ed094fd250..c780d607a0 100644
--- a/libavdevice/pulse_audio_dec.c
+++ b/libavdevice/pulse_audio_dec.c
@@ -162,7 +162,12 @@  static av_cold int pulse_read_header(AVFormatContext *s)
         return AVERROR(ENOMEM);
-    attr.fragsize = pd->fragment_size;
+    if (pd->fragment_size == -1) {
+        // 50 ms fragments/latency by default seem good enough
+        attr.fragsize = av_rescale(pa_frame_size(&ss), pd->sample_rate, 20);
+    } else {
+        attr.fragsize = pd->fragment_size;
+    }
     if (s->url[0] != '\0' && strcmp(s->url, "default"))
         device = s->url;