Update license header for Tremolo and remove unused script.

Change-Id: I10d4885e51c15f7e4adfa6455ccab50561db9a94

34 files changed, 408 insertions, 433 deletions

diff --git a/Tremolo/arm2gnu.pl b/Tremolo/arm2gnu.pl
deleted file mode 100644
index ad12baa..0000000
--- a/Tremolo/arm2gnu.pl
+++ /dev/null
@@ -1,265 +0,0 @@
-#!/usr/bin/perl
-
-my $bigend;  # little/big endian
-
-eval 'exec /usr/local/bin/perl -S $0 ${1+"$@"}'
-    if $running_under_some_shell;
-
-while ($ARGV[0] =~ /^-/) {
-    $_ = shift;
-  last if /^--/;
-    if (/^-n/) {
-    $nflag++;
-    next;
-    }
-    die "I don't recognize this switch: $_\\n";
-}
-$printit++ unless $nflag;
-
-$\ = "\n";      # automatically add newline on print
-$n=0;
-
-$thumb = 0;     # ARM mode by default, not Thumb.
-
-LINE:
-while (<>) {
-
-    # For ADRLs we need to add a new line after the substituted one.
-    $addPadding = 0;
-
-    # First, we do not dare to touch *anything* inside double quotes, do we?
-    # Second, if you want a dollar character in the string,
-    # insert two of them -- that's how ARM C and assembler treat strings.
-    s/^([A-Za-z_]\w*)[ \t]+DCB[ \t]*\"/$1:   .ascii \"/   && do { s/\$\$/\$/g; next };
-    s/\bDCB\b[ \t]*\"/.ascii \"/                          && do { s/\$\$/\$/g; next };
-    s/^(\S+)\s+RN\s+(\S+)/$1 .req r$2/                    && do { s/\$\$/\$/g; next };
-    # If substituted -- leave immediately !
-
-    s/@/,:/;
-    s/;/@/;
-    while ( /@.*'/ ) {
-      s/(@.*)'/$1/g;
-    }
-    s/\{FALSE\}/0/g;
-    s/\{TRUE\}/1/g;
-    s/\{(\w\w\w\w+)\}/$1/g;
-    s/\bINCLUDE[ \t]*([^ \t\n]+)/.include \"$1\"/;
-    s/\bGET[ \t]*([^ \t\n]+)/.include \"$1\"/;
-    s/\bIMPORT\b/.extern/;
-    s/\bEXPORT\b/.global/;
-    s/^(\s+)\[/$1IF/;
-    s/^(\s+)\|/$1ELSE/;
-    s/^(\s+)\]/$1ENDIF/;
-    s/IF *:DEF:/ .ifdef/;
-    s/IF *:LNOT: *:DEF:/ .ifndef/;
-    s/ELSE/ .else/;
-    s/ENDIF/ .endif/;
-
-    if( /\bIF\b/ ) {
-      s/\bIF\b/ .if/;
-      s/=/==/;
-    }
-    if ( $n == 2) {
-        s/\$/\\/g;
-    }
-    if ($n == 1) {
-        s/\$//g;
-        s/label//g;
-    $n = 2;
-      }
-    if ( /MACRO/ ) {
-      s/MACRO *\n/.macro/;
-      $n=1;
-    }
-    if ( /\bMEND\b/ ) {
-      s/\bMEND\b/.endm/;
-      $n=0;
-    }
-
-    # ".rdata" doesn't work in 'as' version 2.13.2, as it is ".rodata" there.
-    #
-    if ( /\bAREA\b/ ) {
-        s/^(.+)CODE(.+)READONLY(.*)/    .text/;
-        s/^(.+)DATA(.+)READONLY(.*)/    .section .rdata\n    .align 2/;
-        s/^(.+)\|\|\.data\|\|(.+)/    .data\n    .align 2/;
-        s/^(.+)\|\|\.bss\|\|(.+)/    .bss/;
-    }
-
-    s/\|\|\.constdata\$(\d+)\|\|/.L_CONST$1/;       # ||.constdata$3||
-    s/\|\|\.bss\$(\d+)\|\|/.L_BSS$1/;               # ||.bss$2||
-    s/\|\|\.data\$(\d+)\|\|/.L_DATA$1/;             # ||.data$2||
-    s/\|\|([a-zA-Z0-9_]+)\@([a-zA-Z0-9_]+)\|\|/@ $&/;
-    s/^(\s+)\%(\s)/    .space $1/;
-
-    s/\|(.+)\.(\d+)\|/\.$1_$2/;                     # |L80.123| -> .L80_123
-    s/\bCODE32\b/.code 32/ && do {$thumb = 0};
-    s/\bCODE16\b/.code 16/ && do {$thumb = 1};
-    if (/\bPROC\b/)
-    {
-        print "    .thumb_func" if ($thumb);
-        s/\bPROC\b/@ $&/;
-    }
-    s/\bENDP\b/@ $&/;
-    s/\bSUBT\b/@ $&/;
-    s/\bDATA\b/@ $&/;   # DATA directive is deprecated -- Asm guide, p.7-25
-    s/\bKEEP\b/@ $&/;
-    s/\bEXPORTAS\b/@ $&/;
-    s/\|\|(.)+\bEQU\b/@ $&/;
-    s/\|\|([\w\$]+)\|\|/$1/;
-    s/\bENTRY\b/@ $&/;
-    s/\bASSERT\b/@ $&/;
-    s/\bGBLL\b/@ $&/;
-    s/\bGBLA\b/@ $&/;
-    s/^\W+OPT\b/@ $&/;
-    s/:OR:/|/g;
-    s/:SHL:/<</g;
-    s/:SHR:/>>/g;
-    s/:AND:/&/g;
-    s/:LAND:/&&/g;
-    s/CPSR/cpsr/;
-    s/SPSR/spsr/;
-    s/ALIGN$/.balign 4/;
-    s/psr_cxsf/psr_all/;
-    s/LTORG/.ltorg/;
-    s/^([A-Za-z_]\w*)[ \t]+EQU/ .set $1,/;
-    s/^([A-Za-z_]\w*)[ \t]+SETL/ .set $1,/;
-    s/^([A-Za-z_]\w*)[ \t]+SETA/ .set $1,/;
-    s/^([A-Za-z_]\w*)[ \t]+\*/ .set $1,/;
-
-    #  {PC} + 0xdeadfeed  -->  . + 0xdeadfeed
-    s/\{PC\} \+/ \. +/;
-
-    # Single hex constant on the line !
-    #
-    # >>> NOTE <<<
-    #   Double-precision floats in gcc are always mixed-endian, which means
-    #   bytes in two words are little-endian, but words are big-endian.
-    #   So, 0x0000deadfeed0000 would be stored as 0x0000dead at low address
-    #   and 0xfeed0000 at high address.
-    #
-    s/\bDCFD\b[ \t]+0x([a-fA-F0-9]{8})([a-fA-F0-9]{8})/.long 0x$1, 0x$2/;
-    # Only decimal constants on the line, no hex !
-    s/\bDCFD\b[ \t]+([0-9\.\-]+)/.double $1/;
-
-    # Single hex constant on the line !
-#    s/\bDCFS\b[ \t]+0x([a-f0-9]{8})([a-f0-9]{8})/.long 0x$1, 0x$2/;
-    # Only decimal constants on the line, no hex !
-#    s/\bDCFS\b[ \t]+([0-9\.\-]+)/.double $1/;
-    s/\bDCFS[ \t]+0x/.word 0x/;
-    s/\bDCFS\b/.float/;
-
-    s/^([A-Za-z_]\w*)[ \t]+DCD/$1 .word/;
-    s/\bDCD\b/.word/;
-    s/^([A-Za-z_]\w*)[ \t]+DCW/$1 .short/;
-    s/\bDCW\b/.short/;
-    s/^([A-Za-z_]\w*)[ \t]+DCB/$1 .byte/;
-    s/\bDCB\b/.byte/;
-    s/^([A-Za-z_]\w*)[ \t]+\%/.comm $1,/;
-    s/^[A-Za-z_\.]\w+/$&:/;
-    s/^(\d+)/$1:/;
-    s/\%(\d+)/$1b_or_f/;
-    s/\%[Bb](\d+)/$1b/;
-    s/\%[Ff](\d+)/$1f/;
-    s/\%[Ff][Tt](\d+)/$1f/;
-    s/&([\dA-Fa-f]+)/0x$1/;
-    if ( /\b2_[01]+\b/ ) {
-      s/\b2_([01]+)\b/conv$1&&&&/g;
-      while ( /[01][01][01][01]&&&&/ ) {
-        s/0000&&&&/&&&&0/g;
-        s/0001&&&&/&&&&1/g;
-        s/0010&&&&/&&&&2/g;
-        s/0011&&&&/&&&&3/g;
-        s/0100&&&&/&&&&4/g;
-        s/0101&&&&/&&&&5/g;
-        s/0110&&&&/&&&&6/g;
-        s/0111&&&&/&&&&7/g;
-        s/1000&&&&/&&&&8/g;
-        s/1001&&&&/&&&&9/g;
-        s/1010&&&&/&&&&A/g;
-        s/1011&&&&/&&&&B/g;
-        s/1100&&&&/&&&&C/g;
-        s/1101&&&&/&&&&D/g;
-        s/1110&&&&/&&&&E/g;
-        s/1111&&&&/&&&&F/g;
-      }
-      s/000&&&&/&&&&0/g;
-      s/001&&&&/&&&&1/g;
-      s/010&&&&/&&&&2/g;
-      s/011&&&&/&&&&3/g;
-      s/100&&&&/&&&&4/g;
-      s/101&&&&/&&&&5/g;
-      s/110&&&&/&&&&6/g;
-      s/111&&&&/&&&&7/g;
-      s/00&&&&/&&&&0/g;
-      s/01&&&&/&&&&1/g;
-      s/10&&&&/&&&&2/g;
-      s/11&&&&/&&&&3/g;
-      s/0&&&&/&&&&0/g;
-      s/1&&&&/&&&&1/g;
-      s/conv&&&&/0x/g;
-    }
-
-    if ( /commandline/)
-    {
-        if( /-bigend/)
-        {
-            $bigend=1;
-        }
-    }
-
-    if ( /\bDCDU\b/ )
-    {
-        my $cmd=$_;
-        my $value;
-        my $w1;
-        my $w2;
-        my $w3;
-        my $w4;
-
-        s/\s+DCDU\b/@ $&/;
-
-        $cmd =~ /\bDCDU\b\s+0x(\d+)/;
-        $value = $1;
-        $value =~ /(\w\w)(\w\w)(\w\w)(\w\w)/;
-        $w1 = $1;
-        $w2 = $2;
-        $w3 = $3;
-        $w4 = $4;
-
-        if( $bigend ne "")
-        {
-            # big endian
-
-            print "        .byte      0x".$w1;
-            print "        .byte      0x".$w2;
-            print "        .byte      0x".$w3;
-            print "        .byte      0x".$w4;
-        }
-        else
-        {
-            # little endian
-
-            print "        .byte      0x".$w4;
-            print "        .byte      0x".$w3;
-            print "        .byte      0x".$w2;
-            print "        .byte      0x".$w1;
-        }
-
-    }
-
-
-    if ( /\badrl\b/i )
-    {
-        s/\badrl\s+(\w+)\s*,\s*(\w+)/ldr $1,=$2/i;
-        $addPadding = 1;
-    }
-    s/\bEND\b/@ END/;
-} continue {
-    printf ("%s", $_) if $printit;
-    if ($addPadding != 0)
-    {
-        printf ("   mov r0,r0\n");
-        $addPadding = 0;
-    }
-}
-
diff --git a/Tremolo/asm_arm.h b/Tremolo/asm_arm.h
index f4ecd3d..6303b87 100644
--- a/Tremolo/asm_arm.h
+++ b/Tremolo/asm_arm.h
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/bitwise.c b/Tremolo/bitwise.c
index 71ac3ef..3f1be7a 100644
--- a/Tremolo/bitwise.c
+++ b/Tremolo/bitwise.c
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/bitwiseARM.s b/Tremolo/bitwiseARM.s
index f79b26e..b7c72f1 100644
--- a/Tremolo/bitwiseARM.s
+++ b/Tremolo/bitwiseARM.s
@@ -1,5 +1,36 @@
 @ Tremolo library
