diff --git a/.gitignore b/.gitignore index 0c201cb46..27ec90e06 100644 --- a/.gitignore +++ b/.gitignore @@ -36,5 +36,26 @@ vorbisfile-uninstalled.pc vorbisfile.pc doc/Doxyfile doc/doxygen-build.stamp +examples/chaining_example +examples/decoder_example +examples/encoder_example +examples/seeking_example +examples/vorbisfile_example lib/test_sharedbook test/test + +CMakeCache.txt +CMakeFiles +CMakeScripts +Testing +Makefile +cmake_install.cmake +install_manifest.txt +compile_commands.json +CTestTestfile.cmake +CMakeSettings.json + +*[Bb]uild*/ + +.vs/ +.vscode/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 000000000..e438d9724 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,27 @@ +default: + tags: + - docker + # Image from https://hub.docker.com/_/gcc/ based on Debian + image: gcc:9 + +autoconf: + stage: build + before_script: + - apt-get update && + apt-get install -y libogg-dev zip doxygen + script: + - ./autogen.sh + - ./configure + - make + - make distcheck + +cmake: + stage: build + before_script: + - apt-get update && + apt-get install -y libogg-dev zip doxygen + cmake ninja-build + script: + - mkdir build + - cmake -S . -B build -G "Ninja" -DCMAKE_BUILD_TYPE=Release + - cmake --build build diff --git a/.travis.yml b/.travis.yml index b3dddcdc0..23fec3d40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,11 @@ language: c +os: + - linux + - osx + +osx_image: xcode11 + compiler: - gcc - clang @@ -12,13 +18,10 @@ addons: apt: packages: - libogg-dev + homebrew: + brewfile: true + update: true script: - - if [[ "$BUILD_SYSTEM" == "AUTOTOOLS" ]] ; then ./autogen.sh ; fi - - if [[ "$BUILD_SYSTEM" == "AUTOTOOLS" ]] ; then ./configure ; fi - - if [[ "$BUILD_SYSTEM" == "AUTOTOOLS" ]] ; then make -j2 V=1 distcheck ; fi - - if [[ "$BUILD_SYSTEM" == "CMAKE" ]] ; then mkdir build ; fi - - if [[ "$BUILD_SYSTEM" == "CMAKE" ]] ; then pushd build ; fi - - if [[ "$BUILD_SYSTEM" == "CMAKE" ]] ; then cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release .. ; fi - - if [[ "$BUILD_SYSTEM" == "CMAKE" ]] ; then cmake --build . ; fi - - if [[ "$BUILD_SYSTEM" == "CMAKE" ]] ; then popd ; fi + - if [[ "$BUILD_SYSTEM" == "AUTOTOOLS" ]] ; then ./autogen.sh && ./configure && make -j2 V=1 distcheck; fi + - if [[ "$BUILD_SYSTEM" == "CMAKE" ]] ; then mkdir build && pushd build && cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release .. && cmake --build . && popd; fi diff --git a/Brewfile b/Brewfile new file mode 100644 index 000000000..af81e5b46 --- /dev/null +++ b/Brewfile @@ -0,0 +1,3 @@ +brew 'doxygen' +brew 'libogg' +brew 'xz' diff --git a/CHANGES b/CHANGES index 5db9d05fb..c4a0addf0 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,22 @@ +libvorbis 1.3.7 (2020-07-04) -- "Xiph.Org libVorbis I 20200704 (Reducing Environment)" + +* Fix CVE-2018-10393 - out-of-bounds read encoding very low sample rates. +* Fix CVE-2017-14160 - out-of-bounds read encoding very low sample rates. +* Fix handling invalid bytes per sample arguments. +* Fix handling invalid channel count arguments. +* Fix invalid free on seek failure. +* Fix negative shift reading blocksize. +* Fix accepting unreasonable float32 values. +* Fix tag comparison depending on locale. +* Fix unnecessarily linking libm. +* Fix memory leak in test_sharedbook. +* Update Visual Studio projects for ogg library filename change. +* Distribute CMake build files with the source package. +* Remove unnecessary configure --target switch. +* Add gitlab CI support. +* Add OSS-Fuzz support. +* Build system and integration updates. + libvorbis 1.3.6 (2018-03-16) -- "Xiph.Org libVorbis I 20180316 (Now 100% fewer shells)" * Fix CVE-2018-5146 - out-of-bounds write on codebook decoding. diff --git a/CMakeLists.txt b/CMakeLists.txt index bbc045ba6..f377c4286 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,12 @@ -cmake_minimum_required(VERSION 2.8.7) +cmake_minimum_required(VERSION 2.8.12) project(vorbis) +list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") + # Required modules include(GNUInstallDirs) include(CheckIncludeFiles) +include(CheckLibraryExists) # Build options option(BUILD_SHARED_LIBS "Build shared library" OFF) @@ -15,6 +18,8 @@ if(BUILD_FRAMEWORK) set(BUILD_SHARED_LIBS TRUE) endif() +option(INSTALL_CMAKE_PACKAGE_MODULE "Install CMake package configiguration module" ON) + # Extract project version from configure.ac file(READ configure.ac CONFIGURE_AC_CONTENTS) string(REGEX MATCH "AC_INIT\\(\\[libvorbis\\],\\[([0-9]*).([0-9]*).([0-9]*)" DUMMY ${CONFIGURE_AC_CONTENTS}) @@ -52,18 +57,12 @@ endfunction() message(STATUS "Configuring ${PROJECT_NAME} ${PROJECT_VERSION}") +# Find math library + +check_library_exists(m floor "" HAVE_LIBM) + # Find ogg dependency -if(NOT OGG_ROOT) - find_package(PkgConfig QUIET) - pkg_check_modules(PC_OGG QUIET ogg) - find_path(OGG_INCLUDE_DIRS NAMES ogg/ogg.h HINTS ${PC_OGG_INCLUDE_DIRS} PATH_SUFFIXES ogg) - find_library(OGG_LIBRARIES NAMES ogg HINTS ${PC_OGG_LIBRARY_DIRS}) -else() - find_path(OGG_INCLUDE_DIRS NAMES ogg/ogg.h HINTS ${OGG_ROOT}/include PATH_SUFFIXES ogg) - find_library(OGG_LIBRARIES NAMES ogg HINTS ${OGG_ROOT}/lib ${OGG_ROOT}/lib64) -endif() -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(OGG DEFAULT_MSG OGG_INCLUDE_DIRS OGG_LIBRARIES) +find_package(Ogg REQUIRED) add_subdirectory(lib) diff --git a/COPYING b/COPYING index 153b926a1..fb456a87b 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,4 @@ -Copyright (c) 2002-2018 Xiph.org Foundation +Copyright (c) 2002-2020 Xiph.org Foundation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/Makefile.am b/Makefile.am index c35131a6e..359a70199 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,9 +25,8 @@ EXTRA_DIST = \ vorbis-uninstalled.pc.in \ vorbisenc-uninstalled.pc.in \ vorbisfile-uninstalled.pc.in \ - symbian \ - macosx win32 - + symbian macosx win32 \ + CMakeLists.txt cmake/FindOgg.cmake cmake/VorbisConfig.cmake.in DISTCHECK_CONFIGURE_FLAGS = --enable-docs diff --git a/README.md b/README.md index 5e7e50107..30c88d391 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Vorbis +[![GitLab Build Status](https://gitlab.xiph.org/xiph/vorbis/badges/master/pipeline.svg)](https://gitlab.xiph.org/xiph/vorbis/-/pipelines) [![Travis Build Status](https://travis-ci.org/xiph/vorbis.svg?branch=master)](https://travis-ci.org/xiph/vorbis) -[![Jenkins Build Status](https://mf4.xiph.org/jenkins/job/libvorbis/badge/icon)](https://mf4.xiph.org/jenkins/job/libvorbis/) [![AppVeyor Build status](https://ci.appveyor.com/api/projects/status/github/xiph/vorbis?branch=master&svg=true)](https://ci.appveyor.com/project/rillian/vorbis) Vorbis is a general purpose audio and music encoding format @@ -17,7 +17,7 @@ This package contains: - libvorbis, a BSD-style license software implementation of the Vorbis specification by the Xiph.Org Foundation - (https://www.xiph.org/) + (https://xiph.org/) - libvorbisfile, a BSD-style license convenience library built on Vorbis designed to simplify common uses @@ -58,19 +58,17 @@ Directory: ## Contact ## -The Ogg homepage is located at 'https://www.xiph.org/ogg/'. -Vorbis's homepage is located at 'https://www.xiph.org/vorbis/'. +The Ogg homepage is located at 'https://xiph.org/ogg/'. +Vorbis's homepage is located at 'https://xiph.org/vorbis/'. Up to date technical documents, contact information, source code and pre-built utilities may be found there. -The user website for Ogg Vorbis software and audio is http://vorbis.com/ - ## Building ## #### Building from master #### Development source is under git revision control at -https://git.xiph.org/vorbis.git. You will also need the +https://gitlab.xiph.org/xiph/vorbis.git. You will also need the newest versions of autoconf, automake, libtool and pkg-config in order to compile Vorbis from development source. A configure script is provided for you in the source tarball distributions. @@ -107,8 +105,8 @@ after normal configuring: ## Building with CMake ## -Ogg supports building using [CMake](http://www.cmake.org/). CMake is a meta build system that generates native projects for each platform. -To generate projects just run cmake replacing `YOUR-PROJECT-GENERATOR` with a proper generator from a list [here](http://www.cmake.org/cmake/help/v3.2/manual/cmake-generators.7.html): +Ogg supports building using [CMake](https://cmake.org/). CMake is a meta build system that generates native projects for each platform. +To generate projects just run cmake replacing `YOUR-PROJECT-GENERATOR` with a proper generator from a list [here](https://cmake.org/cmake/help/latest/manual/cmake-generators.7.html): cmake -G YOUR-PROJECT-GENERATOR . @@ -145,5 +143,5 @@ USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. -THE OggVorbis SOURCE CODE IS COPYRIGHT (C) 1994-2018 -by the Xiph.Org Foundation https://www.xiph.org/ +THE OggVorbis SOURCE CODE IS COPYRIGHT (C) 1994-2020 +by the Xiph.Org Foundation https://xiph.org/ diff --git a/appveyor.yml b/appveyor.yml index 158b9e628..154c3c26a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,7 +12,7 @@ environment: install: - git clone -q https://github.com/xiph/ogg.git %APPVEYOR_BUILD_FOLDER%\..\libogg -- if "%BUILD_SYSTEM%"=="MSVC" msbuild "%APPVEYOR_BUILD_FOLDER%\..\libogg\win32\VS2015\libogg_static.sln" /m /v:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /property:Configuration=%CONFIGURATION%;Platform=%PLATFORM% +- if "%BUILD_SYSTEM%"=="MSVC" msbuild "%APPVEYOR_BUILD_FOLDER%\..\libogg\win32\VS2015\libogg.sln" /m /v:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" /property:Configuration=%CONFIGURATION%;Platform=%PLATFORM% - if "%BUILD_SYSTEM%"=="CMAKE" mkdir "%APPVEYOR_BUILD_FOLDER%\..\libogg\build" - if "%BUILD_SYSTEM%"=="CMAKE" pushd "%APPVEYOR_BUILD_FOLDER%\..\libogg\build" - if "%BUILD_SYSTEM%"=="CMAKE" cmake -A "%PLATFORM%" -G "Visual Studio 14 2015" -DCMAKE_INSTALL_PREFIX="%APPVEYOR_BUILD_FOLDER%\..\libogg\install" .. diff --git a/cmake/FindOgg.cmake b/cmake/FindOgg.cmake new file mode 100644 index 000000000..ebcd7d4e2 --- /dev/null +++ b/cmake/FindOgg.cmake @@ -0,0 +1,94 @@ +#[=======================================================================[.rst: + +FindOgg +-------- + +Find the native Ogg includes and library. + +IMPORTED Targets +^^^^^^^^^^^^^^^^ + +This module defines :prop_tgt:`IMPORTED` target ``Ogg::ogg``, if +Ogg has been found. + +Result Variables +^^^^^^^^^^^^^^^^ + +This module defines the following variables: + +:: + + OGG_INCLUDE_DIRS - where to find ogg.h, etc. + OGG_LIBRARIES - List of libraries when using ogg. + OGG_FOUND - True if ogg found. + +:: + + OGG_VERSION_STRING - The version of ogg found (x.y.z) + +Hints +^^^^^ + +A user may set ``OGG_ROOT`` to a ogg installation root to tell this +module where to look. +#]=======================================================================] + +if(OGG_INCLUDE_DIR) + # Already in cache, be silent + set(OGG_FIND_QUIETLY TRUE) +endif() + +find_package(PkgConfig QUIET) +pkg_check_modules(PC_OGG QUIET ogg) + +set(OGG_VERSION_STRING ${PC_OGG_VERSION}) + +find_path(OGG_INCLUDE_DIR ogg/ogg.h + HINTS + ${PC_OGG_INCLUDEDIR} + ${PC_OGG_INCLUDE_DIRS} + ${OGG_ROOT} + PATH_SUFFIXES + include +) +# MSVC built ogg may be named ogg_static. +# The provided project files name the library with the lib prefix. +find_library(OGG_LIBRARY + NAMES + ogg + ogg_static + libogg + libogg_static + HINTS + ${PC_OGG_LIBDIR} + ${PC_OGG_LIBRARY_DIRS} + ${OGG_ROOT} + PATH_SUFFIXES + lib +) + +# Handle the QUIETLY and REQUIRED arguments and set OGG_FOUND +# to TRUE if all listed variables are TRUE. +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(Ogg + REQUIRED_VARS + OGG_LIBRARY + OGG_INCLUDE_DIR + VERSION_VAR + OGG_VERSION_STRING +) + +if(OGG_FOUND) + set(OGG_LIBRARIES ${OGG_LIBRARY}) + set(OGG_INCLUDE_DIRS ${OGG_INCLUDE_DIR}) + + if(NOT TARGET Ogg::ogg) + add_library(Ogg::ogg UNKNOWN IMPORTED) + set_target_properties(Ogg::ogg PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${OGG_INCLUDE_DIRS}" + IMPORTED_LOCATION "${OGG_LIBRARIES}" + ) + endif() +endif() + +mark_as_advanced(OGG_INCLUDE_DIR OGG_LIBRARY) diff --git a/cmake/VorbisConfig.cmake.in b/cmake/VorbisConfig.cmake.in new file mode 100644 index 000000000..6fc079415 --- /dev/null +++ b/cmake/VorbisConfig.cmake.in @@ -0,0 +1,19 @@ +@PACKAGE_INIT@ + +include(CMakeFindDependencyMacro) +find_dependency(Ogg REQUIRED) + +include(${CMAKE_CURRENT_LIST_DIR}/VorbisTargets.cmake) + +set(Vorbis_Vorbis_FOUND 1) +set(Vorbis_Enc_FOUND 0) +set(Vorbis_File_FOUND 0) + +if(TARGET Vorbis::vorbisenc) + set(Vorbis_Enc_FOUND TRUE) +endif() +if(TARGET Vorbis::vorbisfile) + set(Vorbis_File_FOUND TRUE) +endif() + +check_required_components(Vorbis Enc File) diff --git a/configure.ac b/configure.ac index 28b0a141e..14a267f89 100644 --- a/configure.ac +++ b/configure.ac @@ -5,13 +5,13 @@ dnl Initialization and Versioning dnl ------------------------------------------------ -AC_INIT([libvorbis],[1.3.6],[vorbis-dev@xiph.org]) +AC_INIT([libvorbis],[1.3.7],[vorbis-dev@xiph.org]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([lib/mdct.c]) -AC_CANONICAL_TARGET([]) +AC_CANONICAL_HOST AM_INIT_AUTOMAKE AM_MAINTAINER_MODE @@ -29,15 +29,15 @@ dnl - interfaces added -> increment AGE dnl - interfaces removed -> AGE = 0 V_LIB_CURRENT=4 -V_LIB_REVISION=8 +V_LIB_REVISION=9 V_LIB_AGE=4 VF_LIB_CURRENT=6 -VF_LIB_REVISION=7 +VF_LIB_REVISION=8 VF_LIB_AGE=3 VE_LIB_CURRENT=2 -VE_LIB_REVISION=11 +VE_LIB_REVISION=12 VE_LIB_AGE=0 AC_SUBST(V_LIB_CURRENT) diff --git a/contrib/oss-fuzz/build.sh b/contrib/oss-fuzz/build.sh new file mode 100755 index 000000000..1f76b4a3e --- /dev/null +++ b/contrib/oss-fuzz/build.sh @@ -0,0 +1,23 @@ +#!/bin/bash -eu + +pushd $SRC +mv people.xiph.org/*.ogg decode_corpus/ +zip -r "$OUT/decode_fuzzer_seed_corpus.zip" decode_corpus/ +popd + +pushd $SRC/ogg +./autogen.sh +./configure --prefix="$WORK" --enable-static --disable-shared --disable-crc +make clean +make -j$(nproc) +make install +popd + + +./autogen.sh +./configure --prefix="$WORK" --enable-static --disable-shared +make clean +make -j$(nproc) +make install + +$CXX $CXXFLAGS $SRC/vorbis/contrib/oss-fuzz/decode_fuzzer.cc -o $OUT/decode_fuzzer -L"$WORK/lib" -I"$WORK/include" $LIB_FUZZING_ENGINE -lvorbisfile -lvorbis -logg diff --git a/contrib/oss-fuzz/decode_fuzzer.cc b/contrib/oss-fuzz/decode_fuzzer.cc new file mode 100644 index 000000000..b8840c145 --- /dev/null +++ b/contrib/oss-fuzz/decode_fuzzer.cc @@ -0,0 +1,48 @@ +#include +#include +#include +#include + +struct vorbis_data { + const uint8_t *current; + const uint8_t *data; + size_t size; +}; + +size_t read_func(void *ptr, size_t size1, size_t size2, void *datasource) { + vorbis_data* vd = (vorbis_data *)(datasource); + size_t len = size1 * size2; + if (vd->current + len > vd->data + vd->size) { + len = vd->data + vd->size - vd->current; + } + memcpy(ptr, vd->current, len); + vd->current += len; + return len; +} + + +extern "C" int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size) { + ov_callbacks memory_callbacks = {0}; + memory_callbacks.read_func = read_func; + vorbis_data data_st; + data_st.size = Size; + data_st.current = Data; + data_st.data = Data; + OggVorbis_File vf; + int result = ov_open_callbacks(&data_st, &vf, NULL, 0, memory_callbacks); + if (result < 0) { + return 0; + } + int current_section = 0; + int eof = 0; + char buf[4096]; + int read_result; + while (!eof) { + read_result = ov_read(&vf, buf, sizeof(buf), 0, 2, 1, ¤t_section); + if (read_result != OV_HOLE && read_result <= 0) { + eof = 1; + } + } + ov_clear(&vf); + return 0; +} diff --git a/debian/copyright b/debian/copyright index 2080282ea..c6bf857ed 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,13 +1,13 @@ This package was debianized by Christopher L Cheney on Tue, 31 Oct 2000 15:08:22 -0600. -It was downloaded from http://www.vorbis.com/download_unix.psp +It was downloaded from https://downloads.xiph.org/releases/vorbis/ Upstream Author: Monty Copyright: -Copyright (c) 2002, Xiph.org Foundation +Copyright (c) 2020, Xiph.org Foundation Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/debian/watch b/debian/watch index 1bcd74cf9..3a050841c 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=2 -http://downloads.xiph.org/releases/vorbis/libvorbis-(.*)\.tar\.gz debian uupdate +https://downloads.xiph.org/releases/vorbis/libvorbis-(.*)\.tar\.gz debian uupdate diff --git a/doc/05-comment.tex b/doc/05-comment.tex index 8c804d7b9..7e5445534 100644 --- a/doc/05-comment.tex +++ b/doc/05-comment.tex @@ -119,12 +119,9 @@ \subsubsection{Content vector format} Copyright attribution, e.g., '2001 Nobody's Band' or '1999 Jack Moffitt' \item[LICENSE] - License information, eg, 'All Rights Reserved', 'Any + License information, for example, 'All Rights Reserved', 'Any Use Permitted', a URL to a license such as a Creative Commons license -("www.creativecommons.org/blahblah/license.html") or the EFF Open -Audio License ('distributed under the terms of the Open Audio -License. see http://www.eff.org/IP/Open\_licenses/eff\_oal.html for -details'), etc. +(e.g. "creativecommons.org/license/by/4.0/") or similar. \item[ORGANIZATION] Name of the organization producing the track (i.e. @@ -147,7 +144,7 @@ \subsubsection{Content vector format} \item[ISRC] International Standard Recording Code for the -track; see \href{http://www.ifpi.org/isrc/}{the ISRC +track; see \href{https://isrc.ifpi.org/}{the ISRC intro page} for more information on ISRC numbers. \end{description} diff --git a/doc/Makefile.am b/doc/Makefile.am index 0e96ba1e7..3f1424797 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -27,6 +27,22 @@ static_docs = \ vorbis-fidelity.html # bits needed by the spec +SPEC_TEX = \ + Vorbis_I_spec.tex \ + 01-introduction.tex \ + 02-bitpacking.tex \ + 03-codebook.tex \ + 04-codec.tex \ + 05-comment.tex \ + 06-floor0.tex \ + 07-floor1.tex \ + 08-residue.tex \ + 09-helper.tex \ + 10-tables.tex \ + a1-encapsulation-ogg.tex \ + a2-encapsulation-rtp.tex \ + footer.tex + SPEC_PNG = \ components.png \ floor1-1.png \ @@ -38,7 +54,10 @@ SPEC_PNG = \ residue-pack.png \ residue2.png \ window1.png \ - window2.png \ + window2.png + +# Figure images generated by htlatex +built_SPEC_PNG = \ Vorbis_I_spec0x.png \ Vorbis_I_spec1x.png \ Vorbis_I_spec2x.png \ @@ -55,23 +74,9 @@ SPEC_PNG = \ Vorbis_I_spec13x.png \ Vorbis_I_spec14x.png -SPEC_TEX = \ - Vorbis_I_spec.tex \ - 01-introduction.tex \ - 02-bitpacking.tex \ - 03-codebook.tex \ - 04-codec.tex \ - 05-comment.tex \ - 06-floor0.tex \ - 07-floor1.tex \ - 08-residue.tex \ - 09-helper.tex \ - 10-tables.tex \ - a1-encapsulation-ogg.tex \ - a2-encapsulation-rtp.tex \ - footer.tex -built_docs = Vorbis_I_spec.pdf Vorbis_I_spec.html Vorbis_I_spec.css +built_docs = Vorbis_I_spec.pdf \ + Vorbis_I_spec.html Vorbis_I_spec.css $(built_SPEC_PNG) # conditionally make the generated documentation if BUILD_DOCS @@ -91,9 +96,8 @@ CLEANFILES = $(SPEC_TEX:%.tex=%.aux) \ Vorbis_I_spec.lg Vorbis_I_spec.log \ Vorbis_I_spec.out Vorbis_I_spec.tmp \ Vorbis_I_spec.toc Vorbis_I_spec.xref \ + Vorbis_I_spec.out.ps \ zzVorbis_I_spec.ps -DISTCLEANFILES = $(built_docs) - # explicit rules for generating docs if BUILD_DOCS diff --git a/doc/Vorbis_I_spec.html b/doc/Vorbis_I_spec.html index 629b2fb4e..a1d9496ff 100644 --- a/doc/Vorbis_I_spec.html +++ b/doc/Vorbis_I_spec.html @@ -7,7 +7,6 @@ - @@ -15,15 +14,12 @@ - - -

Vorbis I specification

Xiph.Org Foundation

February 27, 2015
+class="cmr-17">July 4, 2020

Contents

@@ -248,19 +244,19 @@

1. Introduction and Description

-

+

1.1. Overview

-

This document provides a high level description of the Vorbis codec’s construction. A bit-by-bit +

This document provides a high level description of the Vorbis codec’s construction. A bit-by-bit specification appears beginning in section 4, “Codec Setup and Packet Decode”. The later sections assume a high-level understanding of the Vorbis decode process, which is provided here. -

+

1.1.1. Application
-

Vorbis is a general purpose perceptual audio CODEC intended to allow maximum encoder +

Vorbis is a general purpose perceptual audio CODEC intended to allow maximum encoder flexibility, thus allowing it to scale competitively over an exceptionally wide range of bitrates. At the high quality/bitrate end of the scale (CD or DAT rate stereo, 16/24 bits) it is in the same league as MPEG-2 and MPC. Similarly, the 1.0 encoder can encode high-quality CD and DAT @@ -268,27 +264,27 @@

1.1.1.

+

1.1.2. Classification
-

Vorbis I is a forward-adaptive monolithic transform CODEC based on the Modified Discrete +

Vorbis I is a forward-adaptive monolithic transform CODEC based on the Modified Discrete Cosine Transform. The codec is structured to allow addition of a hybrid wavelet filterbank in Vorbis II to offer better transient response and reproduction using a transform better suited to localized time events. -

+

1.1.3. Assumptions
-

The Vorbis CODEC design assumes a complex, psychoacoustically-aware encoder and simple, +

The Vorbis CODEC design assumes a complex, psychoacoustically-aware encoder and simple, low-complexity decoder. Vorbis decode is computationally simpler than mp3, although it does require more working memory as Vorbis has no static probability model; the vector codebooks used in the first stage of decoding from the bitstream are packed in their entirety into the Vorbis bitstream headers. In packed form, these codebooks occupy only a few kilobytes; the extent to which they are pre-decoded into a cache is the dominant factor in decoder memory usage. -

Vorbis provides none of its own framing, synchronization or protection against errors; it +

Vorbis provides none of its own framing, synchronization or protection against errors; it is solely a method of accepting input audio, dividing it into individual frames and compressing these frames into raw, unformatted ’packets’. The decoder then accepts these raw packets in sequence, decodes them, synthesizes audio frames from them, and @@ -299,121 +295,121 @@

1.1.3.

Vorbis packets are thus intended to be used with a transport mechanism that provides free-form +

Vorbis packets are thus intended to be used with a transport mechanism that provides free-form framing, sync, positioning and error correction in accordance with these design assumptions, such as Ogg (for file transport) or RTP (for network multicast). For purposes of a few examples in this document, we will assume that Vorbis is to be embedded in an Ogg stream specifically, although this is by no means a requirement or fundamental assumption in the Vorbis design. -

The specification for embedding Vorbis into an Ogg transport stream is in

The specification for embedding Vorbis into an Ogg transport stream is in section A, “Embedding Vorbis into an Ogg stream”. -

+

1.1.4. Codec Setup and Probability Model
-

Vorbis’ heritage is as a research CODEC and its current design reflects a desire to allow multiple +

Vorbis’ heritage is as a research CODEC and its current design reflects a desire to allow multiple decades of continuous encoder improvement before running out of room within the codec specification. For these reasons, configurable aspects of codec setup intentionally lean toward the extreme of forward adaptive. -

