 @@ -1,17 +1,17 @@
-/*	$NetBSD: libaudio.h,v 1.15 2008/05/29 14:51:27 mrg Exp $	*/
+/*	$NetBSD: libaudio.h,v 1.15.4.1 2009/06/23 06:53:36 snj Exp $	*/
 /*
- * Copyright (c) 1999 Matthew R. Green
+ * Copyright (c) 1999, 2009 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 @@ -97,55 +97,75 @@ int	audio_encoding_to_sun (int, int, int
 /*
  * M$ WAV files, info gleamed from sox sources
  */
 /*
  * This is the WAV audio file magic value.  Note that it
  * is also `RIFF' and `WAVE' in ASCII.
  */
 #define	WAVAUDIO_FILE_MAGIC_RIFF	((u_int32_t)0x52494646)
 #define	WAVAUDIO_FILE_MAGIC_WAVE	((u_int32_t)0x57415645)
 #define	WAVAUDIO_FILE_MAGIC_FMT		((u_int32_t)0x666d7420)
 #define	WAVAUDIO_FILE_MAGIC_DATA	((u_int32_t)0x64617461)
-/* purloined from public Microsoft RIFF docs via sox */
+/* purloined from public Microsoft RIFF docs via sox or mplayer */
 #define WAVE_FORMAT_UNKNOWN		(0x0000)
 #define WAVE_FORMAT_PCM			(0x0001)
 #define WAVE_FORMAT_ADPCM		(0x0002)
 #define WAVE_FORMAT_ALAW		(0x0006)
 #define WAVE_FORMAT_MULAW		(0x0007)
 #define WAVE_FORMAT_OKI_ADPCM		(0x0010)
 #define WAVE_FORMAT_IMA_ADPCM		(0x0011)
 #define WAVE_FORMAT_DIGISTD		(0x0015)
 #define WAVE_FORMAT_DIGIFIX		(0x0016)
 #define WAVE_FORMAT_DOLBY_AC2		(0x0030)
 #define WAVE_FORMAT_GSM610		(0x0031)
 #define WAVE_FORMAT_ROCKWELL_ADPCM	(0x003b)
 #define WAVE_FORMAT_ROCKWELL_DIGITALK	(0x003c)
 #define WAVE_FORMAT_G721_ADPCM		(0x0040)
 #define WAVE_FORMAT_G728_CELP		(0x0041)
 #define WAVE_FORMAT_MPEG		(0x0050)
 #define WAVE_FORMAT_MPEGLAYER3		(0x0055)
 #define WAVE_FORMAT_G726_ADPCM		(0x0064)
 #define WAVE_FORMAT_G722_ADPCM		(0x0065)
 #define IBM_FORMAT_MULAW		(0x0101)
 #define IBM_FORMAT_ALAW			(0x0102)
 #define IBM_FORMAT_ADPCM		(0x0103)
 #define WAVE_FORMAT_EXTENSIBLE		(0xfffe)
 const char *wav_enc_from_val (int);
 typedef struct {
 	char		name[4];
 	u_int32_t	len;
 } wav_audioheaderpart;
 typedef struct {
 	u_int16_t	tag;
 	u_int16_t	channels;
 	u_int32_t	sample_rate;
 	u_int32_t	avg_bps;
 	u_int16_t	alignment;
 	u_int16_t	bits_per_sample;
 } __packed wav_audioheaderfmt;
 typedef struct {
 	u_int16_t	len;
 	u_int16_t	valid_bits;
 	u_int32_t	speaker_pos_mask;
 	u_int16_t	sub_tag;
 	u_int8_t	dummy[14];
 } __packed wav_audiohdrextensible;
 /* returns size of header, or -ve for failure */
 ssize_t audio_wav_parse_hdr (void *, size_t, u_int *, u_int *, u_int *, u_int *, size_t *);
 /*
  * audio routine error codes
  */
 #define AUDIO_ENOENT		-1		/* no such audio format */
 #define AUDIO_ESHORTHDR		-2		/* short header */
 #define AUDIO_EWAVUNSUPP	-3		/* WAV: unsupported file */
 #define AUDIO_EWAVBADPCM	-4		/* WAV: bad PCM bps */
 #define AUDIO_EWAVNODATA	-5		/* WAV: missing data */
 #define AUDIO_EINTERNAL		-6		/* internal error */

 @@ -1,17 +1,17 @@
