head	1.4;
access;
symbols
	RELENG_4_11_0_RELEASE:1.3.6.1
	RELENG_4_11:1.3.6.1.0.18
	RELENG_4_11_BP:1.3.6.1
	RELENG_4_10_0_RELEASE:1.3.6.1
	RELENG_4_10:1.3.6.1.0.16
	RELENG_4_10_BP:1.3.6.1
	RELENG_4_9_0_RELEASE:1.3.6.1
	RELENG_4_9:1.3.6.1.0.14
	RELENG_4_9_BP:1.3.6.1
	RELENG_4_8_0_RELEASE:1.3.6.1
	RELENG_4_8:1.3.6.1.0.12
	RELENG_4_8_BP:1.3.6.1
	RELENG_4_7_0_RELEASE:1.3.6.1
	RELENG_4_7:1.3.6.1.0.10
	RELENG_4_7_BP:1.3.6.1
	RELENG_4_6_2_RELEASE:1.3.6.1
	RELENG_4_6_1_RELEASE:1.3.6.1
	RELENG_4_6_0_RELEASE:1.3.6.1
	RELENG_4_6:1.3.6.1.0.8
	RELENG_4_6_BP:1.3.6.1
	RELENG_4_5_0_RELEASE:1.3.6.1
	RELENG_4_5:1.3.6.1.0.6
	RELENG_4_5_BP:1.3.6.1
	RELENG_4_4_0_RELEASE:1.3.6.1
	RELENG_4_4:1.3.6.1.0.4
	RELENG_4_4_BP:1.3.6.1
	RELENG_4_3_0_RELEASE:1.3.6.1
	RELENG_4_3:1.3.6.1.0.2
	RELENG_4_3_BP:1.3.6.1
	RELENG_4_2_0_RELEASE:1.3
	RELENG_4_1_1_RELEASE:1.3
	PRE_SMPNG:1.3
	RELENG_4_1_0_RELEASE:1.3
	RELENG_3_5_0_RELEASE:1.3
	RELENG_4_0_0_RELEASE:1.3
	RELENG_4:1.3.0.6
	RELENG_4_BP:1.3
	RELENG_3_4_0_RELEASE:1.3
	RELENG_3_3_0_RELEASE:1.3
	RELENG_3_2_PAO:1.3.0.4
	RELENG_3_2_PAO_BP:1.3
	RELENG_3_2_0_RELEASE:1.3
	RELENG_3_1_0_RELEASE:1.3
	RELENG_3:1.3.0.2
	RELENG_3_BP:1.3
	RELENG_2_2_8_RELEASE:1.1.1.2.2.2
	RELENG_3_0_0_RELEASE:1.3
	RELENG_2_2_7_RELEASE:1.1.1.2.2.2
	RELENG_2_2_6_RELEASE:1.1.1.2.2.2
	RELENG_2_2_5_RELEASE:1.1.1.2.2.2
	RELENG_2_2_2_RELEASE:1.1.1.2.2.1
	RELENG_2_2_1_RELEASE:1.1.1.2.2.1
	file_3_22:1.1.1.3
	RELENG_2_2_0_RELEASE:1.1.1.2.2.1
	RELENG_2_1_7_RELEASE:1.1.1.1
	RELENG_2_1_6_1_RELEASE:1.1.1.1
	RELENG_2_1_6_RELEASE:1.1.1.1
	RELENG_2_2:1.1.1.2.0.2
	RELENG_2_1_5_RELEASE:1.1.1.1
	file_3_19:1.1.1.2
	RELENG_2_1_0_RELEASE:1.1.1.1
	RELENG_2_1_0:1.1.1.1.0.6
	RELENG_2_1_0_BP:1.1.1.1
	RELENG_2_0_5_RELEASE:1.1.1.1
	RELENG_2_0_5:1.1.1.1.0.4
	RELENG_2_0_5_BP:1.1.1.1
	RELENG_2_0_5_ALPHA:1.1.1.1
	RELEASE_2_0:1.1.1.1
	BETA_2_0:1.1.1.1
	ALPHA_2_0:1.1.1.1.0.2
	file_3_14:1.1.1.1
	DARWIN:1.1.1;
locks; strict;
comment	@# @;


1.4
date	2000.11.05.09.06.03;	author obrien;	state dead;
branches;
next	1.3;

1.3
date	97.03.18.19.37.36;	author mpp;	state Exp;
branches
	1.3.6.1;
next	1.2;

