Merge branch 'tmp_draft'

Conflicts:
	README

Makefile.draft

@@ -20,7 +20,7 @@ CFLAGS := -Drestrict= $(CFLAGS)
 
 ###################### END OF OPTIONS ######################
 
-CFLAGS += -DOPUS_VERSION='"0.9.10"'
+CFLAGS += -DOPUS_VERSION='"0.9.11"'
 include silk_sources.mk
 include celt_sources.mk
 include opus_sources.mk

README

-
 Opus is a codec for interactive speech and audio transmission over the Internet.
 
   Opus can handle a wide range of interactive audio applications, including
@@ -31,7 +30,6 @@ Opus-tools can be found at:
  http://git.xiph.org/?p=users/greg/opus-tools.git
 
 == Compiling libopus ==
-
 To build from a distribution tarball, you only need to do the following:
 
 % ./configure
@@ -74,7 +72,7 @@ options:
 -dtx                 : enable SILK DTX
 -loss <perc>         : simulate packet loss, in percent (0-100); default: 0
 
-input and output are little endian signed 16-bit PCM files or opus bitstreams
+input and output are little-endian signed 16-bit PCM files or opus bitstreams
 with simple opus_demo proprietary framing.
 
 == Testing ==

README.draft

@@ -2,10 +2,15 @@ To build this source code, simply type:
 
 % make
 
-If this does not work, or if you want to change the default configuration (e.g., 
-to compile for a fixed-point architecture), simply edit the options in the
-Makefile.
-
+If this does not work, or if you want to change the default configuration
+(e.g., to compile for a fixed-point architecture), simply edit the options
+in the Makefile.
+
+An up-to-date implementation conforming to this standard is available in a
+Git repository at git://git.xiph.org/opus.git or on a website at:
+http://opus-codec.org/
+However, although that implementation is expected to remain conformant 
+with the standard, it is the code in this RFC that shall remain normative. 
 To build from the git repository instead of using this RFC, follow these
 steps:
 

configure.ac

@@ -9,7 +9,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 OPUS_MAJOR_VERSION=0
 OPUS_MINOR_VERSION=9
-OPUS_MICRO_VERSION=10
+OPUS_MICRO_VERSION=11
 OPUS_EXTRA_VERSION=
 
 OPUS_VERSION="$OPUS_MAJOR_VERSION.$OPUS_MINOR_VERSION.$OPUS_MICRO_VERSION$OPUS_EXTRA_VERSION"

doc/build_draft.sh

@@ -34,7 +34,7 @@ cp -a "${toplevel}"/README.draft "${destdir}"/README
 cp -a "${toplevel}"/COPYING "${destdir}"/COPYING
 cp -a "${toplevel}"/tests/run_vectors.sh "${destdir}"/
 
-tar czf opus_source.tar.gz "${destdir}"
+GZIP=-9 tar --owner=root --group=root --format=v7 -czf opus_source.tar.gz "${destdir}"
 echo building base64 version
 cat opus_source.tar.gz| base64 | tr -d '\n' | fold -w 64 | \
  sed -e 's/^/\<spanx style="vbare"\>###/' -e 's/$/\<\/spanx\>\<vspace\/\>/' > \
@@ -49,6 +49,11 @@ cat opus_source.tar.gz| base64 | tr -d '\n' | fold -w 64 | \
 #echo '</artwork>' >> opus_compare_escaped.c
 #echo '</figure>' >> opus_compare_escaped.c
 
+if [[ ! -d ../opus_testvectors ]] ; then
+  echo "Downloading test vectors..."
+  wget 'http://www.opus-codec.org/testvectors/opus_testvectors-draft11.tar.gz'
+  tar -C .. -xvzf opus_testvectors-draft11.tar.gz
+fi
 echo '<figure>' > testvectors_sha1
 echo '<artwork>' >> testvectors_sha1
 echo '<![CDATA[' >> testvectors_sha1

include/opus_types.h

@@ -24,7 +24,7 @@
    NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
    SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-/* opus_types.h taken from libogg */
+/* opus_types.h based on ogg_types.h from libogg */
 
 /**
    @file opus_types.h