asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-10 03:25:43 +01:00
Code Issues Projects Releases Packages Wiki Activity

aplay/arecord - Add support for IEEE float 32-bit WAV files

Browse source 
This patch modifies aplay/arecord to support playing/capturing IEEE float
32-bit WAV files. Tested on HDA hardware in both stereo and multi-channel
modes. Added the WAV file constant for Dolby AC-3 S/PDIF passthrough to
formats.h for future use when AC-3 passthrough is better supported.

Signed-off-by: Andrew Paprocki <andrew@ishiboo.com>
This commit is contained in:
Andrew Paprocki 2008-02-06 14:05:07 +01:00 committed by Takashi Iwai
parent a86e94ec04
commit 6f438b9b9a
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
aplay/aplay.c
View file

@ -745,8 +745,9 @@ static ssize_t test_wavefile(int fd, u_char *_buffer, size_t size)
check_wavefile_space(buffer, len, blimit); check_wavefile_space(buffer, len, blimit);
test_wavefile_read(fd, buffer, &size, len, __LINE__); test_wavefile_read(fd, buffer, &size, len, __LINE__);
f = (WaveFmtBody*) buffer; f = (WaveFmtBody*) buffer;
if (LE_SHORT(f->format) != WAV_PCM_CODE) { if (LE_SHORT(f->format) != WAV_FMT_PCM &&
error(_("can't play not PCM-coded WAVE-files")); LE_SHORT(f->format) != WAV_FMT_IEEE_FLOAT) {
error(_("can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded"), LE_SHORT(f->format));
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (LE_SHORT(f->modus) < 1) { if (LE_SHORT(f->modus) < 1) {
@ -788,7 +789,10 @@ static ssize_t test_wavefile(int fd, u_char *_buffer, size_t size)
} }
break; break;
case 32: case 32:
if (LE_SHORT(f->format) == WAV_FMT_PCM)
hwparams.format = SND_PCM_FORMAT_S32_LE; hwparams.format = SND_PCM_FORMAT_S32_LE;
else if (LE_SHORT(f->format) == WAV_FMT_IEEE_FLOAT)
hwparams.format = SND_PCM_FORMAT_FLOAT_LE;
break; break;
default: default:
error(_(" can't play WAVE-files with sample %d bits wide"), error(_(" can't play WAVE-files with sample %d bits wide"),
@ -1778,6 +1782,7 @@ static void begin_wave(int fd, size_t cnt)
bits = 16; bits = 16;
break; break;
case SND_PCM_FORMAT_S32_LE: case SND_PCM_FORMAT_S32_LE:
case SND_PCM_FORMAT_FLOAT_LE:
bits = 32; bits = 32;
break; break;
case SND_PCM_FORMAT_S24_LE: case SND_PCM_FORMAT_S24_LE:
@ -1796,7 +1801,10 @@ static void begin_wave(int fd, size_t cnt)
cf.type = WAV_FMT; cf.type = WAV_FMT;
cf.length = LE_INT(16); cf.length = LE_INT(16);
f.format = LE_SHORT(WAV_PCM_CODE); if (hwparams.format == SND_PCM_FORMAT_FLOAT_LE)
f.format = LE_SHORT(WAV_FMT_IEEE_FLOAT);
else
f.format = LE_SHORT(WAV_FMT_PCM);
f.modus = LE_SHORT(hwparams.channels); f.modus = LE_SHORT(hwparams.channels);
f.sample_fq = LE_INT(hwparams.rate); f.sample_fq = LE_INT(hwparams.rate);
#if 0 #if 0

6
aplay/formats.h
View file

@ -64,7 +64,11 @@ typedef struct voc_ext_block {
#define WAV_WAVE COMPOSE_ID('W','A','V','E') #define WAV_WAVE COMPOSE_ID('W','A','V','E')
#define WAV_FMT COMPOSE_ID('f','m','t',' ') #define WAV_FMT COMPOSE_ID('f','m','t',' ')
#define WAV_DATA COMPOSE_ID('d','a','t','a') #define WAV_DATA COMPOSE_ID('d','a','t','a')
#define WAV_PCM_CODE 1
/* WAVE fmt block constants from Microsoft mmreg.h header */
#define WAV_FMT_PCM 0x0001
#define WAV_FMT_IEEE_FLOAT 0x0003
#define WAV_FMT_DOLBY_AC3_SPDIF 0x0092
/* it's in chunks like .voc and AMIGA iff, but my source say there /* it's in chunks like .voc and AMIGA iff, but my source say there
are in only in this combination, so I combined them in one header; are in only in this combination, so I combined them in one header;