-@ Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd
+@-----------------------------------------------------------------------
+@ Copyright (C) 2002-2009, Xiph.org Foundation
+@ Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
+@ All rights reserved.
+
+@ Redistribution and use in source and binary forms, with or without
+@ modification, are permitted provided that the following conditions
+@ are met:
+
+@     * Redistributions of source code must retain the above copyright
+@ notice, this list of conditions and the following disclaimer.
+@     * 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.
+@     * Neither the names of the Xiph.org Foundation nor Pinknoise
+@ Productions Ltd nor the names of its contributors may be used to
+@ endorse or promote products derived from this software without
+@ specific prior written permission.
+@
+@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+@ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+@ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+@ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+@ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 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.
+@ ----------------------------------------------------------------------
 
     .text
 
diff --git a/Tremolo/codebook.c b/Tremolo/codebook.c
index 335e952..329c3c1 100644
--- a/Tremolo/codebook.c
+++ b/Tremolo/codebook.c
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/codebook.h b/Tremolo/codebook.h
index 477a6d0..7aff26b 100644
--- a/Tremolo/codebook.h
+++ b/Tremolo/codebook.h
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/codec_internal.h b/Tremolo/codec_internal.h
index 4ec35c3..6889ec8 100644
--- a/Tremolo/codec_internal.h
+++ b/Tremolo/codec_internal.h
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/config_types.h b/Tremolo/config_types.h
index 9a84bfb..2b85570 100644
--- a/Tremolo/config_types.h
+++ b/Tremolo/config_types.h
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/dpen.s b/Tremolo/dpen.s
index 278b061..6123f8f 100644
--- a/Tremolo/dpen.s
+++ b/Tremolo/dpen.s
@@ -1,5 +1,36 @@
 @ Tremolo library