1.2
date	96.11.17.11.03.07;	author ache;	state Exp;
branches;
next	1.1;

1.1
date	94.09.03.19.16.24;	author csgr;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	94.09.03.19.16.25;	author csgr;	state Exp;
branches;
next	1.1.1.2;

1.1.1.2
date	96.01.23.12.27.09;	author mpp;	state Exp;
branches
	1.1.1.2.2.1;
next	1.1.1.3;

1.1.1.3
date	97.03.18.17.59.07;	author mpp;	state Exp;
branches;
next	;

1.1.1.2.2.1
date	96.11.21.16.47.30;	author phk;	state Exp;
branches;
next	1.1.1.2.2.2;

1.1.1.2.2.2
date	97.08.18.18.59.33;	author jdp;	state Exp;
branches;
next	;

1.3.6.1
date	2000.11.29.19.32.49;	author obrien;	state dead;
branches;
next	;


desc
@@


1.4
log
@Switch over to using the Christos Zoulas maintained version in contrib/
This also gives use the same exact results as NetBSD, thus sharing more
code with our bretheren.
@
text
@
#------------------------------------------------------------------------------
# audio:  file(1) magic for sound formats (see also "iff")
#
# Jan Nicolai Langfeldt (janl@@ifi.uio.no), Dan Quinlan (quinlan@@yggdrasil.com),
# and others
#

# Sun/NeXT audio data
0	string		.snd		Sun/NeXT audio data:
>12	belong		1		8-bit ISDN u-law,
>12	belong		2		8-bit linear PCM [REF-PCM],
>12	belong		3		16-bit linear PCM,
>12	belong		4		24-bit linear PCM,
>12	belong		5		32-bit linear PCM,
>12	belong		6		32-bit IEEE floating point,
>12	belong		7		64-bit IEEE floating point,
>12	belong		23		8-bit ISDN u-law compressed (CCITT G.721 ADPCM voice data encoding),
>12	belong		24		compressed (8-bit G.722 ADPCM)
>12	belong		25		compressed (3-bit G.723 ADPCM),
>12	belong		26		compressed (5-bit G.723 ADPCM),
>12	belong		27		8-bit A-law,
>20	belong		1		mono,
>20	belong		2		stereo,
>20	belong		4		quad,
>16	belong		>0		%d Hz

# DEC systems (e.g. DECstation 5000) use a variant of the Sun/NeXT format
# that uses little-endian encoding and has a different magic number
0	lelong		0x0064732E	DEC audio data:
>12	lelong		1		8-bit ISDN u-law,
>12	lelong		2		8-bit linear PCM [REF-PCM],
>12	lelong		3		16-bit linear PCM,
>12	lelong		4		24-bit linear PCM,
>12	lelong		5		32-bit linear PCM,
>12	lelong		6		32-bit IEEE floating point,
>12	lelong		7		64-bit IEEE floating point,
>12	lelong		23		8-bit ISDN u-law compressed (CCITT G.721 ADPCM voice data encoding),
>20	lelong		1		mono,
>20	lelong		2		stereo,
>20	lelong		4		quad,
>16	lelong		>0		%d Hz

# Creative Labs AUDIO stuff
0	string	MThd			Standard MIDI data
>9 	byte	>0			(format %d)
>11	byte	>1			using %d channels
0	string	CTMF			Creative Music (CMF) data
0	string	SBI			SoundBlaster instrument data
0	string	Creative\ Voice\ File	Creative Labs voice data
# is this next line right?  it came this way...
>19	byte	0x1A
>23	byte	>0			- version %d
>22	byte	>0			\b.%d

# first entry is also the string "NTRK"
0	belong		0x4e54524b	MultiTrack sound data
>4	belong		x		- version %ld

# Microsoft WAVE format (*.wav)
0	string		RIFF		Microsoft RIFF
>8	string		WAVE		\b, WAVE audio data
>>34	leshort		>0		\b, %d bit
>>22	leshort		=1		\b, mono
>>22	leshort		=2		\b, stereo
>>22	leshort		>2		\b, %d channels
>>24	lelong		>0		%d Hz
# AVI == Audio Video Interleave
>8      string          AVI\            \b, AVI data

# Extended MOD format (*.emd) (Greg Roelofs, newt@@uchicago.edu); NOT TESTED
# [based on posting 940824 by "Dirk/Elastik", husberg@@lehtori.cc.tut.fi]
0	string		EMOD		Extended MOD sound data,
>4	byte&0xf0	x		version %d
>4	byte&0x0f	x		\b.%d,
>45	byte		x		%d instruments
>83	byte		0		(module)
>83	byte		1		(song)

