mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 10:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

pulsesrc: Fix mapping of latency parameters to buffer attributes

Browse source
This commit is contained in:
Arun Raghavan 2015-04-07 14:06:16 +05:30
parent 0c46c5c3e2
commit 8e236fa2e1
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ext/pulse/pulsesrc.c
View file

@ -1501,7 +1501,20 @@ gst_pulsesrc_prepare (GstAudioSrc * asrc, GstAudioRingBufferSpec * spec)
pa_operation_unref (o); pa_operation_unref (o);
wanted.maxlength = -1; /* There's a bit of a disconnect here between the audio ringbuffer and what
* PulseAudio provides. The audio ringbuffer provide a total of buffer_time
* worth of buffering, divided into segments of latency_time size. We're
* asking PulseAudio to provide a total latency of latency_time, which, with
* PA_STREAM_ADJUST_LATENCY, effectively sets itself up as a ringbuffer with
* one segment being the hardware buffer, and the other the software buffer.
* This segment size is returned as the fragsize.
*
* Since the two concepts don't map very well, what we do is keep segsize as
* it is (unless fragsize is even larger, in which case we use that). We'll
* get data from PulseAudio in smaller chunks than we want to pass on as an
* element, and we coalesce those chunks in the ringbuffer memory and pass it
* on in the expected chunk size. */
wanted.maxlength = spec->segsize * spec->segtotal;
wanted.tlength = -1; wanted.tlength = -1;
wanted.prebuf = 0; wanted.prebuf = 0;
wanted.minreq = -1; wanted.minreq = -1;
@ -1574,11 +1587,14 @@ gst_pulsesrc_prepare (GstAudioSrc * asrc, GstAudioRingBufferSpec * spec)
GST_INFO_OBJECT (pulsesrc, "fragsize: %d (wanted %d)", GST_INFO_OBJECT (pulsesrc, "fragsize: %d (wanted %d)",
actual->fragsize, wanted.fragsize); actual->fragsize, wanted.fragsize);
if (actual->fragsize >= wanted.fragsize) { if (actual->fragsize >= spec->segsize) {
spec->segsize = actual->fragsize; spec->segsize = actual->fragsize;
} else { } else {
spec->segsize = actual->fragsize * (wanted.fragsize / actual->fragsize); /* fragsize is smaller than what we wanted, so let the read function
* coalesce the smaller chunks as they come in */
} }
/* Fix up the total ringbuffer size based on what we actually got */
spec->segtotal = actual->maxlength / spec->segsize; spec->segtotal = actual->maxlength / spec->segsize;
if (!pulsesrc->paused) { if (!pulsesrc->paused) {