-@ Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd
+@-----------------------------------------------------------------------
+@ Copyright (C) 2002-2009, Xiph.org Foundation
+@ Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
+@ All rights reserved.
+
+@ Redistribution and use in source and binary forms, with or without
+@ modification, are permitted provided that the following conditions
+@ are met:
+
+@     * Redistributions of source code must retain the above copyright
+@ notice, this list of conditions and the following disclaimer.
+@     * 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.
+@     * Neither the names of the Xiph.org Foundation nor Pinknoise
+@ Productions Ltd nor the names of its contributors may be used to
+@ endorse or promote products derived from this software without
+@ specific prior written permission.
+@
+@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+@ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+@ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+@ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+@ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 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.
+@ ----------------------------------------------------------------------
 
     .text
 
diff --git a/Tremolo/dsp.c b/Tremolo/dsp.c
index b6b3216..db809de 100644
--- a/Tremolo/dsp.c
+++ b/Tremolo/dsp.c
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/floor0.c b/Tremolo/floor0.c
index 8a09b61..1e06200 100644
--- a/Tremolo/floor0.c
+++ b/Tremolo/floor0.c
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/floor1.c b/Tremolo/floor1.c
index a74295c..c471ead 100644
--- a/Tremolo/floor1.c
+++ b/Tremolo/floor1.c
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/floor1ARM.s b/Tremolo/floor1ARM.s
index 8ec201e..981e86b 100644
--- a/Tremolo/floor1ARM.s
+++ b/Tremolo/floor1ARM.s
@@ -1,5 +1,36 @@
 @ Tremolo library
