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

port oss driver to make use of the default fragment sizes as defined in pa_core: store in the sink/source description whether mmap is used; if mmap() fails, fall back to UNIX read/write mode instead of bailing out immediately

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1639 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-08-11 17:09:07 +00:00
parent b71dde0e35
commit a3cd8002b5
1 changed files with 20 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,9 +103,6 @@ PA_MODULE_USAGE(
#define DEFAULT_DEVICE "/dev/dsp" #define DEFAULT_DEVICE "/dev/dsp"
#define DEFAULT_NFRAGS 4
#define DEFAULT_FRAGSIZE_MSEC 25
struct userdata { struct userdata {
pa_core *core; pa_core *core;
pa_module *module; pa_module *module;
@ -1103,8 +1100,8 @@ int pa__init(pa_module*m) {
goto fail; goto fail;
} }
nfrags = DEFAULT_NFRAGS; nfrags = m->core->default_n_fragments;
frag_size = pa_usec_to_bytes(DEFAULT_FRAGSIZE_MSEC*1000, &ss); frag_size = pa_usec_to_bytes(m->core->default_fragment_size_msec*1000, &ss);
if (frag_size <= 0) if (frag_size <= 0)
frag_size = pa_frame_size(&ss); frag_size = pa_frame_size(&ss);
@ -1127,7 +1124,7 @@ int pa__init(pa_module*m) {
} }
if (use_mmap && mode == O_WRONLY) { if (use_mmap && mode == O_WRONLY) {
pa_log_info("Device opened for write only, cannot do memory mapping, falling back to UNIX read/write mode."); pa_log_info("Device opened for playback only, cannot do memory mapping, falling back to UNIX write() mode.");
use_mmap = 0; use_mmap = 0;
} }
@ -1188,16 +1185,10 @@ int pa__init(pa_module*m) {
if (use_mmap) { if (use_mmap) {
if ((u->in_mmap = mmap(NULL, u->in_hwbuf_size, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) { if ((u->in_mmap = mmap(NULL, u->in_hwbuf_size, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) {
if (mode == O_RDWR) { pa_log_warn("mmap(PROT_READ) failed, reverting to non-mmap mode: %s", pa_cstrerror(errno));
pa_log_debug("mmap() failed for input. Changing to O_WRONLY mode."); use_mmap = u->use_mmap = 0;
mode = O_WRONLY; u->in_mmap = NULL;
goto try_write; } else
} else {
pa_log("mmap(): %s", pa_cstrerror(errno));
goto fail;
}
}
pa_log_debug("Successfully mmap()ed input buffer."); pa_log_debug("Successfully mmap()ed input buffer.");
} }
@ -1221,11 +1212,12 @@ int pa__init(pa_module*m) {
pa_source_set_module(u->source, m); pa_source_set_module(u->source, m);
pa_source_set_asyncmsgq(u->source, u->thread_mq.inq); pa_source_set_asyncmsgq(u->source, u->thread_mq.inq);
pa_source_set_description(u->source, t = pa_sprintf_malloc( pa_source_set_description(u->source, t = pa_sprintf_malloc(
"OSS PCM on %s%s%s%s", "OSS PCM on %s%s%s%s%s",
dev, dev,
hwdesc[0] ? " (" : "", hwdesc[0] ? " (" : "",
hwdesc[0] ? hwdesc : "", hwdesc[0] ? hwdesc : "",
hwdesc[0] ? ")" : "")); hwdesc[0] ? ")" : "",
use_mmap ? " via DMA" : ""));
pa_xfree(t); pa_xfree(t);
u->source->is_hardware = 1; u->source->is_hardware = 1;
u->source->refresh_volume = 1; u->source->refresh_volume = 1;
@ -1234,8 +1226,6 @@ int pa__init(pa_module*m) {
u->in_mmap_memblocks = pa_xnew0(pa_memblock*, u->in_nfrags); u->in_mmap_memblocks = pa_xnew0(pa_memblock*, u->in_nfrags);
} }
try_write:
if (mode != O_RDONLY) { if (mode != O_RDONLY) {
char *name_buf = NULL; char *name_buf = NULL;
@ -1246,14 +1236,15 @@ try_write:
mode = O_WRONLY; mode = O_WRONLY;
goto go_on; goto go_on;
} else { } else {
pa_log("mmap(): %s", pa_cstrerror(errno)); pa_log_warn("mmap(PROT_WRITE) failed, reverting to non-mmap mode: %s", pa_cstrerror(errno));
goto fail; u->use_mmap = use_mmap = 0;
u->out_mmap = NULL;
} }
} } else {
pa_log_debug("Successfully mmap()ed output buffer."); pa_log_debug("Successfully mmap()ed output buffer.");
pa_silence_memory(u->out_mmap, u->out_hwbuf_size, &ss); pa_silence_memory(u->out_mmap, u->out_hwbuf_size, &ss);
} }
}
if ((name = pa_modargs_get_value(ma, "sink_name", NULL))) if ((name = pa_modargs_get_value(ma, "sink_name", NULL)))
namereg_fail = 1; namereg_fail = 1;
@ -1275,11 +1266,12 @@ try_write:
pa_sink_set_module(u->sink, m); pa_sink_set_module(u->sink, m);
pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq); pa_sink_set_asyncmsgq(u->sink, u->thread_mq.inq);
pa_sink_set_description(u->sink, t = pa_sprintf_malloc( pa_sink_set_description(u->sink, t = pa_sprintf_malloc(
"OSS PCM on %s%s%s%s", "OSS PCM on %s%s%s%s%s",
dev, dev,
hwdesc[0] ? " (" : "", hwdesc[0] ? " (" : "",
hwdesc[0] ? hwdesc : "", hwdesc[0] ? hwdesc : "",
hwdesc[0] ? ")" : "")); hwdesc[0] ? ")" : "",
use_mmap ? " via DMA" : ""));
pa_xfree(t); pa_xfree(t);
u->sink->is_hardware = 1; u->sink->is_hardware = 1;
u->sink->refresh_volume = 1; u->sink->refresh_volume = 1;