The single most controversial design decision in Vorbis (and the most unusual for a Vorbis +

The single most controversial design decision in Vorbis (and the most unusual for a Vorbis developer to keep in mind) is that the entire probability model of the codec, the Huffman and VQ codebooks, is packed into the bitstream header along with extensive CODEC setup parameters (often several hundred fields). This makes it impossible, as it would be with MPEG audio layers, to embed a simple frame type flag in each audio packet, or begin decode at any frame in the stream without having previously fetched the codec setup header. -

Note: Vorbis can initiate decode at any arbitrary packet within a bitstream so long as the codec has been initialized/setup with the setup headers. -

Thus, Vorbis headers are both required for decode to begin and relatively large as bitstream +

Thus, Vorbis headers are both required for decode to begin and relatively large as bitstream headers go. The header size is unbounded, although for streaming a rule-of-thumb of 4kB or less is recommended (and Xiph.Org’s Vorbis encoder follows this suggestion). -

Our own design work indicates the primary liability of the required header is in mindshare; it is +

Our own design work indicates the primary liability of the required header is in mindshare; it is an unusual design and thus causes some amount of complaint among engineers as this runs against current design trends (and also points out limitations in some existing software/interface designs, such as Windows’ ACM codec framework). However, we find that it does not fundamentally limit Vorbis’ suitable application space. -

+

1.1.5. Format Specification
-

The Vorbis format is well-defined by its decode specification; any encoder that produces packets +

The Vorbis format is well-defined by its decode specification; any encoder that produces packets that are correctly decoded by the reference Vorbis decoder described below may be considered a proper Vorbis encoder. A decoder must faithfully and completely implement the specification defined below (except where noted) to be considered a proper Vorbis decoder. -

+

1.1.6. Hardware Profile
-

Although Vorbis decode is computationally simple, it may still run into specific limitations of an +

Although Vorbis decode is computationally simple, it may still run into specific limitations of an embedded design. For this reason, embedded designs are allowed to deviate in limited ways from the ‘full’ decode specification yet still be certified compliant. These optional omissions are labelled in the spec where relevant. -

+

1.2. Decoder Configuration

-

Decoder setup consists of configuration of multiple, self-contained component abstractions that +

Decoder setup consists of configuration of multiple, self-contained component abstractions that perform specific functions in the decode pipeline. Each different component instance of a specific type is semantically interchangeable; decoder configuration consists both of internal component configuration, as well as arrangement of specific instances into a decode pipeline. Componentry arrangement is roughly as follows:

-

+

-

PIC

Figure 1: decoder pipeline configuration
-

+

1.2.1. Global Config
-

Global codec configuration consists of a few audio related fields (sample rate, channels), Vorbis +

Global codec configuration consists of a few audio related fields (sample rate, channels), Vorbis version (always ’0’ in Vorbis I), bitrate hints, and the lists of component instances. All other configuration is in the context of specific components. -

+

1.2.2. Mode
-

Each Vorbis frame is coded according to a master ’mode’. A bitstream may use one or many +

Each Vorbis frame is coded according to a master ’mode’. A bitstream may use one or many modes. -

The mode mechanism is used to encode a frame according to one of multiple possible +

The mode mechanism is used to encode a frame according to one of multiple possible methods with the intention of choosing a method best suited to that frame. Different modes are, e.g. how frame size is changed from frame to frame. The mode number of a frame serves as a top level configuration switch for all other specific aspects of frame decode. -

A ’mode’ configuration consists of a frame size setting, window type (always 0, the Vorbis +

A ’mode’ configuration consists of a frame size setting, window type (always 0, the Vorbis window, in Vorbis I), transform type (always type 0, the MDCT, in Vorbis I) and a mapping number. The mapping number specifies which mapping configuration instance to use for low-level packet decode and synthesis. -

+

1.2.3. Mapping
-

A mapping contains a channel coupling description and a list of ’submaps’ that bundle sets +

A mapping contains a channel coupling description and a list of ’submaps’ that bundle sets of channel vectors together for grouped encoding and decoding. These submaps are not references to external components; the submap list is internal and specific to a mapping. -

A ’submap’ is a configuration/grouping that applies to a subset of floor and residue vectors +

A ’submap’ is a configuration/grouping that applies to a subset of floor and residue vectors within a mapping. The submap functions as a last layer of indirection such that specific special floor or residue settings can be applied not only to all the vectors in a given mode, but also specific vectors in a specific mode. Each submap specifies the proper floor and residue instance number to use for decoding that submap’s spectral floor and spectral residue vectors. -

As an example: -

Assume a Vorbis stream that contains six channels in the standard 5.1 format. The sixth +

As an example: +

Assume a Vorbis stream that contains six channels in the standard 5.1 format. The sixth channel, as is normal in 5.1, is bass only. Therefore it would be wasteful to encode a full-spectrum version of it as with the other channels. The submapping mechanism can be used to apply a full range floor and residue encoding to channels 0 through 4, and a bass-only @@ -423,66 +419,66 @@

1.2.3.

+

1.2.4. Floor
-

Vorbis encodes a spectral ’floor’ vector for each PCM channel. This vector is a low-resolution +

Vorbis encodes a spectral ’floor’ vector for each PCM channel. This vector is a low-resolution representation of the audio spectrum for the given channel in the current frame, generally used akin to a whitening filter. It is named a ’floor’ because the Xiph.Org reference encoder has historically used it as a unit-baseline for spectral resolution. -

A floor encoding may be of two types. Floor 0 uses a packed LSP representation on a dB +

A floor encoding may be of two types. Floor 0 uses a packed LSP representation on a dB amplitude scale and Bark frequency scale. Floor 1 represents the curve as a piecewise linear interpolated representation on a dB amplitude scale and linear frequency scale. The two floors are semantically interchangeable in encoding/decoding. However, floor type 1 provides more stable inter-frame behavior, and so is the preferred choice in all coupled-stereo and high bitrate modes. Floor 1 is also considerably less expensive to decode than floor 0. -

Floor 0 is not to be considered deprecated, but it is of limited modern use. No known Vorbis +

Floor 0 is not to be considered deprecated, but it is of limited modern use. No known Vorbis encoder past Xiph.Org’s own beta 4 makes use of floor 0. -

The values coded/decoded by a floor are both compactly formatted and make use of entropy +

The values coded/decoded by a floor are both compactly formatted and make use of entropy coding to save space. For this reason, a floor configuration generally refers to multiple codebooks in the codebook component list. Entropy coding is thus provided as an abstraction, and each floor instance may choose from any and all available codebooks when coding/decoding. -

+

1.2.5. Residue
-

The spectral residue is the fine structure of the audio spectrum once the floor curve has been +

The spectral residue is the fine structure of the audio spectrum once the floor curve has been subtracted out. In simplest terms, it is coded in the bitstream using cascaded (multi-pass) vector quantization according to one of three specific packing/coding algorithms numbered 0 through 2. The packing algorithm details are configured by residue instance. As with the floor components, the final VQ/entropy encoding is provided by external codebook instances and each residue instance may choose from any and all available codebooks. -

+

1.2.6. Codebooks
-

Codebooks are a self-contained abstraction that perform entropy decoding and, optionally, use +

Codebooks are a self-contained abstraction that perform entropy decoding and, optionally, use the entropy-decoded integer value as an offset into an index of output value vectors, returning the indicated vector of values. -

The entropy coding in a Vorbis I codebook is provided by a standard Huffman binary tree +

The entropy coding in a Vorbis I codebook is provided by a standard Huffman binary tree representation. This tree is tightly packed using one of several methods, depending on whether codeword lengths are ordered or unordered, or the tree is sparse. -

The codebook vector index is similarly packed according to index characteristic. Most commonly, +

The codebook vector index is similarly packed according to index characteristic. Most commonly, the vector index is encoded as a single list of values of possible values that are then permuted into a list of n-dimensional rows (lattice VQ). -

+

1.3. High-level Decode Process

-

+

1.3.1. Decode Setup
-

Before decoding can begin, a decoder must initialize using the bitstream headers matching the +

Before decoding can begin, a decoder must initialize using the bitstream headers matching the stream to be decoded. Vorbis uses three header packets; all are required, in-order, by this specification. Once set up, decode may begin at any audio packet belonging to the Vorbis stream. In Vorbis I, all packets after the three initial headers are audio packets. -

The header packets are, in order, the identification header, the comments header, and the setup +

The header packets are, in order, the identification header, the comments header, and the setup header. -

Identification Header The identification header identifies the bitstream as Vorbis, Vorbis version, and the simple audio @@ -490,7 +486,7 @@

1.3.1.

Comment Header The comment header includes user text comments (“tags”) and a vendor string for the @@ -498,15 +494,15 @@

1.3.1. section 5, “comment field and header specification”. -

Setup Header The setup header includes extensive CODEC setup information as well as the complete VQ and Huffman codebooks needed for decode. -

+

1.3.2. Decode Procedure
-

The decoding and synthesis procedure for all audio packets is fundamentally the same. +

The decoding and synthesis procedure for all audio packets is fundamentally the same.

1.
decode packet type flag @@ -547,33 +543,33 @@
1.3.2.
12.
if not first frame, return results of overlap/add as audio result of current frame
-

Note that clever rearrangement of the synthesis arithmetic is possible; as an example, one can +

Note that clever rearrangement of the synthesis arithmetic is possible; as an example, one can take advantage of symmetries in the MDCT to store the right-hand transform data of a partial MDCT for a 50% inter-frame buffer space savings, and then complete the transform later before overlap/add with the next frame. This optimization produces entirely equivalent output and is naturally perfectly legal. The decoder must be entirely mathematically equivalent to the specification, it need not be a literal semantic implementation. -

Packet type decode Vorbis I uses four packet types. The first three packet types mark each of the three Vorbis headers described above. The fourth packet type marks an audio packet. All other packet types are reserved; packets marked with a reserved type should be ignored. -

Following the three header packets, all packets in a Vorbis I stream are audio. The first step of +

Following the three header packets, all packets in a Vorbis I stream are audio. The first step of audio packet decode is to read and verify the packet type; a non-audio packet when audio is expected indicates stream corruption or a non-compliant stream. The decoder must ignore the packet and not attempt decoding it to audio. -

Mode decode Vorbis allows an encoder to set up multiple, numbered packet ’modes’, as described earlier, all of which may be used in a given Vorbis stream. The mode is encoded as an integer used as a direct offset into the mode instance index. -

Window shape decode (long windows only) Vorbis frames may be one of two PCM sample sizes specified during codec setup. In Vorbis I, @@ -583,35 +579,35 @@

1.3.2.

Vorbis uses an overlapping transform, namely the MDCT, to blend one frame into the next, +

Vorbis uses an overlapping transform, namely the MDCT, to blend one frame into the next, avoiding most inter-frame block boundary artifacts. The MDCT output of one frame is windowed according to MDCT requirements, overlapped 50% with the output of the previous frame and added. The window shape assures seamless reconstruction. -

This is easy to visualize in the case of equal sized-windows: +

This is easy to visualize in the case of equal sized-windows:

-

+

-

PIC

Figure 2: overlap of two equal-sized windows
-

And slightly more complex in the case of overlapping unequal sized windows: +

And slightly more complex in the case of overlapping unequal sized windows:

-

+

-

PIC

Figure 3: overlap of a long and a short window
-

In the unequal-sized window case, the window shape of the long window must be modified for +

In the unequal-sized window case, the window shape of the long window must be modified for seamless lapping as above. It is possible to correctly infer window shape to be applied to the current window from knowing the sizes of the current, previous and next window. It is legal for a decoder to use this method. However, in the case of a long window (short windows require no @@ -620,7 +616,7 @@

1.3.2.

A description of valid window functions for use with an inverse MDCT can be found in [

A description of valid window functions for use with an inverse MDCT can be found in [1]. Vorbis windows all use the slope function

@@ -630,14 +626,14 @@
1.3.2.
-

-

+

floor decode Each floor is encoded/decoded in channel order, however each floor belongs to a ’submap’ that specifies which floor configuration to use. All floors are decoded before residue decode begins. -

residue decode Although the number of residue vectors equals the number of channels, channel coupling may @@ -645,10 +641,10 @@

1.3.2.

Vorbis codes residue vectors in groups by submap; the coding is done in submap order from +

Vorbis codes residue vectors in groups by submap; the coding is done in submap order from submap 0 through n-1. This differs from floors which are coded using a configuration provided by submap number, but are coded individually in channel order. -

inverse channel coupling A detailed discussion of stereo in the Vorbis codec can be found in the document @@ -656,17 +652,17 @@

1.3.2. Stereo Channel Coupling in the Vorbis CODEC. Vorbis is not limited to only stereo coupling, but the stereo document also gives a good overview of the generic coupling mechanism. -

Vorbis coupling applies to pairs of residue vectors at a time; decoupling is done in-place a +

Vorbis coupling applies to pairs of residue vectors at a time; decoupling is done in-place a pair at a time in the order and using the vectors specified in the current mapping configuration. The decoupling operation is the same for all pairs, converting square polar representation (where one vector is magnitude and the second angle) back to Cartesian representation. -

After decoupling, in order, each pair of vectors on the coupling list, the resulting residue vectors +

After decoupling, in order, each pair of vectors on the coupling list, the resulting residue vectors represent the fine spectral detail of each output channel. -

generate floor curve The decoder may choose to generate the floor curve at any appropriate time. It is reasonable to @@ -674,20 +670,20 @@

1.3.2.

Both floor 0 and floor 1 generate a linear-range, linear-domain output vector to be multiplied +

Both floor 0 and floor 1 generate a linear-range, linear-domain output vector to be multiplied (dot product) by the linear-range, linear-domain spectral residue. -

compute floor/residue dot product This step is straightforward; for each output channel, the decoder multiplies the floor curve and residue vectors element by element, producing the finished audio spectrum of each channel. -

One point is worth mentioning about this dot product; a common mistake in a fixed point +

One point is worth mentioning about this dot product; a common mistake in a fixed point implementation might be to assume that a 32 bit fixed-point representation for floor and residue and direct multiplication of the vectors is sufficient for acceptable spectral depth in all cases because it happens to mostly work with the current Xiph.Org reference encoder. -

However, floor vector values can span

However, floor vector values can span ~140dB (~24 bits unsigned), and the audio spectrum vector should represent a minimum of 120dB (1.3.2.

inverse monolithic transform (MDCT) The audio spectrum is converted back into time domain PCM audio via an inverse Modified Discrete Cosine Transform (MDCT). A detailed description of the MDCT is available in [1]. -

Note that the PCM produced directly from the MDCT is not yet finished audio; it must be +

Note that the PCM produced directly from the MDCT is not yet finished audio; it must be lapped with surrounding frames using an appropriate window (such as the Vorbis window) before the MDCT can be considered orthogonal. -

overlap/add data Windowed MDCT output is overlapped and added with the right hand data of the previous @@ -725,12 +721,12 @@

1.3.2.

cache right hand data The decoder must cache the right hand portion of the current frame to be lapped with the left hand portion of the next frame. -

return finished audio data The overlapped portion produced from overlapping the previous and current frame data @@ -741,14 +737,17 @@

1.3.2.

+

1  window_blocksize(previous_window)/4+window_blocksize(current_window)/4
-

from the center of the previous window to the center of the current window. -

Data is not returned from the first frame; it must be used to ’prime’ the decode engine. The +class="cmtt-8">window_blocksize(previous_window)/4+window_blocksize(current_window)/4 +

from the center of the previous window to the center of the current window. +

Data is not returned from the first frame; it must be used to ’prime’ the decode engine. The encoder accounts for this priming when calculating PCM offsets; after the first frame, the proper PCM output offset is ’0’ (as no data has been returned yet). @@ -759,20 +758,20 @@

1.3.2. 2. Bitpacking Convention
-

+

2.1. Overview

-

The Vorbis codec uses relatively unstructured raw packets containing arbitrary-width binary +

The Vorbis codec uses relatively unstructured raw packets containing arbitrary-width binary integer fields. Logically, these packets are a bitstream in which bits are coded one-by-one by the encoder and then read one-by-one in the same monotonically increasing order by the decoder. Most current binary storage arrangements group bits into a native word size of eight bits (octets), sixteen bits, thirty-two bits or, less commonly other fixed word sizes. The Vorbis bitpacking convention specifies the correct mapping of the logical packet bitstream into an actual representation in fixed-width words. -

+

2.1.1. octets, bytes and words
-

In most contemporary architectures, a ’byte’ is synonymous with an ’octet’, that is, eight bits. +

In most contemporary architectures, a ’byte’ is synonymous with an ’octet’, that is, eight bits. This has not always been the case; seven, ten, eleven and sixteen bit ’bytes’ have been used. For purposes of the bitpacking convention, a byte implies the native, smallest integer storage representation offered by a platform. On modern platforms, this is generally @@ -780,45 +779,45 @@

2.1.1.

The most ubiquitous architectures today consider a ’byte’ to be an octet (eight bits) and a word +

The most ubiquitous architectures today consider a ’byte’ to be an octet (eight bits) and a word to be a group of two, four or eight bytes (16, 32 or 64 bits). Note however that the Vorbis bitpacking convention is still well defined for any native byte size; Vorbis uses the native bit-width of a given storage system. This document assumes that a byte is one octet for purposes of example. -

+

2.1.2. bit order
-

A byte has a well-defined ’least significant’ bit (LSb), which is the only bit set when the byte is +

A byte has a well-defined ’least significant’ bit (LSb), which is the only bit set when the byte is storing the two’s complement integer value +1. A byte’s ’most significant’ bit (MSb) is at the opposite end of the byte. Bits in a byte are numbered from zero at the LSb to n (n = 7 in an octet) for the MSb. -

+

2.1.3. byte order
-

Words are native groupings of multiple bytes. Several byte orderings are possible in a word; the +

Words are native groupings of multiple bytes. Several byte orderings are possible in a word; the common ones are 3-2-1-0 (’big endian’ or ’most significant byte first’ in which the highest-valued byte comes first), 0-1-2-3 (’little endian’ or ’least significant byte first’ in which the lowest value byte comes first) and less commonly 3-1-2-0 and 0-2-1-3 (’mixed endian’). -

The Vorbis bitpacking convention specifies storage and bitstream manipulation at the byte, not +

The Vorbis bitpacking convention specifies storage and bitstream manipulation at the byte, not word, level, thus host word ordering is of a concern only during optimization when writing high performance code that operates on a word of storage at a time rather than by byte. Logically, bytes are always coded and decoded in order from byte zero through byte n. -

+

2.1.4. coding bits into byte sequences
-

The Vorbis codec has need to code arbitrary bit-width integers, from zero to 32 bits +

The Vorbis codec has need to code arbitrary bit-width integers, from zero to 32 bits wide, into packets. These integer fields are not aligned to the boundaries of the byte representation; the next field is written at the bit position at which the previous field ends. -

The encoder logically packs integers by writing the LSb of a binary integer to the logical +

The encoder logically packs integers by writing the LSb of a binary integer to the logical bitstream first, followed by next least significant bit, etc, until the requested number of bits have been coded. When packing the bits into bytes, the encoder begins by placing the LSb of the integer to be written into the least significant unused bit position of @@ -831,19 +830,19 @@

2.1.4.

+

2.1.5. signedness
-

The signedness of a specific number resulting from decode is to be interpreted by the decoder +

The signedness of a specific number resulting from decode is to be interpreted by the decoder given decode context. That is, the three bit binary pattern ’b111’ can be taken to represent either ’seven’ as an unsigned integer, or ’-1’ as a signed, two’s complement integer. The encoder and decoder are responsible for knowing if fields are to be treated as signed or unsigned. -

+

2.1.6. coding example
-

Code the 4 bit integer value ’12’ [b1100] into an empty bytestream. Bytestream result: -

+

Code the 4 bit integer value ’12’ [b1100] into an empty bytestream. Bytestream result: +

12.1.6.       |
22.1.6.       V
3  
3
4 2.1.6.       7 6 52.1.6.  0
5  bytebyte 0 [0 02.1.6.  <-
6  bytebyte 1 [ 2.1.6. 7  bytebyte 2 [ 2.1.6.  ]
8  bytebyte 3 [ 2.1.6.       ...
10  bytebyte n [ 2.1.6.  1 byte
11  
-

Continue by coding the 3 bit integer value ’-1’ [b111]: -

+class="cmr-6">11 +

Continue by coding the 3 bit integer value ’-1’ [b111]: +

12.1.6.       |
22.1.6.       V
3  
3
4 2.1.6.       7 6 52.1.6.  0
5  bytebyte 0 [0 12.1.6.  <-
6  bytebyte 1 [ 2.1.6.     ] -
 ]
7  bytebyte 2 [ 2.1.6.     ]
 ] +
8  bytebyte 3 [ 2.1.6.       ...
10  bytebyte n [ 2.1.6.  == 1 byte
-

Continue by coding the 7 bit integer value ’17’ [b0010001]: -

+

Continue by coding the 7 bit integer value ’17’ [b0010001]: +

12.1.6.       |
22.1.6.       V
3  
3
4 2.1.6.       7 6 52.1.6.  0
5  bytebyte 0 [1 12.1.6.  0]
6  bytebyte 1 [0 02.1.6.  <-
7  bytebyte 2 [ 2.1.6. 8  bytebyte 3 [ 2.1.6.       ...
10  bytebyte n [ 2.1.6.       bit cursor == 6
-

Continue by coding the 13 bit integer value ’6969’ [b110 11001110 01]: -

+

Continue by coding the 13 bit integer value ’6969’ [b110 11001110 01]: +

12.1.6.       |
22.1.6.       V
3  
3
4 2.1.6.       7 6 52.1.6.  0
5  bytebyte 0 [1 12.1.6.  0]
6  bytebyte 1 [0 12.1.6. 7  bytebyte 2 [1 12.1.6.  0]
8  bytebyte 3 [0 02.1.6.       ...
10  bytebyte n [ 2.1.6.  4 bytes
11  
+class="cmr-6">11 -

+

2.1.7. decoding example
-

Reading from the beginning of the bytestream encoded in the above example: -

+

Reading from the beginning of the bytestream encoded in the above example: +

12.1.7.       |
22.1.7.       V
3  
3
4 2.1.7.       7 6 52.1.7.  0
5  bytebyte 0 [1 12.1.7.  0 0]  <- -
 <-
6  bytebyte 1 [0 12.1.7.  1 0 0 0]
 0] +
7  bytebyte 2 [1 12.1.7.  0]
8  bytebyte 3 [0 02.1.7.  4 bytes
9  
-

We read two, two-bit integer fields, resulting in the returned numbers ’b00’ and ’b11’. Two things +class="cmr-6">9 +

We read two, two-bit integer fields, resulting in the returned numbers ’b00’ and ’b11’. Two things are worth noting here:

-

+

2.1.8. end-of-packet alignment
-

The typical use of bitpacking is to produce many independent byte-aligned packets which are +

The typical use of bitpacking is to produce many independent byte-aligned packets which are embedded into a larger byte-aligned container structure, such as an Ogg transport bitstream. Externally, each bytestream (encoded bitstream) must begin and end on a byte boundary. Often, the encoded bitstream is not an integer number of bytes, and so there is unused (uncoded) space in the last byte of a packet. -

Unused space in the last byte of a bytestream is always zeroed during the coding process. Thus, +

Unused space in the last byte of a bytestream is always zeroed during the coding process. Thus, should this unused space be read, it will return binary zeroes. -

Attempting to read past the end of an encoded packet results in an ’end-of-packet’ condition. +

Attempting to read past the end of an encoded packet results in an ’end-of-packet’ condition. End-of-packet is not to be considered an error; it is merely a state indicating that there is insufficient remaining data to fulfill the desired read size. Vorbis uses truncated packets as a @@ -1753,10 +1672,10 @@

2.1.8.

+

2.1.9. reading zero bits
-

Reading a zero-bit-wide integer returns the value ’0’ and does not increment the stream cursor. +

Reading a zero-bit-wide integer returns the value ’0’ and does not increment the stream cursor. Reading to the end of the packet (but not past, such that an ’end-of-packet’ condition has not triggered) and then reading a zero bit integer shall succeed, returning 0, and not trigger an end-of-packet condition. Reading a zero-bit-wide integer after a previous read sets ’end-of-packet’ @@ -1769,28 +1688,28 @@

2.1.9. 3. Probability Model and Codebooks
-

+

3.1. Overview

-

Unlike practically every other mainstream audio codec, Vorbis has no statically configured +

Unlike practically every other mainstream audio codec, Vorbis has no statically configured probability model, instead packing all entropy decoding configuration, VQ and Huffman, into the bitstream itself in the third header, the codec setup header. This packed configuration consists of multiple ’codebooks’, each containing a specific Huffman-equivalent representation for decoding compressed codewords as well as an optional lookup table of output vector values to which a decoded Huffman value is applied as an offset, generating the final decoded output corresponding to a given compressed codeword. -

+

3.1.1. Bitwise operation
-

The codebook mechanism is built on top of the vorbis bitpacker. Both the codebooks themselves +

The codebook mechanism is built on top of the vorbis bitpacker. Both the codebooks themselves and the codewords they decode are unrolled from a packet as a series of arbitrary-width values read from the stream according to section 2, “Bitpacking Convention”. -

+

3.2. Packed codebook format

-

For purposes of the examples below, we assume that the storage system’s native byte width is +

For purposes of the examples below, we assume that the storage system’s native byte width is eight bits. This is not universally true; see section 2, “Bitpacking Convention” for discussion @@ -1798,16 +1717,15 @@

3.2.

+

3.2.1. codebook decode
-

A codebook begins with a 24 bit sync pattern, 0x564342: -

+

A codebook begins with a 24 bit sync pattern, 0x564342: +

1  bytebyte 0: [ 03.2.1.  (0x42)
2  bytebyte 1: [ 03.2.1.  (0x43)
3  bytebyte 2: [ 03.2.1.  0 ] (0x56)
-

16 bit [codebook_dimensions] and 24 bit [codebook_entries] fields: -

+

16 bit [codebook_dimensions] and 24 bit [codebook_entries] fields: +

1  
1
2  bytebyte 3: [ X3.2.1.  ]
3  bytebyte 4: [ X3.2.1.  X X ] [codebook_dimensions] [codebook_dimensions] (16 bit unsigned)
4   -
4
5  bytebyte 5: [ X3.2.1.  X X X ]
 ] +
6  bytebyte 6: [ X3.2.1.  ]
7  bytebyte 7: [ X3.2.1.  X X ] [codebook_entries] [codebook_entries] (24 bit unsigned)
8  
-

Next is the 8 +

Next is the [ordered] bit flag: -

+

1  
1
2  bytebyte 8: [ 3.2.1.  (1 bit)
3  
-

Each entry, numbering a total of [codebook_entries], is assigned a codeword length. +class="cmr-6">3 +

Each entry, numbering a total of [codebook_entries], is assigned a codeword length. We now read the list of codeword lengths and store these lengths in the array [codebook_codeword_lengths]. Decode of lengths is according to whether the [codebook_codeword_lengths]. Decode of lengths is according to whether the [ordered] flag is set or unset.

-

After all codeword lengths have been decoded, the decoder reads the vector lookup table. Vorbis +

After all codeword lengths have been decoded, the decoder reads the vector lookup table. Vorbis I supports three lookup types:

1.
3.2.1.
3.
Explicitly populated value mapping (tessellated or ’foam’ VQ)
-

The lookup table type is read as a four bit unsigned integer: +

The lookup table type is read as a four bit unsigned integer:

1    1) [codebook_lookup_type] [codebook_lookup_type] = read four3.2.1.  an unsigned integer
-

Codebook decode precedes according to [codebook_lookup_type]: +

Codebook decode precedes according to [codebook_lookup_type]:

-

An ’end of packet’ during any read operation in the above steps is considered an error condition +

An ’end of packet’ during any read operation in the above steps is considered an error condition rendering the stream undecodable. -

Huffman decision tree representation The [codebook_codeword_lengths] array and [codebook_entries] value uniquely define the +class="cmtt-12">[codebook_codeword_lengths] array and [codebook_entries] value uniquely define the Huffman decision tree used for entropy decoding. -

Briefly, each used codebook entry (recall that length-unordered codebooks support unused +

Briefly, each used codebook entry (recall that length-unordered codebooks support unused codeword entries) is assigned, in order, the lowest valued unused binary Huffman codeword possible. Assume the following codeword length list: -

+

1  entryentry 0: length 2
2  entryentry 1: length 4
3  entryentry 2: length 4
4  entryentry 3: length 4
5  entryentry 4: length 4
6  entryentry 5: length 2 -
 2
7  entryentry 6: length 3
8  entryentry 7: length 3
-

Assigning codewords in order (lowest possible value of the appropriate length to highest) results +

Assigning codewords in order (lowest possible value of the appropriate length to highest) results in the following codeword list: -

+

1  entryentry 0: length 23.2.1.  00
2  entryentry 1: length 43.2.1.  0100
3  entryentry 2: length 43.2.1.  0101
4  entryentry 3: length 43.2.1. 5  entryentry 4: length 43.2.1.  0111
6  entryentry 5: length 23.2.1.  10
7  entryentry 6: length 33.2.1.  110
8  entryentry 7: length 3 codeword 111
-

Note: Unlike most binary numerical values in this document, we intend the above codewords to be read and used bit by bit from left to right, thus the codeword ’001’ is the bit string ’zero, zero, one’. When determining ’lowest possible value’ in the assignment definition above, the leftmost bit is the MSb. -

It is clear that the codeword length list represents a Huffman decision tree with the entry +

It is clear that the codeword length list represents a Huffman decision tree with the entry numbers equivalent to the leaves numbered left-to-right:

-

+

-

PIC

Figure 4: huffman tree illustration
-

As we assign codewords in order, we see that each choice constructs a new leaf in the leftmost +

As we assign codewords in order, we see that each choice constructs a new leaf in the leftmost possible position. -

Note that it’s possible to underspecify or overspecify a Huffman tree via the length list. +

Note that it’s possible to underspecify or overspecify a Huffman tree via the length list. In the above example, if codeword seven were eliminated, it’s clear that the tree is unfinished:

-

+

-

PIC

Figure 5: underspecified huffman tree illustration
-

Similarly, in the original codebook, it’s clear that the tree is fully populated and a ninth +

Similarly, in the original codebook, it’s clear that the tree is fully populated and a ninth codeword is impossible. Both underspecified and overspecified trees are an error condition rendering the stream undecodable. -

Codebook entries marked ’unused’ are simply skipped in the assigning process. They have no +

Codebook entries marked ’unused’ are simply skipped in the assigning process. They have no codeword and do not appear in the decision tree, thus it’s impossible for any bit pattern read from the stream to decode to that entry number. -

Errata 20150226: Single entry codebooks A ’single-entry codebook’ is a codebook with one active codeword entry. A single-entry codebook @@ -2926,43 +2766,48 @@

3.2.1.

In r14811 of the libvorbis reference implementation, Xiph added an additional check to the +

In r14811 of the libvorbis reference implementation, Xiph added an additional check to the codebook implementation to reject underpopulated Huffman trees. This change led to the discovery of single-entry books used ’in the wild’ when the new, stricter checks rejected a number of apparently working streams. -

In order to minimize breakage of deployed (if technically erroneous) streams, r16073 of the +

In order to minimize breakage of deployed (if technically erroneous) streams, r16073 of the reference implementation explicitly special-cased single-entry codebooks to tolerate the single-entry case. Commit r16073 also added the following to the specification: -

“Take special care that a codebook with a single used entry is handled properly; it consists of a +

“Take special care that a codebook with a single used entry is handled properly; it consists of a single codework of zero bits and reading a value out of such a codebook always returns the single used value and sinks zero bits. ” -

The intent was to clarify the spec and codify current practice. However, this addition is +

The intent was to clarify the spec and codify current practice. However, this addition is erroneously at odds with the intent of preserving usability of existing streams using single-entry codebooks, disagrees with the code changes that reinstated decoding, and does not address how single-entry codebooks should be encoded. -

As such, the above addition made in r16037 is struck from the specification and replaced by the +

As such, the above addition made in r16037 is struck from the specification and replaced by the following: -

+

-

It is possible to declare a Vorbis codebook containing a single codework +

It is possible to declare a Vorbis codebook containing a single codework entry. A single-entry codebook may be either a fully populated codebook with [codebook_entries] set to 1, or a sparse codebook marking only one entry +class="cmtt-12">[codebook_entries] set to 1, or a sparse codebook marking only one entry used. Note that it is not possible to also encode a [codeword_length] of zero +class="cmtt-12">[codeword_length] of zero for the single used codeword, as the unsigned value written to the stream is [codeword_length]-1. Instead, encoder implementations should indicate a +class="cmtt-12">[codeword_length]-1. Instead, encoder implementations should indicate a [codeword_length] of 1 and ’write’ the codeword to a stream during audio +class="cmtt-12">[codeword_length] of 1 and ’write’ the codeword to a stream during audio encoding by writing a single zero bit. -

Decoder implementations shall reject a codebook if it contains only one used +

Decoder implementations shall reject a codebook if it contains only one used entry and the encoded [codeword_length] of that entry is not 1. ’Reading’ a +class="cmtt-12">[codeword_length] of that entry is not 1. ’Reading’ a value from single-entry codebook always returns the single used codeword value and sinks one bit. Decoders should tolerate that the bit read from the stream be ’1’ instead of ’0’; both values shall return the single used codeword.

-

VQ lookup table vector representation Unpacking the VQ lookup table vectors relies on the following values: @@ -2972,61 +2817,56 @@

3.2.1. 1  thethe [codebook\_multiplicands] array
2  [codebook\_minimum\_value]
[codebook\_minimum\_value]
3  [codebook\_delta\_value]
[codebook\_delta\_value]
4  [codebook\_sequence\_p] +class="cmtt-8">[codebook\_sequence\_p]
5  [codebook\_lookup\_type]
[codebook\_lookup\_type]
6  [codebook\_entries]
[codebook\_entries]
7  [codebook\_dimensions]
[codebook\_dimensions]
8  [codebook\_lookup\_values] -

Decoding (unpacking) a specific vector in the vector lookup table proceeds according to +class="cmtt-8">[codebook\_lookup\_values] +

Decoding (unpacking) a specific vector in the vector lookup table proceeds according to [codebook_lookup_type]. The unpacked vector values are what a codebook would return +class="cmtt-12">[codebook_lookup_type]. The unpacked vector values are what a codebook would return during audio packet decode in a VQ context. -

Vector value decode: Lookup type 1 Lookup type one specifies a lattice VQ lookup table built algorithmically from a list of scalar values. Calculate (unpack) the final values of a codebook entry vector from the entries in [codebook_multiplicands] as follows ([value_vector] is the output +class="cmtt-12">[codebook_multiplicands] as follows ([value_vector] is the output vector representing the vector of values for entry number [lookup_offset] in this +class="cmtt-12">[lookup_offset] in this codebook): -

+

-

Vector value decode: Lookup type 2 Lookup type two specifies a VQ lookup table in which each scalar in each vector is explicitly set by the [codebook_multiplicands] array in a one-to-one mapping. Calculate [unpack] the final +class="cmtt-12">[codebook_multiplicands] array in a one-to-one mapping. Calculate [unpack] the final values of a codebook entry vector from the entries in [codebook_multiplicands] as follows +class="cmtt-12">[codebook_multiplicands] as follows ([value_vector] is the output vector representing the vector of values for entry number +class="cmtt-12">[value_vector] is the output vector representing the vector of values for entry number [lookup_offset] in this codebook): -

+class="cmtt-12">[lookup_offset] in this codebook): +

1    1) [last] =3.2.1. 2    2) [multiplicand_offset] [multiplicand_offset] = [lookup_offset] [lookup_offset] * [codebook_dimensions] +class="cmtt-8"> [codebook_dimensions]
3    3) iterate [i]3.2.1.  range 0 ... [codebook_dimensions]-1 [codebook_dimensions]-1 (once for each3.2.1.  {
4   +class="cmr-6">4
53.2.1.       4) vector [value_vector] [value_vector] element [i] =
3.2.1.       ( [codebook_multiplicands] [codebook_multiplicands] array element number [multiplicand_offset] [multiplicand_offset] ) *
3.2.1.       [codebook_delta_value] [codebook_delta_value] + [codebook_minimum_value] [codebook_minimum_value] + [last];
8   +class="cmr-6">8
93.2.1.       5) if ( [codebook_sequence_p] [codebook_sequence_p] is set )3.2.1.  [last] = vector [value_vector] [value_vector] element [i]
10   +class="cmr-6">10
113.2.1.       6) increment [multiplicand_offset]
 [multiplicand_offset]
12  
12
13 3.2.1.      }
14  
14
15    7) vector calculation3.2.1.

+

3.3. Use of the codebook abstraction

-

The decoder uses the codebook abstraction much as it does the bit-unpacking convention; a +

The decoder uses the codebook abstraction much as it does the bit-unpacking convention; a specific codebook reads a codeword from the bitstream, decoding it into an entry number, and then returns that entry number to the decoder (when used in a scalar entropy coding context), or uses that entry number as an offset into the VQ lookup table, returning a vector of values (when used in a context desiring a VQ value). Scalar or VQ context is always explicit; any call to the codebook mechanism requests either a scalar entry number or a lookup vector. -

Note that VQ lookup type zero indicates that there is no lookup table; requesting +

Note that VQ lookup type zero indicates that there is no lookup table; requesting decode using a codebook of lookup type 0 in any context expecting a vector return value (even in a case where a vector of dimension one) is forbidden. If decoder setup or decode requests such an action, that is an error condition rendering the packet undecodable. -

Using a codebook to read from the packet bitstream consists first of reading and decoding the +

Using a codebook to read from the packet bitstream consists first of reading and decoding the next codeword in the bitstream. The decoder reads bits until the accumulated bits match a codeword in the codebook. This process can be though of as logically walking the Huffman decode tree by reading one bit at a time from the bitstream, and using the @@ -3479,9 +3295,9 @@

3.3.

When used in a scalar context, the resulting codeword entry is the desired return +

When used in a scalar context, the resulting codeword entry is the desired return value. -

When used in a VQ context, the codeword entry number is used as an offset into the VQ lookup +

When used in a VQ context, the codeword entry number is used as an offset into the VQ lookup table. The value returned to the decoder is the vector of scalars corresponding to this offset. @@ -3492,10 +3308,10 @@

3.3. 4. Codec Setup and Packet Decode

-

+

4.1. Overview

-

This document serves as the top-level reference document for the bit-by-bit decode specification +

This document serves as the top-level reference document for the bit-by-bit decode specification of Vorbis I. This document assumes a high-level understanding of the Vorbis decode process, which is provided in section 1, “4.1. Bitpacking Convention” covers reading and writing bit fields from and to bitstream packets. -

+

4.2. Header decode and decode setup

-

A Vorbis bitstream begins with three header packets. The header packets are, in order, the +

A Vorbis bitstream begins with three header packets. The header packets are, in order, the identification header, the comments header, and the setup header. All are required for decode compliance. An end-of-packet condition during decoding the first or third header packet renders the stream undecodable. End-of-packet decoding the comment header is a non-fatal error condition. -

+

4.2.1. Common header decode
-

Each header packet begins with the same header fields. -

+

Each header packet begins with the same header fields. +

1    1) [packet_type] [packet_type] : 8 bit4.2.1. 2    2) 0x76, 0x6f,4.2.1.  as six octets
-

Decode continues according to packet type; the identification header is type 1, the comment +

Decode continues according to packet type; the identification header is type 1, the comment header type 3 and the setup header type 5 (these types are all odd as a packet with a leading single bit of ’0’ is an audio packet). The packets must occur in the order of identification, comment, setup. -

+

4.2.2. Identification header
-

The identification header is a short header of only a few fields used to declare the stream +

The identification header is a short header of only a few fields used to declare the stream definitively as Vorbis, and provide a few externally relevant pieces of information about the audio stream. The identification header is coded as follows: -

+

1   1) [vorbis_version] [vorbis_version] = read 324.2.2.  integer
2   2) [audio_channels] [audio_channels] = read 84.2.2. 3   3) [audio_sample_rate] [audio_sample_rate] = read 324.2.2.  integer
4   4) [bitrate_maximum] [bitrate_maximum] = read 324.2.2. 5   5) [bitrate_nominal] [bitrate_nominal] = read 324.2.2.  integer
6   6) [bitrate_minimum] [bitrate_minimum] = read 324.2.2. 7   7) [blocksize_0] [blocksize_0] = 2 exponent4.2.2.  integer)
8   8) [blocksize_1] [blocksize_1] = 2 exponent4.2.2. 9   9) [framing_flag] [framing_flag] = read one bit
-

[vorbis_version] is to read ’0’ in order to be compatible with this document. Both +

[vorbis_version] is to read ’0’ in order to be compatible with this document. Both [audio_channels] and [audio_sample_rate] must read greater than zero. Allowed final +class="cmtt-12">[audio_channels] and [audio_sample_rate] must read greater than zero. Allowed final blocksize values are 64, 128, 256, 512, 1024, 2048, 4096 and 8192 in Vorbis I. [blocksize_0] +class="cmtt-12">[blocksize_0] must be less than or equal to [blocksize_1]. The framing bit must be nonzero. Failure to meet +class="cmtt-12">[blocksize_1]. The framing bit must be nonzero. Failure to meet any of these conditions renders a stream undecodable. -

The bitrate fields above are used only as hints. The nominal bitrate field especially may be +

The bitrate fields above are used only as hints. The nominal bitrate field especially may be considerably off in purely VBR streams. The fields are meaningful only when greater than zero.

+

from the center (element windowsize/2) of the previous window to the center (element windowsize/2-1, inclusive) of the current window. -

Data is not returned from the first frame; it must be used to ’prime’ the decode engine. The +

Data is not returned from the first frame; it must be used to ’prime’ the decode engine. The encoder accounts for this priming when calculating PCM offsets; after the first frame, the proper PCM output offset is ’0’ (as no data has been returned yet). -

+

4.3.9. output channel order
-

Vorbis I specifies only a channel mapping type 0. In mapping type 0, channel mapping is +

Vorbis I specifies only a channel mapping type 0. In mapping type 0, channel mapping is implicitly defined as follows for standard audio applications. As of revision 16781 (20100113), the specification adds defined channel locations for 6.1 and 7.1 surround. Ordering/location for greater-than-eight channels remains ’left to the implementation’. -

These channel orderings refer to order within the encoded stream. It is naturally possible for a +

These channel orderings refer to order within the encoded stream. It is naturally possible for a decoder to produce output with channels in any order. Any such decoder should explicitly document channel reordering behavior. -

+

one channel
4.3.9. greater than eight channels
channel use and order is defined by the application
-

Applications using Vorbis for dedicated purposes may define channel mapping as seen fit. Future +

Applications using Vorbis for dedicated purposes may define channel mapping as seen fit. Future channel mappings (such as three and four channel Ambisonics) will make use of channel mappings other than mapping 0. @@ -4717,30 +4767,30 @@

4.3.9. 5. comment field and header specification
-

+

5.1. Overview

-

The Vorbis text comment header is the second (of three) header packets that begin a Vorbis +

The Vorbis text comment header is the second (of three) header packets that begin a Vorbis bitstream. It is meant for short text comments, not arbitrary metadata; arbitrary metadata belongs in a separate logical bitstream (usually an XML stream type) that provides greater structure and machine parseability. -

The comment field is meant to be used much like someone jotting a quick note on the bottom of +

The comment field is meant to be used much like someone jotting a quick note on the bottom of a CDR. It should be a little information to remember the disc by and explain it to others; a short, to-the-point text note that need not only be a couple words, but isn’t going to be more than a short paragraph. The essentials, in other words, whatever they turn out to be, eg: -

+

-

Honest Bob and the Factory-to-Dealer-Incentives,

Honest Bob and the Factory-to-Dealer-Incentives, “I’m Still Around”, opening for Moxy Früvous, 1997.

-

+

5.2. Comment encoding

-

+

5.2.1. Structure
-

The comment header is logically a list of eight-bit-clean vectors; the number of vectors is +

The comment header is logically a list of eight-bit-clean vectors; the number of vectors is bounded to 232 - 1 and the length of each vector is limited to 25.2.1.

The vector lengths and number of vectors are stored lsb first, according to the bit +

The vector lengths and number of vectors are stored lsb first, according to the bit packing conventions of the vorbis codec. However, since data in the comment header is octet-aligned, they can simply be read as unaligned 32 bit little endian unsigned integers. -

The comment header is decoded as follows: -

+

The comment header is decoded as follows: +

1    1) [vendor\_length] =5.2.1. 2    2) [vendor\_string] =5.2.1. 3    3) [user\_comment\_list\_length] =5.2.1. 4    4) iterate [user\_comment\_list\_length]5.2.1.       5) [length] =5.2.1.       6) this iteration’s5.2.1.       }
8    7) [framing\_bit] =5.2.1. 9    8) if (5.2.1. 10    9) done.
-

