aplay/arecord - Add support for IEEE float 32-bit WAV files
PATCH 1/1 aplay/arecord - Add support for IEEE float 32-bit WAV files
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.
aplay/aplay.c +12 -4
@@ -745,8 +745,9 @@ static ssize_t test_wavefile(int fd, u_ccheck_wavefile_space (buffer, len, blimit);test_wavefile_read (fd, buffer, &size, len, __LINE__); f = (WaveFmtBody *) buffer; -if (LE_SHORT (f->format) !=WAV_PCM_CODE ) { -error (_ ("can't play not PCM-coded WAVE-files" )); +if (LE_SHORT (f->format) !=WAV_FMT_PCM && +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 ); }if (LE_SHORT (f->modus) <1 ) {
@@ -788,7 +789,10 @@ static ssize_t test_wavefile(int fd, u_c }break ;case 32 : - hwparams.format =SND_PCM_FORMAT_S32_LE ; +if (LE_SHORT (f->format) ==WAV_FMT_PCM ) + 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 ;default : error(_(" can't play WAVE-files with sample %d bits wide"),
@@ -1778,6 +1782,7 @@ static void begin_wave(int fd, size_t cn bits =16 ;break ;case SND_PCM_FORMAT_S32_LE : +case SND_PCM_FORMAT_FLOAT_LE : bits =32 ;break ;case SND_PCM_FORMAT_S24_LE :
@@ -1796,7 +1801,10 @@ static void begin_wave(int fd, size_t cn cf.type =WAV_FMT ; 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.sample_fq =LE_INT (hwparams.rate);#if 0
aplay/formats.h +5 -1
@@ -64,7 +64,11 @@ typedef struct voc_ext_block {#define WAV_WAVE COMPOSE_ID('W','A','V','E')#define WAV_FMT COMPOSE_ID('f','m','t',' ')#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 are in only in this combination, so I combined them in one header;
Takashi Iwai
AppliedAt Sat, 02 Feb 2008 17:29:52 -0400,
Quoted 7 lines · Andrew Paprocki
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.hfor future use when AC-3 passthrough is better supported.Signed-off-by Andrew Paprocki <[email protected]>
Applied to HG tree now (as post 1.0.16). Thanks.
Takashi
aplay/formats.h typedef struct voc_ext_block { · line 71
Quoted 4 lines
aplay/formats.h +4
-0+/* 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
Does this mean "copy and paste" from M$ copyrighted work ? And if yes, wouldn't that imply a copyright violation committed by ALSA ?
Just asking, best,
Michael
Signature · 2 lines
Michael Gerdau email: [email protected] GPG-keys available on request or at public keyserver
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 6 lines · Michael Gerdau
aplay/formats.h typedef struct voc_ext_block { · line 71
Quoted 4 lines
aplay/formats.h +4
-0+/* 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 0x0092Does this mean "copy and paste" from M$ copyrighted work ?
No, mmreg.h actually uses "WAVE_FORMAT_PCM".
Regards,
Clemens