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

* support native ULAW/ALAW file streams

Browse source 
* fix shutdown of file streams


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@901 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-05-17 14:55:54 +00:00
parent b47b257a91
commit fa53ed7aaf
1 changed files with 26 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/polypcore/sound-file-stream.c
View file

@ -65,10 +65,6 @@ static void sink_input_kill(pa_sink_input *i) {
free_userdata(i->userdata); free_userdata(i->userdata);
} }
static void si_kill(PA_GCC_UNUSED pa_mainloop_api *m, void *i) {
sink_input_kill(i);
}
static int sink_input_peek(pa_sink_input *i, pa_memchunk *chunk) { static int sink_input_peek(pa_sink_input *i, pa_memchunk *chunk) {
struct userdata *u; struct userdata *u;
assert(i && chunk && i->userdata); assert(i && chunk && i->userdata);
@ -76,18 +72,25 @@ static int sink_input_peek(pa_sink_input *i, pa_memchunk *chunk) {
if (!u->memchunk.memblock) { if (!u->memchunk.memblock) {
uint32_t fs = pa_frame_size(&i->sample_spec); uint32_t fs = pa_frame_size(&i->sample_spec);
sf_count_t samples = BUF_SIZE/fs; sf_count_t n;
u->memchunk.memblock = pa_memblock_new(BUF_SIZE, i->sink->core->memblock_stat); u->memchunk.memblock = pa_memblock_new(BUF_SIZE, i->sink->core->memblock_stat);
u->memchunk.index = 0; u->memchunk.index = 0;
samples = u->readf_function(u->sndfile, u->memchunk.memblock->data, samples);
u->memchunk.length = samples*fs; if (u->readf_function) {
if ((n = u->readf_function(u->sndfile, u->memchunk.memblock->data, BUF_SIZE/fs)) <= 0)
n = 0;
u->memchunk.length = n * fs;
} else {
if ((n = sf_read_raw(u->sndfile, u->memchunk.memblock->data, BUF_SIZE)) <= 0)
n = 0;
u->memchunk.length = n;
}
if (!u->memchunk.length) { if (!u->memchunk.length) {
pa_memblock_unref(u->memchunk.memblock); free_userdata(u);
u->memchunk.memblock = NULL;
u->memchunk.index = u->memchunk.length = 0;
pa_mainloop_api_once(i->sink->core->mainloop, si_kill, i);
return -1; return -1;
} }
} }
@ -135,14 +138,24 @@ int pa_play_file(pa_sink *sink, const char *fname, const pa_cvolume *volume) {
goto fail; goto fail;
} }
u->readf_function = NULL;
switch (sfinfo.format & 0xFF) { switch (sfinfo.format & 0xFF) {
case SF_FORMAT_PCM_16: case SF_FORMAT_PCM_16:
case SF_FORMAT_PCM_U8: case SF_FORMAT_PCM_U8:
case SF_FORMAT_ULAW: case SF_FORMAT_PCM_S8:
case SF_FORMAT_ALAW:
ss.format = PA_SAMPLE_S16NE; ss.format = PA_SAMPLE_S16NE;
u->readf_function = (sf_count_t (*)(SNDFILE *sndfile, void *ptr, sf_count_t frames)) sf_readf_short; u->readf_function = (sf_count_t (*)(SNDFILE *sndfile, void *ptr, sf_count_t frames)) sf_readf_short;
break; break;
case SF_FORMAT_ULAW:
ss.format = PA_SAMPLE_ULAW;
break;
case SF_FORMAT_ALAW:
ss.format = PA_SAMPLE_ALAW;
break;
case SF_FORMAT_FLOAT: case SF_FORMAT_FLOAT:
default: default:
ss.format = PA_SAMPLE_FLOAT32NE; ss.format = PA_SAMPLE_FLOAT32NE;