-@ Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd
+@-----------------------------------------------------------------------
+@ Copyright (C) 2002-2009, Xiph.org Foundation
+@ Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
+@ All rights reserved.
+
+@ Redistribution and use in source and binary forms, with or without
+@ modification, are permitted provided that the following conditions
+@ are met:
+
+@     * Redistributions of source code must retain the above copyright
+@ notice, this list of conditions and the following disclaimer.
+@     * 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.
+@     * Neither the names of the Xiph.org Foundation nor Pinknoise
+@ Productions Ltd nor the names of its contributors may be used to
+@ endorse or promote products derived from this software without
+@ specific prior written permission.
+@
+@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+@ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+@ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+@ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+@ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 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.
+@ ----------------------------------------------------------------------
 
     .text
 
diff --git a/Tremolo/floor1LARM.s b/Tremolo/floor1LARM.s
index 6b719a1..48b794c 100644
--- a/Tremolo/floor1LARM.s
+++ b/Tremolo/floor1LARM.s
@@ -1,5 +1,36 @@
 @ Tremolo library
-@ Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd
+@-----------------------------------------------------------------------
+@ Copyright (C) 2002-2009, Xiph.org Foundation
+@ Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
+@ All rights reserved.
+
+@ Redistribution and use in source and binary forms, with or without
+@ modification, are permitted provided that the following conditions
+@ are met:
+
+@     * Redistributions of source code must retain the above copyright
+@ notice, this list of conditions and the following disclaimer.
+@     * 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.
+@     * Neither the names of the Xiph.org Foundation nor Pinknoise
+@ Productions Ltd nor the names of its contributors may be used to
+@ endorse or promote products derived from this software without
+@ specific prior written permission.
+@
+@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+@ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+@ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+@ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+@ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 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.
+@ ----------------------------------------------------------------------
 
     .text
 