+

5.2.2. Content vector format
-

The comment vectors are structured similarly to a UNIX environment variable. That is, +

The comment vectors are structured similarly to a UNIX environment variable. That is, comment fields consist of a field name and a corresponding value and look like: -

+

-

+

1  comment[0]="ARTIST=me";
comment[0]="ARTIST=me";
2  comment[1]="TITLE=thecomment[1]="TITLE=the sound of Vorbis";
-

The field name is case-insensitive and may consist of ASCII 0x20 through 0x7D, 0x3D (’=’) +

The field name is case-insensitive and may consist of ASCII 0x20 through 0x7D, 0x3D (’=’) excluded. ASCII 0x41 through 0x5A inclusive (characters A-Z) is to be considered equivalent to ASCII 0x61 through 0x7A inclusive (characters a-z). -

The field name is immediately followed by ASCII 0x3D (’=’); this equals sign is used to +

The field name is immediately followed by ASCII 0x3D (’=’); this equals sign is used to terminate the field name. -

0x3D is followed by 8 bit clean UTF-8 encoded value of the field contents to the end of the +

0x3D is followed by 8 bit clean UTF-8 encoded value of the field contents to the end of the field. -

Field names Below is a proposed, minimal list of standard field names with a description of intended use. No single or group of field names is mandatory; a comment header may contain one, all or none of the names in this list. -

+

TITLE
5.2.2.
LICENSE
License information, eg, ’All Rights Reserved’, ’Any Use Permitted’, a URL to - a license such as a Creative - Commons license (”www.creativecommons.org/blahblah/license.html”) or the EFF - Open Audio License (’distributed under the terms of the Open Audio License. see - http://www.eff.org/IP/Open_licenses/eff_oal.html for details’), etc. +class="description">License information, for example, ’All Rights Reserved’, ’Any Use + Permitted’, a URL to a license such as a Creative Commons license (e.g. + ”creativecommons.org/license/by/4.0/”) or similar.
ORGANIZATION
5.2.2. DESCRIPTION
A short text description of the contents
- - - GENRE
A short text indication of music genre + + +
DATE
5.2.2. ISRC
International Standard Recording Code for the track; see the ISRC intro page for +href="https://isrc.ifpi.org/" >the ISRC intro page for more information on ISRC numbers.
-

Implications Field names should not be ’internationalized’; this is a concession to simplicity not @@ -5029,53 +5055,50 @@

5.2.2. contents, however, use the UTF-8 character encoding to allow easy representation of any language. -

We have the length of the entirety of the field and restrictions on the field name so that +

We have the length of the entirety of the field and restrictions on the field name so that the field name is bounded in a known way. Thus we also have the length of the field contents. -

Individual ’vendors’ may use non-standard field names within reason. The proper +

Individual ’vendors’ may use non-standard field names within reason. The proper use of comment fields should be clear through context at this point. Abuse will be discouraged. -

There is no vendor-specific prefix to ’nonstandard’ field names. Vendors should make some effort +

There is no vendor-specific prefix to ’nonstandard’ field names. Vendors should make some effort to avoid arbitrarily polluting the common namespace. We will generally collect the more useful tags here to help with standardization. -

Field names are not required to be unique (occur once) within a comment header. As an +

Field names are not required to be unique (occur once) within a comment header. As an example, assume a track was recorded by three well know artists; the following is permissible, and encouraged: -

+

-

- - - +

1  ARTIST=DizzyARTIST=Dizzy Gillespie
2  ARTIST=SonnyARTIST=Sonny Rollins
3  ARTIST=SonnyARTIST=Sonny Stitt
+ + +
-

+

5.2.3. Encoding
-

The comment header comprises the entirety of the second bitstream header packet. Unlike the +

The comment header comprises the entirety of the second bitstream header packet. Unlike the first bitstream header packet, it is not generally the only packet on the second page and may not be restricted to within the second bitstream page. The length of the comment header packet is (practically) unbounded. The comment header packet is not optional; it must be present in the bitstream even if it is effectively empty. -

The comment header is encoded as follows (as per Ogg’s standard bitstream mapping which +

The comment header is encoded as follows (as per Ogg’s standard bitstream mapping which renders least-significant-bit of the word to be coded into the least significant available bit of the current bitstream octet first): -

+

1.
Vendor string length (32 bit unsigned quantity specifying number of octets) @@ -5100,14 +5123,15 @@
5.2.3. Comment field 1 length (if [Number of comment fields] > 1...)...
-

This is actually somewhat easier to describe in code; implementation of the above can be found +

This is actually somewhat easier to describe in code; implementation of the above can be found in vorbis/lib/info.c, _vorbis_pack_comment() and _vorbis_unpack_comment(). - - - +class="cmtt-12">_vorbis_pack_comment() and _vorbis_unpack_comment(). @@ -5116,33 +5140,32 @@

5.2.3. 6. Floor type 0 setup and decode
-

+

6.1. Overview

-

Vorbis floor type zero uses Line Spectral Pair (LSP, also alternately known as Line Spectral +

Vorbis floor type zero uses Line Spectral Pair (LSP, also alternately known as Line Spectral Frequency or LSF) representation to encode a smooth spectral envelope curve as the frequency response of the LSP filter. This representation is equivalent to a traditional all-pole infinite impulse response filter as would be used in linear predictive coding; LSP representation may be converted to LPC representation and vice-versa. -

+

6.2. Floor 0 format

-

Floor zero configuration consists of six integer fields and a list of VQ codebooks for use in +

Floor zero configuration consists of six integer fields and a list of VQ codebooks for use in coding/decoding the LSP filter coefficient values used by each frame. -

+

6.2.1. header decode
-

Configuration information for instances of floor zero decodes from the codec setup header (third +

Configuration information for instances of floor zero decodes from the codec setup header (third packet). configuration decode proceeds as follows: -

+

1    1) [floor0_order] [floor0_order] = read an6.2.1. 2    2) [floor0_rate] [floor0_rate] = read an6.2.1. 3    3) [floor0_bark_map_size] [floor0_bark_map_size] = read an6.2.1. 4    4) [floor0_amplitude_bits] [floor0_amplitude_bits] = read an6.2.1. 5    5) [floor0_amplitude_offset] [floor0_amplitude_offset] = read an6.2.1.  integer of eight bits -
 bits
6    6) [floor0_number_of_books] [floor0_number_of_books] = read an6.2.1. 7    7) array [floor0_book_list] [floor0_book_list] = read a list of [floor0_number_of_books] [floor0_number_of_books] unsigned integers of eight bits each;
+

An end-of-packet condition during any of these bitstream reads renders this stream undecodable. +In addition, any element of the array [floor0_book_list] that is greater than the maximum +codebook number for this bitstream is an error condition that also renders the stream -

An end-of-packet condition during any of these bitstream reads renders this stream undecodable. -In addition, any element of the array [floor0_book_list] that is greater than the maximum -codebook number for this bitstream is an error condition that also renders the stream undecodable. -

+

6.2.2. packet decode
-

Extracting a floor0 curve from an audio packet consists of first decoding the curve +

Extracting a floor0 curve from an audio packet consists of first decoding the curve amplitude and [floor0_order] LSP coefficient values from the bitstream, and then +class="cmtt-12">[floor0_order] LSP coefficient values from the bitstream, and then computing the floor curve, which is defined as the frequency response of the decoded LSP filter. -

Packet decode proceeds as follows: +

Packet decode proceeds as follows:

-

Take note of the following properties of decode: +class="cmr-6">16 +

Take note of the following properties of decode:

  • An [amplitude] value of zero must result in a return code that indicates this channel @@ -5548,36 +5557,42 @@
    6.2.2. The book number used for decode can, in fact, be stored in the bitstream in ilog( [floor0_number_of_books] - 1 ) bits. Nevertheless, the above specification is correct +class="cmtt-12">[floor0_number_of_books] - 1 ) bits. Nevertheless, the above specification is correct and values greater than the maximum possible book value are reserved.
  • The number of scalars read into the vector [coefficients] may be greater than [floor0_order], the number actually required for curve computation. For +class="cmtt-12">[floor0_order], the number actually required for curve computation. For example, if the VQ codebook used for the floor currently being decoded has a [codebook_dimensions] value of three and [floor0_order] is ten, the only way to - - - +class="cmtt-12">[codebook_dimensions] value of three and [floor0_order] is ten, the only way to fill all the needed scalars in [coefficients] is to to read a total of twelve scalars as four vectors of three scalars each. This is not an error condition, and care must be taken not to allow a buffer overflow in decode. The extra values are not used and + + + may be ignored or discarded.
-

+

6.2.3. curve computation
-

Given an

Given an [amplitude] integer and [coefficients] vector from packet decode as well as the [floor0_order], [floor0_rate], [floor0_bark_map_size], [floor0_amplitude_bits] and [floor0_amplitude_offset] values from floor setup, and an output vector size [n] specified by the decode process, we compute a floor output vector. -

If the value

If the value [amplitude] is zero, the return value is a length [n] vector with all-zero scalars. Otherwise, begin by assuming the following definitions for the given vector to be @@ -5585,31 +5600,33 @@

6.2.3. { -map = min (floor0_bark_map_size - 1,f oobar) for i ∈ [0, n - 1] - i - 1 for i = n + min (floor0xbarkxmapxsize - 1,f oobar) for i ∈ [0, n - 1] +mapi = - 1 for i = n -

-

where +

+

where

⌊ ⌋ - ( floor0_rate--⋅ i) floor0_bark_map_size---- -f oobar = bark 2n ⋅ bark(.5 ⋅ floor0_rate ) +src=
-

-

and +

+

and

2 -bark(x) = 13.1arctan (.00074x ) + 2.24 arctan(.0000000185x ) + .0001x +src=
-

-

The above is used to synthesize the LSP curve on a Bark-scale frequency axis, then map the +

+ + + +

The above is used to synthesize the LSP curve on a Bark-scale frequency axis, then map the result to a linear-scale frequency axis. Similarly, the below calculation synthesizes the output LSP curve [output] on a log (dB) amplitude scale, mapping it to linear amplitude in the last step: -

+

1.
6.2.3. ] = π * map element [i] / [floor0_bark_map_size] +class="cmtt-12">[floor0_bark_map_size]
3.
if ( [floor0_order] is odd ) +class="cmtt-12">[floor0_order] is odd )
a)
calculate 6.2.3. [q] according to:
floor0∏_2order-3 +src=
-

