mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-05 13:29:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

* fix latency calculation where a full playback buffer was erroneously taken as empty buffer and vice versa.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@689 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-04-12 18:33:13 +00:00
parent 0fa56f9b6f
commit 853caf1274
1 changed files with 22 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/modules/module-oss-mmap.c
View file

@ -70,8 +70,9 @@ struct userdata {
pa_core *core; pa_core *core;
pa_sample_spec sample_spec; pa_sample_spec sample_spec;
size_t in_fragment_size, out_fragment_size, in_fragments, out_fragments; size_t in_fragment_size, out_fragment_size;
int out_blocks_saved, in_blocks_saved; unsigned in_fragments, out_fragments;
unsigned out_blocks_saved, in_blocks_saved;
int fd; int fd;
@ -121,7 +122,12 @@ static void out_fill_memblocks(struct userdata *u, unsigned n) {
if (u->out_memblocks[u->out_current]) if (u->out_memblocks[u->out_current])
pa_memblock_unref_fixed(u->out_memblocks[u->out_current]); pa_memblock_unref_fixed(u->out_memblocks[u->out_current]);
chunk.memblock = u->out_memblocks[u->out_current] = pa_memblock_new_fixed((uint8_t*)u->out_mmap+u->out_fragment_size*u->out_current, u->out_fragment_size, 1, u->core->memblock_stat); chunk.memblock = u->out_memblocks[u->out_current] =
pa_memblock_new_fixed(
(uint8_t*) u->out_mmap+u->out_fragment_size*u->out_current,
u->out_fragment_size,
1,
u->core->memblock_stat);
assert(chunk.memblock); assert(chunk.memblock);
chunk.length = chunk.memblock->length; chunk.length = chunk.memblock->length;
chunk.index = 0; chunk.index = 0;
@ -233,7 +239,7 @@ static void io_callback(pa_mainloop_api *m, pa_io_event *e, PA_GCC_UNUSED int fd
static pa_usec_t sink_get_latency_cb(pa_sink *s) { static pa_usec_t sink_get_latency_cb(pa_sink *s) {
struct userdata *u = s->userdata; struct userdata *u = s->userdata;
struct count_info info; struct count_info info;
size_t bpos, n; size_t bpos, n, total;
assert(s && u); assert(s && u);
if (ioctl(u->fd, SNDCTL_DSP_GETOPTR, &info) < 0) { if (ioctl(u->fd, SNDCTL_DSP_GETOPTR, &info) < 0) {
@ -243,20 +249,23 @@ static pa_usec_t sink_get_latency_cb(pa_sink *s) {
u->out_blocks_saved += info.blocks; u->out_blocks_saved += info.blocks;
bpos = ((u->out_current + u->out_blocks_saved) % u->out_fragments) * u->out_fragment_size; total = u->out_fragments * u->out_fragment_size;
bpos = ((u->out_current + u->out_blocks_saved) * u->out_fragment_size) % total;
if (bpos < (size_t) info.ptr) if (bpos <= (size_t) info.ptr)
n = (u->out_fragments * u->out_fragment_size) - (info.ptr - bpos); n = total - (info.ptr - bpos);
else else
n = bpos - info.ptr; n = bpos - info.ptr;
/* pa_log("n = %u, bpos = %u, ptr = %u, total=%u, fragsize = %u, n_frags = %u\n", n, bpos, (unsigned) info.ptr, total, u->out_fragment_size, u->out_fragments); */
return pa_bytes_to_usec(n, &s->sample_spec); return pa_bytes_to_usec(n, &s->sample_spec);
} }
static pa_usec_t source_get_latency_cb(pa_source *s) { static pa_usec_t source_get_latency_cb(pa_source *s) {
struct userdata *u = s->userdata; struct userdata *u = s->userdata;
struct count_info info; struct count_info info;
size_t bpos, n; size_t bpos, n, total;
assert(s && u); assert(s && u);
if (ioctl(u->fd, SNDCTL_DSP_GETIPTR, &info) < 0) { if (ioctl(u->fd, SNDCTL_DSP_GETIPTR, &info) < 0) {
@ -266,13 +275,16 @@ static pa_usec_t source_get_latency_cb(pa_source *s) {
u->in_blocks_saved += info.blocks; u->in_blocks_saved += info.blocks;
bpos = ((u->in_current + u->in_blocks_saved) % u->in_fragments) * u->in_fragment_size; total = u->in_fragments * u->in_fragment_size;
bpos = ((u->in_current + u->in_blocks_saved) * u->in_fragment_size) % total;
if (bpos < (size_t) info.ptr) if (bpos <= (size_t) info.ptr)
n = info.ptr - bpos; n = info.ptr - bpos;
else else
n = (u->in_fragments * u->in_fragment_size) - bpos + info.ptr; n = (u->in_fragments * u->in_fragment_size) - bpos + info.ptr;
/* pa_log("n = %u, bpos = %u, ptr = %u, total=%u, fragsize = %u, n_frags = %u\n", n, bpos, (unsigned) info.ptr, total, u->in_fragment_size, u->in_fragments); */
return pa_bytes_to_usec(n, &s->sample_spec); return pa_bytes_to_usec(n, &s->sample_spec);
} }