asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-09-20 01:59:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

- Fix big-endian bug in aplay/arecord.

Browse source
This commit is contained in:
Takashi Iwai 2000-05-30 10:12:59 +00:00
parent 048c2000f8
commit 1b4bd70ef9
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
aplay/aplay.c
View file

@ -527,7 +527,7 @@ static int test_wavefile(void *buffer, size_t size)
return 0; return 0;
c = (WaveChunkHeader*)((char *)buffer + sizeof(WaveHeader)); c = (WaveChunkHeader*)((char *)buffer + sizeof(WaveHeader));
while (c->type != WAV_FMT) { while (c->type != WAV_FMT) {
c = (WaveChunkHeader*)((char*)c + sizeof(*c) + c->length); c = (WaveChunkHeader*)((char*)c + sizeof(*c) + LE_INT(c->length));
if ((char *)c + sizeof(*c) > (char*) buffer + size) { if ((char *)c + sizeof(*c) > (char*) buffer + size) {
fprintf(stderr, "%s: cannot found WAVE fmt chunk\n", command); fprintf(stderr, "%s: cannot found WAVE fmt chunk\n", command);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -558,7 +558,7 @@ static int test_wavefile(void *buffer, size_t size)
} }
format.rate = LE_INT(f->sample_fq); format.rate = LE_INT(f->sample_fq);
while (c->type != WAV_DATA) { while (c->type != WAV_DATA) {
c = (WaveChunkHeader*)((char*)c + sizeof(*c) + c->length); c = (WaveChunkHeader*)((char*)c + sizeof(*c) + LE_INT(c->length));
if ((char *)c + sizeof(*c) > (char*) buffer + size) { if ((char *)c + sizeof(*c) > (char*) buffer + size) {
fprintf(stderr, "%s: cannot found WAVE data chunk\n", command); fprintf(stderr, "%s: cannot found WAVE data chunk\n", command);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
@ -1231,6 +1231,8 @@ static void begin_wave(int fd, size_t cnt)
WaveFmtHeader f; WaveFmtHeader f;
WaveChunkHeader c; WaveChunkHeader c;
int bits; int bits;
u_int tmp;
u_short tmp2;
bits = 8; bits = 8;
switch (format.format) { switch (format.format) {
@ -1245,25 +1247,30 @@ static void begin_wave(int fd, size_t cnt)
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
h.magic = WAV_RIFF; h.magic = WAV_RIFF;
h.length = cnt + sizeof(WaveHeader) + sizeof(WaveFmtHeader) + sizeof(WaveChunkHeader) - 8; tmp = cnt + sizeof(WaveHeader) + sizeof(WaveFmtHeader) + sizeof(WaveChunkHeader) - 8;
h.length = LE_INT(tmp);
h.type = WAV_WAVE; h.type = WAV_WAVE;
f.type = WAV_FMT; f.type = WAV_FMT;
f.length = 16; f.length = LE_INT(16);
f.format = WAV_PCM_CODE; f.format = LE_INT(WAV_PCM_CODE);
f.modus = format.channels; f.modus = LE_SHORT(format.voices);
f.sample_fq = format.rate; f.sample_fq = LE_INT(format.rate);
#if 0 #if 0
f.byte_p_spl = (samplesize == 8) ? 1 : 2; tmp2 = (samplesize == 8) ? 1 : 2;
f.byte_p_sec = dsp_speed * f.modus * f.byte_p_spl; f.byte_p_spl = LE_SHORT(tmp2);
tmp2 = dsp_speed * format.channels * tmp2;
f.byte_p_sec = LE_SHORT(tmp2);
#else #else
f.byte_p_spl = f.modus * ((bits + 7) / 8); tmp2 = format.voices * ((bits + 7) / 8);
f.byte_p_sec = f.byte_p_spl * format.rate; f.byte_p_spl = LE_SHORT(tmp2);
tmp2 = tmp2 * format.rate;
f.byte_p_sec = LE_SHORT(tmp2);
#endif #endif
f.bit_p_spl = bits; f.bit_p_spl = LE_SHORT(bits);
c.type = WAV_DATA; c.type = WAV_DATA;
c.length = cnt; c.length = LE_INT(cnt);
if (write(fd, &h, sizeof(WaveHeader)) != sizeof(WaveHeader) || if (write(fd, &h, sizeof(WaveHeader)) != sizeof(WaveHeader) ||
write(fd, &f, sizeof(WaveFmtHeader)) != sizeof(WaveFmtHeader) || write(fd, &f, sizeof(WaveFmtHeader)) != sizeof(WaveFmtHeader) ||
@ -1465,7 +1472,7 @@ static void playback(char *name)
check_new_format(&rformat); check_new_format(&rformat);
init_raw_data(); init_raw_data();
count = calc_count(); count = calc_count();
playback_go(fd, 50, count, FORMAT_RAW, name); playback_go(fd, 64, count, FORMAT_RAW, name);
} }
__end: __end:
if (fd != 0) if (fd != 0)