else [floor0_order] is even - - - +

else [floor0_order] is even

a)
calculate [p] and [q] according to:
+ + +
floor0_order-2 - (1 - cosω ) ---∏2----- -p = ----------- 4(cos([coefficients ]2j+1) - cosω)2 +src=
4.
calculate [linear_floor_value] according to: +class="cmtt-12">[linear_floor_value] according to:
( ( )) - amplitude---⋅ floor0_amplitute_offset--- -exp .11512925 (2floor0_amplitude_bits - 1)√p--+-q - floor0_amplitude_offset + amplitude ⋅ floor0xamplitutexoffset +exp .11512925 ------floor0xamplitudexbits-----√----------- floor0xamplitudexoffset + (2 - 1) p + q
-

+

5.
[iteration_condition] = map element [iteration_condition] = map element [i]
6.
[output] element [i] = [linear_floor_value] +class="cmtt-12">[linear_floor_value]
7.
increment 6.2.3.
if ( map element [i] is equal to [iteration_condition] ) continue at step - - - +class="cmtt-12">[iteration_condition] ) continue at step 5
9.
if ( [i] is less than [n] ) continue at step 2 + + +
10.
done
-

Errata 20150227: Bark scale computation Due to a typo when typesetting this version of the specification from the original HTML document, the Bark scale computation previously erroneously read:

2 -bark(x) = 13.1arctan (.00074x ) + 2.24 arctan(.0000000185x + .0001x ) +src=
-

-

Note that the last parenthesis is misplaced. This document now uses the correct equation as it +

+

Note that the last parenthesis is misplaced. This document now uses the correct equation as it appeared in the original HTML spec document:

bark(x) = 13.1arctan (.00074x ) + 2.24 arctan(.0000000185x2 ) + .0001x
-

+

@@ -5736,20 +5763,20 @@

6.2.3. 7. Floor type 1 setup and decode
-

+

7.1. Overview

-

Vorbis floor type one uses a piecewise straight-line representation to encode a spectral envelope +

Vorbis floor type one uses a piecewise straight-line representation to encode a spectral envelope curve. The representation plots this curve mechanically on a linear frequency axis and a logarithmic (dB) amplitude axis. The integer plotting algorithm used is similar to Bresenham’s algorithm. -

+

7.2. Floor 1 format

-

+

7.2.1. model
-

Floor type one represents a spectral curve as a series of line segments. Synthesis constructs a +

Floor type one represents a spectral curve as a series of line segments. Synthesis constructs a floor curve using iterative prediction in a process roughly equivalent to the following simplified description:

-

Consider the following example, with values chosen for ease of understanding rather than +

Consider the following example, with values chosen for ease of understanding rather than representing typical configuration: -

For the below example, we assume a floor setup with an [n] of 128. The list of selected X values +

For the below example, we assume a floor setup with an [n] of 128. The list of selected X values in increasing order is 0,16,32,48,64,80,96,112 and 128. In list order, the values interleave as 0, 128, 64, 32, 96, 16, 48, 80 and 112. The corresponding list-order Y values as decoded from an example packet are 110, 20, -5, -45, 0, -25, -10, 30 and -10. We compute the floor in the following way, beginning with the first line:

-

+

-

PIC

Figure 7: graph of example floor
-

We now draw new logical lines to reflect the correction to new˙Y, and iterate for X positions 32 +

We now draw new logical lines to reflect the correction to new˙Y, and iterate for X positions 32 and 96:

-

+

-

PIC

Figure 8: graph of example floor
-

Although the new Y value at X position 96 is unchanged, it is still used later as an endpoint for +

Although the new Y value at X position 96 is unchanged, it is still used later as an endpoint for further refinement. From here on, the pattern should be clear; we complete the floor computation as follows: @@ -5812,9 +5839,9 @@

7.2.1. -

+

-

PIC

7.2.1.
-

+

-

PIC

Figure 10: graph of example floor
-

A more efficient algorithm with carefully defined integer rounding behavior is used for actual +

A more efficient algorithm with carefully defined integer rounding behavior is used for actual decode, as described later. The actual algorithm splits Y value computation and line plotting into two steps with modifications to the above algorithm to eliminate noise accumulation through integer roundoff/truncation. -

+

7.2.2. header decode
-

A list of floor X values is stored in the packet header in interleaved format (used in list order +

A list of floor X values is stored in the packet header in interleaved format (used in list order during packet decode and synthesis). This list is split into partitions, and each partition is assigned to a partition class. X positions 0 and [n] are implicit and do not belong to an explicit partition or partition class. -

A partition class consists of a representation vector width (the number of Y values which +

A partition class consists of a representation vector width (the number of Y values which the partition class encodes at once), a ’subclass’ value representing the number of alternate entropy books the partition class may use in representing Y values, the list of [subclass] books and a master book used to encode which alternate books were chosen @@ -5853,19 +5880,16 @@

7.2.2.

+

1  
1
2    1) [floor1_partitions] [floor1_partitions] = read 57.2.2. 3    2) [maximum_class] [maximum_class] = -1
4    3) iterate [i]7.2.2.  range 0 ... [floor1_partitions]-1 [floor1_partitions]-1 { -
{
5  
5 +
6 7.2.2.       4) vector [floor1_partition_class_list] [floor1_partition_class_list] element [i] =7.2.2.  unsigned integer
7  
7
8 7.2.2.      }
9   +class="cmr-6">9
10    5) [maximum_class] [maximum_class] = largest integer7.2.2.  value in vector [floor1_partition_class_list]
 [floor1_partition_class_list]
11    6) iterate [i]7.2.2.  range 0 ... [maximum_class] [maximum_class] { -
{
12  
12 +
13 7.2.2.       7) vector [floor1_class_dimensions] [floor1_class_dimensions] element [i] =7.2.2.  1
14   8)14 8) vector [floor1_class_subclasses] [floor1_class_subclasses] element [i] =7.2.2.       9) if ( vector [floor1_class_subclasses] [floor1_class_subclasses] element [i] is7.2.2.  {
16   +class="cmr-6">16
177.2.2.       10) vector [floor1_class_masterbooks] [floor1_class_masterbooks] element [i] =7.2.2.  unsigned integer
18  
18
19 7.2.2.      }
20   +class="cmr-6">20
217.2.2.       11) iterate [j]7.2.2.  ... (2 exponent [floor1_class_subclasses] [floor1_class_subclasses] element [i]) -7.2.2.  {
22   +class="cmr-6">22
237.2.2.       12) array [floor1_subclass_books] [floor1_subclass_books] element [i],[j] =
7.2.2.       read 8 bits7.2.2.  integer and subtract one
 one +
25 7.2.2.      } -
}
26 7.2.2.      }
27  
27
28   13) [floor1_multiplier] [floor1_multiplier] = read 27.2.2.  one
29   14) [rangebits] =7.2.2. 30   15) vector [floor1_X_list] [floor1_X_list] element [0] = 0
31   16) vector [floor1_X_list] [floor1_X_list] element [1] = 2 exponent [rangebits]; -
 [rangebits];
32   17) [floor1_values] [floor1_values] = 2
 2 +
33   18) iterate [i]7.2.2.  range 0 ... [floor1_partitions]-1 [floor1_partitions]-1 { -
{
34  
34
35 7.2.2.       19) [current_class_number] [current_class_number] = vector [floor1_partition_class_list] [floor1_partition_class_list] element [i]
7.2.2.       20) iterate [j]7.2.2.  range 0 ... ([floor1_class_dimensions] ([floor1_class_dimensions] element [current_class_number])-1 [current_class_number])-1 {
7.2.2.       21) vector [floor1_X_list] [floor1_X_list] element ([floor1_values]) ([floor1_values]) =
387.2.2.       read [rangebits] bits7.2.2.       22) increment [floor1_values] [floor1_values] by one
7.2.2.      }
417.2.2.      }
42  
42
43   23) done
-

An end-of-packet condition while reading any aspect of a floor 1 configuration during +

An end-of-packet condition while reading any aspect of a floor 1 configuration during setup renders a stream undecodable. In addition, a [floor1_class_masterbooks] or +class="cmtt-12">[floor1_class_masterbooks] or [floor1_subclass_books] scalar element greater than the highest numbered codebook +class="cmtt-12">[floor1_subclass_books] scalar element greater than the highest numbered codebook configured in this stream is an error condition that renders the stream undecodable. Vector [floor1_x_list] is limited to a maximum length of 65 elements; a setup indicating more than 65 total elements (including elements 0 and 1 set prior to the read loop) renders the stream undecodable. All vector [floor1_x_list] element values must be unique within the vector; a non-unique value renders the stream undecodable. -

+

7.2.3. packet decode
-

Packet decode begins by checking the

Packet decode begins by checking the [nonzero] flag: -

+

1    1) [nonzero] =7.2.3.  bit as boolean
-

If

If [nonzero] is unset, that indicates this channel contained no audio energy in this frame. Decode immediately returns a status indicating this floor curve (and thus this channel) is unused this frame. (A return status of ’unused’ is different from decoding a floor that has all points set to minimum representation amplitude, which happens to be approximately -140dB). -

Assuming

Assuming [nonzero] is set, decode proceeds as follows: -

+

1    1) [range] =7.2.3.  } element ([floor1_multiplier]-1) - - - +class="cmtt-8"> ([floor1_multiplier]-1)
2    2) vector [floor1_Y] [floor1_Y] element [0] =7.2.3.  as unsigned integer + + +
3    3) vector [floor1_Y] [floor1_Y] element [1] =7.2.3. 4    4) [offset] =7.2.3. 5    5) iterate [i]7.2.3.  range 0 ... [floor1_partitions]-1 [floor1_partitions]-1 {
6   +class="cmr-6">6
77.2.3.       6) [class] = vector [floor1_partition_class] [floor1_partition_class]  element [i]
7.2.3.       7) [cdim]  = vector [floor1_class_dimensions] [floor1_class_dimensions] element [class]
7.2.3.       8) [cbits] = vector [floor1_class_subclasses] [floor1_class_subclasses] element [class]
7.2.3.       9) [csub] 7.2.3.       10) [cval] 7.2.3.       11) if (7.2.3.  {
13  
13
14 7.2.3.       12) [cval] =7.2.3.       (vector [floor1_class_masterbooks] [floor1_class_masterbooks] element [class]) in scalar context -
 context
16 7.2.3.      }
17  
17
18 7.2.3.       13) iterate [j]7.2.3.  {
19   +class="cmr-6">19
207.2.3.       14) [book] = array [floor1_subclass_books] [floor1_subclass_books] element [class],([cval] bitwise7.2.3.       15) [cval] =7.2.3.  [cbits] bits
22   22    7.2.3.  {
23   +class="cmr-6">23
24   24    7.2.3.   17) vector [floor1_Y] [floor1_Y] element ([j]+[offset]) =7.2.3.       [book] in scalar context -
 context
26  
26 +
27 7.2.3.      } else [book]7.2.3.  {
28  
28
29   29    7.2.3.   18) vector [floor1_Y] [floor1_Y] element ([j]+[offset]) = 0 -
 0
30  
30 +
31 7.2.3.      }
327.2.3.      }
33  
33
34 7.2.3.       19) [offset] =7.2.3.  + [cdim]
35  
35
36 7.2.3.      }
37  
37
38   20) done
-

An end-of-packet condition during curve decode should be considered a nominal occurrence; if +

An end-of-packet condition during curve decode should be considered a nominal occurrence; if end-of-packet is reached during any read operation above, floor decode is to return ’unused’ status as if the [nonzero] flag had been unset at the beginning of decode. -

Vector [floor1_Y] contains the values from packet decode needed for floor 1 synthesis. -

+

Vector [floor1_Y] contains the values from packet decode needed for floor 1 synthesis. +

7.2.4. curve computation
-

Curve computation is split into two logical steps; the first step derives final Y amplitude values +

Curve computation is split into two logical steps; the first step derives final Y amplitude values from the encoded, wrapped difference values taken from the bitstream. The second step plots the curve lines. Also, although zero-difference values are used in the iterative prediction to find final Y values, these points are conditionally skipped during final line computation in step two. Skipping zero-difference values allows a smoother line fit. -

Although some aspects of the below algorithm look like inconsequential optimizations, +

Although some aspects of the below algorithm look like inconsequential optimizations, implementors are warned to follow the details closely. Deviation from implementing a strictly equivalent algorithm can result in serious decoding errors. -

Additional note: Although [floor1_final_Y] values in the prediction loop and at the end of +class="cmtt-12">[floor1_final_Y] values in the prediction loop and at the end of step 1 are inherently limited by the prediction algorithm to [0, [range]), it is possible to abuse the setup and codebook machinery to produce negative or over-range results. We suggest that decoder implementations guard the values in vector [floor1_final_Y] by clamping each +class="cmtt-12">[floor1_final_Y] by clamping each element to [0, [range]) after step 1. Variants of this suggestion are acceptable as valid floor1 setups cannot produce out of range values. -

+

step 1: amplitude value synthesis
-

Unwrap the always-positive-or-zero values read from the packet into +/- difference +

Unwrap the always-positive-or-zero values read from the packet into +/- difference + values, then apply to line prediction. - values, then apply to line prediction. -

+

1    1) [range] =7.2.4.  } element ([floor1_multiplier]-1)
 ([floor1_multiplier]-1)
2    2) vector [floor1_step2_flag] [floor1_step2_flag] element [0] =7.2.4. 3    3) vector [floor1_step2_flag] [floor1_step2_flag] element [1] =7.2.4. 4    4) vector [floor1_final_Y] [floor1_final_Y] element [0] = vector [floor1_Y] [floor1_Y] element [0]
5    5) vector [floor1_final_Y] [floor1_final_Y] element [1] = vector [floor1_Y] [floor1_Y] element [1]
6    6) iterate [i]7.2.4.  range 2 ... [floor1_values]-1 [floor1_values]-1 {
7   +class="cmr-6">7
87.2.4.       7) [low_neighbor_offset] [low_neighbor_offset] = low_neighbor([floor1_X_list],[i])
low_neighbor([floor1_X_list],[i])
9 7.2.4.       8) [high_neighbor_offset] [high_neighbor_offset] = high_neighbor([floor1_X_list],[i]) -
high_neighbor([floor1_X_list],[i])
10  
10 +
11 7.2.4.       9) [predicted] = render_pointrender_point( vector [floor1_X_list] [floor1_X_list] element [low_neighbor_offset], +class="cmtt-8"> [low_neighbor_offset],
12   12       vector [floor1_final_Y] [floor1_final_Y] element [low_neighbor_offset], +class="cmtt-8"> [low_neighbor_offset],
137.2.4.       vector [floor1_X_list] [floor1_X_list] element [high_neighbor_offset], +class="cmtt-8"> [high_neighbor_offset],
14   14       vector [floor1_final_Y] [floor1_final_Y] element [high_neighbor_offset], +class="cmtt-8"> [high_neighbor_offset],
157.2.4.       vector [floor1_X_list] [floor1_X_list] element [i] )
16  
16
17 7.2.4.       10) [val] = vector [floor1_Y] [floor1_Y] element [i]
7.2.4.       11) [highroom] =7.2.4.       12) [lowroom]  = [predicted] -
 [predicted]
20 7.2.4.       13) if (7.2.4.  {
21  
21 +
22 7.2.4.       14) [room] =7.2.4.  * 2
23   -
23
24 7.2.4.      } else [highroom]7.2.4.  {
25  
25
26 7.2.4.       15) [room] =7.2.4.  * 2
27  
27 +
28 7.2.4.      }
29   -
29
30 7.2.4.       16) if (7.2.4.  {
31  
31
32 7.2.4.       17) vector [floor1_step2_flag] [floor1_step2_flag] element [low_neighbor_offset] [low_neighbor_offset] = set
7.2.4.       18) vector [floor1_step2_flag] [floor1_step2_flag] element [high_neighbor_offset] [high_neighbor_offset] = set -
 set
34 7.2.4.       19) vector [floor1_step2_flag] [floor1_step2_flag] element [i] = set
 set +
35 7.2.4.       20) if (7.2.4.  [room] ) { -
{
36  
36
37 7.2.4.       21) if (7.2.4.  {
38   +class="cmr-6">38
397.2.4.       22) vector [floor1_final_Y] [floor1_final_Y] element [i] =7.2.4.  - [lowroom] + [predicted] -
 [predicted]
40  
40 +
41   41    7.2.4.  {
42   +class="cmr-6">42
437.2.4.       23) vector [floor1_final_Y] [floor1_final_Y] element [i] =7.2.4.  + [highroom] - 1 -
 1
44  
44 +
45 7.2.4.      }
46  
46
47 7.2.4.      } else [val]7.2.4.  {
48   +class="cmr-6">48
497.2.4.       24) if ([val]7.2.4.  {
50  
50
51 7.2.4.       25) vector [floor1_final_Y] [floor1_final_Y] element [i] = @@ -7998,8 +7882,6 @@
7.2.4.       [predicted] - (([val]7.2.4.  integer division)
53   +class="cmr-6">53
547.2.4.      } else [val]7.2.4.  {
55  
55
56 7.2.4.       26) vector [floor1_final_Y] [floor1_final_Y] element [i] = @@ -8117,8 +7993,6 @@
7.2.4.       [predicted] + ([val]7.2.4.  integer division)
58  
58
59 7.2.4.      }
60   +class="cmr-6">60
617.2.4.      }
62  
62
63 7.2.4.      } else [val]7.2.4.  {
64  
64
65 7.2.4.       27) vector [floor1_step2_flag] [floor1_step2_flag] element [i] =7.2.4.       28) vector [floor1_final_Y] [floor1_final_Y] element [i] = [predicted]
67  
67
68 7.2.4.      }
69  
69
70 7.2.4.      }
71  
71
72   29) done
73  
+class="cmr-6">73
step 2: curve synthesis
-

Curve synthesis generates a return vector

Curve synthesis generates a return vector [floor] of length [n] (where [n] is provided by the decode process calling to floor decode). Floor 1 curve synthesis makes use of the [floor1_X_list], [floor1_final_Y] and [floor1_step2_flag] vectors, as well as +class="cmtt-12">[floor1_X_list], [floor1_final_Y] and [floor1_step2_flag] vectors, as well as [floor1_multiplier] and [floor1_values] values. -

Decode begins by sorting the scalars from vectors [floor1_X_list], [floor1_final_Y] and +

Decode begins by sorting the scalars from vectors [floor1_X_list], [floor1_final_Y] and [floor1_step2_flag] together into new vectors [floor1_X_list]’, [floor1_final_Y]’ +class="cmtt-12">[floor1_step2_flag] together into new vectors [floor1_X_list]’, [floor1_final_Y]’ and [floor1_step2_flag]’ according to ascending sort order of the values in +class="cmtt-12">[floor1_step2_flag]’ according to ascending sort order of the values in [floor1_X_list]. That is, sort the values of [floor1_X_list] and then apply the same +class="cmtt-12">[floor1_X_list]. That is, sort the values of [floor1_X_list] and then apply the same permutation to elements of the other two vectors so that the X, Y and step2_flag values still match. -

Then compute the final curve in one pass: -

+

Then compute the final curve in one pass: +

1    1) [hx] =7.2.4. 2    2) [lx] =7.2.4. 3    3) [ly] = vector [floor1_final_Y]’ [floor1_final_Y]’ element [0] * [floor1_multiplier] +class="cmtt-8"> [floor1_multiplier]
4    4) iterate [i]7.2.4.  range 1 ... [floor1_values]-1 [floor1_values]-1 {
5  
5
6 7.2.4.       5) if ( [floor1_step2_flag]’ [floor1_step2_flag]’ element [i] is7.2.4.  {
7   +class="cmr-6">7
87.2.4.       6) [hy] = [floor1_final_Y]’ [floor1_final_Y]’ element [i] * [floor1_multiplier]
 [floor1_multiplier]
9      7.2.4.  7) [hx] = [floor1_X_list]’ [floor1_X_list]’ element [i]
7.2.4.       8) render_linerender_line( [lx], [ly],7.2.4.       9) [lx] = [hx]
12   12     10) [ly] = [hy] -
 [hy]
13 7.2.4.      }
147.2.4.      }
15  
15 +
16   11) if (7.2.4.  {
17  
17
18 7.2.4.       12) render_linerender_line( [hx], [hy], [n], [hy], [floor] ) -
 )
19  
19
20 7.2.4.      }
21  
21
22   13) if (7.2.4.  {
23  
23 +
24 7.2.4.       14) truncate vector [floor] to [n] elements -
 elements
25  
25
26 7.2.4.      }
27  
27
28   15) for each7.2.4.  lookup substitution using - - -
297.2.4.       the scalar value7.2.4.  vector [floor1_inverse_dB_static_table]
[floor1_inverse_dB_static_table]
30  
30
31   16) done
32  
+class="cmr-6">32

8. Residue setup and decode

-

+

8.1. Overview

-

A residue vector represents the fine detail of the audio spectrum of one channel in an audio frame +

A residue vector represents the fine detail of the audio spectrum of one channel in an audio frame after the encoder subtracts the floor curve and performs any channel coupling. A residue vector may represent spectral lines, spectral magnitude, spectral phase or hybrids as mixed by channel coupling. The exact semantic content of the vector does not matter to the residue abstraction. -

Whatever the exact qualities, the Vorbis residue abstraction codes the residue vectors into the +

Whatever the exact qualities, the Vorbis residue abstraction codes the residue vectors into the bitstream packet, and then reconstructs the vectors during decode. Vorbis makes use of three different encoding variants (numbered 0, 1 and 2) of the same basic vector encoding abstraction. -

+

8.2. Residue format

-

Residue format partitions each vector in the vector bundle into chunks, classifies each +

Residue format partitions each vector in the vector bundle into chunks, classifies each chunk, encodes the chunk classifications and finally encodes the chunks themselves using the the specific VQ arrangement defined for each selected classification. The exact interleaving and partitioning vary by residue encoding number, however the high-level process used to classify and encode the residue vector is the same in all three variants. -

A set of coded residue vectors are all of the same length. High level coding structure, ignoring for +

A set of coded residue vectors are all of the same length. High level coding structure, ignoring for the moment exactly how a partition is encoded and simply trusting that it is, is as follows:

    @@ -8790,36 +8607,34 @@

    8.2.

-

+

-

PIC

Figure 11: illustration of residue vector format
-

+

8.3. residue 0

-

Residue 0 and 1 differ only in the way the values within a residue partition are interleaved during +

Residue 0 and 1 differ only in the way the values within a residue partition are interleaved during partition encoding (visually treated as a black box–or cyan box or brown box–in the above figure). -

Residue encoding 0 interleaves VQ encoding according to the dimension of the codebook used to +

Residue encoding 0 interleaves VQ encoding according to the dimension of the codebook used to encode a partition in a specific pass. The dimension of the codebook need not be the same in multiple passes, however the partition size must be an even multiple of the codebook dimension. -

As an example, assume a partition vector of size eight, to be encoded by residue 0 using +

As an example, assume a partition vector of size eight, to be encoded by residue 0 using codebook sizes of 8, 4, 2 and 1: -

+

1  
1
2 8.3.       original residue vector:8.3.  7 ]
3  
3
4  codebookcodebook dimensions = 88.3.  7 ]
5   +class="cmr-6">5
6  codebookcodebook dimensions = 48.3.  7 ]
7  
7
8  codebookcodebook dimensions = 28.3.  [ 3 7 ] -
 ]
9  
9 +
10  codebookcodebook dimensions = 18.3.  7 ]
11  
-

It is worth mentioning at this point that no configurable value in the residue coding setup is +class="cmr-6">11 +

It is worth mentioning at this point that no configurable value in the residue coding setup is restricted to a power of two. -

+

8.4. residue 1

-

Residue 1 does not interleave VQ encoding. It represents partition vector scalars in order. As +

Residue 1 does not interleave VQ encoding. It represents partition vector scalars in order. As with residue 0, however, partition length must be an integer multiple of the codebook dimension, although dimension may vary from pass to pass. -

As an example, assume a partition vector of size eight, to be encoded by residue 0 using +

As an example, assume a partition vector of size eight, to be encoded by residue 0 using codebook sizes of 8, 4, 2 and 1: -

+

1  
1
2 8.4.       original residue vector:8.4.  7 ]
3  
3
4  codebookcodebook dimensions = 88.4.  7 ]
5   +class="cmr-6">5
6  codebookcodebook dimensions = 48.4.  7 ]
7  
7
8  codebookcodebook dimensions = 28.4.  [ 6 7 ] -
 ]
9  
9 +
10  codebookcodebook dimensions = 18.4.  7 ]
11  
-

+class="cmr-6">11 +

8.5. residue 2

-

Residue type two can be thought of as a variant of residue type 1. Rather than encoding multiple +

Residue type two can be thought of as a variant of residue type 1. Rather than encoding multiple passed-in vectors as in residue type 1, the ch passed in vectors of length n are first interleaved @@ -9157,28 +8938,26 @@

8.5. -

+

-

PIC

Figure 12: illustration of residue type 2
-

+

8.6. Residue decode

-

+

8.6.1. header decode
-

Header decode for all three residue types is identical. +

Header decode for all three residue types is identical.

1    1) [residue\_begin] =8.6.1. 2    2) [residue\_end] =8.6.1. 3    3) [residue\_partition\_size] =8.6.1. 4    4) [residue\_classifications] =8.6.1. 5    5) [residue\_classbook] =8.6.1.  as unsigned integer
-

[residue_begin] and [residue_end] select the specific sub-portion of each vector that is +

[residue_begin] and [residue_end] select the specific sub-portion of each vector that is actually coded; it implements akin to a bandpass where, for coding purposes, the vector effectively begins at element [residue_begin] and ends at [residue_end]. Preceding and +class="cmtt-12">[residue_begin] and ends at [residue_end]. Preceding and following values in the unpacked vectors are zeroed. Note that for residue type 2, these values as well as [residue_partition_size]apply to the interleaved vector, not the +class="cmtt-12">[residue_partition_size]apply to the interleaved vector, not the individual vectors before interleave. [residue_partition_size] is as explained above, +class="cmtt-12">[residue_partition_size] is as explained above, [residue_classifications] is the number of possible classification to which a partition can +class="cmtt-12">[residue_classifications] is the number of possible classification to which a partition can belong and [residue_classbook] is the codebook number used to code classification +class="cmtt-12">[residue_classbook] is the codebook number used to code classification codewords. The number of dimensions in book [residue_classbook] determines how +class="cmtt-12">[residue_classbook] determines how many classification values are grouped into a single classification codeword. Note that the number of entries and dimensions in book [residue_classbook], along with +class="cmtt-12">[residue_classbook], along with [residue_classifications], overdetermines to possible number of classification +class="cmtt-12">[residue_classifications], overdetermines to possible number of classification codewords. If [residue_classifications]ˆ[residue_classbook].dimensions exceeds +class="cmtt-12">[residue_classifications]ˆ[residue_classbook].dimensions exceeds [residue_classbook].entries, the bitstream should be regarded to be undecodable. +class="cmtt-12">[residue_classbook].entries, the bitstream should be regarded to be undecodable. -