-/*	$NetBSD: wav.c,v 1.8 2008/05/29 14:51:27 mrg Exp $	*/
+/*	$NetBSD: wav.c,v 1.8.4.1 2009/06/23 06:53:36 snj Exp $	*/
 /*
- * Copyright (c) 2002 Matthew R. Green
+ * Copyright (c) 2002, 2009 Matthew R. Green
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
 @@ -23,40 +23,41 @@
  * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * WAV support for the audio tools; thanks go to the sox utility for
  * clearing up issues with WAV files.
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: wav.c,v 1.8 2008/05/29 14:51:27 mrg Exp $");
+__RCSID("$NetBSD: wav.c,v 1.8.4.1 2009/06/23 06:53:36 snj Exp $");
 #endif
 #include <sys/types.h>
 #include <sys/audioio.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <ctype.h>
 #include <err.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdint.h>
 #include "libaudio.h"
 struct {
 	int	wenc;
 	const char *wname;
 } wavencs[] = {
 	{ WAVE_FORMAT_UNKNOWN, 	"Microsoft Official Unknown" },
 	{ WAVE_FORMAT_PCM,	"Microsoft PCM" },
 	{ WAVE_FORMAT_ADPCM,	"Microsoft ADPCM" },
 	{ WAVE_FORMAT_ALAW,	"Microsoft A-law" },
 	{ WAVE_FORMAT_MULAW,	"Microsoft mu-law" },
 	{ WAVE_FORMAT_OKI_ADPCM,"OKI ADPCM" },
 @@ -66,53 +67,57 @@ struct {
 };
 const char *
 wav_enc_from_val(int encoding)
+{
 	int	i;
 	for (i = 0; wavencs[i].wenc != -1; i++)
 		if (wavencs[i].wenc == encoding)
 			break;
 	return (wavencs[i].wname);
+}
 extern int verbose;
 /*
  * sample header is:
+ *
  *   RIFF\^@^C^@WAVEfmt ^P^@^@^@^A^@^B^@D<AC>^@^@^P<B1>^B^@^D^@^P^@data^@^@^C^@^@^@^@^@^@^@^@^@^@
+ *
  */
 /*
  * WAV format helpers
  */
 /*
  * find a .wav header, etc. returns header length on success
  */
 ssize_t
 audio_wav_parse_hdr(hdr, sz, enc, prec, sample, channels, datasize)
 	void	*hdr;
 	size_t	sz;
 	u_int	*enc;
 	u_int	*prec;
 	u_int	*sample;
 	u_int	*channels;
 	size_t *datasize;
+{
 	char	*where = hdr, *owhere;
 	wav_audioheaderpart part;
 	wav_audioheaderfmt fmt;
 	wav_audiohdrextensible ext;
 	char	*end = (((char *)hdr) + sz);
 	u_int	newenc, newprec;
 	u_int16_t fmttag;
 	static const char
 	    strfmt[4] = "fmt ",
 	    strRIFF[4] = "RIFF",
 	    strWAVE[4] = "WAVE",
 	    strdata[4] = "data";
 	if (sz < 32)
 		return (AUDIO_ENOENT);
 	if (strncmp(where, strRIFF, sizeof strRIFF))
 		return (AUDIO_ENOENT);
 	where += 8;
 	if (strncmp(where, strWAVE, sizeof strWAVE))
 @@ -121,39 +126,55 @@ audio_wav_parse_hdr(hdr, sz, enc, prec,
 	do {
 		memcpy(&part, where, sizeof part);
 		owhere = where;
 		where += getle32(part.len) + 8;
 	} while (where < end && strncmp(part.name, strfmt, sizeof strfmt));
 	/* too short ? */
 	if (where + sizeof fmt > end)
 		return (AUDIO_ESHORTHDR);
 	memcpy(&fmt, (owhere + 8), sizeof fmt);
-	switch (getle16(fmt.tag)) {
+	fmttag = getle16(fmt.tag);
 	if (verbose)
 		printf("WAVE format tag: %x\n", fmttag);
 	if (fmttag == WAVE_FORMAT_EXTENSIBLE) {
 		if ((uintptr_t)(where - owhere) < sizeof(fmt) + sizeof(ext))
 			return (AUDIO_ESHORTHDR);
 		memcpy(&ext, owhere + sizeof fmt, sizeof ext);
 		if (getle16(ext.len) < sizeof(ext) - sizeof(ext.len))
 			return (AUDIO_ESHORTHDR);
 		fmttag = ext.sub_tag;
 		if (verbose)
 			printf("WAVE extensible sub tag: %x\n", fmttag);
+	}
 	switch (fmttag) {
 	case WAVE_FORMAT_UNKNOWN:
 	case WAVE_FORMAT_ADPCM:
 	case WAVE_FORMAT_OKI_ADPCM:
 	case WAVE_FORMAT_DIGISTD:
 	case WAVE_FORMAT_DIGIFIX:
 	case IBM_FORMAT_MULAW:
 	case IBM_FORMAT_ALAW:
 	case IBM_FORMAT_ADPCM:
 	default:
 		return (AUDIO_EWAVUNSUPP);
 	case WAVE_FORMAT_PCM:
 	case WAVE_FORMAT_ADPCM:
 	case WAVE_FORMAT_OKI_ADPCM:
 	case WAVE_FORMAT_IMA_ADPCM:
 	case WAVE_FORMAT_DIGIFIX:
 	case WAVE_FORMAT_DIGISTD:
 		switch (getle16(fmt.bits_per_sample)) {
 		case 8:
 			newprec = 8;
 			break;
 		case 16:
 			newprec = 16;
 			break;
 		case 24:
 			newprec = 24;
 			break;
 		case 32:
 			newprec = 32;
 			break;