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

* set default fragment metrics depending on the sample specs of the device in OSS and ALSA

Browse source 
* fix fragment size calculation in module-alsa-sink


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@855 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-05-13 21:20:34 +00:00
parent 0231e6ea41
commit 0f22d63289
3 changed files with 21 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/modules/module-alsa-sink.c
View file

@ -342,13 +342,17 @@ int pa__init(pa_core *c, pa_module*m) {
frame_size = pa_frame_size(&ss); frame_size = pa_frame_size(&ss);
/* Fix latency to 100ms */
periods = 8; periods = 8;
fragsize = 1024; fragsize = pa_bytes_per_second(&ss)/128;
pa_log("req: %i %i", periods, fragsize);
if (pa_modargs_get_value_u32(ma, "fragments", &periods) < 0 || pa_modargs_get_value_u32(ma, "fragment_size", &fragsize) < 0) { if (pa_modargs_get_value_u32(ma, "fragments", &periods) < 0 || pa_modargs_get_value_u32(ma, "fragment_size", &fragsize) < 0) {
pa_log(__FILE__": failed to parse buffer metrics"); pa_log(__FILE__": failed to parse buffer metrics");
goto fail; goto fail;
} }
period_size = fragsize; period_size = fragsize/frame_size;
u = pa_xmalloc0(sizeof(struct userdata)); u = pa_xmalloc0(sizeof(struct userdata));
m->userdata = u; m->userdata = u;
@ -431,7 +435,7 @@ int pa__init(pa_core *c, pa_module*m) {
} }
u->frame_size = frame_size; u->frame_size = frame_size;
u->fragment_size = period_size; u->fragment_size = period_size * frame_size;
pa_log_info(__FILE__": using %u fragments of size %lu bytes.", periods, (long unsigned)u->fragment_size); pa_log_info(__FILE__": using %u fragments of size %lu bytes.", periods, (long unsigned)u->fragment_size);

8
src/modules/module-alsa-source.c
View file

@ -333,9 +333,11 @@ int pa__init(pa_core *c, pa_module*m) {
} }
frame_size = pa_frame_size(&ss); frame_size = pa_frame_size(&ss);
/* Fix latency to 100ms */
periods = 12; periods = 12;
fragsize = frame_size*1024; fragsize = pa_bytes_per_second(&ss)/128;
if (pa_modargs_get_value_u32(ma, "fragments", &periods) < 0 || pa_modargs_get_value_u32(ma, "fragment_size", &fragsize) < 0) { if (pa_modargs_get_value_u32(ma, "fragments", &periods) < 0 || pa_modargs_get_value_u32(ma, "fragment_size", &fragsize) < 0) {
pa_log(__FILE__": failed to parse buffer metrics"); pa_log(__FILE__": failed to parse buffer metrics");
goto fail; goto fail;
@ -425,7 +427,7 @@ int pa__init(pa_core *c, pa_module*m) {
u->frame_size = frame_size; u->frame_size = frame_size;
u->fragment_size = period_size * frame_size; u->fragment_size = period_size * frame_size;
pa_log(__FILE__": using %u fragments of size %lu bytes.", periods, (long unsigned) u->fragment_size); pa_log_info(__FILE__": using %u fragments of size %lu bytes.", periods, (long unsigned) u->fragment_size);
u->memchunk.memblock = NULL; u->memchunk.memblock = NULL;
u->memchunk.index = u->memchunk.length = 0; u->memchunk.index = u->memchunk.length = 0;

18
src/modules/module-oss.c
View file

@ -97,8 +97,6 @@ static const char* const valid_modargs[] = {
#define DEFAULT_SINK_NAME "oss_output" #define DEFAULT_SINK_NAME "oss_output"
#define DEFAULT_SOURCE_NAME "oss_input" #define DEFAULT_SOURCE_NAME "oss_input"
#define DEFAULT_DEVICE "/dev/dsp" #define DEFAULT_DEVICE "/dev/dsp"
#define DEFAULT_NFRAGS 12
#define DEFAULT_FRAGSIZE 1024
static void update_usage(struct userdata *u) { static void update_usage(struct userdata *u) {
pa_module_set_used(u->module, pa_module_set_used(u->module,
@ -348,19 +346,21 @@ int pa__init(pa_core *c, pa_module*m) {
mode = (playback&&record) ? O_RDWR : (playback ? O_WRONLY : (record ? O_RDONLY : 0)); mode = (playback&&record) ? O_RDWR : (playback ? O_WRONLY : (record ? O_RDONLY : 0));
nfrags = DEFAULT_NFRAGS;
frag_size = DEFAULT_FRAGSIZE;
if (pa_modargs_get_value_s32(ma, "fragments", &nfrags) < 0 || pa_modargs_get_value_s32(ma, "fragment_size", &frag_size) < 0) {
pa_log(__FILE__": failed to parse fragments arguments");
goto fail;
}
ss = c->default_sample_spec; ss = c->default_sample_spec;
if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map) < 0) { if (pa_modargs_get_sample_spec_and_channel_map(ma, &ss, &map) < 0) {
pa_log(__FILE__": failed to parse sample specification or channel map"); pa_log(__FILE__": failed to parse sample specification or channel map");
goto fail; goto fail;
} }
/* Fix latency to 100ms */
nfrags = 12;
frag_size = pa_bytes_per_second(&ss)/128;
if (pa_modargs_get_value_s32(ma, "fragments", &nfrags) < 0 || pa_modargs_get_value_s32(ma, "fragment_size", &frag_size) < 0) {
pa_log(__FILE__": failed to parse fragments arguments");
goto fail;
}
if ((fd = pa_oss_open(p = pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), &mode, NULL)) < 0) if ((fd = pa_oss_open(p = pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), &mode, NULL)) < 0)
goto fail; goto fail;