Next we read a bitmap pattern that specifies which partition classes code values in which +

Next we read a bitmap pattern that specifies which partition classes code values in which passes. -

+

 -

Finally, we read in a list of book numbers, each corresponding to specific bit set in the cascade +

Finally, we read in a list of book numbers, each corresponding to specific bit set in the cascade bitmap. We loop over the possible codebook classifications and the maximum possible number of encoding stages (8 in Vorbis I, as constrained by the elements of the cascade bitmap being eight bits): -

+

-

An end-of-packet condition at any point in header decode renders the stream undecodable. +

An end-of-packet condition at any point in header decode renders the stream undecodable. In addition, any codebook number greater than the maximum numbered codebook set up in this stream also renders the stream undecodable. All codebooks in array [residue_books] are required to have a value mapping. The presence of codebook in array [residue_books] without a value mapping (maptype equals zero) renders the stream undecodable. -

+

8.6.2. packet decode
-

Format 0 and 1 packet decode is identical except for specific partition interleave. Format 2 packet +

Format 0 and 1 packet decode is identical except for specific partition interleave. Format 2 packet decode can be built out of the format 1 decode process. Thus we describe first the decode infrastructure identical to all three formats. -

In addition to configuration information, the residue decode process is passed the number of +

In addition to configuration information, the residue decode process is passed the number of vectors in the submap bundle and a vector of flags indicating if any of the vectors are not to be decoded. If the passed in number of vectors is 3 and vector number 1 is marked ’do not decode’, decode skips vector 1 during the decode loop. However, even ’do not decode’ vectors are allocated and zeroed. -

Depending on the values of [residue_begin] and [residue_end], it is obvious that the +

Depending on the values of [residue_begin] and [residue_end], it is obvious that the encoded portion of a residue vector may be the entire possible residue vector or some other strict subset of the actual residue vector size with zero padding at either uncoded end. However, it is +also possible to set [residue_begin] and [residue_end] to specify a range partially or wholly -also possible to set [residue_begin] and [residue_end] to specify a range partially or wholly beyond the maximum vector size. Before beginning residue decode, limit [residue_begin] +class="cmtt-12">[residue_begin] and [residue_end] to the maximum possible vector size as follows. We assume that +class="cmtt-12">[residue_end] to the maximum possible vector size as follows. We assume that the number of vectors being encoded, [ch] is provided by the higher level decoding process. -

+

1    1) [actual\_size] =8.6.2. 2    2) if residue encoding is format 2 -
 2
3 8.6.2.       3) [actual\_size] = [actual\_size] * [ch];
 [ch]; +
4    4) [limit\_residue\_begin] = minimum of ([residue\_begin],[actual\_size]); -
 ([residue\_begin],[actual\_size]);
5    5) [limit\_residue\_end] = minimum of ([residue\_end],[actual\_size]);
-

The following convenience values are conceptually useful to clarifying the decode process: -

+

The following convenience values are conceptually useful to clarifying the decode process: +

1    1) [classwords\_per\_codeword] =8.6.2. 2    2) [n\_to\_read] =8.6.2.  - [limit\_residue\_begin]
3  3  3) [partitions\_to\_read]8.6.2.  [n\_to\_read] / [residue\_partition\_size]
-

Packet decode proceeds as follows, matching the description offered earlier in the document. +

Packet decode proceeds as follows, matching the description offered earlier in the document.

1    1) allocate and8.6.2. 2    2) if ([n\_to\_read]8.6.2. 3    3) iterate [pass]8.6.2.  7 {
4  
4
5 8.6.2.       4) [partition\_count] = 0
6   +class="cmr-6">6
78.6.2.       5) while [partition\_count]8.6.2.  than [partitions\_to\_read]
8  
8
9 8.6.2.       6) if ([pass]8.6.2.  zero) {
10   +class="cmr-6">10
118.6.2.       7) iterate [j]8.6.2.  [ch]-1 {
12  
12
13 8.6.2.       8) if vector8.6.2.  ’do not decode’ { -
 {
14  
14 +
15 8.6.2.       9) [temp] =8.6.2.       10) iterate [i]8.6.2.  [classwords\_per\_codeword]-1 ... 0 { -
 {
17  
17 +
18 8.6.2.       11) array [classifications]8.6.2.       [temp] integer modulo8.6.2.       12) [temp] =8.6.2.  integer division
21   +class="cmr-6">21
228.6.2.       }
23  
23
24 8.6.2.       }
25  
25
26 8.6.2.       }
27  
27
28 8.6.2.       }
29   +class="cmr-6">29
308.6.2.       13) iterate [i]8.6.2.       is also less8.6.2.  [partitions\_to\_read] {
32  
32
33 8.6.2.       14) iterate [j]8.6.2.  0 .. [ch]-1 { -
 {
34  
34 +
35 8.6.2.       15) if vector8.6.2.  decode’ {
36   +class="cmr-6">36
378.6.2.       16) [vqclass] =8.6.2.       17) [vqbook] =8.6.2.       18) if ([vqbook] is not ’unused’) { -
 {
40  
40 +
41 8.6.2.       19) decode partition8.6.2.       offset [limit\_residue\_begin]+[partition\_count]*[residue\_partition\_size] using @@ -10705,8 +10344,6 @@
8.6.2.       codebook number [vqbook]8.6.2.       }
 } +
45 8.6.2.       } -
 }
46  
46
47 8.6.2.       20) increment [partition\_count] by one
48  
48
49 8.6.2.       }
508.6.2.       }
518.6.2.       }
52  
52
53   21) done
54  
-

An end-of-packet condition during packet decode is to be considered a nominal occurrence. +class="cmr-6">54 +

An end-of-packet condition during packet decode is to be considered a nominal occurrence. Decode returns the result of vector decode up to that point. -

+

8.6.3. format 0 specifics
-

Format zero decodes partitions exactly as described earlier in the ’Residue Format: residue 0’ +

Format zero decodes partitions exactly as described earlier in the ’Residue Format: residue 0’ section. The following pseudocode presents the same algorithm. Assume: @@ -10871,19 +10486,19 @@

