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 loading ULAW/ALAW files into ULAW/ALAW memchunks

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

55
src/polypcore/sound-file.c
View file

@ -39,7 +39,7 @@ int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_channel_map *ma
SF_INFO sfinfo; SF_INFO sfinfo;
int ret = -1; int ret = -1;
size_t l; size_t l;
sf_count_t (*readf_function)(SNDFILE *sndfile, void *ptr, sf_count_t frames); sf_count_t (*readf_function)(SNDFILE *sndfile, void *ptr, sf_count_t frames) = NULL;
assert(fname && ss && chunk); assert(fname && ss && chunk);
chunk->memblock = NULL; chunk->memblock = NULL;
@ -53,17 +53,27 @@ int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_channel_map *ma
} }
switch (sfinfo.format & SF_FORMAT_SUBMASK) { switch (sfinfo.format & SF_FORMAT_SUBMASK) {
case SF_FORMAT_FLOAT: case SF_FORMAT_PCM_16:
case SF_FORMAT_DOUBLE: case SF_FORMAT_PCM_U8:
/* Only float and double need a special case. */ case SF_FORMAT_PCM_S8:
ss->format = PA_SAMPLE_FLOAT32NE;
readf_function = (sf_count_t (*)(SNDFILE *sndfile, void *ptr, sf_count_t frames)) sf_readf_float;
break;
default:
/* Everything else is cleanly converted to signed 16 bit. */
ss->format = PA_SAMPLE_S16NE; ss->format = PA_SAMPLE_S16NE;
readf_function = (sf_count_t (*)(SNDFILE *sndfile, void *ptr, sf_count_t frames)) sf_readf_short; 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_DOUBLE:
default:
ss->format = PA_SAMPLE_FLOAT32NE;
readf_function = (sf_count_t (*)(SNDFILE *sndfile, void *ptr, sf_count_t frames)) sf_readf_float;
break;
} }
ss->rate = sfinfo.samplerate; ss->rate = sfinfo.samplerate;
@ -87,7 +97,8 @@ int pa_sound_file_load(const char *fname, pa_sample_spec *ss, pa_channel_map *ma
chunk->index = 0; chunk->index = 0;
chunk->length = l; chunk->length = l;
if (readf_function(sf, chunk->memblock->data, sfinfo.frames) != sfinfo.frames) { if ((readf_function && readf_function(sf, chunk->memblock->data, sfinfo.frames) != sfinfo.frames) ||
(!readf_function && sf_read_raw(sf, chunk->memblock->data, l) != l)) {
pa_log(__FILE__": Premature file end"); pa_log(__FILE__": Premature file end");
goto finish; goto finish;
} }
@ -119,15 +130,25 @@ int pa_sound_file_too_big_to_cache(const char *fname) {
sf_close(sf); sf_close(sf);
switch (sfinfo.format & SF_FORMAT_SUBMASK) { switch (sfinfo.format & SF_FORMAT_SUBMASK) {
case SF_FORMAT_FLOAT: case SF_FORMAT_PCM_16:
case SF_FORMAT_DOUBLE: case SF_FORMAT_PCM_U8:
/* Only float and double need a special case. */ case SF_FORMAT_PCM_S8:
ss.format = PA_SAMPLE_FLOAT32NE;
break;
default:
/* Everything else is cleanly converted to signed 16 bit. */
ss.format = PA_SAMPLE_S16NE; ss.format = PA_SAMPLE_S16NE;
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_DOUBLE:
case SF_FORMAT_FLOAT:
default:
ss.format = PA_SAMPLE_FLOAT32NE;
break;
} }
ss.rate = sfinfo.samplerate; ss.rate = sfinfo.samplerate;