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

when playing an ULAW or ALAW audio file, do not convert to S16NE unconditionally, instead use sf_read_raw() to read raw audio data

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@898 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-05-17 14:06:12 +00:00
parent 106fb20d56
commit 31a9d4fb30
1 changed files with 35 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

57
src/utils/paplay.c
View file

@ -57,7 +57,7 @@ static pa_sample_spec sample_spec = { 0, 0, 0 };
static pa_channel_map channel_map; static pa_channel_map channel_map;
static int channel_map_set = 0; static int channel_map_set = 0;
static sf_count_t (*readf_function)(SNDFILE *_sndfile, void *ptr, sf_count_t frames); static sf_count_t (*readf_function)(SNDFILE *_sndfile, void *ptr, sf_count_t frames) = NULL;
/* A shortcut for terminating the application */ /* A shortcut for terminating the application */
static void quit(int ret) { static void quit(int ret) {
@ -98,26 +98,30 @@ static void stream_drain_complete(pa_stream*s, int success, void *userdata) {
/* This is called whenever new data may be written to the stream */ /* This is called whenever new data may be written to the stream */
static void stream_write_callback(pa_stream *s, size_t length, void *userdata) { static void stream_write_callback(pa_stream *s, size_t length, void *userdata) {
size_t k; sf_count_t bytes;
sf_count_t f, n;
void *data; void *data;
assert(s && length); assert(s && length);
if (!sndfile) if (!sndfile)
return; return;
k = pa_frame_size(&sample_spec);
data = malloc(length); data = malloc(length);
n = length/k; if (readf_function) {
size_t k = pa_frame_size(&sample_spec);
f = readf_function(sndfile, data, n);
if (f > 0) if ((bytes = readf_function(sndfile, data, length/k)) > 0)
pa_stream_write(s, data, f*k, free, 0, PA_SEEK_RELATIVE); bytes *= k;
} else
bytes = sf_read_raw(sndfile, data, length);
if (f < n) { if (bytes > 0)
pa_stream_write(s, data, bytes, free, 0, PA_SEEK_RELATIVE);
else
free(data);
if (bytes < length) {
sf_close(sndfile); sf_close(sndfile);
sndfile = NULL; sndfile = NULL;
pa_operation_unref(pa_stream_drain(s, stream_drain_complete, NULL)); pa_operation_unref(pa_stream_drain(s, stream_drain_complete, NULL));
@ -296,16 +300,8 @@ int main(int argc, char *argv[]) {
} }
} }
filename = optind < argc ? argv[optind] : "STDIN"; filename = optind < argc ? argv[optind] : "STDIN";
if (!client_name)
client_name = strdup(bn);
if (!stream_name)
stream_name = strdup(filename);
memset(&sfinfo, 0, sizeof(sfinfo)); memset(&sfinfo, 0, sizeof(sfinfo));
if (optind < argc) if (optind < argc)
@ -317,18 +313,27 @@ int main(int argc, char *argv[]) {
fprintf(stderr, "Failed to open file '%s'\n", filename); fprintf(stderr, "Failed to open file '%s'\n", filename);
goto quit; goto quit;
} }
sample_spec.rate = sfinfo.samplerate; sample_spec.rate = sfinfo.samplerate;
sample_spec.channels = sfinfo.channels; sample_spec.channels = sfinfo.channels;
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_ALAW:
sample_spec.format = PA_SAMPLE_S16NE; sample_spec.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:
sample_spec.format = PA_SAMPLE_ULAW;
readf_function = NULL;
break;
case SF_FORMAT_ALAW:
sample_spec.format = PA_SAMPLE_ALAW;
readf_function = NULL;
break;
case SF_FORMAT_FLOAT: case SF_FORMAT_FLOAT:
default: default:
sample_spec.format = PA_SAMPLE_FLOAT32NE; sample_spec.format = PA_SAMPLE_FLOAT32NE;
@ -343,6 +348,14 @@ int main(int argc, char *argv[]) {
goto quit; goto quit;
} }
if (!client_name)
client_name = strdup(bn);
if (!stream_name) {
const char *n = sf_get_string(sndfile, SF_STR_TITLE);
stream_name = strdup(n ? n : filename);
}
if (verbose) { if (verbose) {
char t[PA_SAMPLE_SPEC_SNPRINT_MAX]; char t[PA_SAMPLE_SPEC_SNPRINT_MAX];
pa_sample_spec_snprint(t, sizeof(t), &sample_spec); pa_sample_spec_snprint(t, sizeof(t), &sample_spec);