8.6.3.
  • [n] is the value in [residue_partition_size] +class="cmtt-12">[residue_partition_size]
  • [v] is the residue vector
  • [offset] is the beginning read offset in [v]
    • -

    +

    1   1) [step] =8.6.3.  [codebook\_dimensions]
    2   2) iterate [i]8.6.3.  [step]-1 {
    3   +class="cmr-6">3
    48.6.3.       3) vector [entry\_temp]8.6.3.       4) iterate [j]8.6.3.  [codebook\_dimensions]-1 {
    6  
    6
    7 8.6.3.       5) vector [v]8.6.3.  =
    8   8    8.6.3.       vector [entry\_temp] element [j]
    10  
    10
    11 8.6.3.       }
    12  
    12
    13      }
    14  
    14
    15    6) done
    16  
    -

    +class="cmr-6">16 +

    8.6.4. format 1 specifics
    -

    Format 1 decodes partitions exactly as described earlier in the ’Residue Format: residue 1’ +

    Format 1 decodes partitions exactly as described earlier in the ’Residue Format: residue 1’ section. The following pseudocode presents the same algorithm. Assume:

    • [n] is the value in [residue_partition_size] +class="cmtt-12">[residue_partition_size]
    • [v] is the residue vector
    • [offset] is the beginning read offset in [v]
    -

    +

    1   1) [i] = 0
    2   2) vector [entry\_temp]8.6.4. 3   3) iterate [j]8.6.4.  [codebook\_dimensions]-1 {
    4  
    4
    5 8.6.4.       4) vector [v] element ([offset]+[i]) = -
     =
    6   6   vector [v] element ([offset]+[i]) +
     + +
    7 8.6.4.       vector [entry\_temp] element8.6.4.       5) increment [i]
    9   -
    9
    10      }
    11  
    11
    12    6) if (8.6.4. 13    7) done
    -

    +

    8.6.5. format 2 specifics
    -

    Format 2 is reducible to format 1. It may be implemented as an additional step prior to and an +

    Format 2 is reducible to format 1. It may be implemented as an additional step prior to and an additional post-decode step after a normal format 1 decode. -

    Format 2 handles ’do not decode’ vectors differently than residue 0 or 1; if all vectors are marked +

    Format 2 handles ’do not decode’ vectors differently than residue 0 or 1; if all vectors are marked ’do not decode’, no decode occurrs. However, if at least one vector is to be decoded, all the vectors are decoded. We then request normal format 1 to decode a single vector representing all output channels, rather than a vector for each channel. After decode, deinterleave the vector into independent vectors, one for each output channel. That is: -

    +

    1.
    If all vectors 0 through 8.6.5. 1    1) iterate [i]8.6.5.  [n]-1 {
    2  
    2
    3 8.6.5.       2) iterate [j]8.6.5.  [ch]-1 {
    4   +class="cmr-6">4
    58.6.5.       3) output vector8.6.5.  + [j])
    6  
    6
    7 8.6.5.       }
    88.6.5.       }
    9  
    9
    10    4) done
    @@ -11380,30 +10920,28 @@
    8.6.5. 9. Helper equations
    -

    +

    9.1. Overview

    -

    The equations below are used in multiple places by the Vorbis codec specification. Rather than +

    The equations below are used in multiple places by the Vorbis codec specification. Rather than cluttering up the main specification documents, they are defined here and referenced where appropriate. -

    +

    9.2. Functions

    -

    +

    9.2.1. ilog
    -

    The ”ilog(x)” function returns the position number (1 through n) of the highest set bit in the +

    The ”ilog(x)” function returns the position number (1 through n) of the highest set bit in the two’s complement integer value [x]. Values of [x] less than zero are defined to return zero. -

    +

    1    1) [return\_value] =9.2.1. 2    2) if (9.2.1.  ) {
    3  
    3
    4 9.2.1.       3) increment [return\_value]; @@ -11449,8 +10981,6 @@
    9.2.1.       4) logical shift9.2.1.       5) repeat at step 2)
    7  
    7
    8       }
    9  
    9
    10     6) done
    -

    Examples: +

    Examples:

    -

    +

    9.2.2. float32_unpack
    -

    ”float32_unpack(x)” is intended to translate the packed binary representation of a Vorbis +

    ”float32_unpack(x)” is intended to translate the packed binary representation of a Vorbis codebook float value into the representation used by the decoder for floating point numbers. For purposes of this example, we will unpack a Vorbis float32 into a host-native floating point number. -

    +

    1    1) [mantissa] =9.2.2. 2    2) [sign] =9.2.2. 3    3) [exponent] =9.2.2. 4    4) if (9.2.2.  negate [mantissa]
    5  5  5) return9.2.2.  788 ) )
    -

    +

    9.2.3. lookup1_values
    -

    ”lookup1_values(codebook_entries,codebook_dimensions)” is used to compute the +

    ”lookup1_values(codebook_entries,codebook_dimensions)” is used to compute the correct length of the value index for a codebook VQ lookup table of lookup type 1. The values on this list are permuted to construct the VQ vector lookup table of size [codebook_entries]. -

    The return value for this function is defined to be ’the greatest integer value for which +class="cmtt-12">[codebook_entries]. +

    The return value for this function is defined to be ’the greatest integer value for which [return_value] to the power of [codebook_dimensions] is less than or equal to +class="cmtt-12">[return_value] to the power of [codebook_dimensions] is less than or equal to [codebook_entries]’. +class="cmtt-12">[codebook_entries]’. -

    +

    9.2.4. low_neighbor
    -

    ”low_neighbor(v,x)” finds the position

    ”low_neighbor(v,x)” finds the position n in vector [v] of the greatest value scalar element for which 9.2.4. [v] element [x]. -

    +

    9.2.5. high_neighbor
    -

    ”high_neighbor(v,x)” finds the position

    ”high_neighbor(v,x)” finds the position n in vector [v] of the lowest value scalar element for which n is less than 9.2.5. [v] element [x]. -

    +

    9.2.6. render_point
    -

    ”render_point(x0,y0,x1,y1,X)” is used to find the Y value at point X along the line specified by +

    ”render_point(x0,y0,x1,y1,X)” is used to find the Y value at point X along the line specified by x0, x1, y0 and y1. This function uses an integer algorithm to solve for the point directly without calculating intervening values along the line. -

    +

    1    1)  [dy]9.2.6. 2    2) [adx] =9.2.6. 3    3) [ady] =9.2.6. 4    4) [err] =9.2.6. 5    5) [off] =9.2.6. 6    6) if (9.2.6.  ) {
    7  
    7
    8 9.2.6.       7) [Y] = [y0] - [off] -
     [off]
    9  
    9     +
    10       } else {
    11  
    11
    12 9.2.6.       8) [Y] =9.2.6.  +     [off]
    13  
    13
    14       }
    15  
    15
    16    9) done
    -

    +

    9.2.7. render_line
    -

    Floor decode type one uses the integer line drawing algorithm of ”render_line(x0, y0, x1, y1, v)” +

    Floor decode type one uses the integer line drawing algorithm of ”render_line(x0, y0, x1, y1, v)” to construct an integer floor curve for contiguous piecewise line segments. Note that it has not been relevant elsewhere, but here we must define integer division as rounding division of both positive and negative numbers toward zero. -

    +

    1    1)  9.2.7. 2    2)  [adx]9.2.7. 3    3)  [ady]9.2.7. 4    4) [base] =9.2.7. 5    5)  9.2.7. 6    6)  9.2.7. 7    7)  [err] = 0
    8  
    8
    9    8) if (9.2.7.  ) {
    10  
    10
    11 9.2.7.       9) [sy] = [base] - 1 -
     1
    12  
    12     +
    13       } else {
    14  
    14
    15 9.2.7.       10) [sy] =9.2.7.  +     1
    16  
    16
    17       }
    18  
    18
    19   11) [ady] =9.2.7. 20   12) vector [v]9.2.7.  = [y]
    21  
    21
    22   13) iterate [x]9.2.7.  [x1]-1 {
    23  
    23
    24 9.2.7.       14) [err] =9.2.7.       15) if (9.2.7.  ) {
    26  
    26
    27 9.2.7.       16) [err] =9.2.7.       17)  9.2.7.  + [sy]
    29   +class="cmr-6">29
    309.2.7.       } else {
    31  
    31
    32 9.2.7.       18) [y] =9.2.7.  + [base]
    33  
    33
    34 9.2.7.       }
    35  
    35
    36 9.2.7.       19) vector [v]9.2.7.  = [y]
    37  
    37
    38       }
    @@ -12259,19 +11665,20 @@
    9.2.7. 10. Tables
    -

    +

    10.1. floor1_inverse_dB_table

    -

    The vector [floor1_inverse_dB_table] is a 256 element static lookup table consisting of the +

    The vector [floor1_inverse_dB_table] is a 256 element static lookup table consisting of the following values (read left to right then top to bottom): -

    +

    1    1.0649863e-07, 1.1341951e-07, 1.2079015e-07,10.1. 2    1.3699951e-07, 1.4590251e-07, 1.5538408e-07,10.1. 3    1.7623575e-07, 1.8768855e-07, 1.9988561e-07,10.1. 4    2.2670913e-07, 2.4144197e-07, 2.5713223e-07,10.1. 5    2.9163793e-07, 3.1059021e-07, 3.3077411e-07,10.1. 6    3.7516214e-07, 3.9954229e-07, 4.2550680e-07,10.1. 7    4.8260743e-07, 5.1396998e-07, 5.4737065e-07,10.1. 8    6.2082472e-07, 6.6116941e-07, 7.0413592e-07,10.1. 9    7.9862701e-07, 8.5052630e-07, 9.0579828e-07,10.1. 10    1.0273513e-06, 1.0941144e-06, 1.1652161e-06,10.1. 11    1.3215816e-06, 1.4074654e-06, 1.4989305e-06,10.1. 12    1.7000785e-06, 1.8105592e-06, 1.9282195e-06,10.1. 13    2.1869758e-06, 2.3290978e-06, 2.4804557e-06,10.1. 14    2.8133190e-06, 2.9961443e-06, 3.1908506e-06,10.1. 15    3.6190449e-06, 3.8542308e-06, 4.1047004e-06,10.1. 16    4.6555282e-06, 4.9580707e-06, 5.2802740e-06,10.1. 17    5.9888572e-06, 6.3780469e-06, 6.7925283e-06,10.1. 18    7.7040476e-06, 8.2047000e-06, 8.7378876e-06,10.1. 19    9.9104632e-06, 1.0554501e-05, 1.1240392e-05,10.1. 20    1.2748789e-05, 1.3577278e-05, 1.4459606e-05,10.1. 21    1.6400004e-05, 1.7465768e-05, 1.8600792e-05,10.1. 22    2.1096914e-05, 2.2467911e-05, 2.3928002e-05,10.1. 23    2.7139006e-05, 2.8902651e-05, 3.0780908e-05,10.1. 24    3.4911534e-05, 3.7180282e-05, 3.9596466e-05,10.1. 25    4.4910090e-05, 4.7828601e-05, 5.0936773e-05,10.1. 26    5.7772202e-05, 6.1526565e-05, 6.5524908e-05,10.1. 27    7.4317983e-05, 7.9147585e-05, 8.4291040e-05,10.1. 28    9.5602426e-05, 0.00010181521, 0.00010843174,10.1. 29    0.00012298267, 0.00013097477, 0.00013948625,10.1. 30    0.00015820453, 0.00016848555, 0.00017943469,10.1. 31    0.00020351382, 0.00021673929, 0.00023082423,10.1. 32    0.00026179955, 0.00027881276, 0.00029693158,10.1. 33    0.00033677814, 0.00035866388, 0.00038197188,10.1. 34    0.00043323036, 0.00046138411, 0.00049136745,10.1. 35    0.00055730621, 0.00059352311, 0.00063209358,10.1. 36    0.00071691700, 0.00076350630, 0.00081312324,10.1. 37    0.00092223983, 0.00098217216, 0.0010459992,10.1. 38    0.0011863665,  0.0012634633,10.1. 39    0.0015261382,  0.0016253153,10.1. 40    0.0019632195,  0.0020908006,10.1. 41    0.0025254795,  0.0026895994,10.1. 42    0.0032487691,  0.0034598925,10.1. 43    0.0041792066,  0.0044507950,10.1. 44    0.0053761186,  0.0057254891,10.1. 45    0.0069158225,  0.0073652516,10.1. 46    0.0088964928,  0.009474637,10.1. 47    0.011444421,  10.1. 48    0.014722068,  10.1. 49    0.018938423,  10.1. 50    0.024362330,  10.1. 51    0.031339626,  10.1. 52    0.040315199,  10.1. 53    0.051861348,  10.1. 54    0.066714279,  10.1. 55    0.085821044,  10.1. 56    0.11039993,  10.1. 57    0.14201813,  10.1. 58    0.18269168,  10.1. 59    0.23501402,  10.1. 60    0.30232132,  10.1. 61    0.38890521,  10.1. 62    0.50028648,  10.1. 63    0.64356699,  10.1. 64    0.82788260,  10.1. A. Embedding Vorbis into an Ogg stream -

    +

    A.1. Overview

    -

    This document describes using Ogg logical and physical transport streams to encapsulate Vorbis +

    This document describes using Ogg logical and physical transport streams to encapsulate Vorbis compressed audio packet data into file form. -

    The

    The section 1, “Introduction and Description” provides an overview of the construction of Vorbis audio packets. -

    The

    The Ogg bitstream overview and Ogg logical bitstream and framing spec provide detailed descriptions of Ogg transport streams. This specification document assumes a working knowledge of the concepts covered in these named backround documents. Please read them first. -

    +

    A.1.1. Restrictions
    -

    The Ogg/Vorbis I specification currently dictates that Ogg/Vorbis streams use Ogg transport +

    The Ogg/Vorbis I specification currently dictates that Ogg/Vorbis streams use Ogg transport streams in degenerate, unmultiplexed form only. That is:

    • A meta-headerless Ogg file encapsulates the Vorbis I packets @@ -13080,7 +12361,7 @@
      A.1.1.

      This is not to say that it is not currently possible to multiplex Vorbis with other media +

      This is not to say that it is not currently possible to multiplex Vorbis with other media types into a multi-stream Ogg file. At the time this document was written, Ogg was becoming a popular container for low-bitrate movies consisting of DivX video and Vorbis audio. However, a ’Vorbis I audio file’ is taken to imply Vorbis audio existing alone @@ -13088,10 +12369,10 @@

      A.1.1.

      +

      A.1.2. MIME type
      -

      The MIME type of Ogg files depend on the context. Specifically, complex multimedia and +

      The MIME type of Ogg files depend on the context. Specifically, complex multimedia and applications should use application/ogg, while visual media should use video/ogg, and audio @@ -13100,10 +12381,10 @@

      A.1.2. audio/vorbis + audio/vorbis-config. -

      +

      A.2. Encapsulation

      -

      Ogg encapsulation of a Vorbis packet stream is straightforward. +

      Ogg encapsulation of a Vorbis packet stream is straightforward.

      -

      In both of these cases in which the initial audio PCM starting offset is nonzero, the +

      In both of these cases in which the initial audio PCM starting offset is nonzero, the second finished audio packet must flush the page on which it appears and the third packet begin a fresh page. This allows the decoder to always be able to perform PCM position adjustments before needing to return any PCM data from synthesis, resulting in correct positioning information without any aditional seeking logic. -

      Note: Failure to do so should, at worst, cause a decoder implementation to return incorrect positioning information for seeking operations at the very beginning of the @@ -13187,7 +12468,7 @@

      A.2. B. Vorbis encapsulation in RTP

      -

      Please consult RFC 5215

      Please consult RFC 5215 “RTP Payload Format for Vorbis Encoded Audio” for description of how to embed Vorbis audio in an RTP stream. @@ -13198,41 +12479,41 @@

      B. Colophon

      -

      PIC -

      Ogg is a Xiph.Org Foundation effort to protect essential tenets of Internet multimedia from +

      Ogg is a Xiph.Org Foundation effort to protect essential tenets of Internet multimedia from corporate hostage-taking; Open Source is the net’s greatest tool to keep everyone honest. See About the Xiph.Org Foundation for details. -

      Ogg Vorbis is the first Ogg audio CODEC. Anyone may freely use and distribute the Ogg and +href="https://xiph.org/about/" >About the Xiph.Org Foundation for details. +

      Ogg Vorbis is the first Ogg audio CODEC. Anyone may freely use and distribute the Ogg and Vorbis specification, whether in a private, public or corporate capacity. However, the Xiph.Org Foundation and the Ogg project (xiph.org) reserve the right to set the Ogg Vorbis specification and certify specification compliance. -

      Xiph.Org’s Vorbis software CODEC implementation is distributed under a BSD-like license. This +

      Xiph.Org’s Vorbis software CODEC implementation is distributed under a BSD-like license. This does not restrict third parties from distributing independent implementations of Vorbis software under other licenses. -

      Ogg, Vorbis, Xiph.Org Foundation and their logos are trademarks (tm) of the Xiph.Org +

      Ogg, Vorbis, Xiph.Org Foundation and their logos are trademarks (tm) of the Xiph.Org Foundation. These pages are copyright (C) 1994-2015 Xiph.Org Foundation. All rights reserved. -

      This document is set using LAT

      This document is set using LATEX.

      References

      -

      +

      [1]   T. Sporer, K. Brandenburg and B. Edler, The use of multirate filter banks for coding of high quality digital audio, http://www.iocon.com/resource/docs/ps/eusipco_corrected.ps. +href="https://media.taricorp.net/eusipco_corrected.pdf" class="url" >https://media.taricorp.net/eusipco_corrected.pdf.

      diff --git a/doc/Vorbis_I_spec.pdf b/doc/Vorbis_I_spec.pdf index 04c068278..165628fdf 100644 Binary files a/doc/Vorbis_I_spec.pdf and b/doc/Vorbis_I_spec.pdf differ diff --git a/doc/Vorbis_I_spec.tex b/doc/Vorbis_I_spec.tex index 23bc81d2c..1213a25aa 100644 --- a/doc/Vorbis_I_spec.tex +++ b/doc/Vorbis_I_spec.tex @@ -133,7 +133,7 @@ \bibitem{Sporer/Brandenburg/Edler} T.~Sporer, K.~Brandenburg and B.~Edler, The use of multirate filter banks for coding of high quality digital audio, -\url{http://www.iocon.com/resource/docs/ps/eusipco_corrected.ps}. +\url{https://media.taricorp.net/eusipco_corrected.pdf}. \end{thebibliography} diff --git a/doc/Vorbis_I_spec0x.png b/doc/Vorbis_I_spec0x.png index f6d296779..a6b90fa7f 100644 Binary files a/doc/Vorbis_I_spec0x.png and b/doc/Vorbis_I_spec0x.png differ diff --git a/doc/Vorbis_I_spec10x.png b/doc/Vorbis_I_spec10x.png index 086e42951..571f324bd 100644 Binary files a/doc/Vorbis_I_spec10x.png and b/doc/Vorbis_I_spec10x.png differ diff --git a/doc/Vorbis_I_spec11x.png b/doc/Vorbis_I_spec11x.png index 610e28cd4..50c3994fb 100644 Binary files a/doc/Vorbis_I_spec11x.png and b/doc/Vorbis_I_spec11x.png differ diff --git a/doc/Vorbis_I_spec12x.png b/doc/Vorbis_I_spec12x.png index f4f477abd..4dcbe6a9b 100644 Binary files a/doc/Vorbis_I_spec12x.png and b/doc/Vorbis_I_spec12x.png differ diff --git a/doc/Vorbis_I_spec13x.png b/doc/Vorbis_I_spec13x.png index 803dd55cc..dd80c1ed4 100644 Binary files a/doc/Vorbis_I_spec13x.png and b/doc/Vorbis_I_spec13x.png differ diff --git a/doc/Vorbis_I_spec14x.png b/doc/Vorbis_I_spec14x.png index 211774f0f..38cbbdb13 100644 Binary files a/doc/Vorbis_I_spec14x.png and b/doc/Vorbis_I_spec14x.png differ diff --git a/doc/Vorbis_I_spec1x.png b/doc/Vorbis_I_spec1x.png index 0d4975a32..2e72115b7 100644 Binary files a/doc/Vorbis_I_spec1x.png and b/doc/Vorbis_I_spec1x.png differ diff --git a/doc/Vorbis_I_spec2x.png b/doc/Vorbis_I_spec2x.png index 81088000b..334be846a 100644 Binary files a/doc/Vorbis_I_spec2x.png and b/doc/Vorbis_I_spec2x.png differ diff --git a/doc/Vorbis_I_spec3x.png b/doc/Vorbis_I_spec3x.png index dabd2098f..a280384d4 100644 Binary files a/doc/Vorbis_I_spec3x.png and b/doc/Vorbis_I_spec3x.png differ diff --git a/doc/Vorbis_I_spec4x.png b/doc/Vorbis_I_spec4x.png index 00544e418..a79c2fe51 100644 Binary files a/doc/Vorbis_I_spec4x.png and b/doc/Vorbis_I_spec4x.png differ diff --git a/doc/Vorbis_I_spec5x.png b/doc/Vorbis_I_spec5x.png index a723708f7..3c7ff1437 100644 Binary files a/doc/Vorbis_I_spec5x.png and b/doc/Vorbis_I_spec5x.png differ diff --git a/doc/Vorbis_I_spec6x.png b/doc/Vorbis_I_spec6x.png index 9c7e2f72d..8d78a0065 100644 Binary files a/doc/Vorbis_I_spec6x.png and b/doc/Vorbis_I_spec6x.png differ diff --git a/doc/Vorbis_I_spec7x.png b/doc/Vorbis_I_spec7x.png index 373e00490..67440ea38 100644 Binary files a/doc/Vorbis_I_spec7x.png and b/doc/Vorbis_I_spec7x.png differ diff --git a/doc/Vorbis_I_spec8x.png b/doc/Vorbis_I_spec8x.png index 370963dc0..c7e58704d 100644 Binary files a/doc/Vorbis_I_spec8x.png and b/doc/Vorbis_I_spec8x.png differ diff --git a/doc/Vorbis_I_spec9x.png b/doc/Vorbis_I_spec9x.png index 145100b34..38cbbdb13 100644 Binary files a/doc/Vorbis_I_spec9x.png and b/doc/Vorbis_I_spec9x.png differ diff --git a/doc/floor1_inverse_dB_table.html b/doc/floor1_inverse_dB_table.html index 99ad4b805..88412500f 100644 --- a/doc/floor1_inverse_dB_table.html +++ b/doc/floor1_inverse_dB_table.html @@ -67,7 +67,7 @@

      Ogg Vorbis I format specification: floor1_inverse_dB_table

      diff --git a/doc/footer.tex b/doc/footer.tex index ffb2c8170..bb5e590c8 100644 --- a/doc/footer.tex +++ b/doc/footer.tex @@ -5,10 +5,10 @@ \section*{Colophon} \includegraphics[width=5cm]{fish_xiph_org} \label{footer} -Ogg is a \href{http://www.xiph.org/}{Xiph.Org Foundation} effort +Ogg is a \href{https://xiph.org/}{Xiph.Org Foundation} effort to protect essential tenets of Internet multimedia from corporate hostage-taking; Open Source is the net's greatest tool to keep -everyone honest. See \href{http://www.xiph.org/about.html}{About +everyone honest. See \href{https://xiph.org/about/}{About the Xiph.Org Foundation} for details. @@ -24,7 +24,7 @@ \section*{Colophon} other licenses. Ogg, Vorbis, Xiph.Org Foundation and their logos are trademarks (tm) -of the \href{http://www.xiph.org/}{Xiph.Org Foundation}. These +of the \href{https://xiph.org/}{Xiph.Org Foundation}. These pages are copyright (C) 1994-2015 Xiph.Org Foundation. All rights reserved. diff --git a/doc/framing.html b/doc/framing.html index 857b292b8..b362d6cac 100644 --- a/doc/framing.html +++ b/doc/framing.html @@ -67,7 +67,7 @@

      Ogg logical bitstream framing

      @@ -366,10 +366,9 @@

      page checksum

      continued over the page. The CRC field is then filled with the computed value.

      -

      (A thorough discussion of CRC algorithms can be found in "A -Painless Guide to CRC Error Detection Algorithms" by Ross -Williams ross@ross.net.)

      +

      (A thorough discussion of CRC algorithms can be found in +"A Painless Guide to CRC Error Detection Algorithms" +by Ross Williams.)

      
  byte value
diff --git a/doc/helper.html b/doc/helper.html
index a16df2800..5da77653e 100644
--- a/doc/helper.html
+++ b/doc/helper.html
@@ -67,7 +67,7 @@
 
 
 
 
 
      Ogg Vorbis I format specification: helper equations
      
diff --git a/doc/index.html b/doc/index.html
index 6d95e4573..5c260ceab 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -67,7 +67,7 @@
 
 
 
 
 
      Ogg Vorbis Documentation
      
diff --git a/doc/libvorbis/index.html b/doc/libvorbis/index.html
index e2199a2e1..7d87cc4dc 100644
--- a/doc/libvorbis/index.html
+++ b/doc/libvorbis/index.html
@@ -32,7 +32,7 @@ 
      Libvorbis Documentation
      
 
-
+
diff --git a/doc/libvorbis/overview.html b/doc/libvorbis/overview.html
index 22cd18645..574db7457 100644
--- a/doc/libvorbis/overview.html
+++ b/doc/libvorbis/overview.html
@@ -123,7 +123,7 @@ 
      Metadata workflow
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/reference.html b/doc/libvorbis/reference.html
index 642b1f9c0..7c254c7db 100644
--- a/doc/libvorbis/reference.html
+++ b/doc/libvorbis/reference.html
@@ -74,7 +74,7 @@ 
      Libvorbis API Reference
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/return.html b/doc/libvorbis/return.html
index 7a008d5c3..2ce46fab0 100644
--- a/doc/libvorbis/return.html
+++ b/doc/libvorbis/return.html
@@ -67,7 +67,7 @@ 
      Return Codes
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_analysis.html b/doc/libvorbis/vorbis_analysis.html
index b126f2094..78bab433f 100644
--- a/doc/libvorbis/vorbis_analysis.html
+++ b/doc/libvorbis/vorbis_analysis.html
@@ -73,7 +73,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_analysis_blockout.html b/doc/libvorbis/vorbis_analysis_blockout.html
index 94948b62e..2ca51c0ae 100644
--- a/doc/libvorbis/vorbis_analysis_blockout.html
+++ b/doc/libvorbis/vorbis_analysis_blockout.html
@@ -66,7 +66,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_analysis_buffer.html b/doc/libvorbis/vorbis_analysis_buffer.html
index cf6ae8086..7a8a34a5d 100644
--- a/doc/libvorbis/vorbis_analysis_buffer.html
+++ b/doc/libvorbis/vorbis_analysis_buffer.html
@@ -61,7 +61,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_analysis_headerout.html b/doc/libvorbis/vorbis_analysis_headerout.html
index 58c37c317..9880fb964 100644
--- a/doc/libvorbis/vorbis_analysis_headerout.html
+++ b/doc/libvorbis/vorbis_analysis_headerout.html
@@ -70,7 +70,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_analysis_init.html b/doc/libvorbis/vorbis_analysis_init.html
index 8799338b0..2ffde1fb7 100644
--- a/doc/libvorbis/vorbis_analysis_init.html
+++ b/doc/libvorbis/vorbis_analysis_init.html
@@ -53,7 +53,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_analysis_wrote.html b/doc/libvorbis/vorbis_analysis_wrote.html
index 2326f60f7..16ace2da6 100644
--- a/doc/libvorbis/vorbis_analysis_wrote.html
+++ b/doc/libvorbis/vorbis_analysis_wrote.html
@@ -67,7 +67,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_bitrate_addblock.html b/doc/libvorbis/vorbis_bitrate_addblock.html
index 9de5de43e..334a9e084 100644
--- a/doc/libvorbis/vorbis_bitrate_addblock.html
+++ b/doc/libvorbis/vorbis_bitrate_addblock.html
@@ -61,7 +61,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_bitrate_flushpacket.html b/doc/libvorbis/vorbis_bitrate_flushpacket.html
index 297abb0bc..7277bc4e0 100644
--- a/doc/libvorbis/vorbis_bitrate_flushpacket.html
+++ b/doc/libvorbis/vorbis_bitrate_flushpacket.html
@@ -67,7 +67,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_block.html b/doc/libvorbis/vorbis_block.html
index 9cd24c21e..0c4f21470 100644
--- a/doc/libvorbis/vorbis_block.html
+++ b/doc/libvorbis/vorbis_block.html
@@ -48,7 +48,7 @@ 
      Parameters
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_block_clear.html b/doc/libvorbis/vorbis_block_clear.html
index 13be5b626..5d4a5ca7d 100644
--- a/doc/libvorbis/vorbis_block_clear.html
+++ b/doc/libvorbis/vorbis_block_clear.html
@@ -48,7 +48,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_block_init.html b/doc/libvorbis/vorbis_block_init.html
index 82f6ae8f5..10bb27348 100644
--- a/doc/libvorbis/vorbis_block_init.html
+++ b/doc/libvorbis/vorbis_block_init.html
@@ -53,7 +53,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_comment.html b/doc/libvorbis/vorbis_comment.html
index 7afb7f327..25dc9218d 100644
--- a/doc/libvorbis/vorbis_comment.html
+++ b/doc/libvorbis/vorbis_comment.html
@@ -68,7 +68,7 @@ 
      Parameters
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_comment_add.html b/doc/libvorbis/vorbis_comment_add.html
index b7125b04e..7fa7fec4c 100644
--- a/doc/libvorbis/vorbis_comment_add.html
+++ b/doc/libvorbis/vorbis_comment_add.html
@@ -57,7 +57,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_comment_add_tag.html b/doc/libvorbis/vorbis_comment_add_tag.html
index 97565d35a..13ac01607 100644
--- a/doc/libvorbis/vorbis_comment_add_tag.html
+++ b/doc/libvorbis/vorbis_comment_add_tag.html
@@ -61,7 +61,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_comment_clear.html b/doc/libvorbis/vorbis_comment_clear.html
index 0771d6ee0..bb9684cdf 100644
--- a/doc/libvorbis/vorbis_comment_clear.html
+++ b/doc/libvorbis/vorbis_comment_clear.html
@@ -56,7 +56,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_comment_init.html b/doc/libvorbis/vorbis_comment_init.html
index abce0a6ac..bb6333b7c 100644
--- a/doc/libvorbis/vorbis_comment_init.html
+++ b/doc/libvorbis/vorbis_comment_init.html
@@ -59,7 +59,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_comment_query.html b/doc/libvorbis/vorbis_comment_query.html
index f958ebb60..71cf97ac7 100644
--- a/doc/libvorbis/vorbis_comment_query.html
+++ b/doc/libvorbis/vorbis_comment_query.html
@@ -59,7 +59,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_comment_query_count.html b/doc/libvorbis/vorbis_comment_query_count.html
index e8a04f462..dc1e84c97 100644
--- a/doc/libvorbis/vorbis_comment_query_count.html
+++ b/doc/libvorbis/vorbis_comment_query_count.html
@@ -53,7 +53,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_commentheader_out.html b/doc/libvorbis/vorbis_commentheader_out.html
index 0dd63d632..e880b0163 100644
--- a/doc/libvorbis/vorbis_commentheader_out.html
+++ b/doc/libvorbis/vorbis_commentheader_out.html
@@ -52,7 +52,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_dsp_clear.html b/doc/libvorbis/vorbis_dsp_clear.html
index 0a9b959ce..a012a7e38 100644
--- a/doc/libvorbis/vorbis_dsp_clear.html
+++ b/doc/libvorbis/vorbis_dsp_clear.html
@@ -50,7 +50,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_dsp_state.html b/doc/libvorbis/vorbis_dsp_state.html
index b8baf9cdc..3ac31a5df 100644
--- a/doc/libvorbis/vorbis_dsp_state.html
+++ b/doc/libvorbis/vorbis_dsp_state.html
@@ -45,7 +45,7 @@ 
      Parameters
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_granule_time.html b/doc/libvorbis/vorbis_granule_time.html
index f5c8b7f48..adca9b01e 100644
--- a/doc/libvorbis/vorbis_granule_time.html
+++ b/doc/libvorbis/vorbis_granule_time.html
@@ -52,7 +52,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_info.html b/doc/libvorbis/vorbis_info.html
index 2a06c0648..fccea2124 100644
--- a/doc/libvorbis/vorbis_info.html
+++ b/doc/libvorbis/vorbis_info.html
@@ -68,7 +68,7 @@ 
      Relevant Struct Members
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_info_blocksize.html b/doc/libvorbis/vorbis_info_blocksize.html
index f256d2485..47d00e1bd 100644
--- a/doc/libvorbis/vorbis_info_blocksize.html
+++ b/doc/libvorbis/vorbis_info_blocksize.html
@@ -53,7 +53,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_info_clear.html b/doc/libvorbis/vorbis_info_clear.html
index 907be6f23..da52223f0 100644
--- a/doc/libvorbis/vorbis_info_clear.html
+++ b/doc/libvorbis/vorbis_info_clear.html
@@ -48,7 +48,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_info_init.html b/doc/libvorbis/vorbis_info_init.html
index a0e58fb22..ab81515bf 100644
--- a/doc/libvorbis/vorbis_info_init.html
+++ b/doc/libvorbis/vorbis_info_init.html
@@ -49,7 +49,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_packet_blocksize.html b/doc/libvorbis/vorbis_packet_blocksize.html
index 827e03f87..7ae8ff6f3 100644
--- a/doc/libvorbis/vorbis_packet_blocksize.html
+++ b/doc/libvorbis/vorbis_packet_blocksize.html
@@ -53,7 +53,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_synthesis.html b/doc/libvorbis/vorbis_synthesis.html
index 38ac4ede6..902e3b6a5 100644
--- a/doc/libvorbis/vorbis_synthesis.html
+++ b/doc/libvorbis/vorbis_synthesis.html
@@ -57,7 +57,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_synthesis_blockin.html b/doc/libvorbis/vorbis_synthesis_blockin.html
index d12fd2a6f..32ec6681d 100644
--- a/doc/libvorbis/vorbis_synthesis_blockin.html
+++ b/doc/libvorbis/vorbis_synthesis_blockin.html
@@ -56,7 +56,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_synthesis_halfrate.html b/doc/libvorbis/vorbis_synthesis_halfrate.html
index fefe8d354..8869723f8 100644
--- a/doc/libvorbis/vorbis_synthesis_halfrate.html
+++ b/doc/libvorbis/vorbis_synthesis_halfrate.html
@@ -55,7 +55,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_synthesis_halfrate_p.html b/doc/libvorbis/vorbis_synthesis_halfrate_p.html
index d82880e54..b2b3f983e 100644
--- a/doc/libvorbis/vorbis_synthesis_halfrate_p.html
+++ b/doc/libvorbis/vorbis_synthesis_halfrate_p.html
@@ -51,7 +51,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_synthesis_headerin.html b/doc/libvorbis/vorbis_synthesis_headerin.html
index 835d8ce17..5234bbec3 100644
--- a/doc/libvorbis/vorbis_synthesis_headerin.html
+++ b/doc/libvorbis/vorbis_synthesis_headerin.html
@@ -67,7 +67,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_synthesis_idheader.html b/doc/libvorbis/vorbis_synthesis_idheader.html
index 7fe99e945..cc58eb25d 100644
--- a/doc/libvorbis/vorbis_synthesis_idheader.html
+++ b/doc/libvorbis/vorbis_synthesis_idheader.html
@@ -50,7 +50,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_synthesis_init.html b/doc/libvorbis/vorbis_synthesis_init.html
index 64f06b918..6d2c7a9cb 100644
--- a/doc/libvorbis/vorbis_synthesis_init.html
+++ b/doc/libvorbis/vorbis_synthesis_init.html
@@ -56,7 +56,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_synthesis_lapout.html b/doc/libvorbis/vorbis_synthesis_lapout.html
index 7fcdf0639..77696e4c8 100644
--- a/doc/libvorbis/vorbis_synthesis_lapout.html
+++ b/doc/libvorbis/vorbis_synthesis_lapout.html
@@ -61,7 +61,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_synthesis_pcmout.html b/doc/libvorbis/vorbis_synthesis_pcmout.html
index 0283d88c6..8a22bb8f4 100644
--- a/doc/libvorbis/vorbis_synthesis_pcmout.html
+++ b/doc/libvorbis/vorbis_synthesis_pcmout.html
@@ -62,7 +62,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_synthesis_read.html b/doc/libvorbis/vorbis_synthesis_read.html
index 4972a85d1..3b1ee70e5 100644
--- a/doc/libvorbis/vorbis_synthesis_read.html
+++ b/doc/libvorbis/vorbis_synthesis_read.html
@@ -54,7 +54,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_synthesis_restart.html b/doc/libvorbis/vorbis_synthesis_restart.html
index c02385e5a..efcf13364 100644
--- a/doc/libvorbis/vorbis_synthesis_restart.html
+++ b/doc/libvorbis/vorbis_synthesis_restart.html
@@ -51,7 +51,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_synthesis_trackonly.html b/doc/libvorbis/vorbis_synthesis_trackonly.html
index dd3e685a5..550f32d0b 100644
--- a/doc/libvorbis/vorbis_synthesis_trackonly.html
+++ b/doc/libvorbis/vorbis_synthesis_trackonly.html
@@ -58,7 +58,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/libvorbis/vorbis_version_string.html b/doc/libvorbis/vorbis_version_string.html
index e85f23e44..017d68461 100644
--- a/doc/libvorbis/vorbis_version_string.html
+++ b/doc/libvorbis/vorbis_version_string.html
@@ -43,7 +43,7 @@ 
      Return Values
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/oggstream.html b/doc/oggstream.html
index 6952ed9f3..48c337edf 100644
--- a/doc/oggstream.html
+++ b/doc/oggstream.html
@@ -67,7 +67,7 @@
 
      Ogg logical and physical bitstream overview
      
diff --git a/doc/programming.html b/doc/programming.html
index 4b54347b1..b0ad255cf 100644
--- a/doc/programming.html
+++ b/doc/programming.html
@@ -67,7 +67,7 @@
 
      Programming with Xiph.Org libvorbis
      
diff --git a/doc/stereo.html b/doc/stereo.html
index 9cfbbea06..c7180e0e9 100644
--- a/doc/stereo.html
+++ b/doc/stereo.html
@@ -67,7 +67,7 @@
 
      Ogg Vorbis stereo-specific channel coupling discussion
      
diff --git a/doc/v-comment.html b/doc/v-comment.html
index aad5e880f..0093447cd 100644
--- a/doc/v-comment.html
+++ b/doc/v-comment.html
@@ -67,7 +67,7 @@
 
      Ogg Vorbis I format specification: comment field and header specification
      
@@ -182,12 +182,9 @@ 
      Field names
      Copyright attribution, e.g., '2001 Nobody's Band' or '1999 Jack Moffitt'
      LICENSE
      
-
      License information, eg, 'All Rights Reserved', 'Any
+
      License information, for example, 'All Rights Reserved', 'Any
 Use Permitted', a URL to a license such as a Creative Commons license
-("www.creativecommons.org/blahblah/license.html") or the EFF Open
-Audio License ('distributed under the terms of the Open Audio
-License. see http://www.eff.org/IP/Open_licenses/eff_oal.html for
-details'), etc.
      
+(e.g. "creativecommons.org/licenses/by/4.0/"), or similar.
      ORGANIZATION
      Name of the organization producing the track (i.e.
@@ -211,7 +208,7 @@ 
      Field names
      
 the producing label.
      ISRC
      
-
      ISRC number for the track; see the
+
      ISRC number for the track; see the
 ISRC intro page for more information on ISRC numbers.
      
diff --git a/doc/vorbis-fidelity.html b/doc/vorbis-fidelity.html
index 2321d6753..85229282f 100644
--- a/doc/vorbis-fidelity.html
+++ b/doc/vorbis-fidelity.html
@@ -67,7 +67,7 @@
 
      Ogg Vorbis: Fidelity measurement and terminology discussion
      
diff --git a/doc/vorbisenc/changes.html b/doc/vorbisenc/changes.html
index eb8460e55..fbf0ebc48 100644
--- a/doc/vorbisenc/changes.html
+++ b/doc/vorbisenc/changes.html
@@ -92,7 +92,7 @@ 
      Newly added in 1.1
      
 
      
 
      copyright © 2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbis documentation
      		
 
      libvorbis version 1.3.2 - 20101101
      		
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
      
-
+
diff --git a/doc/vorbisenc/examples.html b/doc/vorbisenc/examples.html
index 1fcc7e08d..72282eb91 100644
--- a/doc/vorbisenc/examples.html
+++ b/doc/vorbisenc/examples.html
@@ -121,7 +121,7 @@ 
      Example: encoding using VBR selected by approximate bitrate
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbisenc documentation
      		
 
      libvorbisenc version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisenc/index.html b/doc/vorbisenc/index.html
index ec9b98836..b39c04f24 100644
--- a/doc/vorbisenc/index.html
+++ b/doc/vorbisenc/index.html
@@ -28,7 +28,7 @@ 
      Libvorbisenc Documentation
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbisenc documentation
      		
 
      libvorbisenc version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisenc/ovectl_ratemanage2_arg.html b/doc/vorbisenc/ovectl_ratemanage2_arg.html
index 3d9d417b5..cc7962544 100644
--- a/doc/vorbisenc/ovectl_ratemanage2_arg.html
+++ b/doc/vorbisenc/ovectl_ratemanage2_arg.html
@@ -80,7 +80,7 @@ 
      Relevant Struct Members
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbisenc documentation
      		
 
      libvorbisenc version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisenc/ovectl_ratemanage_arg.html b/doc/vorbisenc/ovectl_ratemanage_arg.html
index 48f5a6251..f64c05782 100644
--- a/doc/vorbisenc/ovectl_ratemanage_arg.html
+++ b/doc/vorbisenc/ovectl_ratemanage_arg.html
@@ -80,7 +80,7 @@ 
      Relevant Struct Members
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbisenc documentation
      		
 
      libvorbisenc version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisenc/overview.html b/doc/vorbisenc/overview.html
index 51af7b507..cf439b5b5 100644
--- a/doc/vorbisenc/overview.html
+++ b/doc/vorbisenc/overview.html
@@ -369,7 +369,7 @@ 
      encoding model adjustments
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbisenc documentation
      		
 
      libvorbisenc version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisenc/reference.html b/doc/vorbisenc/reference.html
index 59d643229..041ebd3aa 100644
--- a/doc/vorbisenc/reference.html
+++ b/doc/vorbisenc/reference.html
@@ -42,7 +42,7 @@ 
      Encoder Setup
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbisenc documentation
      		
 
      libvorbisenc version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisenc/vorbis_encode_ctl.html b/doc/vorbisenc/vorbis_encode_ctl.html
index 13de574c5..b1d836e03 100644
--- a/doc/vorbisenc/vorbis_encode_ctl.html
+++ b/doc/vorbisenc/vorbis_encode_ctl.html
@@ -170,7 +170,7 @@ 
      Return Values
       vorbis_encode_ctl() returns zero on success,
 
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbisenc documentation
      		
 
      libvorbisenc version 1.3.2 - 20101101
      
-
+
diff --git a/doc/vorbisenc/vorbis_encode_init.html b/doc/vorbisenc/vorbis_encode_init.html
index d371899f4..4f5728095 100644
--- a/doc/vorbisenc/vorbis_encode_init.html
+++ b/doc/vorbisenc/vorbis_encode_init.html
@@ -75,7 +75,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbisenc documentation
      		
 
      libvorbisenc version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisenc/vorbis_encode_init_vbr.html b/doc/vorbisenc/vorbis_encode_init_vbr.html
index 800d25783..d37b87c57 100644
--- a/doc/vorbisenc/vorbis_encode_init_vbr.html
+++ b/doc/vorbisenc/vorbis_encode_init_vbr.html
@@ -68,7 +68,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbisenc documentation
      		
 
      libvorbisenc version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisenc/vorbis_encode_setup_init.html b/doc/vorbisenc/vorbis_encode_setup_init.html
index aa2c90491..752d40af9 100644
--- a/doc/vorbisenc/vorbis_encode_setup_init.html
+++ b/doc/vorbisenc/vorbis_encode_setup_init.html
@@ -75,7 +75,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbisenc documentation
      		
 
      libvorbisenc version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisenc/vorbis_encode_setup_managed.html b/doc/vorbisenc/vorbis_encode_setup_managed.html
index 0389ddecd..bea9aa233 100644
--- a/doc/vorbisenc/vorbis_encode_setup_managed.html
+++ b/doc/vorbisenc/vorbis_encode_setup_managed.html
@@ -89,7 +89,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbisenc documentation
      		
 
      libvorbisenc version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisenc/vorbis_encode_setup_vbr.html b/doc/vorbisenc/vorbis_encode_setup_vbr.html
index e390edfcc..4b59c3c28 100644
--- a/doc/vorbisenc/vorbis_encode_setup_vbr.html
+++ b/doc/vorbisenc/vorbis_encode_setup_vbr.html
@@ -77,7 +77,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbisenc documentation
      		
 
      libvorbisenc version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/OggVorbis_File.html b/doc/vorbisfile/OggVorbis_File.html
index 67f47d70d..e2cef6ade 100644
--- a/doc/vorbisfile/OggVorbis_File.html
+++ b/doc/vorbisfile/OggVorbis_File.html
@@ -125,7 +125,7 @@ 
      Relevant Struct Members
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      libvorbisenc documentation
      		
 
      libvorbisenc version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/callbacks.html b/doc/vorbisfile/callbacks.html
index 20ae55a1c..7ce493a99 100644
--- a/doc/vorbisfile/callbacks.html
+++ b/doc/vorbisfile/callbacks.html
@@ -109,7 +109,7 @@ 
      Tell function
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/chaining_example_c.html b/doc/vorbisfile/chaining_example_c.html
index e40689ce9..b3e146cfa 100644
--- a/doc/vorbisfile/chaining_example_c.html
+++ b/doc/vorbisfile/chaining_example_c.html
@@ -78,7 +78,7 @@ 
      chaining_example.c
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/chainingexample.html b/doc/vorbisfile/chainingexample.html
index 9e0440d15..4c190b16b 100644
--- a/doc/vorbisfile/chainingexample.html
+++ b/doc/vorbisfile/chainingexample.html
@@ -163,7 +163,7 @@ 
      Chaining Example Code
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/crosslap.html b/doc/vorbisfile/crosslap.html
index 9d28b0b42..b6693249f 100644
--- a/doc/vorbisfile/crosslap.html
+++ b/doc/vorbisfile/crosslap.html
@@ -109,7 +109,7 @@ 
      Best Crosslap
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/datastructures.html b/doc/vorbisfile/datastructures.html
index 00f8f8d74..caf023c5e 100644
--- a/doc/vorbisfile/datastructures.html
+++ b/doc/vorbisfile/datastructures.html
@@ -49,7 +49,7 @@ 
      Base Data Structures
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/decoding.html b/doc/vorbisfile/decoding.html
index f39437677..3ff8a0369 100644
--- a/doc/vorbisfile/decoding.html
+++ b/doc/vorbisfile/decoding.html
@@ -80,7 +80,7 @@ 
      file cursor position
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/example.html b/doc/vorbisfile/example.html
index e0c4fa392..9a6b0f62a 100644
--- a/doc/vorbisfile/example.html
+++ b/doc/vorbisfile/example.html
@@ -196,7 +196,7 @@ 
      Decoding Example Code
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/exampleindex.html b/doc/vorbisfile/exampleindex.html
index 9227b97bb..afe9adab4 100644
--- a/doc/vorbisfile/exampleindex.html
+++ b/doc/vorbisfile/exampleindex.html
@@ -27,7 +27,7 @@ 
      VorbisFile Example Code
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/fileinfo.html b/doc/vorbisfile/fileinfo.html
index c025dd6ef..a703100d8 100644
--- a/doc/vorbisfile/fileinfo.html
+++ b/doc/vorbisfile/fileinfo.html
@@ -83,7 +83,7 @@ 
      File Information
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/index.html b/doc/vorbisfile/index.html
index 167e1c0b7..b5bde1571 100644
--- a/doc/vorbisfile/index.html
+++ b/doc/vorbisfile/index.html
@@ -37,7 +37,7 @@ 
      Vorbisfile Documentation
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/initialization.html b/doc/vorbisfile/initialization.html
index da8395745..346ee72f5 100644
--- a/doc/vorbisfile/initialization.html
+++ b/doc/vorbisfile/initialization.html
@@ -106,7 +106,7 @@ 
      Setup/Teardown
      In order to decode audio using
 
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		 
      
-
+
diff --git a/doc/vorbisfile/ov_bitrate.html b/doc/vorbisfile/ov_bitrate.html
index eb3c4d742..ae1495b75 100644
--- a/doc/vorbisfile/ov_bitrate.html
+++ b/doc/vorbisfile/ov_bitrate.html
@@ -60,7 +60,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_bitrate_instant.html b/doc/vorbisfile/ov_bitrate_instant.html
index da44dcff6..2edfd044d 100644
--- a/doc/vorbisfile/ov_bitrate_instant.html
+++ b/doc/vorbisfile/ov_bitrate_instant.html
@@ -53,7 +53,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_callbacks.html b/doc/vorbisfile/ov_callbacks.html
index d1b64be89..b9e580287 100644
--- a/doc/vorbisfile/ov_callbacks.html
+++ b/doc/vorbisfile/ov_callbacks.html
@@ -105,7 +105,7 @@ 
      Examples and usage
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_clear.html b/doc/vorbisfile/ov_clear.html
index e67107c0c..0c011bfed 100644
--- a/doc/vorbisfile/ov_clear.html
+++ b/doc/vorbisfile/ov_clear.html
@@ -52,7 +52,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_comment.html b/doc/vorbisfile/ov_comment.html
index 9f1b499b3..02795b75b 100644
--- a/doc/vorbisfile/ov_comment.html
+++ b/doc/vorbisfile/ov_comment.html
@@ -54,7 +54,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_crosslap.html b/doc/vorbisfile/ov_crosslap.html
index 0b2b1020f..6b563f622 100644
--- a/doc/vorbisfile/ov_crosslap.html
+++ b/doc/vorbisfile/ov_crosslap.html
@@ -88,7 +88,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_fopen.html b/doc/vorbisfile/ov_fopen.html
index 9a7b14b6d..75927149e 100644
--- a/doc/vorbisfile/ov_fopen.html
+++ b/doc/vorbisfile/ov_fopen.html
@@ -112,7 +112,7 @@ 
      Notes
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_info.html b/doc/vorbisfile/ov_info.html
index b94fa684f..e29c516d8 100644
--- a/doc/vorbisfile/ov_info.html
+++ b/doc/vorbisfile/ov_info.html
@@ -52,7 +52,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_open.html b/doc/vorbisfile/ov_open.html
index d0311ce98..bf214aaf3 100644
--- a/doc/vorbisfile/ov_open.html
+++ b/doc/vorbisfile/ov_open.html
@@ -171,7 +171,7 @@ 
      Notes
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_open_callbacks.html b/doc/vorbisfile/ov_open_callbacks.html
index 6d59e0b66..60816803b 100644
--- a/doc/vorbisfile/ov_open_callbacks.html
+++ b/doc/vorbisfile/ov_open_callbacks.html
@@ -135,7 +135,7 @@ 
      Notes
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_pcm_seek.html b/doc/vorbisfile/ov_pcm_seek.html
index 81b0c1c3c..3709467a1 100644
--- a/doc/vorbisfile/ov_pcm_seek.html
+++ b/doc/vorbisfile/ov_pcm_seek.html
@@ -71,7 +71,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_pcm_seek_lap.html b/doc/vorbisfile/ov_pcm_seek_lap.html
index 6310e427b..71c490aa8 100644
--- a/doc/vorbisfile/ov_pcm_seek_lap.html
+++ b/doc/vorbisfile/ov_pcm_seek_lap.html
@@ -91,7 +91,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_pcm_seek_page.html b/doc/vorbisfile/ov_pcm_seek_page.html
index 8f1959ac1..6f33505e1 100644
--- a/doc/vorbisfile/ov_pcm_seek_page.html
+++ b/doc/vorbisfile/ov_pcm_seek_page.html
@@ -72,7 +72,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_pcm_seek_page_lap.html b/doc/vorbisfile/ov_pcm_seek_page_lap.html
index d9694e87d..d4736eb40 100644
--- a/doc/vorbisfile/ov_pcm_seek_page_lap.html
+++ b/doc/vorbisfile/ov_pcm_seek_page_lap.html
@@ -100,7 +100,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_pcm_tell.html b/doc/vorbisfile/ov_pcm_tell.html
index 2d8ea83df..114bec54f 100644
--- a/doc/vorbisfile/ov_pcm_tell.html
+++ b/doc/vorbisfile/ov_pcm_tell.html
@@ -51,7 +51,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_pcm_total.html b/doc/vorbisfile/ov_pcm_total.html
index 297a8e182..cad8c318b 100644
--- a/doc/vorbisfile/ov_pcm_total.html
+++ b/doc/vorbisfile/ov_pcm_total.html
@@ -55,7 +55,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_raw_seek.html b/doc/vorbisfile/ov_raw_seek.html
index 04ed549c3..9074b3540 100644
--- a/doc/vorbisfile/ov_raw_seek.html
+++ b/doc/vorbisfile/ov_raw_seek.html
@@ -71,7 +71,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_raw_seek_lap.html b/doc/vorbisfile/ov_raw_seek_lap.html
index 8e8c24d8a..87d0e7ebd 100644
--- a/doc/vorbisfile/ov_raw_seek_lap.html
+++ b/doc/vorbisfile/ov_raw_seek_lap.html
@@ -98,7 +98,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_raw_tell.html b/doc/vorbisfile/ov_raw_tell.html
index 5f30efffc..419a5b32c 100644
--- a/doc/vorbisfile/ov_raw_tell.html
+++ b/doc/vorbisfile/ov_raw_tell.html
@@ -53,7 +53,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_raw_total.html b/doc/vorbisfile/ov_raw_total.html
index d9d830367..54c93c196 100644
--- a/doc/vorbisfile/ov_raw_total.html
+++ b/doc/vorbisfile/ov_raw_total.html
@@ -56,7 +56,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_read.html b/doc/vorbisfile/ov_read.html
index 5461a848f..e696086e8 100644
--- a/doc/vorbisfile/ov_read.html
+++ b/doc/vorbisfile/ov_read.html
@@ -136,7 +136,7 @@ 
      Notes
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_read_filter.html b/doc/vorbisfile/ov_read_filter.html
index e3f2e8453..932b7a92f 100644
--- a/doc/vorbisfile/ov_read_filter.html
+++ b/doc/vorbisfile/ov_read_filter.html
@@ -102,7 +102,7 @@ 
      Notes
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_read_float.html b/doc/vorbisfile/ov_read_float.html
index 0c36eb000..00c2f37b5 100644
--- a/doc/vorbisfile/ov_read_float.html
+++ b/doc/vorbisfile/ov_read_float.html
@@ -89,7 +89,7 @@ 
      Notes
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_seekable.html b/doc/vorbisfile/ov_seekable.html
index 59b6e97af..c4448ba57 100644
--- a/doc/vorbisfile/ov_seekable.html
+++ b/doc/vorbisfile/ov_seekable.html
@@ -51,7 +51,7 @@ 
      Return Values
      
 
      
 
      copyright © 2002 vorbis team
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_serialnumber.html b/doc/vorbisfile/ov_serialnumber.html
index 1b64415f5..eaf24b0c0 100644
--- a/doc/vorbisfile/ov_serialnumber.html
+++ b/doc/vorbisfile/ov_serialnumber.html
@@ -55,7 +55,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_streams.html b/doc/vorbisfile/ov_streams.html
index e455b0755..233490464 100644
--- a/doc/vorbisfile/ov_streams.html
+++ b/doc/vorbisfile/ov_streams.html
@@ -52,7 +52,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_test.html b/doc/vorbisfile/ov_test.html
index cb11d0185..663927f8b 100644
--- a/doc/vorbisfile/ov_test.html
+++ b/doc/vorbisfile/ov_test.html
@@ -92,7 +92,7 @@ 
      Notes
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_test_callbacks.html b/doc/vorbisfile/ov_test_callbacks.html
index 9abc84c0a..77ee16d64 100644
--- a/doc/vorbisfile/ov_test_callbacks.html
+++ b/doc/vorbisfile/ov_test_callbacks.html
@@ -99,7 +99,7 @@ 
      Notes
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_test_open.html b/doc/vorbisfile/ov_test_open.html
index 6fb8ae9b5..f6ef0ed68 100644
--- a/doc/vorbisfile/ov_test_open.html
+++ b/doc/vorbisfile/ov_test_open.html
@@ -63,7 +63,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_time_seek.html b/doc/vorbisfile/ov_time_seek.html
index ec19ce357..067ac01d2 100644
--- a/doc/vorbisfile/ov_time_seek.html
+++ b/doc/vorbisfile/ov_time_seek.html
@@ -70,7 +70,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_time_seek_lap.html b/doc/vorbisfile/ov_time_seek_lap.html
index f300f3b21..e163949a1 100644
--- a/doc/vorbisfile/ov_time_seek_lap.html
+++ b/doc/vorbisfile/ov_time_seek_lap.html
@@ -93,7 +93,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_time_seek_page.html b/doc/vorbisfile/ov_time_seek_page.html
index 271d57554..a76750af8 100644
--- a/doc/vorbisfile/ov_time_seek_page.html
+++ b/doc/vorbisfile/ov_time_seek_page.html
@@ -71,7 +71,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_time_seek_page_lap.html b/doc/vorbisfile/ov_time_seek_page_lap.html
index 3b1effac2..2d7c606ea 100644
--- a/doc/vorbisfile/ov_time_seek_page_lap.html
+++ b/doc/vorbisfile/ov_time_seek_page_lap.html
@@ -100,7 +100,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_time_tell.html b/doc/vorbisfile/ov_time_tell.html
index 92d171c74..73cbe60f9 100644
--- a/doc/vorbisfile/ov_time_tell.html
+++ b/doc/vorbisfile/ov_time_tell.html
@@ -51,7 +51,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/ov_time_total.html b/doc/vorbisfile/ov_time_total.html
index 3b34f93a9..98133d264 100644
--- a/doc/vorbisfile/ov_time_total.html
+++ b/doc/vorbisfile/ov_time_total.html
@@ -55,7 +55,7 @@ 
      Return Values
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/overview.html b/doc/vorbisfile/overview.html
index 13064953a..dfe80297d 100644
--- a/doc/vorbisfile/overview.html
+++ b/doc/vorbisfile/overview.html
@@ -48,7 +48,7 @@ 
      Vorbisfile API Overview
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/reference.html b/doc/vorbisfile/reference.html
index 7c3c789ce..4c00a4d73 100644
--- a/doc/vorbisfile/reference.html
+++ b/doc/vorbisfile/reference.html
@@ -74,7 +74,7 @@ 
      Vorbisfile API Reference
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/seekexample.html b/doc/vorbisfile/seekexample.html
index 897403d08..5da157e5b 100644
--- a/doc/vorbisfile/seekexample.html
+++ b/doc/vorbisfile/seekexample.html
@@ -140,7 +140,7 @@ 
      Example Code: seeking
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/seeking.html b/doc/vorbisfile/seeking.html
index 17e4e8235..d479984fa 100644
--- a/doc/vorbisfile/seeking.html
+++ b/doc/vorbisfile/seeking.html
@@ -95,7 +95,7 @@ 
      Seeking
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/seeking_example_c.html b/doc/vorbisfile/seeking_example_c.html
index eb10a98f0..a7b9759c7 100644
--- a/doc/vorbisfile/seeking_example_c.html
+++ b/doc/vorbisfile/seeking_example_c.html
@@ -74,7 +74,7 @@ 
      seeking_test.c
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/seeking_test_c.html b/doc/vorbisfile/seeking_test_c.html
index eb10a98f0..a7b9759c7 100644
--- a/doc/vorbisfile/seeking_test_c.html
+++ b/doc/vorbisfile/seeking_test_c.html
@@ -74,7 +74,7 @@ 
      seeking_test.c
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/seekingexample.html b/doc/vorbisfile/seekingexample.html
index 8263f02f8..6b831dbca 100644
--- a/doc/vorbisfile/seekingexample.html
+++ b/doc/vorbisfile/seekingexample.html
@@ -191,7 +191,7 @@ 
      Example Code
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/doc/vorbisfile/threads.html b/doc/vorbisfile/threads.html
index 274e11519..3d2015163 100644
--- a/doc/vorbisfile/threads.html
+++ b/doc/vorbisfile/threads.html
@@ -38,7 +38,7 @@ 
      Thread Safety
      
 
      
 
      copyright © 2000 vorbis team
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      vorbisfile documentation
      		
 
      vorbisfile version 1.25 - 20000615
      		
 
      
-
+
diff --git a/doc/vorbisfile/vorbisfile_example_c.html b/doc/vorbisfile/vorbisfile_example_c.html
index f3ba1d6cc..8662d9961 100644
--- a/doc/vorbisfile/vorbisfile_example_c.html
+++ b/doc/vorbisfile/vorbisfile_example_c.html
@@ -94,7 +94,7 @@ 
      vorbisfile_example.c
      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101
      		
 
      
-
+
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 58816350d..63dc8985f 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -13,19 +13,19 @@ AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
 #LDFLAGS = -all-static 
 
 decoder_example_SOURCES = decoder_example.c
-decoder_example_LDADD = $(top_builddir)/lib/libvorbis.la @OGG_LIBS@
+decoder_example_LDADD = $(top_builddir)/lib/libvorbis.la @VORBIS_LIBS@ @OGG_LIBS@
 
 encoder_example_SOURCES = encoder_example.c
-encoder_example_LDADD = $(top_builddir)/lib/libvorbisenc.la $(top_builddir)/lib/libvorbis.la @OGG_LIBS@
+encoder_example_LDADD = $(top_builddir)/lib/libvorbisenc.la $(top_builddir)/lib/libvorbis.la @VORBIS_LIBS@ @OGG_LIBS@
 
 chaining_example_SOURCES = chaining_example.c
-chaining_example_LDADD = $(top_builddir)/lib/libvorbisfile.la $(top_builddir)/lib/libvorbis.la @OGG_LIBS@
+chaining_example_LDADD = $(top_builddir)/lib/libvorbisfile.la $(top_builddir)/lib/libvorbis.la @VORBIS_LIBS@ @OGG_LIBS@
 
 vorbisfile_example_SOURCES = vorbisfile_example.c
-vorbisfile_example_LDADD = $(top_builddir)/lib/libvorbisfile.la $(top_builddir)/lib/libvorbis.la @OGG_LIBS@
+vorbisfile_example_LDADD = $(top_builddir)/lib/libvorbisfile.la $(top_builddir)/lib/libvorbis.la @VORBIS_LIBS@ @OGG_LIBS@
 
 seeking_example_SOURCES = seeking_example.c
-seeking_example_LDADD = $(top_builddir)/lib/libvorbisfile.la $(top_builddir)/lib/libvorbis.la @OGG_LIBS@
+seeking_example_LDADD = $(top_builddir)/lib/libvorbisfile.la $(top_builddir)/lib/libvorbis.la @VORBIS_LIBS@ @OGG_LIBS@
 
 debug:
 	$(MAKE) all CFLAGS="@DEBUG@"
diff --git a/examples/chaining_example.c b/examples/chaining_example.c
index 19215d7ba..bde374900 100644
--- a/examples/chaining_example.c
+++ b/examples/chaining_example.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/examples/decoder_example.c b/examples/decoder_example.c
index e264e403b..082f1bc9f 100644
--- a/examples/decoder_example.c
+++ b/examples/decoder_example.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/examples/encoder_example.c b/examples/encoder_example.c
index d46a051a2..9a527f33d 100644
--- a/examples/encoder_example.c
+++ b/examples/encoder_example.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/examples/seeking_example.c b/examples/seeking_example.c
index d039b0db8..9588680b1 100644
--- a/examples/seeking_example.c
+++ b/examples/seeking_example.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/examples/vorbisfile_example.c b/examples/vorbisfile_example.c
index d15bc4cb0..78c8a04fe 100644
--- a/examples/vorbisfile_example.c
+++ b/examples/vorbisfile_example.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/include/vorbis/codec.h b/include/vorbis/codec.h
index 42aa29138..f8a912bc2 100644
--- a/include/vorbis/codec.h
+++ b/include/vorbis/codec.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
 
  ********************************************************************
 
diff --git a/include/vorbis/vorbisenc.h b/include/vorbis/vorbisenc.h
index 55f3b4a66..085b15e66 100644
--- a/include/vorbis/vorbisenc.h
+++ b/include/vorbis/vorbisenc.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/include/vorbis/vorbisfile.h b/include/vorbis/vorbisfile.h
index 56626119b..3d65393f5 100644
--- a/include/vorbis/vorbisfile.h
+++ b/include/vorbis/vorbisfile.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index e808e7722..7cd68e509 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -61,15 +61,17 @@ if(WIN32)
     list(APPEND VORBIS_SOURCES vorbisenc.c)
 endif()
 
-if(MSVC)
+if(WIN32)
     list(APPEND VORBIS_SOURCES ../win32/vorbis.def)
     list(APPEND VORBISENC_SOURCES ../win32/vorbisenc.def)
     list(APPEND VORBISFILE_SOURCES ../win32/vorbisfile.def)
 endif()
 
-include_directories(../include)
-include_directories(.)
-include_directories(${OGG_INCLUDE_DIRS})
+if(MSVC)
+    add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+endif()
 
 if (NOT BUILD_FRAMEWORK)
     add_library(vorbis ${VORBIS_HEADERS} ${VORBIS_SOURCES})
@@ -83,15 +85,68 @@ if (NOT BUILD_FRAMEWORK)
     get_version_info(VORBISFILE_VERSION_INFO "VF_LIB_CURRENT" "VF_LIB_AGE" "VF_LIB_REVISION")
     set_target_properties(vorbisfile PROPERTIES SOVERSION ${VORBISFILE_VERSION_INFO})
 
-    target_link_libraries(vorbis ${OGG_LIBRARIES})
-    target_link_libraries(vorbisenc ${OGG_LIBRARIES} vorbis)
-    target_link_libraries(vorbisfile ${OGG_LIBRARIES} vorbis)
+    target_include_directories(vorbis
+        PUBLIC
+            $
+            $
+       PRIVATE
+            ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+    target_include_directories(vorbisenc
+        PUBLIC
+            $
+            $
+        PRIVATE
+            ${CMAKE_CURRENT_SOURCE_DIR}
+    )
+    target_include_directories(vorbisfile
+        PUBLIC
+            $
+            $
+    )
+
+    target_link_libraries(vorbis
+        PUBLIC Ogg::ogg
+        PRIVATE $<$:m>
+    )
+    target_link_libraries(vorbisenc PUBLIC vorbis)
+    target_link_libraries(vorbisfile PUBLIC vorbis)
 
     install(FILES ${VORBIS_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/vorbis)
 
-    install(TARGETS vorbis     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR})
-    install(TARGETS vorbisenc  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR})
-    install(TARGETS vorbisfile RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    install(TARGETS vorbis vorbisenc vorbisfile
+        EXPORT VorbisTargets
+        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    )
+
+    if(INSTALL_CMAKE_PACKAGE_MODULE)
+
+    set(CMAKE_INSTALL_CONFIGDIR ${CMAKE_INSTALL_LIBDIR}/cmake/Vorbis)
+
+        install(EXPORT VorbisTargets
+            DESTINATION ${CMAKE_INSTALL_CONFIGDIR}
+            NAMESPACE Vorbis::
+        )
+
+
+        include(CMakePackageConfigHelpers)
+
+        configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/VorbisConfig.cmake.in ${PROJECT_BINARY_DIR}/VorbisConfig.cmake
+            INSTALL_DESTINATION ${CMAKE_INSTALL_CONFIGDIR}
+        )
+
+        write_basic_package_version_file(${PROJECT_BINARY_DIR}/VorbisConfigVersion.cmake
+            COMPATIBILITY SameMajorVersion
+        )
+
+        install(FILES ${PROJECT_BINARY_DIR}/VorbisConfig.cmake ${PROJECT_BINARY_DIR}/VorbisConfigVersion.cmake
+            DESTINATION ${CMAKE_INSTALL_CONFIGDIR}
+        )
+
+    endif()
 else()
     add_library(vorbis ${VORBIS_PUBLIC_HEADERS} ${VORBIS_HEADERS} ${VORBIS_SOURCES} ${VORBISFILE_SOURCES} ${VORBISENC_SOURCES})
     set_target_properties(vorbis PROPERTIES
diff --git a/lib/Makefile.am b/lib/Makefile.am
index cd5afdfa0..e22895eab 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -35,7 +35,7 @@ psytune_SOURCES = psytune.c
 psytune_LDFLAGS = -static
 psytune_LDADD = libvorbis.la
 
-EXTRA_DIST = lookups.pl 
+EXTRA_DIST = lookups.pl CMakeLists.txt
 
 # build and run the self tests on 'make check'
 
diff --git a/lib/analysis.c b/lib/analysis.c
index 0e11a167b..14919737e 100644
--- a/lib/analysis.c
+++ b/lib/analysis.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/backends.h b/lib/backends.h
index 22809d46d..670b0b902 100644
--- a/lib/backends.h
+++ b/lib/backends.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/barkmel.c b/lib/barkmel.c
index 4b19935f3..f833c3021 100644
--- a/lib/barkmel.c
+++ b/lib/barkmel.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/bitrate.c b/lib/bitrate.c
index 96055140f..132553cbe 100644
--- a/lib/bitrate.c
+++ b/lib/bitrate.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/bitrate.h b/lib/bitrate.h
index 655a68cc0..48fa15059 100644
--- a/lib/bitrate.h
+++ b/lib/bitrate.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/block.c b/lib/block.c
index db245b3e6..6a50da084 100644
--- a/lib/block.c
+++ b/lib/block.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/books/coupled/res_books_51.h b/lib/books/coupled/res_books_51.h
index 47df4b221..eb569c6f0 100644
--- a/lib/books/coupled/res_books_51.h
+++ b/lib/books/coupled/res_books_51.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2010             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
  *
diff --git a/lib/books/coupled/res_books_stereo.h b/lib/books/coupled/res_books_stereo.h
index 61d934046..7b53cb972 100644
--- a/lib/books/coupled/res_books_stereo.h
+++ b/lib/books/coupled/res_books_stereo.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/books/floor/floor_books.h b/lib/books/floor/floor_books.h
index 67d5f31a3..d26664f76 100644
--- a/lib/books/floor/floor_books.h
+++ b/lib/books/floor/floor_books.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/books/uncoupled/res_books_uncoupled.h b/lib/books/uncoupled/res_books_uncoupled.h
index 3d658ec47..107e22f9e 100644
--- a/lib/books/uncoupled/res_books_uncoupled.h
+++ b/lib/books/uncoupled/res_books_uncoupled.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/codebook.c b/lib/codebook.c
index 78672e222..7a0c20678 100644
--- a/lib/codebook.c
+++ b/lib/codebook.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/codebook.h b/lib/codebook.h
index 08440c696..7d4e2aae4 100644
--- a/lib/codebook.h
+++ b/lib/codebook.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/codec_internal.h b/lib/codec_internal.h
index e522be18d..2ecf5e5c7 100644
--- a/lib/codec_internal.h
+++ b/lib/codec_internal.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/envelope.c b/lib/envelope.c
index da7523754..22d39aa6e 100644
--- a/lib/envelope.c
+++ b/lib/envelope.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/envelope.h b/lib/envelope.h
index f466efde8..2ef60a82c 100644
--- a/lib/envelope.h
+++ b/lib/envelope.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/floor0.c b/lib/floor0.c
index 443c0e5a9..f4a6d4d55 100644
--- a/lib/floor0.c
+++ b/lib/floor0.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/floor1.c b/lib/floor1.c
index 673e954c5..c4fe3ea7e 100644
--- a/lib/floor1.c
+++ b/lib/floor1.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/highlevel.h b/lib/highlevel.h
index 337b75bfa..7690e3ebf 100644
--- a/lib/highlevel.h
+++ b/lib/highlevel.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/info.c b/lib/info.c
index 3fbb7c757..f2e39e387 100644
--- a/lib/info.c
+++ b/lib/info.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
@@ -19,7 +19,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include "vorbis/codec.h"
 #include "codec_internal.h"
@@ -30,8 +29,8 @@
 #include "misc.h"
 #include "os.h"
 
-#define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.3.6"
-#define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20180316 (Now 100% fewer shells)"
+#define GENERAL_VENDOR_STRING "Xiph.Org libVorbis 1.3.7"
+#define ENCODE_VENDOR_STRING "Xiph.Org libVorbis I 20200704 (Reducing Environment)"
 
 /* helpers */
 static void _v_writestring(oggpack_buffer *o,const char *s, int bytes){
@@ -47,6 +46,10 @@ static void _v_readstring(oggpack_buffer *o,char *buf,int bytes){
   }
 }
 
+static int _v_toupper(int c) {
+  return (c >= 'a' && c <= 'z') ? (c & ~('a' - 'A')) : c;
+}
+
 void vorbis_comment_init(vorbis_comment *vc){
   memset(vc,0,sizeof(*vc));
 }
@@ -78,7 +81,7 @@ void vorbis_comment_add_tag(vorbis_comment *vc, const char *tag, const char *con
 static int tagcompare(const char *s1, const char *s2, int n){
   int c=0;
   while(c < n){
-    if(toupper(s1[c]) != toupper(s2[c]))
+    if(_v_toupper(s1[c]) != _v_toupper(s2[c]))
       return !0;
     c++;
   }
@@ -203,6 +206,7 @@ void vorbis_info_clear(vorbis_info *vi){
 
 static int _vorbis_unpack_info(vorbis_info *vi,oggpack_buffer *opb){
   codec_setup_info     *ci=vi->codec_setup;
+  int bs;
   if(!ci)return(OV_EFAULT);
 
   vi->version=oggpack_read(opb,32);
@@ -215,8 +219,12 @@ static int _vorbis_unpack_info(vorbis_info *vi,oggpack_buffer *opb){
   vi->bitrate_nominal=(ogg_int32_t)oggpack_read(opb,32);
   vi->bitrate_lower=(ogg_int32_t)oggpack_read(opb,32);
 
-  ci->blocksizes[0]=1<blocksizes[1]=1<blocksizes[0]=1<blocksizes[1]=1<rate<1)goto err_out;
   if(vi->channels<1)goto err_out;
diff --git a/lib/lookup.c b/lib/lookup.c
index 1cc1f88ee..7cd01a44d 100644
--- a/lib/lookup.c
+++ b/lib/lookup.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/lookup.h b/lib/lookup.h
index 4bc0f3a20..ec05014f4 100644
--- a/lib/lookup.h
+++ b/lib/lookup.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/lookup_data.h b/lib/lookup_data.h
index 5de3cfdc7..7935715a7 100644
--- a/lib/lookup_data.h
+++ b/lib/lookup_data.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/lookups.pl b/lib/lookups.pl
index 9bc0b03a3..87e2cad81 100755
--- a/lib/lookups.pl
+++ b/lib/lookups.pl
@@ -8,7 +8,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/lpc.c b/lib/lpc.c
index 798f4cf07..877da47f8 100644
--- a/lib/lpc.c
+++ b/lib/lpc.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/lpc.h b/lib/lpc.h
index 9cc79451b..4f59e6d32 100644
--- a/lib/lpc.h
+++ b/lib/lpc.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/lsp.c b/lib/lsp.c
index 858805451..8afa305f5 100644
--- a/lib/lsp.c
+++ b/lib/lsp.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
@@ -15,9 +15,10 @@
   The LSP generation code is taken (with minimal modification and a
   few bugfixes) from "On the Computation of the LSP Frequencies" by
   Joseph Rothweiler (see http://www.rothweiler.us for contact info).
+
   The paper is available at:
 
-  http://www.myown1.com/joe/lsf
+  https://web.archive.org/web/20110810174000/http://home.myfairpoint.net/vzenxj75/myown1/joe/lsf/index.html
 
  ********************************************************************/
 
diff --git a/lib/lsp.h b/lib/lsp.h
index 8a8d10e97..68b38daf1 100644
--- a/lib/lsp.h
+++ b/lib/lsp.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/mapping0.c b/lib/mapping0.c
index ccb4493d4..efa0fbcd9 100644
--- a/lib/mapping0.c
+++ b/lib/mapping0.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2010             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/masking.h b/lib/masking.h
index 955e18c71..7a196a37e 100644
--- a/lib/masking.h
+++ b/lib/masking.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/mdct.c b/lib/mdct.c
index f3f1ed805..2a0ff8d01 100644
--- a/lib/mdct.c
+++ b/lib/mdct.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/mdct.h b/lib/mdct.h
index 3b8c9ba4a..ceaea617a 100644
--- a/lib/mdct.h
+++ b/lib/mdct.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/misc.c b/lib/misc.c
index cf2f1eebb..70a091d79 100644
--- a/lib/misc.c
+++ b/lib/misc.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************/
 
diff --git a/lib/misc.h b/lib/misc.h
index 13788445a..eac5160e8 100644
--- a/lib/misc.h
+++ b/lib/misc.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/floor_all.h b/lib/modes/floor_all.h
index 20928aac8..2e3d4a501 100644
--- a/lib/modes/floor_all.h
+++ b/lib/modes/floor_all.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/psych_11.h b/lib/modes/psych_11.h
index cc5eea240..9d8ed357e 100644
--- a/lib/modes/psych_11.h
+++ b/lib/modes/psych_11.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/psych_16.h b/lib/modes/psych_16.h
index 477cb4d90..49cbf7c4b 100644
--- a/lib/modes/psych_16.h
+++ b/lib/modes/psych_16.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/psych_44.h b/lib/modes/psych_44.h
index 6c9eaa4e5..d15509b71 100644
--- a/lib/modes/psych_44.h
+++ b/lib/modes/psych_44.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/psych_8.h b/lib/modes/psych_8.h
index 277db8436..a19817f76 100644
--- a/lib/modes/psych_8.h
+++ b/lib/modes/psych_8.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/residue_16.h b/lib/modes/residue_16.h
index 3e05471ce..15e161c86 100644
--- a/lib/modes/residue_16.h
+++ b/lib/modes/residue_16.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/residue_44.h b/lib/modes/residue_44.h
index e89bc0e48..3f982695a 100644
--- a/lib/modes/residue_44.h
+++ b/lib/modes/residue_44.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/residue_44p51.h b/lib/modes/residue_44p51.h
index 7f33e250e..8ac5f65e6 100644
--- a/lib/modes/residue_44p51.h
+++ b/lib/modes/residue_44p51.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2010             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/residue_44u.h b/lib/modes/residue_44u.h
index e55ac1254..2f3595e49 100644
--- a/lib/modes/residue_44u.h
+++ b/lib/modes/residue_44u.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/residue_8.h b/lib/modes/residue_8.h
index ae123a276..b836f79c8 100644
--- a/lib/modes/residue_8.h
+++ b/lib/modes/residue_8.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/setup_11.h b/lib/modes/setup_11.h
index 0cbcaafcb..5ade5dd16 100644
--- a/lib/modes/setup_11.h
+++ b/lib/modes/setup_11.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/setup_16.h b/lib/modes/setup_16.h
index d59ad70d2..8b2daafa3 100644
--- a/lib/modes/setup_16.h
+++ b/lib/modes/setup_16.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/setup_22.h b/lib/modes/setup_22.h
index bc38af963..eef5a4e7d 100644
--- a/lib/modes/setup_22.h
+++ b/lib/modes/setup_22.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/setup_32.h b/lib/modes/setup_32.h
index f66a0bcd0..f87cb767d 100644
--- a/lib/modes/setup_32.h
+++ b/lib/modes/setup_32.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/setup_44.h b/lib/modes/setup_44.h
index a189b5fb9..12d592808 100644
--- a/lib/modes/setup_44.h
+++ b/lib/modes/setup_44.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/setup_44p51.h b/lib/modes/setup_44p51.h
index 3bde7b340..4d49173ff 100644
--- a/lib/modes/setup_44p51.h
+++ b/lib/modes/setup_44p51.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2010             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/setup_44u.h b/lib/modes/setup_44u.h
index 7ae3af6b2..2dd8bf701 100644
--- a/lib/modes/setup_44u.h
+++ b/lib/modes/setup_44u.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/setup_8.h b/lib/modes/setup_8.h
index 750255687..16b02e01b 100644
--- a/lib/modes/setup_8.h
+++ b/lib/modes/setup_8.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/modes/setup_X.h b/lib/modes/setup_X.h
index 2229a5ef2..27807c10b 100644
--- a/lib/modes/setup_X.h
+++ b/lib/modes/setup_X.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/os.h b/lib/os.h
index 416a401dd..9ded7358d 100644
--- a/lib/os.h
+++ b/lib/os.h
@@ -8,7 +8,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
@@ -60,7 +60,7 @@ void *_alloca(size_t size);
 #  define FAST_HYPOT hypot
 #endif
 
-#endif
+#endif /* _V_IFDEFJAIL_H_ */
 
 #ifdef HAVE_ALLOCA_H
 #  include 
@@ -80,7 +80,7 @@ void *_alloca(size_t size);
 
 
 /* Special i386 GCC implementation */
-#if defined(__i386__) && defined(__GNUC__) && !defined(__BEOS__)
+#if defined(__i386__) && defined(__GNUC__) && !defined(__BEOS__) && !defined(__SSE2_MATH__)
 #  define VORBIS_FPU_CONTROL
 /* both GCC and MSVC are kinda stupid about rounding/casting to int.
    Because of encapsulation constraints (GCC can't see inside the asm
@@ -119,8 +119,7 @@ static inline int vorbis_ftoi(double f){  /* yes, double!  Otherwise,
 
 /* MSVC inline assembly. 32 bit only; inline ASM isn't implemented in the
  * 64 bit compiler and doesn't work on arm. */
-#if defined(_MSC_VER) && !defined(_WIN64) && \
-      !defined(_WIN32_WCE) && !defined(_M_ARM)
+#if defined(_MSC_VER) && defined(_M_IX86) && !defined(_WIN32_WCE)
 #  define VORBIS_FPU_CONTROL
 
 typedef ogg_int16_t vorbis_fpu_control;
@@ -147,7 +146,7 @@ static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){
 
 /* Optimized code path for x86_64 builds. Uses SSE2 intrinsics. This can be
    done safely because all x86_64 CPUs supports SSE2. */
-#if (defined(_MSC_VER) && defined(_WIN64)) || (defined(__GNUC__) && defined (__x86_64__))
+#if (defined(_MSC_VER) && defined(_M_X64)) || (defined(__GNUC__) && defined (__SSE2_MATH__))
 #  define VORBIS_FPU_CONTROL
 
 typedef ogg_int16_t vorbis_fpu_control;
@@ -174,7 +173,7 @@ static __inline void vorbis_fpu_restore(vorbis_fpu_control fpu){
 
 typedef int vorbis_fpu_control;
 
-static int vorbis_ftoi(double f){
+STIN int vorbis_ftoi(double f){
         /* Note: MSVC and GCC (at least on some systems) round towards zero, thus,
            the floor() call is required to ensure correct roudning of
            negative numbers */
diff --git a/lib/psy.c b/lib/psy.c
index 422c6f1e4..036b094aa 100644
--- a/lib/psy.c
+++ b/lib/psy.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2010             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
@@ -599,11 +599,12 @@ static void bark_noise_hybridmp(int n,const long *b,
     XY[i] = tXY;
   }
 
-  for (i = 0, x = 0.f;; i++, x += 1.f) {
+  for (i = 0, x = 0.f; i < n; i++, x += 1.f) {
 
     lo = b[i] >> 16;
-    if( lo>=0 ) break;
     hi = b[i] & 0xffff;
+    if( lo>=0 || -lo>=n ) break;
+    if( hi>=n ) break;
 
     tN = N[hi] + N[-lo];
     tX = X[hi] - X[-lo];
@@ -615,17 +616,17 @@ static void bark_noise_hybridmp(int n,const long *b,
     B = tN * tXY - tX * tY;
     D = tN * tXX - tX * tX;
     R = (A + x * B) / D;
-    if (R < 0.f)
-      R = 0.f;
+    if (R < 0.f) R = 0.f;
 
     noise[i] = R - offset;
   }
 
-  for ( ;; i++, x += 1.f) {
+  for ( ; i < n; i++, x += 1.f) {
 
     lo = b[i] >> 16;
     hi = b[i] & 0xffff;
-    if(hi>=n)break;
+    if( lo<0 || lo>=n ) break;
+    if( hi>=n ) break;
 
     tN = N[hi] - N[lo];
     tX = X[hi] - X[lo];
@@ -641,6 +642,7 @@ static void bark_noise_hybridmp(int n,const long *b,
 
     noise[i] = R - offset;
   }
+
   for ( ; i < n; i++, x += 1.f) {
 
     R = (A + x * B) / D;
@@ -651,10 +653,11 @@ static void bark_noise_hybridmp(int n,const long *b,
 
   if (fixed <= 0) return;
 
-  for (i = 0, x = 0.f;; i++, x += 1.f) {
+  for (i = 0, x = 0.f; i < n; i++, x += 1.f) {
     hi = i + fixed / 2;
     lo = hi - fixed;
-    if(lo>=0)break;
+    if ( hi>=n ) break;
+    if ( lo>=0 ) break;
 
     tN = N[hi] + N[-lo];
     tX = X[hi] - X[-lo];
@@ -670,11 +673,12 @@ static void bark_noise_hybridmp(int n,const long *b,
 
     if (R - offset < noise[i]) noise[i] = R - offset;
   }
-  for ( ;; i++, x += 1.f) {
+  for ( ; i < n; i++, x += 1.f) {
 
     hi = i + fixed / 2;
     lo = hi - fixed;
-    if(hi>=n)break;
+    if ( hi>=n ) break;
+    if ( lo<0 ) break;
 
     tN = N[hi] - N[lo];
     tX = X[hi] - X[lo];
diff --git a/lib/psy.h b/lib/psy.h
index ab2534db3..d9a04e8b7 100644
--- a/lib/psy.h
+++ b/lib/psy.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/psytune.c b/lib/psytune.c
index 6952136c6..67223e511 100644
--- a/lib/psytune.c
+++ b/lib/psytune.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/registry.c b/lib/registry.c
index 74f7ef039..db0f67b2e 100644
--- a/lib/registry.c
+++ b/lib/registry.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/registry.h b/lib/registry.h
index 599d95994..b823aa609 100644
--- a/lib/registry.h
+++ b/lib/registry.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/res0.c b/lib/res0.c
index 6d623d730..c931aded3 100644
--- a/lib/res0.c
+++ b/lib/res0.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2010             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
@@ -30,9 +30,6 @@
 #include "misc.h"
 #include "os.h"
 
-//#define TRAIN_RES 1
-//#define TRAIN_RESAUX 1
-
 #if defined(TRAIN_RES) || defined (TRAIN_RESAUX)
 #include 
 #endif
diff --git a/lib/scales.h b/lib/scales.h
index 18bc4e751..3c2ae48d9 100644
--- a/lib/scales.h
+++ b/lib/scales.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/sharedbook.c b/lib/sharedbook.c
index 4545d4f45..62a9a00af 100644
--- a/lib/sharedbook.c
+++ b/lib/sharedbook.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
@@ -50,7 +50,7 @@ long _float32_pack(float val){
     sign=0x80000000;
     val= -val;
   }
-  exp= floor(log(val)/log(2.f)+.001); //+epsilon
+  exp= floor(log(val)/log(2.f)+.001); /* +epsilon */
   mant=rint(ldexp(val,(VQ_FMAN-1)-exp));
   exp=(exp+VQ_FEXP_BIAS)<>VQ_FMAN;
   if(sign)mant= -mant;
-  return(ldexp(mant,exp-(VQ_FMAN-1)-VQ_FEXP_BIAS));
+  exp=exp-(VQ_FMAN-1)-VQ_FEXP_BIAS;
+  /* clamp excessive exponent values */
+  if (exp>63){
+    exp=63;
+  }
+  if (exp<-63){
+    exp=-63;
+  }
+  return(ldexp(mant,exp));
 }
 
 /* given a list of word lengths, generate a list of codewords.  Works
@@ -294,7 +302,7 @@ int vorbis_book_init_encode(codebook *c,const static_codebook *s){
   c->used_entries=s->entries;
   c->dim=s->dim;
   c->codelist=_make_words(s->lengthlist,s->entries,0);
-  //c->valuelist=_book_unquantize(s,s->entries,NULL);
+  /* c->valuelist=_book_unquantize(s,s->entries,NULL); */
   c->quantvals=_book_maptype1_quantvals(s);
   c->minval=(int)rint(_float32_unpack(s->q_min));
   c->delta=(int)rint(_float32_unpack(s->q_delta));
@@ -573,6 +581,7 @@ void run_test(static_codebook *b,float *comp){
       exit(1);
     }
   }
+  free(out);
 }
 
 int main(){
diff --git a/lib/smallft.c b/lib/smallft.c
index 6d528af42..4ffabab4b 100644
--- a/lib/smallft.c
+++ b/lib/smallft.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/smallft.h b/lib/smallft.h
index 9e867c67d..02fe8f9cd 100644
--- a/lib/smallft.h
+++ b/lib/smallft.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/synthesis.c b/lib/synthesis.c
index 5f6092c3d..3e2d68127 100644
--- a/lib/synthesis.c
+++ b/lib/synthesis.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/vorbisenc.c b/lib/vorbisenc.c
index 4a4607cb4..cf3806a6e 100644
--- a/lib/vorbisenc.c
+++ b/lib/vorbisenc.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
@@ -684,6 +684,7 @@ int vorbis_encode_setup_init(vorbis_info *vi){
   highlevel_encode_setup *hi=&ci->hi;
 
   if(ci==NULL)return(OV_EINVAL);
+  if(vi->channels<1||vi->channels>255)return(OV_EINVAL);
   if(!hi->impulse_block_p)i0=1;
 
   /* too low/high an ATH floater is nonsensical, but doesn't break anything */
@@ -1210,7 +1211,7 @@ int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg){
                                           hi->req,
                                           hi->managed,
                                           &new_base);
-        if(!hi->setup)return OV_EIMPL;
+        if(!new_template)return OV_EIMPL;
         hi->setup=new_template;
         hi->base_setting=new_base;
         vorbis_encode_setup_setting(vi,vi->channels,vi->rate);
diff --git a/lib/vorbisfile.c b/lib/vorbisfile.c
index b570c3c5f..9219c2f2d 100644
--- a/lib/vorbisfile.c
+++ b/lib/vorbisfile.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
@@ -264,6 +264,10 @@ static ogg_int64_t _get_prev_page_serial(OggVorbis_File *vf, ogg_int64_t begin,
         }
       }
     }
+    /*We started from the beginning of the stream and found nothing.
+      This should be impossible unless the contents of the stream changed out
+      from under us after we read from it.*/
+    if(!begin&&vf->offset<0)return OV_EBADLINK;
   }
 
   /* we're not interested in the page... just the serialno and granpos. */
@@ -1230,7 +1234,6 @@ double ov_time_total(OggVorbis_File *vf,int i){
 
 int ov_raw_seek(OggVorbis_File *vf,ogg_int64_t pos){
   ogg_stream_state work_os;
-  int ret;
 
   if(vf->ready_stateseekable)
@@ -1253,8 +1256,12 @@ int ov_raw_seek(OggVorbis_File *vf,ogg_int64_t pos){
                             vf->current_serialno); /* must set serialno */
   vorbis_synthesis_restart(&vf->vd);
 
-  ret=_seek_helper(vf,pos);
-  if(ret)goto seek_error;
+  if(_seek_helper(vf,pos)) {
+    /* dump the machine so we're in a known state */
+    vf->pcm_offset=-1;
+    _decode_clear(vf);
+    return OV_EBADLINK;
+  }
 
   /* we need to make sure the pcm_offset is set, but we don't want to
      advance the raw cursor past good packets just to get to the first
@@ -1388,13 +1395,6 @@ int ov_raw_seek(OggVorbis_File *vf,ogg_int64_t pos){
   vf->bittrack=0.f;
   vf->samptrack=0.f;
   return(0);
-
- seek_error:
-  /* dump the machine so we're in a known state */
-  vf->pcm_offset=-1;
-  ogg_stream_clear(&work_os);
-  _decode_clear(vf);
-  return OV_EBADLINK;
 }
 
 /* Page granularity seek (faster than sample granularity because we
@@ -1964,6 +1964,7 @@ long ov_read_filter(OggVorbis_File *vf,char *buffer,int length,
   long samples;
 
   if(vf->ready_stateready_state==INITSET){
@@ -1989,6 +1990,8 @@ long ov_read_filter(OggVorbis_File *vf,char *buffer,int length,
     long channels=ov_info(vf,-1)->channels;
     long bytespersample=word * channels;
     vorbis_fpu_control fpu;
+
+    if(channels<1||channels>255)return(OV_EINVAL);
     if(samples>length/bytespersample)samples=length/bytespersample;
 
     if(samples <= 0)
diff --git a/lib/window.c b/lib/window.c
index b3b7ce016..2151b278d 100644
--- a/lib/window.c
+++ b/lib/window.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2009             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/lib/window.h b/lib/window.h
index 6ac260749..33d83f85f 100644
--- a/lib/window.h
+++ b/lib/window.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/libvorbis.spec.in b/libvorbis.spec.in
index 723c07080..aeba19751 100644
--- a/libvorbis.spec.in
+++ b/libvorbis.spec.in
@@ -5,9 +5,9 @@ Summary:	The Vorbis General Audio Compression Codec.
 
 Group:		System Environment/Libraries
 License:	BSD
-URL:		http://www.xiph.org/
+URL:		https://xiph.org/
 Vendor:		Xiph.org Foundation 
-Source:		http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.gz
+Source:		https://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 # We're forced to use an epoch since both Red Hat and Ximian use it in their
diff --git a/test/test.c b/test/test.c
index fe1648d49..e9b48744f 100644
--- a/test/test.c
+++ b/test/test.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/test/util.c b/test/util.c
index 2ab748363..3dc1597c3 100644
--- a/test/util.c
+++ b/test/util.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/test/util.h b/test/util.h
index 85f8d4f0e..9fe471c0a 100644
--- a/test/util.h
+++ b/test/util.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/test/write_read.c b/test/write_read.c
index f1190dc60..949524095 100644
--- a/test/write_read.c
+++ b/test/write_read.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/test/write_read.h b/test/write_read.h
index c50c48359..b99609aa4 100644
--- a/test/write_read.h
+++ b/test/write_read.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/vorbis.pc.in b/vorbis.pc.in
index 0eacf66f5..f5ca77d0f 100644
--- a/vorbis.pc.in
+++ b/vorbis.pc.in
@@ -11,5 +11,5 @@ Version: @VERSION@
 Requires.private: ogg
 Conflicts:
 Libs: -L${libdir} -lvorbis 
-Libs.private: -lm
+Libs.private: @VORBIS_LIBS@
 Cflags: -I${includedir}
diff --git a/vq/bookutil.c b/vq/bookutil.c
index 304641069..c8b894e17 100644
--- a/vq/bookutil.c
+++ b/vq/bookutil.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2014             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/vq/bookutil.h b/vq/bookutil.h
index e84b01830..d8fbcbe52 100644
--- a/vq/bookutil.h
+++ b/vq/bookutil.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/vq/distribution.c b/vq/distribution.c
index 132b5b913..7c0c095a6 100644
--- a/vq/distribution.c
+++ b/vq/distribution.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/vq/huffbuild.c b/vq/huffbuild.c
index 014c81c13..ba00a2e8f 100644
--- a/vq/huffbuild.c
+++ b/vq/huffbuild.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2014             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/vq/latticebuild.c b/vq/latticebuild.c
index acfe9ffbe..0f87e6aae 100644
--- a/vq/latticebuild.c
+++ b/vq/latticebuild.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/vq/latticetune.c b/vq/latticetune.c
index 193d4d139..67fc1e2dc 100644
--- a/vq/latticetune.c
+++ b/vq/latticetune.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/vq/localcodebook.h b/vq/localcodebook.h
index f90d5e4b7..dbade0de8 100644
--- a/vq/localcodebook.h
+++ b/vq/localcodebook.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/vq/metrics.c b/vq/metrics.c
index e74831a9b..d9f0da357 100644
--- a/vq/metrics.c
+++ b/vq/metrics.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/vq/vqgen.c b/vq/vqgen.c
index 934d26420..45f7790d7 100644
--- a/vq/vqgen.c
+++ b/vq/vqgen.c
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/vq/vqgen.h b/vq/vqgen.h
index 688379ccd..47a7d2da6 100644
--- a/vq/vqgen.h
+++ b/vq/vqgen.h
@@ -6,7 +6,7 @@
  * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
  * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2001             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ * by the Xiph.Org Foundation https://xiph.org/                     *
  *                                                                  *
  ********************************************************************
 
diff --git a/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj b/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj
index 8011dec5b..c806a53e8 100644
--- a/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj
+++ b/win32/VS2010/libvorbis/libvorbis_dynamic.vcxproj
@@ -98,7 +98,7 @@
       Cdecl
     
     
-      libogg_static.lib;%(AdditionalDependencies)
+      libogg.lib;%(AdditionalDependencies)
       $(OutDir)libvorbis.dll
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       ..\..\vorbis.def
@@ -128,7 +128,7 @@
       Cdecl
     
     
-      libogg_static.lib;%(AdditionalDependencies)
+      libogg.lib;%(AdditionalDependencies)
       $(OutDir)libvorbis.dll
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       ..\..\vorbis.def
@@ -161,7 +161,7 @@
       Cdecl
     
     
-      libogg_static.lib;%(AdditionalDependencies)
+      libogg.lib;%(AdditionalDependencies)
       $(OutDir)libvorbis.dll
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       ..\..\vorbis.def
@@ -198,7 +198,7 @@
       Cdecl
     
     
-      libogg_static.lib;%(AdditionalDependencies)
+      libogg.lib;%(AdditionalDependencies)
       $(OutDir)libvorbis.dll
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       ..\..\vorbis.def
diff --git a/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj b/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj
index 9dd881c84..503d609eb 100644
--- a/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj
+++ b/win32/VS2010/libvorbisfile/libvorbisfile_dynamic.vcxproj
@@ -95,7 +95,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis.lib;%(AdditionalDependencies)
       $(OutDir)libvorbisfile.dll
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       ..\..\vorbisfile.def
@@ -124,7 +124,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis.lib;%(AdditionalDependencies)
       $(OutDir)libvorbisfile.dll
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       ..\..\vorbisfile.def
@@ -147,7 +147,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis.lib;%(AdditionalDependencies)
       $(OutDir)libvorbisfile.dll
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       ..\..\vorbisfile.def
@@ -174,7 +174,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis.lib;%(AdditionalDependencies)
       $(OutDir)libvorbisfile.dll
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       ..\..\vorbisfile.def
diff --git a/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj b/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj
index 3fb0e100b..70097a3d1 100644
--- a/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj
+++ b/win32/VS2010/vorbisdec/vorbisdec_dynamic.vcxproj
@@ -97,7 +97,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis.lib;%(AdditionalDependencies)
       $(OutDir)vorbisdec.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       true
@@ -125,7 +125,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis.lib;%(AdditionalDependencies)
       $(OutDir)vorbisdec.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       true
@@ -155,7 +155,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis.lib;%(AdditionalDependencies)
       $(OutDir)vorbisdec.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       false
@@ -189,7 +189,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis.lib;%(AdditionalDependencies)
       $(OutDir)vorbisdec.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       false
diff --git a/win32/VS2010/vorbisdec/vorbisdec_static.vcxproj b/win32/VS2010/vorbisdec/vorbisdec_static.vcxproj
index b46616192..753a6b619 100644
--- a/win32/VS2010/vorbisdec/vorbisdec_static.vcxproj
+++ b/win32/VS2010/vorbisdec/vorbisdec_static.vcxproj
@@ -97,7 +97,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)
       $(OutDir)vorbisdec_static.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       true
@@ -125,7 +125,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)
       $(OutDir)vorbisdec_static.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       true
@@ -155,7 +155,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)
       $(OutDir)vorbisdec_static.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       false
@@ -189,7 +189,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)
       $(OutDir)vorbisdec_static.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       false
@@ -210,4 +210,4 @@
   
   
   
-
\ No newline at end of file
+
diff --git a/win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj b/win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj
index 84e8e8f10..115f8b849 100644
--- a/win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj
+++ b/win32/VS2010/vorbisenc/vorbisenc_dynamic.vcxproj
@@ -99,7 +99,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis.lib;%(AdditionalDependencies)
       $(OutDir)vorbisenc.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       true
@@ -129,7 +129,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis.lib;%(AdditionalDependencies)
       $(OutDir)vorbisenc.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       true
@@ -159,7 +159,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis.lib;%(AdditionalDependencies)
       $(OutDir)vorbisenc.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       false
@@ -193,7 +193,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis.lib;%(AdditionalDependencies)
       $(OutDir)vorbisenc.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       false
diff --git a/win32/VS2010/vorbisenc/vorbisenc_static.vcxproj b/win32/VS2010/vorbisenc/vorbisenc_static.vcxproj
index 45f09ac5e..065ed5680 100644
--- a/win32/VS2010/vorbisenc/vorbisenc_static.vcxproj
+++ b/win32/VS2010/vorbisenc/vorbisenc_static.vcxproj
@@ -99,7 +99,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)
       $(OutDir)vorbisenc_static.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       true
@@ -129,7 +129,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)
       $(OutDir)vorbisenc_static.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       true
@@ -159,7 +159,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)
       $(OutDir)vorbisenc_static.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       false
@@ -193,7 +193,7 @@
       Cdecl
     
     
-      libogg_static.lib;libvorbis_static.lib;%(AdditionalDependencies)
+      libogg.lib;libvorbis_static.lib;%(AdditionalDependencies)
       $(OutDir)vorbisenc_static.exe
       ..\..\..\..\libogg\win32\VS2010\$(Platform)\$(Configuration);..\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories)
       false
@@ -214,4 +214,4 @@
   
   
   
-
\ No newline at end of file
+

      
 
      
 
      copyright © 2000-2010 Xiph.Org
      Ogg Vorbis
      Ogg Vorbis
      		
 
      
 
      Vorbisfile documentation
      		
 
      vorbisfile version 1.3.2 - 20101101