Date: Tue, 28 Dec 2004 17:01:39 GMT From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 67803 for review Message-ID: <200412281701.iBSH1dqb036768@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=67803 Change 67803 by sam@sam_ebb on 2004/12/28 17:01:36 IFC @ 67802 Affected files ... .. //depot/projects/wifi/Makefile.inc1#9 integrate .. //depot/projects/wifi/UPDATING#9 integrate .. //depot/projects/wifi/bin/ps/ps.1#3 integrate .. //depot/projects/wifi/contrib/file/ChangeLog#2 integrate .. //depot/projects/wifi/contrib/file/LEGAL.NOTICE#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/animation#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/archive#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/audio#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/console#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/elf#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/esri#1 branch .. //depot/projects/wifi/contrib/file/Magdir/filesystems#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/linux#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/msdos#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/os9#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/perl#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/plan9#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/sinclair#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/sniffer#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/tex#2 integrate .. //depot/projects/wifi/contrib/file/Magdir/virtutech#1 branch .. //depot/projects/wifi/contrib/file/Magdir/xo65#1 branch .. //depot/projects/wifi/contrib/file/Makefile.am#2 integrate .. //depot/projects/wifi/contrib/file/Makefile.in#2 integrate .. //depot/projects/wifi/contrib/file/PORTING#1 branch .. //depot/projects/wifi/contrib/file/aclocal.m4#2 integrate .. //depot/projects/wifi/contrib/file/apprentice.c#2 integrate .. //depot/projects/wifi/contrib/file/ascmagic.c#2 integrate .. //depot/projects/wifi/contrib/file/compress.c#2 integrate .. //depot/projects/wifi/contrib/file/config.h.in#2 integrate .. //depot/projects/wifi/contrib/file/configure#2 integrate .. //depot/projects/wifi/contrib/file/configure.in#2 integrate .. //depot/projects/wifi/contrib/file/file.c#2 integrate .. //depot/projects/wifi/contrib/file/file.h#2 integrate .. //depot/projects/wifi/contrib/file/fsmagic.c#2 integrate .. //depot/projects/wifi/contrib/file/funcs.c#2 integrate .. //depot/projects/wifi/contrib/file/install-sh#2 integrate .. //depot/projects/wifi/contrib/file/is_tar.c#2 integrate .. //depot/projects/wifi/contrib/file/magic.c#2 integrate .. //depot/projects/wifi/contrib/file/magic.h#2 integrate .. //depot/projects/wifi/contrib/file/magic.mime#2 integrate .. //depot/projects/wifi/contrib/file/mkinstalldirs#2 integrate .. //depot/projects/wifi/contrib/file/names.h#2 integrate .. //depot/projects/wifi/contrib/file/patchlevel.h#2 integrate .. //depot/projects/wifi/contrib/file/print.c#2 integrate .. //depot/projects/wifi/contrib/file/readelf.c#2 integrate .. //depot/projects/wifi/contrib/file/readelf.h#2 integrate .. //depot/projects/wifi/contrib/file/softmagic.c#2 integrate .. //depot/projects/wifi/contrib/file/tar.h#2 integrate .. //depot/projects/wifi/contrib/file/test.c#2 integrate .. //depot/projects/wifi/etc/devd.conf#5 integrate .. //depot/projects/wifi/games/fortune/datfiles/fortunes#5 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_compression_bzip2.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_read_support_format_tar.c#4 integrate .. //depot/projects/wifi/lib/libarchive/archive_string.c#2 integrate .. //depot/projects/wifi/lib/libarchive/archive_string.h#3 integrate .. //depot/projects/wifi/lib/libarchive/libarchive-formats.5#2 integrate .. //depot/projects/wifi/lib/libc/gen/signal.3#2 integrate .. //depot/projects/wifi/lib/libc/gen/syslog.c#3 integrate .. //depot/projects/wifi/lib/libc/sys/_exit.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/acct.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/adjtime.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/aio_suspend.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/getitimer.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/recv.2#2 integrate .. //depot/projects/wifi/lib/libc/sys/select.2#2 integrate .. //depot/projects/wifi/lib/libdisk/disk.c#3 integrate .. //depot/projects/wifi/lib/libmagic/config.h#2 integrate .. //depot/projects/wifi/rescue/rescue/Makefile#7 integrate .. //depot/projects/wifi/sbin/geom/class/mirror/geom_mirror.c#2 integrate .. //depot/projects/wifi/sbin/geom/class/raid3/geom_raid3.c#2 integrate .. //depot/projects/wifi/sbin/growfs/growfs.8#2 integrate .. //depot/projects/wifi/sbin/mdconfig/mdconfig.c#4 integrate .. //depot/projects/wifi/sbin/mount/mount.8#3 integrate .. //depot/projects/wifi/share/man/man4/aac.4#3 integrate .. //depot/projects/wifi/share/man/man4/altq.4#6 integrate .. //depot/projects/wifi/share/man/man4/pccbb.4#2 integrate .. //depot/projects/wifi/share/man/man4/random.4#2 integrate .. //depot/projects/wifi/share/mk/bsd.init.mk#3 integrate .. //depot/projects/wifi/share/mk/sys.mk#4 integrate .. //depot/projects/wifi/sys/alpha/alpha/machdep.c#5 integrate .. //depot/projects/wifi/sys/alpha/alpha/pmap.c#4 integrate .. //depot/projects/wifi/sys/amd64/amd64/pmap.c#7 integrate .. //depot/projects/wifi/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/wifi/sys/amd64/isa/isa.c#2 integrate .. //depot/projects/wifi/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/wifi/sys/conf/files#11 integrate .. //depot/projects/wifi/sys/conf/majors#2 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/fil.c#3 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/ip_auth.c#2 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/ip_compat.h#2 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/ip_fil.c#2 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/ip_frag.c#2 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/ip_log.c#2 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/ip_nat.h#2 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/ip_proxy.c#2 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/ip_state.c#2 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/ip_state.h#2 integrate .. //depot/projects/wifi/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_ec.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pci_link.c#8 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pcib.c#4 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_powerres.c#2 integrate .. //depot/projects/wifi/sys/dev/acpica/acpi_resource.c#2 integrate .. //depot/projects/wifi/sys/dev/ata/ata-chipset.c#3 integrate .. //depot/projects/wifi/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/wifi/sys/dev/kbd/kbd.c#2 integrate .. //depot/projects/wifi/sys/dev/md/md.c#4 integrate .. //depot/projects/wifi/sys/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/wifi/sys/dev/ofw/ofw_disk.c#3 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbb_pci.c#2 integrate .. //depot/projects/wifi/sys/dev/pccbb/pccbbdevid.h#2 integrate .. //depot/projects/wifi/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/wifi/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/wifi/sys/dev/snp/snp.c#3 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio.c#2 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio.h#2 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudio_pcm.c#2 integrate .. //depot/projects/wifi/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/wifi/sys/dev/usb/ugen.c#4 integrate .. //depot/projects/wifi/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/ums.c#4 integrate .. //depot/projects/wifi/sys/dev/usb/usb.c#3 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#7 integrate .. //depot/projects/wifi/sys/dev/vkbd/vkbd.c#2 integrate .. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#12 integrate .. //depot/projects/wifi/sys/geom/mirror/g_mirror.c#5 integrate .. //depot/projects/wifi/sys/geom/mirror/g_mirror.h#3 integrate .. //depot/projects/wifi/sys/geom/mirror/g_mirror_ctl.c#3 integrate .. //depot/projects/wifi/sys/geom/raid3/g_raid3.c#7 integrate .. //depot/projects/wifi/sys/geom/raid3/g_raid3.h#3 integrate .. //depot/projects/wifi/sys/geom/raid3/g_raid3_ctl.c#2 integrate .. //depot/projects/wifi/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/wifi/sys/i386/i386/local_apic.c#2 integrate .. //depot/projects/wifi/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/wifi/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/wifi/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/wifi/sys/i386/include/apicreg.h#2 integrate .. //depot/projects/wifi/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/wifi/sys/i386/include/intr_machdep.h#2 integrate .. //depot/projects/wifi/sys/i386/isa/isa.c#2 integrate .. //depot/projects/wifi/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/wifi/sys/isa/isa_common.c#2 integrate .. //depot/projects/wifi/sys/isa/isa_common.h#2 integrate .. //depot/projects/wifi/sys/isa/pnp.c#2 integrate .. //depot/projects/wifi/sys/isa/pnpvar.h#2 integrate .. //depot/projects/wifi/sys/kern/init_sysent.c#5 integrate .. //depot/projects/wifi/sys/kern/kern_clock.c#2 integrate .. //depot/projects/wifi/sys/kern/kern_kse.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_switch.c#5 integrate .. //depot/projects/wifi/sys/kern/kern_synch.c#3 integrate .. //depot/projects/wifi/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/wifi/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/wifi/sys/kern/sched_ule.c#6 integrate .. //depot/projects/wifi/sys/kern/subr_trap.c#2 integrate .. //depot/projects/wifi/sys/kern/subr_witness.c#3 integrate .. //depot/projects/wifi/sys/kern/syscalls.c#5 integrate .. //depot/projects/wifi/sys/kern/syscalls.master#5 integrate .. //depot/projects/wifi/sys/kern/tty_pty.c#2 integrate .. //depot/projects/wifi/sys/kern/uipc_sem.c#2 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/wifi/sys/kern/uipc_socket2.c#3 integrate .. //depot/projects/wifi/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/wifi/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/wifi/sys/modules/ipfilter/Makefile#3 integrate .. //depot/projects/wifi/sys/modules/sppp/Makefile#2 integrate .. //depot/projects/wifi/sys/net/bpf.c#5 integrate .. //depot/projects/wifi/sys/net/if_sppp.h#3 integrate .. //depot/projects/wifi/sys/net/if_spppfr.c#1 branch .. //depot/projects/wifi/sys/net/if_spppsubr.c#4 integrate .. //depot/projects/wifi/sys/net/if_tap.c#3 integrate .. //depot/projects/wifi/sys/net/if_tun.c#3 integrate .. //depot/projects/wifi/sys/net/ppp_tty.c#3 integrate .. //depot/projects/wifi/sys/netgraph/netflow/netflow.c#3 integrate .. //depot/projects/wifi/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/wifi/sys/netgraph/ng_device.c#4 integrate .. //depot/projects/wifi/sys/netgraph/ng_sample.c#2 integrate .. //depot/projects/wifi/sys/netinet/ip_output.c#3 integrate .. //depot/projects/wifi/sys/netinet/tcp_input.c#7 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/wifi/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/wifi/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/wifi/sys/nfsclient/nfs_vnops.c#10 integrate .. //depot/projects/wifi/sys/pc98/pc98/fd.c#3 integrate .. //depot/projects/wifi/sys/pci/if_sk.c#6 integrate .. //depot/projects/wifi/sys/powerpc/powerpc/pmap.c#3 integrate .. //depot/projects/wifi/sys/sparc64/include/ver.h#2 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/wifi/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/wifi/sys/sys/ktr.h#3 integrate .. //depot/projects/wifi/sys/sys/mdioctl.h#3 integrate .. //depot/projects/wifi/sys/sys/syscall.h#4 integrate .. //depot/projects/wifi/sys/sys/syscall.mk#4 integrate .. //depot/projects/wifi/sys/sys/sysproto.h#4 integrate .. //depot/projects/wifi/sys/sys/umtx.h#3 integrate .. //depot/projects/wifi/sys/sys/vnode.h#9 integrate .. //depot/projects/wifi/sys/vm/uma.h#2 integrate .. //depot/projects/wifi/sys/vm/uma_core.c#5 integrate .. //depot/projects/wifi/sys/vm/uma_dbg.c#2 integrate .. //depot/projects/wifi/sys/vm/uma_dbg.h#2 integrate .. //depot/projects/wifi/sys/vm/uma_int.h#3 integrate .. //depot/projects/wifi/sys/vm/vm_fault.c#3 integrate .. //depot/projects/wifi/sys/vm/vm_map.c#3 integrate .. //depot/projects/wifi/sys/vm/vm_page.c#5 integrate .. //depot/projects/wifi/sys/vm/vm_page.h#3 integrate .. //depot/projects/wifi/sys/vm/vnode_pager.c#8 integrate .. //depot/projects/wifi/tools/sched/schedgraph.py#1 branch .. //depot/projects/wifi/usr.bin/catman/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/catman/catman.1#2 integrate .. //depot/projects/wifi/usr.bin/catman/catman.c#2 integrate .. //depot/projects/wifi/usr.bin/file/config.h#2 integrate .. //depot/projects/wifi/usr.bin/file/file.1#2 integrate .. //depot/projects/wifi/usr.bin/file/magic.5#2 integrate .. //depot/projects/wifi/usr.bin/tar/bsdtar.c#2 integrate .. //depot/projects/wifi/usr.bin/tar/bsdtar_platform.h#3 integrate .. //depot/projects/wifi/usr.bin/tar/configure.ac.in#2 integrate .. //depot/projects/wifi/usr.bin/tar/matching.c#2 integrate .. //depot/projects/wifi/usr.bin/wc/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/wc/wc.c#2 integrate .. //depot/projects/wifi/usr.sbin/arp/arp.c#2 integrate .. //depot/projects/wifi/usr.sbin/sysinstall/devices.c#3 integrate Differences ... ==== //depot/projects/wifi/Makefile.inc1#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.470 2004/12/21 12:21:25 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.471 2004/12/22 22:00:01 ru Exp $ # # Make command line options: # -DNO_DYNAMICROOT do not link /bin and /sbin dynamically @@ -112,8 +112,8 @@ .else _TARGET_CPUTYPE=dummy .endif -_CPUTYPE!= MAKEFLAGS= ${MAKE} -f /dev/null -m ${.CURDIR}/share/mk \ - CPUTYPE=${_TARGET_CPUTYPE} -V CPUTYPE +_CPUTYPE!= MAKEFLAGS= CPUTYPE=${_TARGET_CPUTYPE} ${MAKE} \ + -f /dev/null -m ${.CURDIR}/share/mk -V CPUTYPE .if ${_CPUTYPE} != ${_TARGET_CPUTYPE} .error CPUTYPE global should be set with ?=. .endif ==== //depot/projects/wifi/UPDATING#9 (text+ko) ==== @@ -23,6 +23,13 @@ developers choose to disable these features on build machines to maximize performance. +20041221: + By a popular demand, a lot of NOFOO options were renamed + to NO_FOO (see bsd.compat.mk for a full list). The old + spellings are still supported, but will cause annoying + warnings on stderr. Make sure you upgrade properly (see + the COMMON ITEMS: section later in this file). + 20041219: Auto-loading of ancillary wlan modules such as wlan_wep has been temporarily disabled; you need to statically configure @@ -1993,4 +2000,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.384 2004/12/20 04:27:23 sam Exp $ +$FreeBSD: src/UPDATING,v 1.385 2004/12/23 16:03:08 ru Exp $ ==== //depot/projects/wifi/bin/ps/ps.1#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.80 2004/11/29 12:00:24 rwatson Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.81 2004/12/22 09:04:47 rwatson Exp $ .\" .Dd March 27, 2004 .Dt PS 1 @@ -603,7 +603,6 @@ .El .Sh FILES .Bl -tag -width ".Pa /boot/kernel/kernel" -compact -KLD .It Pa /boot/kernel/kernel default system namelist .It Pa /proc ==== //depot/projects/wifi/contrib/file/ChangeLog#2 (text+ko) ==== @@ -1,3 +1,30 @@ +2004-11-24 12:39 Christos Zoulas <christos@zoulas.com> + + * Stack smash fix, and ELF more conservative reading. + Jakub Bogusz <qboosh@pld-linux.org> + +2004-11-20 18:50 Christos Zoulas <christos@zoulas.com> + + * New FreeBSD version parsing code: + Jon Noack <noackjr@alumni.rice.edu> + + * Hackish support for ucs16 strings <christos@zoulas.com> + +2004-11-13 03:07 Christos Zoulas <christos@zoulas.com> + + * print the file name and line number in syntax errors. + +2004 10-12 10:50 Christos Zoulas <christos@zoulas.com> + + * Fix stack overwriting on 0 length strings: Tim Waugh + <twaugh@redhat.com> Ned Ludd <solar@gentoo.org> + +2004-09-27 11:30 Christos Zoulas <christos@zoulas.com> + + * Remove 3rd and 4th copyright clause; approved by Ian Darwin. + + * Fix small memory leaks; caught by: Tamas Sarlos + <stamas@csillag.ilab.sztaki.hu> 2004-07-24 16:33 Christos Zoulas <christos@zoulas.com> ==== //depot/projects/wifi/contrib/file/LEGAL.NOTICE#2 (text+ko) ==== @@ -1,7 +1,7 @@ -$Id: LEGAL.NOTICE,v 1.13 2003/03/23 22:23:30 christos Exp $ +$Id: LEGAL.NOTICE,v 1.14 2004/09/11 19:15:56 christos Exp $ Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995. Software written by Ian F. Darwin and others; -maintained 1994-2003 Christos Zoulas. +maintained 1994-2004 Christos Zoulas. This software is not subject to any export provision of the United States Department of Commerce, and may be exported to any country or planet. @@ -15,11 +15,6 @@ 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. -3. All advertising materials mentioning features or use of this software - must display the following acknowledgement: - This product includes software developed by Ian F. Darwin and others. -4. The name of the author may not be used to endorse or promote products - derived from this software without specific prior written permission. THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ==== //depot/projects/wifi/contrib/file/Magdir/animation#2 (text+ko) ==== @@ -6,123 +6,524 @@ # MPEG, FLI, DL originally from vax@ccwf.cc.utexas.edu (VaX#n8) # FLC, SGI, Apple originally from Daniel Quinlan (quinlan@yggdrasil.com) -# MPEG animation format -0 belong 0x000001b3 MPEG video stream data -#>4 beshort&0xfff0 x (%d x -#>5 beshort&0x0fff x %d) -0 belong 0x000001ba MPEG system stream data +# MPEG sequences +# Scans for all common MPEG header start codes +0 belong&0xFFFFFF00 0x00000100 MPEG sequence +>3 byte 0xBA +>>4 byte &0x40 \b, v2, program multiplex +>>4 byte ^0x40 \b, v1, system multiplex +>3 byte 0xBB \b, v1/2, multiplex (missing pack header) +>3 byte 0xB0 \b, v4 +>>5 belong 0x000001B5 +>>>9 byte &0x80 +>>>>10 byte&0xF0 16 \b, video +>>>>10 byte&0xF0 32 \b, still texture +>>>>10 byte&0xF0 48 \b, mesh +>>>>10 byte&0xF0 64 \b, face +>>>9 byte ^0x80 +>>>>9 byte&0xF8 8 \b, video +>>>>9 byte&0xF8 16 \b, still texture +>>>>9 byte&0xF8 24 \b, mesh +>>>>9 byte&0xF8 32 \b, face +>>4 byte 1 \b, simple @ L1 +>>4 byte 2 \b, simple @ L2 +>>4 byte 3 \b, simple @ L3 +>>4 byte 4 \b, simple @ L0 +>>4 byte 17 \b, simple scalable @ L1 +>>4 byte 18 \b, simple scalable @ L2 +>>4 byte 33 \b, core @ L1 +>>4 byte 34 \b, core @ L2 +>>4 byte 50 \b, main @ L2 +>>4 byte 51 \b, main @ L3 +>>4 byte 53 \b, main @ L4 +>>4 byte 66 \b, n-bit @ L2 +>>4 byte 81 \b, scalable texture @ L1 +>>4 byte 97 \b, simple face animation @ L1 +>>4 byte 98 \b, simple face animation @ L2 +>>4 byte 99 \b, simple face basic animation @ L1 +>>4 byte 100 \b, simple face basic animation @ L2 +>>4 byte 113 \b, basic animation text @ L1 +>>4 byte 114 \b, basic animation text @ L2 +>>4 byte 129 \b, hybrid @ L1 +>>4 byte 130 \b, hybrid @ L2 +>>4 byte 145 \b, advanced RT simple @ L! +>>4 byte 146 \b, advanced RT simple @ L2 +>>4 byte 147 \b, advanced RT simple @ L3 +>>4 byte 148 \b, advanced RT simple @ L4 +>>4 byte 161 \b, core scalable @ L1 +>>4 byte 162 \b, core scalable @ L2 +>>4 byte 163 \b, core scalable @ L3 +>>4 byte 177 \b, advanced coding efficiency @ L1 +>>4 byte 178 \b, advanced coding efficiency @ L2 +>>4 byte 179 \b, advanced coding efficiency @ L3 +>>4 byte 180 \b, advanced coding efficiency @ L4 +>>4 byte 193 \b, advanced core @ L1 +>>4 byte 194 \b, advanced core @ L2 +>>4 byte 209 \b, advanced scalable texture @ L1 +>>4 byte 210 \b, advanced scalable texture @ L2 +>>4 byte 211 \b, advanced scalable texture @ L3 +>>4 byte 225 \b, simple studio @ L1 +>>4 byte 226 \b, simple studio @ L2 +>>4 byte 227 \b, simple studio @ L3 +>>4 byte 228 \b, simple studio @ L4 +>>4 byte 229 \b, core studio @ L1 +>>4 byte 230 \b, core studio @ L2 +>>4 byte 231 \b, core studio @ L3 +>>4 byte 232 \b, core studio @ L4 +>>4 byte 240 \b, advanced simple @ L0 +>>4 byte 241 \b, advanced simple @ L1 +>>4 byte 242 \b, advanced simple @ L2 +>>4 byte 243 \b, advanced simple @ L3 +>>4 byte 244 \b, advanced simple @ L4 +>>4 byte 245 \b, advanced simple @ L5 +>>4 byte 247 \b, advanced simple @ L3b +>>4 byte 248 \b, FGS @ L0 +>>4 byte 249 \b, FGS @ L1 +>>4 byte 250 \b, FGS @ L2 +>>4 byte 251 \b, FGS @ L3 +>>4 byte 252 \b, FGS @ L4 +>>4 byte 253 \b, FGS @ L5 +>3 byte 0xB5 \b, v4 +>>4 byte &0x80 +>>>5 byte&0xF0 16 \b, video (missing profile header) +>>>5 byte&0xF0 32 \b, still texture (missing profile header) +>>>5 byte&0xF0 48 \b, mesh (missing profile header) +>>>5 byte&0xF0 64 \b, face (missing profile header) +>>4 byte ^0x80 +>>>4 byte&0xF8 8 \b, video (missing profile header) +>>>4 byte&0xF8 16 \b, still texture (missing profile header) +>>>4 byte&0xF8 24 \b, mesh (missing profile header) +>>>4 byte&0xF8 32 \b, face (missing profile header) +>3 byte 0xB3 +>>12 belong 0x000001B8 \b, v1, progressive Y'CbCr 4:2:0 video +>>12 belong 0x000001B2 \b, v1, progressive Y'CbCr 4:2:0 video +>>12 belong 0x000001B5 \b, v2, +>>>16 byte&0x0F 1 \b HP +>>>16 byte&0x0F 2 \b Spt +>>>16 byte&0x0F 3 \b SNR +>>>16 byte&0x0F 4 \b MP +>>>16 byte&0x0F 5 \b SP +>>>17 byte&0xF0 64 \b@HL +>>>17 byte&0xF0 96 \b@H-14 +>>>17 byte&0xF0 128 \b@ML +>>>17 byte&0xF0 160 \b@LL +>>>17 byte &0x08 \b progressive +>>>17 byte ^0x08 \b interlaced +>>>17 byte&0x06 2 \b Y'CbCr 4:2:0 video +>>>17 byte&0x06 4 \b Y'CbCr 4:2:2 video +>>>17 byte&0x06 6 \b Y'CbCr 4:4:4 video +>>11 byte &0x02 +>>>75 byte &0x01 +>>>>140 belong 0x000001B8 \b, v1, progressive Y'CbCr 4:2:0 video +>>>>140 belong 0x000001B2 \b, v1, progressive Y'CbCr 4:2:0 video +>>>>140 belong 0x000001B5 \b, v2, +>>>>>144 byte&0x0F 1 \b HP +>>>>>144 byte&0x0F 2 \b Spt +>>>>>144 byte&0x0F 3 \b SNR +>>>>>144 byte&0x0F 4 \b MP +>>>>>144 byte&0x0F 5 \b SP +>>>>>145 byte&0xF0 64 \b@HL +>>>>>145 byte&0xF0 96 \b@H-14 +>>>>>145 byte&0xF0 128 \b@ML +>>>>>145 byte&0xF0 160 \b@LL +>>>>>145 byte &0x08 \b progressive +>>>>>145 byte ^0x08 \b interlaced +>>>>>145 byte&0x06 2 \b Y'CbCr 4:2:0 video +>>>>>145 byte&0x06 4 \b Y'CbCr 4:2:2 video +>>>>>145 byte&0x06 6 \b Y'CbCr 4:4:4 video +>>>76 belong 0x000001B8 \b, v1, progressive Y'CbCr 4:2:0 video +>>>76 belong 0x000001B2 \b, v1, progressive Y'CbCr 4:2:0 video +>>>76 belong 0x000001B5 \b, v2, +>>>80 byte&0x0F 1 \b HP +>>>80 byte&0x0F 2 \b Spt +>>>80 byte&0x0F 3 \b SNR +>>>80 byte&0x0F 4 \b MP +>>>80 byte&0x0F 5 \b SP +>>>81 byte&0xF0 64 \b@HL +>>>81 byte&0xF0 96 \b@H-14 +>>>81 byte&0xF0 128 \b@ML +>>>81 byte&0xF0 160 \b@LL +>>>81 byte &0x08 \b progressive +>>>81 byte ^0x08 \b interlaced +>>>81 byte&0x06 2 \b Y'CbCr 4:2:0 video +>>>81 byte&0x06 4 \b Y'CbCr 4:2:2 video +>>>81 byte&0x06 6 \b Y'CbCr 4:4:4 video +>>4 belong&0xFFFFFF00 0x78043800 \b, HD-TV 1920P +>>>7 byte&0xF0 0x10 \b, 16:9 +>>4 belong&0xFFFFFF00 0x50002D00 \b, SD-TV 1280I +>>>7 byte&0xF0 0x10 \b, 16:9 +>>4 belong&0xFFFFFF00 0x30024000 \b, PAL Capture +>>>7 byte&0xF0 0x10 \b, 4:3 +>>4 beshort&0xFFF0 0x2C00 \b, 4CIF +>>>5 beshort&0x0FFF 0x01E0 \b NTSC +>>>5 beshort&0x0FFF 0x0240 \b PAL +>>>7 byte&0xF0 0x20 \b, 4:3 +>>>7 byte&0xF0 0x30 \b, 16:9 +>>>7 byte&0xF0 0x40 \b, 11:5 +>>>7 byte&0xF0 0x80 \b, PAL 4:3 +>>>7 byte&0xF0 0xC0 \b, NTSC 4:3 +>>4 belong&0xFFFFFF00 0x2801E000 \b, LD-TV 640P +>>>7 byte&0xF0 0x10 \b, 4:3 +>>4 belong&0xFFFFFF00 0x1400F000 \b, 320x240 +>>>7 byte&0xF0 0x10 \b, 4:3 +>>4 belong&0xFFFFFF00 0x0F00A000 \b, 240x160 +>>>7 byte&0xF0 0x10 \b, 4:3 +>>4 belong&0xFFFFFF00 0x0A007800 \b, 160x120 +>>>7 byte&0xF0 0x10 \b, 4:3 +>>4 beshort&0xFFF0 0x1600 \b, CIF +>>>5 beshort&0x0FFF 0x00F0 \b NTSC +>>>5 beshort&0x0FFF 0x0120 \b PAL +>>>7 byte&0xF0 0x20 \b, 4:3 +>>>7 byte&0xF0 0x30 \b, 16:9 +>>>7 byte&0xF0 0x40 \b, 11:5 +>>>7 byte&0xF0 0x80 \b, PAL 4:3 +>>>7 byte&0xF0 0xC0 \b, NTSC 4:3 +>>>5 beshort&0x0FFF 0x0240 \b PAL 625 +>>>>7 byte&0xF0 0x20 \b, 4:3 +>>>>7 byte&0xF0 0x30 \b, 16:9 +>>>>7 byte&0xF0 0x40 \b, 11:5 +>>4 beshort&0xFFF0 0x2D00 \b, CCIR/ITU +>>>5 beshort&0x0FFF 0x01E0 \b NTSC 525 +>>>5 beshort&0x0FFF 0x0240 \b PAL 625 +>>>7 byte&0xF0 0x20 \b, 4:3 +>>>7 byte&0xF0 0x30 \b, 16:9 +>>>7 byte&0xF0 0x40 \b, 11:5 +>>4 beshort&0xFFF0 0x1E00 \b, SVCD +>>>5 beshort&0x0FFF 0x01E0 \b NTSC 525 +>>>5 beshort&0x0FFF 0x0240 \b PAL 625 +>>>7 byte&0xF0 0x20 \b, 4:3 +>>>7 byte&0xF0 0x30 \b, 16:9 +>>>7 byte&0xF0 0x40 \b, 11:5 +>>7 byte&0x0F 1 \b, 23.976 fps +>>7 byte&0x0F 2 \b, 24 fps +>>7 byte&0x0F 3 \b, 25 fps +>>7 byte&0x0F 4 \b, 29.97 fps +>>7 byte&0x0F 5 \b, 30 fps +>>7 byte&0x0F 6 \b, 50 fps +>>7 byte&0x0F 7 \b, 59.94 fps +>>7 byte&0x0F 8 \b, 60 fps +>>11 byte &0x04 \b, Constrained -# MPEG Audio (*.mpx) +# MPEG ADTS Audio (*.mpx/mxa/aac) # from dreesen@math.fu-berlin.de +# modified to fully support MPEG ADTS + +# MP3, M1A +0 beshort&0xFFFE 0xFFFA MPEG ADTS, layer III, v1 +# rates +>2 byte&0xF0 0x10 \b, 32 kBits +>2 byte&0xF0 0x20 \b, 40 kBits +>2 byte&0xF0 0x30 \b, 48 kBits +>2 byte&0xF0 0x40 \b, 56 kBits +>2 byte&0xF0 0x50 \b, 64 kBits +>2 byte&0xF0 0x60 \b, 80 kBits +>2 byte&0xF0 0x70 \b, 96 kBits +>2 byte&0xF0 0x80 \b, 112 kBits +>2 byte&0xF0 0x90 \b, 128 kBits +>2 byte&0xF0 0xA0 \b, 160 kBits +>2 byte&0xF0 0xB0 \b, 192 kBits +>2 byte&0xF0 0xC0 \b, 224 kBits +>2 byte&0xF0 0xD0 \b, 256 kBits +>2 byte&0xF0 0xE0 \b, 320 kBits +# timing +>2 byte&0x0C 0x00 \b, 44.1 kHz +>2 byte&0x0C 0x04 \b, 48 kHz +>2 byte&0x0C 0x08 \b, 32 kHz +# channels/options +>3 byte&0xC0 0x00 \b, Stereo +>3 byte&0xC0 0x40 \b, JntStereo +>3 byte&0xC0 0x80 \b, 2x Monaural +>3 byte&0xC0 0xC0 \b, Monaural +#>1 byte ^0x01 \b, Data Verify +#>2 byte &0x02 \b, Packet Pad +#>2 byte &0x01 \b, Custom Flag +#>3 byte &0x08 \b, Copyrighted +#>3 byte &0x04 \b, Original Source +#>3 byte&0x03 1 \b, NR: 50/15 ms +#>3 byte&0x03 3 \b, NR: CCIT J.17 + +# MP2, M1A +0 beshort&0xFFFE 0xFFFC MPEG ADTS, layer II, v1 +# rates +>2 byte&0xF0 0x10 \b, 32 kBits +>2 byte&0xF0 0x20 \b, 48 kBits +>2 byte&0xF0 0x30 \b, 56 kBits +>2 byte&0xF0 0x40 \b, 64 kBits +>2 byte&0xF0 0x50 \b, 80 kBits +>2 byte&0xF0 0x60 \b, 96 kBits +>2 byte&0xF0 0x70 \b, 112 kBits +>2 byte&0xF0 0x80 \b, 128 kBits +>2 byte&0xF0 0x90 \b, 160 kBits +>2 byte&0xF0 0xA0 \b, 192 kBits +>2 byte&0xF0 0xB0 \b, 224 kBits +>2 byte&0xF0 0xC0 \b, 256 kBits +>2 byte&0xF0 0xD0 \b, 320 kBits +>2 byte&0xF0 0xE0 \b, 384 kBits +# timing +>2 byte&0x0C 0x00 \b, 44.1 kHz +>2 byte&0x0C 0x04 \b, 48 kHz +>2 byte&0x0C 0x08 \b, 32 kHz +# channels/options +>3 byte&0xC0 0x00 \b, Stereo +>3 byte&0xC0 0x40 \b, JntStereo +>3 byte&0xC0 0x80 \b, 2x Monaural +>3 byte&0xC0 0xC0 \b, Monaural +#>1 byte ^0x01 \b, Data Verify +#>2 byte &0x02 \b, Packet Pad +#>2 byte &0x01 \b, Custom Flag +#>3 byte &0x08 \b, Copyrighted +#>3 byte &0x04 \b, Original Source +#>3 byte&0x03 1 \b, NR: 50/15 ms +#>3 byte&0x03 3 \b, NR: CCIT J.17 + +# MPA, M1A +0 beshort&0xFFFE 0xFFFE MPEG ADTS, layer I, v1 +# rate +>2 byte&0xF0 0x10 \b, 32 kBits +>2 byte&0xF0 0x20 \b, 64 kBits +>2 byte&0xF0 0x30 \b, 96 kBits +>2 byte&0xF0 0x40 \b, 128 kBits +>2 byte&0xF0 0x50 \b, 160 kBits +>2 byte&0xF0 0x60 \b, 192 kBits +>2 byte&0xF0 0x70 \b, 224 kBits +>2 byte&0xF0 0x80 \b, 256 kBits +>2 byte&0xF0 0x90 \b, 288 kBits +>2 byte&0xF0 0xA0 \b, 320 kBits +>2 byte&0xF0 0xB0 \b, 352 kBits +>2 byte&0xF0 0xC0 \b, 384 kBits +>2 byte&0xF0 0xD0 \b, 416 kBits +>2 byte&0xF0 0xE0 \b, 448 kBits +# timing +>2 byte&0x0C 0x00 \b, 44.1 kHz +>2 byte&0x0C 0x04 \b, 48 kHz +>2 byte&0x0C 0x08 \b, 32 kHz +# channels/options +>3 byte&0xC0 0x00 \b, Stereo +>3 byte&0xC0 0x40 \b, JntStereo +>3 byte&0xC0 0x80 \b, 2x Monaural +>3 byte&0xC0 0xC0 \b, Monaural +#>1 byte ^0x01 \b, Data Verify +#>2 byte &0x02 \b, Packet Pad +#>2 byte &0x01 \b, Custom Flag +#>3 byte &0x08 \b, Copyrighted +#>3 byte &0x04 \b, Original Source +#>3 byte&0x03 1 \b, NR: 50/15 ms +#>3 byte&0x03 3 \b, NR: CCIT J.17 + +# MP3, M2A +0 beshort&0xFFFE 0xFFF2 MPEG ADTS, layer III, v2 +# rate +>2 byte&0xF0 0x10 \b, 8 kBits +>2 byte&0xF0 0x20 \b, 16 kBits +>2 byte&0xF0 0x30 \b, 24 kBits +>2 byte&0xF0 0x40 \b, 32 kBits +>2 byte&0xF0 0x50 \b, 40 kBits +>2 byte&0xF0 0x60 \b, 48 kBits +>2 byte&0xF0 0x70 \b, 56 kBits +>2 byte&0xF0 0x80 \b, 64 kBits +>2 byte&0xF0 0x90 \b, 80 kBits +>2 byte&0xF0 0xA0 \b, 96 kBits +>2 byte&0xF0 0xB0 \b, 112 kBits +>2 byte&0xF0 0xC0 \b, 128 kBits +>2 byte&0xF0 0xD0 \b, 144 kBits +>2 byte&0xF0 0xE0 \b, 160 kBits +# timing +>2 byte&0x0C 0x00 \b, 22.05 kHz +>2 byte&0x0C 0x04 \b, 24 kHz +>2 byte&0x0C 0x08 \b, 16 kHz +# channels/options +>3 byte&0xC0 0x00 \b, Stereo +>3 byte&0xC0 0x40 \b, JntStereo +>3 byte&0xC0 0x80 \b, 2x Monaural +>3 byte&0xC0 0xC0 \b, Monaural +#>1 byte ^0x01 \b, Data Verify +#>2 byte &0x02 \b, Packet Pad +#>2 byte &0x01 \b, Custom Flag +#>3 byte &0x08 \b, Copyrighted +#>3 byte &0x04 \b, Original Source +#>3 byte&0x03 1 \b, NR: 50/15 ms +#>3 byte&0x03 3 \b, NR: CCIT J.17 + +# MP2, M2A +0 beshort&0xFFFE 0xFFF4 MPEG ADTS, layer II, v2 +# rate +>2 byte&0xF0 0x10 \b, 8 kBits +>2 byte&0xF0 0x20 \b, 16 kBits +>2 byte&0xF0 0x30 \b, 24 kBits +>2 byte&0xF0 0x40 \b, 32 kBits +>2 byte&0xF0 0x50 \b, 40 kBits +>2 byte&0xF0 0x60 \b, 48 kBits +>2 byte&0xF0 0x70 \b, 56 kBits +>2 byte&0xF0 0x80 \b, 64 kBits +>2 byte&0xF0 0x90 \b, 80 kBits +>2 byte&0xF0 0xA0 \b, 96 kBits +>2 byte&0xF0 0xB0 \b, 112 kBits +>2 byte&0xF0 0xC0 \b, 128 kBits +>2 byte&0xF0 0xD0 \b, 144 kBits +>2 byte&0xF0 0xE0 \b, 160 kBits +# timing +>2 byte&0x0C 0x00 \b, 22.05 kHz +>2 byte&0x0C 0x04 \b, 24 kHz +>2 byte&0x0C 0x08 \b, 16 kHz +# channels/options +>3 byte&0xC0 0x00 \b, Stereo +>3 byte&0xC0 0x40 \b, JntStereo +>3 byte&0xC0 0x80 \b, 2x Monaural +>3 byte&0xC0 0xC0 \b, Monaural +#>1 byte ^0x01 \b, Data Verify +#>2 byte &0x02 \b, Packet Pad +#>2 byte &0x01 \b, Custom Flag +#>3 byte &0x08 \b, Copyrighted +#>3 byte &0x04 \b, Original Source +#>3 byte&0x03 1 \b, NR: 50/15 ms +#>3 byte&0x03 3 \b, NR: CCIT J.17 -# MPEG 1.0 Layer 3 -0 beshort&0xfffe =0xfffa \bMP3 ->2 byte&0xf0 =0x10 \b, 32 kBits ->2 byte&0xf0 =0x20 \b, 40 kBits ->2 byte&0xf0 =0x30 \b, 48 kBits ->2 byte&0xf0 =0x40 \b, 56 kBits ->2 byte&0xf0 =0x50 \b, 64 kBits ->2 byte&0xf0 =0x60 \b, 80 kBits ->2 byte&0xf0 =0x70 \b, 96 kBits ->2 byte&0xf0 =0x80 \b, 112 kBits ->2 byte&0xf0 =0x90 \b, 128 kBits ->2 byte&0xf0 =0xA0 \b, 160 kBits ->2 byte&0xf0 =0xB0 \b, 192 kBits ->2 byte&0xf0 =0xC0 \b, 224 kBits ->2 byte&0xf0 =0xD0 \b, 256 kBits ->2 byte&0xf0 =0xE0 \b, 320 kBits -# freq ->2 byte&0x0C =0x00 \b, 44.1 kHz ->2 byte&0x0C =0x04 \b, 48 kHz ->2 byte&0x0C =0x08 \b, 32 kHz -# misc ->3 byte&0xC0 =0x00 \b, Stereo ->3 byte&0xC0 =0x40 \b, JStereo ->3 byte&0xC0 =0x80 \b, Dual-Ch ->3 byte&0xC0 =0xC0 \b, Mono -#>1 byte&0x01 =0x00 \b, Error Protection -#>2 byte&0x02 =0x02 \b, Padding -#>2 byte&0x01 =0x01 \b, Private -#>3 byte&0x08 =0x08 \b, Copyright -#>3 byte&0x04 =0x04 \b, Original -#>3 byte&0x03 1 \b, Emphasis 5 -#>3 byte&0x03 3 \b, Emphasis c +# MPA, M2A +0 beshort&0xFFFE 0xFFF6 MPEG ADTS, layer I, v2 +# rate +>2 byte&0xF0 0x10 \b, 32 kBits +>2 byte&0xF0 0x20 \b, 48 kBits +>2 byte&0xF0 0x30 \b, 56 kBits +>2 byte&0xF0 0x40 \b, 64 kBits +>2 byte&0xF0 0x50 \b, 80 kBits +>2 byte&0xF0 0x60 \b, 96 kBits +>2 byte&0xF0 0x70 \b, 112 kBits +>2 byte&0xF0 0x80 \b, 128 kBits +>2 byte&0xF0 0x90 \b, 144 kBits +>2 byte&0xF0 0xA0 \b, 160 kBits +>2 byte&0xF0 0xB0 \b, 176 kBits +>2 byte&0xF0 0xC0 \b, 192 kBits +>2 byte&0xF0 0xD0 \b, 224 kBits +>2 byte&0xF0 0xE0 \b, 256 kBits +# timing +>2 byte&0x0C 0x00 \b, 22.05 kHz +>2 byte&0x0C 0x04 \b, 24 kHz +>2 byte&0x0C 0x08 \b, 16 kHz +# channels/options +>3 byte&0xC0 0x00 \b, Stereo +>3 byte&0xC0 0x40 \b, JntStereo +>3 byte&0xC0 0x80 \b, 2x Monaural +>3 byte&0xC0 0xC0 \b, Monaural +#>1 byte ^0x01 \b, Data Verify +#>2 byte &0x02 \b, Packet Pad +#>2 byte &0x01 \b, Custom Flag +#>3 byte &0x08 \b, Copyrighted +#>3 byte &0x04 \b, Original Source +#>3 byte&0x03 1 \b, NR: 50/15 ms +#>3 byte&0x03 3 \b, NR: CCIT J.17 -# MPEG 1.0 Layer 2 -0 beshort&0xfffe =0xfffc \bMP2 ->2 byte&0xf0 =0x10 \b, 32 kBits ->2 byte&0xf0 =0x20 \b, 48 kBits ->2 byte&0xf0 =0x30 \b, 56 kBits ->2 byte&0xf0 =0x40 \b, 64 kBits ->2 byte&0xf0 =0x50 \b, 80 kBits ->2 byte&0xf0 =0x60 \b, 96 kBits ->2 byte&0xf0 =0x70 \b, 112 kBits ->2 byte&0xf0 =0x80 \b, 128 kBits ->2 byte&0xf0 =0x90 \b, 160 kBits ->2 byte&0xf0 =0xA0 \b, 192 kBits ->2 byte&0xf0 =0xB0 \b, 224 kBits ->2 byte&0xf0 =0xC0 \b, 256 kBits ->2 byte&0xf0 =0xD0 \b, 320 kBits ->2 byte&0xf0 =0xE0 \b, 384 kBits -# freq ->2 byte&0x0C =0x00 \b, 44.1 kHz ->2 byte&0x0C =0x04 \b, 48 kHz ->2 byte&0x0C =0x08 \b, 32 kHz -# misc ->3 byte&0xC0 =0x00 \b, Stereo ->3 byte&0xC0 =0x40 \b, JStereo ->3 byte&0xC0 =0x80 \b, Dual-Ch ->3 byte&0xC0 =0xC0 \b, Mono -#>1 byte&0x01 =0x00 \b, Error Protection -#>2 byte&0x02 =0x02 \b, Padding -#>2 byte&0x01 =0x01 \b, Private -#>3 byte&0x08 =0x08 \b, Copyright -#>3 byte&0x04 =0x04 \b, Original -#>3 byte&0x03 1 \b, Emphasis 5 -#>3 byte&0x03 3 \b, Emphasis c +# MP3, M25A +0 beshort&0xFFFE 0xFFE2 MPEG ADTS, layer III, v2.5 +# rate +>2 byte&0xF0 0x10 \b, 8 kBits +>2 byte&0xF0 0x20 \b, 16 kBits +>2 byte&0xF0 0x30 \b, 24 kBits +>2 byte&0xF0 0x40 \b, 32 kBits +>2 byte&0xF0 0x50 \b, 40 kBits +>2 byte&0xF0 0x60 \b, 48 kBits +>2 byte&0xF0 0x70 \b, 56 kBits +>2 byte&0xF0 0x80 \b, 64 kBits +>2 byte&0xF0 0x90 \b, 80 kBits +>2 byte&0xF0 0xA0 \b, 96 kBits +>2 byte&0xF0 0xB0 \b, 112 kBits +>2 byte&0xF0 0xC0 \b, 128 kBits +>2 byte&0xF0 0xD0 \b, 144 kBits +>2 byte&0xF0 0xE0 \b, 160 kBits +# timing +>2 byte&0x0C 0x00 \b, 11.025 kHz +>2 byte&0x0C 0x04 \b, 12 kHz +>2 byte&0x0C 0x08 \b, 8 kHz +# channels/options +>3 byte&0xC0 0x00 \b, Stereo +>3 byte&0xC0 0x40 \b, JntStereo +>3 byte&0xC0 0x80 \b, 2x Monaural +>3 byte&0xC0 0xC0 \b, Monaural +#>1 byte ^0x01 \b, Data Verify +#>2 byte &0x02 \b, Packet Pad +#>2 byte &0x01 \b, Custom Flag +#>3 byte &0x08 \b, Copyrighted +#>3 byte &0x04 \b, Original Source +#>3 byte&0x03 1 \b, NR: 50/15 ms +#>3 byte&0x03 3 \b, NR: CCIT J.17 -# MPEG 2.0 -0 beshort&0xfff8 =0xfff0 MP -# Layer 3 ->1 byte &0x02 \b3 -# Layer 2 ->1 byte &0x04 \b2 ->2 byte&0xf0 =0x10 \b, 8 kBits ->2 byte&0xf0 =0x20 \b, 16 kBits ->2 byte&0xf0 =0x30 \b, 24 kBits ->2 byte&0xf0 =0x40 \b, 32 kBits ->2 byte&0xf0 =0x50 \b, 40 kBits ->2 byte&0xf0 =0x60 \b, 48 kBits ->2 byte&0xf0 =0x70 \b, 56 kBits ->2 byte&0xf0 =0x80 \b, 64 kBits ->2 byte&0xf0 =0x90 \b, 80 kBits ->2 byte&0xf0 =0xA0 \b, 96 kBits ->2 byte&0xf0 =0xB0 \b, 112 kBits ->2 byte&0xf0 =0xC0 \b, 128 kBits ->2 byte&0xf0 =0xD0 \b, 144 kBits ->2 byte&0xf0 =0xE0 \b, 160 kBits -# freq ->2 byte&0x0C =0x00 \b, 22.05 kHz ->2 byte&0x0C =0x04 \b, 24 kHz ->2 byte&0x0C =0x08 \b, 16 kHz -# misc ->3 byte&0xC0 =0x00 \b, Stereo ->3 byte&0xC0 =0x40 \b, JStereo ->3 byte&0xC0 =0x80 \b, Dual-Ch ->3 byte&0xC0 =0xC0 \b, Mono -#>1 byte&0x01 =0x00 \b, Error Protection -#>2 byte&0x02 =0x02 \b, Padding -#>2 byte&0x01 =0x01 \b, Private -#>3 byte&0x08 =0x08 \b, Copyright -#>3 byte&0x04 =0x04 \b, Original -#>3 byte&0x03 1 \b, Emphasis 5 -#>3 byte&0x03 3 \b, Emphasis c +# AAC (aka MPEG-2 NBC audio) and MPEG-4 audio -#From: Johan Gade <jgade@diku.dk> +# Stored AAC streams (instead of the MP4 format) +0 string ADIF MPEG ADIF, AAC +>4 byte &0x80 +>>13 byte &0x10 \b, VBR +>>13 byte ^0x10 \b, CBR +>>16 byte&0x1E 0x02 \b, single stream +>>16 byte&0x1E 0x04 \b, 2 streams +>>16 byte&0x1E 0x06 \b, 3 streams +>>16 byte &0x08 \b, 4 or more streams +>>16 byte &0x10 \b, 8 or more streams +>>4 byte &0x80 \b, Copyrighted +>>13 byte &0x40 \b, Original Source +>>13 byte &0x20 \b, Home Flag +>4 byte ^0x80 +>>4 byte &0x10 \b, VBR +>>4 byte ^0x10 \b, CBR +>>7 byte&0x1E 0x02 \b, single stream +>>7 byte&0x1E 0x04 \b, 2 streams +>>7 byte&0x1E 0x06 \b, 3 streams +>>7 byte &0x08 \b, 4 or more streams +>>7 byte &0x10 \b, 8 or more streams +>>4 byte &0x40 \b, Original Stream(s) +>>4 byte &0x20 \b, Home Source -# MPEG-4 Advanced Audio Coding (AAC) file (perhaps also MPEG-2 ACC?) -16 string M4A MPEG-4 Advanced Audio Coding file (AAC) +# Live or stored single AAC stream (used with MPEG-2 systems) +0 beshort&0xFFF6 0xFFF0 MPEG ADTS, AAC +>1 byte ^0x08 \b, v2 +>1 byte &0x08 \b, v4 +# profile +>>2 byte &0xC0 \b LTP +>2 byte&0xc0 0x00 \b, Main +>2 byte&0xc0 0x40 \b, LC +>2 byte&0xc0 0x80 \b, SSR +# timing +>2 byte&0x3c 0x00 \b, 96 kHz +>2 byte&0x3c 0x04 \b, 88.2 kHz +>2 byte&0x3c 0x08 \b, 64 kHz +>2 byte&0x3c 0x0c \b, 48 kHz +>2 byte&0x3c 0x10 \b, 44.1 kHz +>2 byte&0x3c 0x14 \b, 32 kHz +>2 byte&0x3c 0x18 \b, 24 kHz +>2 byte&0x3c 0x1c \b, 22.05 kHz +>2 byte&0x3c 0x20 \b, 16 kHz +>2 byte&0x3c 0x24 \b, 12 kHz +>2 byte&0x3c 0x28 \b, 11.025 kHz +>2 byte&0x3c 0x2c \b, 8 kHz +# channels/options +>2 beshort&0x01c0 0x0040 \b, monaural +>2 beshort&0x01c0 0x0080 \b, stereo +>2 beshort&0x01c0 0x00c0 \b, stereo + center +>2 beshort&0x01c0 0x0100 \b, stereo+center+LFE +>2 beshort&0x01c0 0x0140 \b, surround +>2 beshort&0x01c0 0x0180 \b, surround + LFE +>2 beshort &0x01C0 \b, surround + side +#>1 byte ^0x01 \b, Data Verify +#>2 byte &0x02 \b, Custom Flag +#>3 byte &0x20 \b, Original Stream +#>3 byte &0x10 \b, Home Source +#>3 byte &0x08 \b, Copyrighted +# Live MPEG-4 audio streams (instead of RTP FlexMux) +0 beshort&0xFFE0 0x56E0 MPEG-4 LOAS +#>1 beshort&0x1FFF x \b, %u byte packet +>3 byte&0xE0 0x40 +>>4 byte&0x3C 0x04 \b, single stream +>>4 byte&0x3C 0x08 \b, 2 streams +>>4 byte&0x3C 0x0C \b, 3 streams +>>4 byte &0x08 \b, 4 or more streams +>>4 byte &0x20 \b, 8 or more streams +>3 byte&0xC0 0 +>>4 byte&0x78 0x08 \b, single stream +>>4 byte&0x78 0x10 \b, 2 streams +>>4 byte&0x78 0x18 \b, 3 streams +>>4 byte &0x20 \b, 4 or more streams +>>4 byte &0x40 \b, 8 or more streams +0 beshort 0x4DE1 MPEG-4 LO-EP audio stream # FLI animation format 4 leshort 0xAF11 FLI file @@ -166,16 +567,31 @@ # SGI formats 0 string MOVI Silicon Graphics movie file -# Apple Quicktime: Scan for all known top-level QT atom markers -4 string moov Apple QuickTime movie file (moov) -4 string mdat Apple QuickTime movie file (mdat) -4 string ftyp Apple QuickTime movie file (ftyp) >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412281701.iBSH1dqb036768>