# Real Audio (Magic .ra\0375)
0	belong		0x2e7261fd	realaudio sound file

# MTM/669/FAR/S3M/ULT/XM format checking [Aaron Eppert, aeppert@@dialin.ind.net]
# Oct 31, 1995
0	string		MTM		MultiTracker Module sound file
0	string		if		Composer 669 Module sound data
0	string		FAR		Module sound data
0	string		MAS_U		ULT(imate) Module sound data
0x2c	string		SCRM		ScreamTracker III Module sound data
0	string		Extended Module	Extended Module sound data

# Gravis UltraSound patches
# From <ache@@nagual.ru>

0	string		GF1PATCH110\0ID#000002\0	GUS patch
0	string		GF1PATCH100\0ID#000002\0	Old GUS	patch
@


1.3
log
@Merge to resolve conflicts with file 3.22 merge.
@
text
@@


1.3.6.1
log
@MFC: switch over to using the Christos Zoulas maintained version in contrib/
@
text
@@


1.2
log
@Detect GUS patches now
@
text
@d19 4
a60 1
# [GRR 950115:  probably all of the shorts and longs should be leshort/lelong]
d63 7
a69 5
>34	short		>0		\b, %d bit
>22	short		=1		\b, mono
>22	short		=2		\b, stereo
>22	short		>2		\b, %d channels
>24	long		>0		%d Hz
d79 12
@


1.1
log
@Initial revision
@
text
@d1 3
d5 2
a6 1
# Sound formats, from Jan Nicolai Langfeldt <janl@@ifi.uio.no>,
d10 3
a12 3
0	string		.snd		audio data:
>12	belong		1		8-bit u-law,
>12	belong		2		8-bit linear PCM,
d16 3
a18 3
>12	belong		6		32-bit floating point,
>12	belong		7		64-bit floating point,
>12	belong		23		compressed (G.721 ADPCM),
d22 2
a23 1
>16	belong		x		%d Hz
a25 1
# (0x0064732E in little-endian encoding).
d27 2
a28 2
>12	lelong		1		8-bit u-law,
>12	lelong		2		8-bit linear PCM,
d32 3
a34 3
>12	lelong		6		32-bit floating point,
>12	lelong		7		64-bit floating point,
>12	lelong		23		compressed (G.721 ADPCM),
d38 42
a79 10
>16	lelong		x		%d Hz
# Bytes 0-3 of AIFF, AIFF-C, & 8SVX audio files are "FORM"
8	string		AIFF		AIFF audio data
8	string		AIFC		AIFF-C audio data
8	string		8SVX		IFF/8SVX audio data
# Bytes 0-3 of Waveform (*.wav) audio files are "RIFF"
8	string		WAVE		Waveform audio data
0	string		Creative\ Voice\ File	Soundblaster audio data
0	long		0x4e54524b	MultiTrack sound data file
>4	long		x		- version %ld
@


1.1.1.1
log
@Bring in file 3.14 by Ian Darwin (and Christos Zoulas)

The following files were moved to different names:
- file.man -> file.1
- magic.man -> magic.5

The following file was removed:
- Magdir/Makefile
@
text
@@


1.1.1.2
log
@Upgrade to file version 3.19.
@
text
@a0 3

#------------------------------------------------------------------------------
# audio:  file(1) magic for sound formats (see also "iff")
d2 1
a2 2
# Jan Nicolai Langfeldt (janl@@ifi.uio.no), Dan Quinlan (quinlan@@yggdrasil.com),
# and others
d6 3
a8 3
0	string		.snd		Sun/NeXT audio data:
>12	belong		1		8-bit ISDN u-law,
>12	belong		2		8-bit linear PCM [REF-PCM],
d12 3
a14 3
>12	belong		6		32-bit IEEE floating point,
>12	belong		7		64-bit IEEE floating point,
>12	belong		23		8-bit ISDN u-law compressed (CCITT G.721 ADPCM voice data encoding),
d18 1
a18 2
>16	belong		>0		%d Hz

d21 1
d23 2
a24 2
>12	lelong		1		8-bit ISDN u-law,
>12	lelong		2		8-bit linear PCM [REF-PCM],
d28 3
a30 3
>12	lelong		6		32-bit IEEE floating point,
>12	lelong		7		64-bit IEEE floating point,
>12	lelong		23		8-bit ISDN u-law compressed (CCITT G.721 ADPCM voice data encoding),
d34 10
a43 36
>16	lelong		>0		%d Hz