diff --git a/Tremolo/floor_lookup.c b/Tremolo/floor_lookup.c
index f21ab20..91c585c 100644
--- a/Tremolo/floor_lookup.c
+++ b/Tremolo/floor_lookup.c
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/framing.c b/Tremolo/framing.c
index 0cca3e5..4aca8ba 100644
--- a/Tremolo/framing.c
+++ b/Tremolo/framing.c
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/ivorbiscodec.h b/Tremolo/ivorbiscodec.h
index 30b6d58..5d1bf95 100644
--- a/Tremolo/ivorbiscodec.h
+++ b/Tremolo/ivorbiscodec.h
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/ivorbisfile.h b/Tremolo/ivorbisfile.h
index 2c0a7f2..8c4fe77 100644
--- a/Tremolo/ivorbisfile.h
+++ b/Tremolo/ivorbisfile.h
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/lsp_lookup.h b/Tremolo/lsp_lookup.h
index 92d488c..8338251 100644
--- a/Tremolo/lsp_lookup.h
+++ b/Tremolo/lsp_lookup.h
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/mapping0.c b/Tremolo/mapping0.c
index 09d6869..ccc84da 100644
--- a/Tremolo/mapping0.c
+++ b/Tremolo/mapping0.c
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/mdct.c b/Tremolo/mdct.c
index 458ed3f..32b3525 100644
--- a/Tremolo/mdct.c
+++ b/Tremolo/mdct.c
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/mdct.h b/Tremolo/mdct.h
index c919935..0878359 100644
--- a/Tremolo/mdct.h
+++ b/Tremolo/mdct.h
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/mdctARM.s b/Tremolo/mdctARM.s
index d7df88b..775e369 100644
--- a/Tremolo/mdctARM.s
+++ b/Tremolo/mdctARM.s
@@ -1,5 +1,36 @@
 @ Tremolo library
-@ Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd
+@-----------------------------------------------------------------------
+@ Copyright (C) 2002-2009, Xiph.org Foundation
+@ Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
+@ All rights reserved.
+
+@ Redistribution and use in source and binary forms, with or without
+@ modification, are permitted provided that the following conditions
+@ are met:
+
+@     * Redistributions of source code must retain the above copyright
+@ notice, this list of conditions and the following disclaimer.
+@     * 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.
+@     * Neither the names of the Xiph.org Foundation nor Pinknoise
+@ Productions Ltd nor the names of its contributors may be used to
+@ endorse or promote products derived from this software without
+@ specific prior written permission.
+@
+@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+@ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+@ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+@ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+@ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 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.
+@ ----------------------------------------------------------------------
 
     .text
 
