Use extended header format for .wav files.

According to Microsoft docs, it is needed if bits > 16 or if there are
more than 2 channels, which aucat supports and is the defaut. Fixes
errors reported by audio/sox port when trying to play .wav files
generated by aucat.

Reported by John Rigg <obsd at jrigg.co.uk> and others on misc@

diff --git a/usr.bin/aucat/afile.c b/usr.bin/aucat/afile.c
index f8aa2ca..46b434e 100644 (file)
--- a/usr.bin/aucat/afile.c
+++ b/usr.bin/aucat/afile.c
@@ -432,12 +432,17 @@ afile_wav_writehdr(struct afile *f)
        le32_set(&hdr.riff.size, f->endpos - sizeof(hdr.riff));
        memcpy(hdr.fmt_hdr.id, wav_id_fmt, 4);
        le32_set(&hdr.fmt_hdr.size, sizeof(hdr.fmt));
-       le16_set(&hdr.fmt.fmt, 1);
+       le16_set(&hdr.fmt.fmt, WAV_FMT_EXT);
        le16_set(&hdr.fmt.nch, f->nch);
        le32_set(&hdr.fmt.rate, f->rate);
        le32_set(&hdr.fmt.byterate, f->rate * f->par.bps * f->nch);
        le16_set(&hdr.fmt.blkalign, f->par.bps * f->nch);
        le16_set(&hdr.fmt.bits, f->par.bits);
+       le16_set(&hdr.fmt.extsize,
+           WAV_FMT_EXT_SIZE - WAV_FMT_SIZE - sizeof(hdr.fmt.extsize));
+       le16_set(&hdr.fmt.valbits, f->par.bits);
+       le16_set(&hdr.fmt.extfmt, 1);
+       memcpy(&hdr.fmt.guid, wav_guid, sizeof(hdr.fmt.guid));
        memcpy(hdr.data_hdr.id, wav_id_data, 4);
        le32_set(&hdr.data_hdr.size, f->endpos - f->startpos);
        return afile_writehdr(f, &hdr, sizeof(struct wav_hdr));