# Creative Labs AUDIO stuff
0	string	MThd			Standard MIDI data
>9 	byte	>0			(format %d)
>11	byte	>1			using %d channels
0	string	CTMF			Creative Music (CMF) data
0	string	SBI			SoundBlaster instrument data
0	string	Creative\ Voice\ File	Creative Labs voice data
# is this next line right?  it came this way...
>19	byte	0x1A
>23	byte	>0			- version %d
>22	byte	>0			\b.%d

# first entry is also the string "NTRK"
0	belong		0x4e54524b	MultiTrack sound data
>4	belong		x		- version %ld

# Microsoft WAVE format (*.wav)
# [GRR 950115:  probably all of the shorts and longs should be leshort/lelong]
0	string		RIFF		Microsoft RIFF
>8	string		WAVE		\b, WAVE audio data
>34	short		>0		\b, %d bit
>22	short		=1		\b, mono
>22	short		=2		\b, stereo
>22	short		>2		\b, %d channels
>24	long		>0		%d Hz

# Extended MOD format (*.emd) (Greg Roelofs, newt@@uchicago.edu); NOT TESTED
# [based on posting 940824 by "Dirk/Elastik", husberg@@lehtori.cc.tut.fi]
0	string		EMOD		Extended MOD sound data,
>4	byte&0xf0	x		version %d
>4	byte&0x0f	x		\b.%d,
>45	byte		x		%d instruments
>83	byte		0		(module)
>83	byte		1		(song)
@


1.1.1.3
log
@Upgrade to file version 3.22.

Obtained from: ftp://ftp.deshaw.com/pub/file/file-3.22.tar.gz
@
text
@a18 4
>12	belong		24		compressed (8-bit G.722 ADPCM)
>12	belong		25		compressed (3-bit G.723 ADPCM),
>12	belong		26		compressed (5-bit G.723 ADPCM),
>12	belong		27		8-bit A-law,
d57 1
d60 5
a64 7
>>34	leshort		>0		\b, %d bit
>>22	leshort		=1		\b, mono
>>22	leshort		=2		\b, stereo
>>22	leshort		>2		\b, %d channels
>>24	lelong		>0		%d Hz
# AVI == Audio Video Interleave
>8      string          AVI\            \b, AVI data
a73 12

# Real Audio (Magic .ra\0375)
0	belong		0x2e7261fd	realaudio sound file

# MTM/669/FAR/S3M/ULT/XM format checking [Aaron Eppert, aeppert@@dialin.ind.net]
# Oct 31, 1995
0	string		MTM		MultiTracker Module sound file
0	string		if		Composer 669 Module sound data
0	string		FAR		Module sound data
0	string		MAS_U		ULT(imate) Module sound data
0x2c	string		SCRM		ScreamTracker III Module sound data
0	string		Extended Module	Extended Module sound data
@


1.1.1.2.2.1
log
@YAMFC
@
text
@a73 6

# Gravis UltraSound patches
# From <ache@@nagual.ru>

0	string		GF1PATCH110\0ID#000002\0	GUS patch
0	string		GF1PATCH100\0ID#000002\0	Old GUS	patch
@


1.1.1.2.2.2
log
@Sync with -current.
@
text
@a18 4
>12	belong		24		compressed (8-bit G.722 ADPCM)
>12	belong		25		compressed (3-bit G.723 ADPCM),
>12	belong		26		compressed (5-bit G.723 ADPCM),
>12	belong		27		8-bit A-law,
d57 1
d60 5
a64 7
>>34	leshort		>0		\b, %d bit
>>22	leshort		=1		\b, mono
>>22	leshort		=2		\b, stereo
>>22	leshort		>2		\b, %d channels
>>24	lelong		>0		%d Hz
# AVI == Audio Video Interleave
>8      string          AVI\            \b, AVI data
a73 12

# Real Audio (Magic .ra\0375)
0	belong		0x2e7261fd	realaudio sound file

# MTM/669/FAR/S3M/ULT/XM format checking [Aaron Eppert, aeppert@@dialin.ind.net]
# Oct 31, 1995
0	string		MTM		MultiTracker Module sound file
0	string		if		Composer 669 Module sound data
0	string		FAR		Module sound data
0	string		MAS_U		ULT(imate) Module sound data
0x2c	string		SCRM		ScreamTracker III Module sound data
0	string		Extended Module	Extended Module sound data
@