diff --git a/Tremolo/mdctLARM.s b/Tremolo/mdctLARM.s
index d1bd5e4..72a4647 100644
--- a/Tremolo/mdctLARM.s
+++ b/Tremolo/mdctLARM.s
@@ -1,5 +1,36 @@
 @ Tremolo library
-@ Copyright (C) 2009 Robin Watts for Pinknoise Productions Ltd
+@-----------------------------------------------------------------------
+@ Copyright (C) 2002-2009, Xiph.org Foundation
+@ Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
+@ All rights reserved.
+
+@ Redistribution and use in source and binary forms, with or without
+@ modification, are permitted provided that the following conditions
+@ are met:
+
+@     * Redistributions of source code must retain the above copyright
+@ notice, this list of conditions and the following disclaimer.
+@     * 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.
+@     * Neither the names of the Xiph.org Foundation nor Pinknoise
+@ Productions Ltd nor the names of its contributors may be used to
+@ endorse or promote products derived from this software without
+@ specific prior written permission.
+@
+@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+@ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+@ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+@ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+@ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+@ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED 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.
+@ ----------------------------------------------------------------------
 
     .text
 
diff --git a/Tremolo/mdct_lookup.h b/Tremolo/mdct_lookup.h
index d5fca1b..a25ea3e 100644
--- a/Tremolo/mdct_lookup.h
+++ b/Tremolo/mdct_lookup.h
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/misc.c b/Tremolo/misc.c
index 10578e7..a85b8da 100644
--- a/Tremolo/misc.c
+++ b/Tremolo/misc.c
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/misc.h b/Tremolo/misc.h
index dd325f1..4176eb6 100644
--- a/Tremolo/misc.h
+++ b/Tremolo/misc.h
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/ogg.h b/Tremolo/ogg.h
index f7f9f3c..7f35bd4 100644
--- a/Tremolo/ogg.h
+++ b/Tremolo/ogg.h
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/os.h b/Tremolo/os.h
index 0c7e654..ae9edd2 100644
--- a/Tremolo/os.h
+++ b/Tremolo/os.h
@@ -1,12 +1,13 @@
 #ifndef _OS_H
 #define _OS_H
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -14,9 +15,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/os_types.h b/Tremolo/os_types.h
index 29309cb..b08d0ce 100644
--- a/Tremolo/os_types.h
+++ b/Tremolo/os_types.h
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/res012.c b/Tremolo/res012.c
index 5aef0b7..ed38ab9 100644
--- a/Tremolo/res012.c
+++ b/Tremolo/res012.c
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/treminfo.c b/Tremolo/treminfo.c
index 248455d..331b459 100644
--- a/Tremolo/treminfo.c
+++ b/Tremolo/treminfo.c
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/vorbisfile.c b/Tremolo/vorbisfile.c
index ba77e1c..f896b43 100644
--- a/Tremolo/vorbisfile.c
+++ b/Tremolo/vorbisfile.c
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
diff --git a/Tremolo/window_lookup.h b/Tremolo/window_lookup.h
index 0d7dd48..db3593d 100644
--- a/Tremolo/window_lookup.h
+++ b/Tremolo/window_lookup.h
@@ -1,10 +1,11 @@
 /************************************************************************
- * Copyright (C) 2010, The Android Open Source Project
+ * Copyright (C) 2002-2009, Xiph.org Foundation
+ * Copyright (C) 2010, Robin Watts for Pinknoise Productions Ltd
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
+ * modification, are permitted provided that the following conditions
+ * are met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ -12,9 +13,10 @@
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
  * distribution.
- *     * Neither the name of the Android Open Source Project nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ *     * Neither the names of the Xiph.org Foundation nor Pinknoise
+ * Productions Ltd nor the names of its contributors may be used to
+ * endorse or promote products derived from this software without
+ * specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT