Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pulse buffer fixes #8

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Pulse buffer fixes #8

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e46ea83
pulse: fix possible overflow for buffer_time option
tomty89 Feb 14, 2019
684c302
pulse: set battr.minreq and battr.maxlength to -1
tomty89 Feb 14, 2019
6872758
pulse: avoid unnecessary calculation
tomty89 Feb 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions src/plugins/pulse/ao_pulse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#include <ao/ao.h>
#include <ao/plugin.h>

#define AO_PULSE_BUFFER_TIME 20000
#define AO_PULSE_BUFFER_TIME 20

/* Unfortunately libao doesn't allow "const" for these structures... */
static char * ao_pulse_options[] = {
Expand Down Expand Up @@ -73,7 +73,7 @@ typedef struct ao_pulse_internal {
struct pa_simple *simple;
char *server, *sink, *client_name;
pa_usec_t static_delay;
pa_usec_t buffer_time;
int buffer_time;
} ao_pulse_internal;

/* Yes, this is very ugly, but required nonetheless... */
Expand Down Expand Up @@ -174,8 +174,8 @@ int ao_plugin_set_option(ao_device *device, const char *key, const char *value)
} else if (!strcmp(key, "client_name")) {
free(internal->client_name);
internal->client_name = strdup(value);
}else if (!strcmp(key, "buffer_time")){
internal->buffer_time = atoi(value) * 1000;
} else if (!strcmp(key, "buffer_time")) {
internal->buffer_time = atoi(value);
}

return 1;
Expand Down Expand Up @@ -256,12 +256,10 @@ int ao_plugin_open(ao_device *device, ao_sample_format *format) {
}

/* buffering attributes */
battr.prebuf = battr.minreq = battr.fragsize = -1;
battr.prebuf = battr.minreq = battr.fragsize = battr.maxlength = -1;

battr.tlength = (int)(internal->buffer_time * format->rate) / 1000000 *
((format->bits+7)/8) * device->output_channels;
battr.minreq = battr.tlength/4;
battr.maxlength = battr.tlength+battr.minreq;
battr.tlength = internal->buffer_time * format->rate / 1000 *
(format->bits / 8) * device->output_channels;

internal->simple = pa_simple_new(internal->server, t, PA_STREAM_PLAYBACK,
internal->sink, t2, &ss,
Expand Down