[xiph-commits] r15922 - in trunk/vorbis/doc: . xml

xiphmont at svn.xiph.org xiphmont at svn.xiph.org
Tue Apr 7 18:46:28 PDT 2009


Author: xiphmont
Date: 2009-04-07 18:46:27 -0700 (Tue, 07 Apr 2009)
New Revision: 15922

Modified:
   trunk/vorbis/doc/06-floor0.tex
   trunk/vorbis/doc/Vorbis_I_spec.css
   trunk/vorbis/doc/Vorbis_I_spec.html
   trunk/vorbis/doc/Vorbis_I_spec.pdf
   trunk/vorbis/doc/xml/06-floor0.xml
Log:
Update docs to eliminate typo that crept into LSP curve computation spec in the XML and latex versions of the doc.



Modified: trunk/vorbis/doc/06-floor0.tex
===================================================================
--- trunk/vorbis/doc/06-floor0.tex	2009-04-08 00:53:57 UTC (rev 15921)
+++ trunk/vorbis/doc/06-floor0.tex	2009-04-08 01:46:27 UTC (rev 15922)
@@ -153,14 +153,7 @@
  \item if ( \varname{[floor0_order]} is odd ) {
   \begin{enumerate}
    \item calculate \varname{[p]} and \varname{[q]} according to:
-\TODO{the following is generated from the TeX code embedded into the DocBook files:}
            \begin{eqnarray*}
-             p & = & (1 - \cos^2\omega)\prod_{j=0}^{(\mathtt{order}-3)/2} 4 (\cos c_{2j+1} - \cos \omega)^2 \\
-             q & = & \frac{1}{4} \prod_{j=0}^{(\mathtt{order}-1)/2} 4 (\cos c_{2j+1} - \cos \omega)^2
-           \end{eqnarray*}
-
-\TODO{the following is what oddlsp.png contains:}
-           \begin{eqnarray*}
              p & = & (1 - \cos^2\omega)\prod_{j=0}^{\frac{\mathtt{floor0\_order}-3}{2}} 4 (\cos([\mathtt{coefficients}]_{2j+1}) - \cos \omega)^2 \\
              q & = & \frac{1}{4} \prod_{j=0}^{\frac{\mathtt{floor0\_order}-1}{2}} 4 (\cos([\mathtt{coefficients}]_{2j}) - \cos \omega)^2
            \end{eqnarray*}
@@ -169,14 +162,7 @@
   } else \varname{[floor0_order]} is even {
   \begin{enumerate}
    \item calculate \varname{[p]} and \varname{[q]} according to:
-\TODO{the following is generated from the TeX code embedded into the DocBook files:}
            \begin{eqnarray*}
-             p & = & \frac{(1 - \cos^2\omega)}{2} \prod_{j=0}^{(\mathtt{order}-2)/2} 4 (\cos c_{2j} - \cos \omega)^2 \\
-             q & = & \frac{(1 + \cos^2\omega)}{2} \prod_{j=0}^{(\mathtt{order}-2)/2} 4 (\cos c_{2j} - \cos \omega)^2
-           \end{eqnarray*}
-
-\TODO{the following is what oddlsp.png contains:}
-           \begin{eqnarray*}
              p & = & \frac{(1 - \cos^2\omega)}{2} \prod_{j=0}^{\frac{\mathtt{floor0\_order}-2}{2}} 4 (\cos([\mathtt{coefficients}]_{2j+1}) - \cos \omega)^2 \\
              q & = & \frac{(1 + \cos^2\omega)}{2} \prod_{j=0}^{\frac{\mathtt{floor0\_order}-2}{2}} 4 (\cos([\mathtt{coefficients}]_{2j}) - \cos \omega)^2
            \end{eqnarray*}

Modified: trunk/vorbis/doc/Vorbis_I_spec.css
===================================================================
--- trunk/vorbis/doc/Vorbis_I_spec.css	2009-04-08 00:53:57 UTC (rev 15921)
+++ trunk/vorbis/doc/Vorbis_I_spec.css	2009-04-08 01:46:27 UTC (rev 15922)
@@ -13,14 +13,12 @@
 .cmtt-10x-x-109{font-family: monospace;}
 .cmtt-10x-x-109{font-family: monospace;}
 .cmbx-10x-x-109{ font-weight: bold;}
-.cmbx-10x-x-109{ font-weight: bold;}
 .cmti-10x-x-109{ font-style: italic;}
 .cmr-8{font-size:72%;}
 .cmr-6{font-size:54%;}
 .cmmi-10x-x-109{font-style: italic;}
 .cmmi-8{font-size:72%;font-style: italic;}
 .cmsy-10x-x-109{}
-.cmsy-8{font-size:72%;}
 .cmsy-6{font-size:54%;}
 .cmtt-10{font-size:90%;font-family: monospace;}
 .cmtt-10{font-family: monospace;}
@@ -34,8 +32,6 @@
 .cmtt-8x-x-75{font-family: monospace;}
 .cmtt-8x-x-75{font-family: monospace;}
 .cmtt-8x-x-75{font-family: monospace;}
-.cmbx-10{font-size:90%; font-weight: bold;}
-.cmbx-10{ font-weight: bold;}
 p.noindent { text-indent: 0em }
 td p.noindent { text-indent: 0em; margin-top:0em; }
 p.nopar { text-indent: 0em; }
@@ -63,7 +59,7 @@
 .fbox {padding-left:3.0pt; padding-right:3.0pt; text-indent:0pt; border:solid black 0.4pt; }
 div.fbox {display:table}
 div.center div.fbox {text-align:center; clear:both; padding-left:3.0pt; padding-right:3.0pt; text-indent:0pt; border:solid black 0.4pt; }
-table.minipage{width:100%;}
+div.minipage{width:100%;}
 div.center, div.center div.center {text-align: center; margin-left:1em; margin-right:1em;}
 div.center div {text-align: left;}
 div.flushright, div.flushright div.flushright {text-align: right;}
@@ -117,6 +113,7 @@
 table.pmatrix {width:100%;}
 img.cdots{vertical-align:middle;}
 .partToc a, .partToc, .likepartToc a, .likepartToc {line-height: 200%; font-weight:bold; font-size:110%;}
+.chapterToc a, .chapterToc, .likechapterToc a, .likechapterToc, .appendixToc a, .appendixToc {line-height: 200%; font-weight:bold;}
 .index-item, .index-subitem, .index-subsubitem {display:block}
 .caption td.id{font-weight: bold; white-space: nowrap; }
 table.caption {text-align:center;}
@@ -135,14 +132,10 @@
 div.author{white-space: nowrap;}
 .quotation {margin-bottom:0.25em; margin-top:0.25em; margin-left:1em; }
 .abstract p {margin-left:5%; margin-right:5%;}
-table.abstract {width:100%;}
+div.abstract {width:100%;}
 span.footnote-mark sup.textsuperscript, span.footnote-mark a sup.textsuperscript{ font-size:80%; }
 .figure img.graphics {margin-left:10%;}
 div.verbatiminput {font-family: monospace; white-space: nowrap; }
 P.fancyvrb {white-space: nowrap; margin:0em;}
-span#textcolor1{color:#FF0000}
-span#textcolor2{color:#FF0000}
-span#textcolor3{color:#FF0000}
-span#textcolor4{color:#FF0000}
 /* end css.sty */
 

Modified: trunk/vorbis/doc/Vorbis_I_spec.html
===================================================================
--- trunk/vorbis/doc/Vorbis_I_spec.html	2009-04-08 00:53:57 UTC (rev 15921)
+++ trunk/vorbis/doc/Vorbis_I_spec.html	2009-04-08 01:46:27 UTC (rev 15922)
@@ -7,7 +7,7 @@
 <meta name="originator" content="TeX4ht (http://www.cse.ohio-state.edu/~gurari/TeX4ht/)"> 
 <!-- html --> 
 <meta name="src" content="Vorbis_I_spec.tex"> 
-<meta name="date" content="2009-03-06 10:49:00"> 
+<meta name="date" content="2009-04-07 21:43:00"> 
 <link rel="stylesheet" type="text/css" href="Vorbis_I_spec.css"> 
 </head><body 
 >
@@ -24,217 +24,217 @@
 class="cmr-12x-x-120">Xiph.org Foundation</span></div>
 <br />
 <div class="date" ><span 
-class="cmr-12x-x-120">March 6, 2009</span></div>
+class="cmr-12x-x-120">April 7, 2009</span></div>
 </div>
 <h3 class="likesectionHead"><a 
  id="x1-1000"></a>Contents</h3>
 <div class="tableofcontents">
-<span class="sectionToc" >1 <a 
+&#x00A0;<span class="sectionToc" >1 <a 
 href="#x1-20001" id="QQ2-1-2">Introduction and Description</a></span>
-<br />&#x00A0;<span class="subsectionToc" >1.1 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >1.1 <a 
 href="#x1-30001.1" id="QQ2-1-3">Overview</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.1.1 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.1.1 <a 
 href="#x1-40001.1.1" id="QQ2-1-4">Application</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.1.2 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.1.2 <a 
 href="#x1-50001.1.2" id="QQ2-1-5">Classification</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.1.3 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.1.3 <a 
 href="#x1-60001.1.3" id="QQ2-1-6">Assumptions</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.1.4 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.1.4 <a 
 href="#x1-70001.1.4" id="QQ2-1-7">Codec Setup and Probability Model</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.1.5 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.1.5 <a 
 href="#x1-90001.1.5" id="QQ2-1-9">Format Specification</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.1.6 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.1.6 <a 
 href="#x1-100001.1.6" id="QQ2-1-10">Hardware Profile</a></span>
-<br />&#x00A0;<span class="subsectionToc" >1.2 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >1.2 <a 
 href="#x1-110001.2" id="QQ2-1-11">Decoder Configuration</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.2.1 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.2.1 <a 
 href="#x1-120001.2.1" id="QQ2-1-13">Global Config</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.2.2 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.2.2 <a 
 href="#x1-130001.2.2" id="QQ2-1-14">Mode</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.2.3 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.2.3 <a 
 href="#x1-140001.2.3" id="QQ2-1-15">Mapping</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.2.4 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.2.4 <a 
 href="#x1-150001.2.4" id="QQ2-1-16">Floor</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.2.5 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.2.5 <a 
 href="#x1-160001.2.5" id="QQ2-1-17">Residue</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.2.6 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.2.6 <a 
 href="#x1-170001.2.6" id="QQ2-1-18">Codebooks</a></span>
                                                                                     
 
                                                                                     
-<br />&#x00A0;<span class="subsectionToc" >1.3 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >1.3 <a 
 href="#x1-180001.3" id="QQ2-1-19">High-level Decode Process</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.3.1 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.3.1 <a 
 href="#x1-190001.3.1" id="QQ2-1-20">Decode Setup</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.3.2 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >1.3.2 <a 
 href="#x1-230001.3.2" id="QQ2-1-24">Decode Procedure</a></span>
-<br /><span class="sectionToc" >2 <a 
+<br />&#x00A0;<span class="sectionToc" >2 <a 
 href="#x1-360002" id="QQ2-1-39">Bitpacking Convention</a></span>
-<br />&#x00A0;<span class="subsectionToc" >2.1 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >2.1 <a 
 href="#x1-370002.1" id="QQ2-1-40">Overview</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.1 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.1 <a 
 href="#x1-380002.1.1" id="QQ2-1-41">octets, bytes and words</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.2 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.2 <a 
 href="#x1-390002.1.2" id="QQ2-1-42">bit order</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.3 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.3 <a 
 href="#x1-400002.1.3" id="QQ2-1-43">byte order</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.4 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.4 <a 
 href="#x1-410002.1.4" id="QQ2-1-44">coding bits into byte sequences</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.5 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.5 <a 
 href="#x1-420002.1.5" id="QQ2-1-45">signedness</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.6 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.6 <a 
 href="#x1-430002.1.6" id="QQ2-1-46">coding example</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.7 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.7 <a 
 href="#x1-440002.1.7" id="QQ2-1-47">decoding example</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.8 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.8 <a 
 href="#x1-450002.1.8" id="QQ2-1-48">end-of-packet alignment</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.9 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >2.1.9 <a 
 href="#x1-460002.1.9" id="QQ2-1-49">reading zero bits</a></span>
-<br /><span class="sectionToc" >3 <a 
+<br />&#x00A0;<span class="sectionToc" >3 <a 
 href="#x1-470003" id="QQ2-1-50">Probability Model and Codebooks</a></span>
-<br />&#x00A0;<span class="subsectionToc" >3.1 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >3.1 <a 
 href="#x1-480003.1" id="QQ2-1-51">Overview</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >3.1.1 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >3.1.1 <a 
 href="#x1-490003.1.1" id="QQ2-1-52">Bitwise operation</a></span>
-<br />&#x00A0;<span class="subsectionToc" >3.2 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >3.2 <a 
 href="#x1-500003.2" id="QQ2-1-53">Packed codebook format</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >3.2.1 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >3.2.1 <a 
 href="#x1-510003.2.1" id="QQ2-1-54">codebook decode</a></span>
-<br />&#x00A0;<span class="subsectionToc" >3.3 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >3.3 <a 
 href="#x1-570003.3" id="QQ2-1-62">Use of the codebook abstraction</a></span>
-<br /><span class="sectionToc" >4 <a 
+<br />&#x00A0;<span class="sectionToc" >4 <a 
 href="#x1-580004" id="QQ2-1-63">Codec Setup and Packet Decode</a></span>
-<br />&#x00A0;<span class="subsectionToc" >4.1 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >4.1 <a 
 href="#x1-590004.1" id="QQ2-1-64">Overview</a></span>
-<br />&#x00A0;<span class="subsectionToc" >4.2 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >4.2 <a 
 href="#x1-600004.2" id="QQ2-1-65">Header decode and decode setup</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.2.1 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.2.1 <a 
 href="#x1-610004.2.1" id="QQ2-1-66">Common header decode</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.2.2 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.2.2 <a 
 href="#x1-620004.2.2" id="QQ2-1-67">Identification header</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.2.3 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.2.3 <a 
 href="#x1-630004.2.3" id="QQ2-1-68">Comment header</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.2.4 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.2.4 <a 
 href="#x1-640004.2.4" id="QQ2-1-69">Setup header</a></span>
-<br />&#x00A0;<span class="subsectionToc" >4.3 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >4.3 <a 
 href="#x1-710004.3" id="QQ2-1-77">Audio packet decode and synthesis</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.1 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.1 <a 
 href="#x1-720004.3.1" id="QQ2-1-78">packet type, mode and window decode</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.2 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.2 <a 
 href="#x1-730004.3.2" id="QQ2-1-79">floor curve decode</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.3 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.3 <a 
 href="#x1-740004.3.3" id="QQ2-1-80">nonzero vector propagate</a></span>
                                                                                     
 
                                                                                     
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.4 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.4 <a 
 href="#x1-750004.3.4" id="QQ2-1-81">residue decode</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.5 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.5 <a 
 href="#x1-760004.3.5" id="QQ2-1-82">inverse coupling</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.6 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.6 <a 
 href="#x1-770004.3.6" id="QQ2-1-83">dot product</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.7 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.7 <a 
 href="#x1-780004.3.7" id="QQ2-1-84">inverse MDCT</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.8 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.8 <a 
 href="#x1-790004.3.8" id="QQ2-1-85">overlap&#x02D9;add</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.9 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >4.3.9 <a 
 href="#x1-800004.3.9" id="QQ2-1-86">output channel order</a></span>
-<br /><span class="sectionToc" >5 <a 
+<br />&#x00A0;<span class="sectionToc" >5 <a 
 href="#x1-810005" id="QQ2-1-87">comment field and header specification</a></span>
-<br />&#x00A0;<span class="subsectionToc" >5.1 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >5.1 <a 
 href="#x1-820005.1" id="QQ2-1-88">Overview</a></span>
-<br />&#x00A0;<span class="subsectionToc" >5.2 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >5.2 <a 
 href="#x1-830005.2" id="QQ2-1-89">Comment encoding</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >5.2.1 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >5.2.1 <a 
 href="#x1-840005.2.1" id="QQ2-1-90">Structure</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >5.2.2 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >5.2.2 <a 
 href="#x1-850005.2.2" id="QQ2-1-91">Content vector format</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >5.2.3 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >5.2.3 <a 
 href="#x1-880005.2.3" id="QQ2-1-94">Encoding</a></span>
-<br /><span class="sectionToc" >6 <a 
+<br />&#x00A0;<span class="sectionToc" >6 <a 
 href="#x1-890006" id="QQ2-1-95">Floor type 0 setup and decode</a></span>
-<br />&#x00A0;<span class="subsectionToc" >6.1 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >6.1 <a 
 href="#x1-900006.1" id="QQ2-1-96">Overview</a></span>
-<br />&#x00A0;<span class="subsectionToc" >6.2 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >6.2 <a 
 href="#x1-910006.2" id="QQ2-1-97">Floor 0 format</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >6.2.1 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >6.2.1 <a 
 href="#x1-920006.2.1" id="QQ2-1-98">header decode</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >6.2.2 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >6.2.2 <a 
 href="#x1-930006.2.2" id="QQ2-1-99">packet decode</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >6.2.3 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >6.2.3 <a 
 href="#x1-940006.2.3" id="QQ2-1-100">curve computation</a></span>
-<br /><span class="sectionToc" >7 <a 
+<br />&#x00A0;<span class="sectionToc" >7 <a 
 href="#x1-950007" id="QQ2-1-101">Floor type 1 setup and decode</a></span>
-<br />&#x00A0;<span class="subsectionToc" >7.1 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >7.1 <a 
 href="#x1-960007.1" id="QQ2-1-102">Overview</a></span>
-<br />&#x00A0;<span class="subsectionToc" >7.2 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >7.2 <a 
 href="#x1-970007.2" id="QQ2-1-103">Floor 1 format</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >7.2.1 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >7.2.1 <a 
 href="#x1-980007.2.1" id="QQ2-1-104">model</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >7.2.2 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >7.2.2 <a 
 href="#x1-990007.2.2" id="QQ2-1-109">header decode</a></span>
-<br /><span class="sectionToc" >8 <a 
+<br />&#x00A0;<span class="sectionToc" >8 <a 
 href="#x1-1020008" id="QQ2-1-112">Residue setup and decode</a></span>
-<br />&#x00A0;<span class="subsectionToc" >8.1 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >8.1 <a 
 href="#x1-1030008.1" id="QQ2-1-113">Overview</a></span>
-<br />&#x00A0;<span class="subsectionToc" >8.2 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >8.2 <a 
 href="#x1-1040008.2" id="QQ2-1-114">Residue format</a></span>
-<br />&#x00A0;<span class="subsectionToc" >8.3 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >8.3 <a 
 href="#x1-1050008.3" id="QQ2-1-116">residue 0</a></span>
-<br />&#x00A0;<span class="subsectionToc" >8.4 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >8.4 <a 
 href="#x1-1060008.4" id="QQ2-1-117">residue 1</a></span>
-<br />&#x00A0;<span class="subsectionToc" >8.5 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >8.5 <a 
 href="#x1-1070008.5" id="QQ2-1-118">residue 2</a></span>
-<br />&#x00A0;<span class="subsectionToc" >8.6 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >8.6 <a 
 href="#x1-1080008.6" id="QQ2-1-120">Residue decode</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >8.6.1 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >8.6.1 <a 
 href="#x1-1090008.6.1" id="QQ2-1-121">header decode</a></span>
                                                                                     
 
                                                                                     
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >8.6.2 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >8.6.2 <a 
 href="#x1-1100008.6.2" id="QQ2-1-122">packet decode</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >8.6.3 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >8.6.3 <a 
 href="#x1-1110008.6.3" id="QQ2-1-123">format 0 specifics</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >8.6.4 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >8.6.4 <a 
 href="#x1-1120008.6.4" id="QQ2-1-124">format 1 specifics</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >8.6.5 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >8.6.5 <a 
 href="#x1-1130008.6.5" id="QQ2-1-125">format 2 specifics</a></span>
-<br /><span class="sectionToc" >9 <a 
+<br />&#x00A0;<span class="sectionToc" >9 <a 
 href="#x1-1140009" id="QQ2-1-126">Helper equations</a></span>
-<br />&#x00A0;<span class="subsectionToc" >9.1 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >9.1 <a 
 href="#x1-1150009.1" id="QQ2-1-127">Overview</a></span>
-<br />&#x00A0;<span class="subsectionToc" >9.2 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >9.2 <a 
 href="#x1-1160009.2" id="QQ2-1-128">Functions</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >9.2.1 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >9.2.1 <a 
 href="#x1-1170009.2.1" id="QQ2-1-129">ilog</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >9.2.2 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >9.2.2 <a 
 href="#x1-1180009.2.2" id="QQ2-1-130">float32&#x02D9;unpack</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >9.2.3 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >9.2.3 <a 
 href="#x1-1190009.2.3" id="QQ2-1-131">lookup1&#x02D9;values</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >9.2.4 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >9.2.4 <a 
 href="#x1-1200009.2.4" id="QQ2-1-132">low&#x02D9;neighbor</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >9.2.5 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >9.2.5 <a 
 href="#x1-1210009.2.5" id="QQ2-1-133">high&#x02D9;neighbor</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >9.2.6 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >9.2.6 <a 
 href="#x1-1220009.2.6" id="QQ2-1-134">render&#x02D9;point</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >9.2.7 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >9.2.7 <a 
 href="#x1-1230009.2.7" id="QQ2-1-135">render&#x02D9;line</a></span>
-<br /><span class="sectionToc" >10 <a 
+<br />&#x00A0;<span class="sectionToc" >10 <a 
 href="#x1-12400010" id="QQ2-1-136">Tables</a></span>
-<br />&#x00A0;<span class="subsectionToc" >10.1 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >10.1 <a 
 href="#x1-12500010.1" id="QQ2-1-137">floor1_inverse_dB_table</a></span>
-<br /><span class="sectionToc" >A <a 
+<br />&#x00A0;<span class="sectionToc" >A <a 
 href="#x1-126000A" id="QQ2-1-138">Embedding Vorbis into an Ogg stream</a></span>
-<br />&#x00A0;<span class="subsectionToc" >A.1 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >A.1 <a 
 href="#x1-127000A.1" id="QQ2-1-139">Overview</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >A.1.1 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >A.1.1 <a 
 href="#x1-128000A.1.1" id="QQ2-1-140">Restrictions</a></span>
-<br />&#x00A0;&#x00A0;<span class="subsubsectionToc" >A.1.2 <a 
+<br />&#x00A0;&#x00A0;&#x00A0;<span class="subsubsectionToc" >A.1.2 <a 
 href="#x1-129000A.1.2" id="QQ2-1-141">MIME type</a></span>
-<br />&#x00A0;<span class="subsectionToc" >A.2 <a 
+<br />&#x00A0;&#x00A0;<span class="subsectionToc" >A.2 <a 
 href="#x1-130000A.2" id="QQ2-1-142">Encapsulation</a></span>
-<br /><span class="sectionToc" >B <a 
+<br />&#x00A0;<span class="sectionToc" >B <a 
 href="#x1-132000B" id="QQ2-1-144">Vorbis encapsulation in RTP</a></span>
 </div>
                                                                                     
@@ -5509,60 +5509,32 @@
           <li 
   class="enumerate" id="x1-94008x1">calculate <span 
 class="cmtt-10x-x-109">[p] </span>and <span 
-class="cmtt-10x-x-109">[q] </span>according to: <span id="textcolor1">*** the following is generated from the TeX code
-          embedded into the DocBook files: ***</span> <div class="eqnarray">
+class="cmtt-10x-x-109">[q] </span>according to: <div class="eqnarray">
           <center class="math-display" >
           <img 
-src="Vorbis_I_spec10x.png" alt="                  (orde&#x220F;r- 3)&#x2215;2
-p  =   (1 - cos2&#x03C9;)          4(cosc2j+1 - cos&#x03C9; )2
-                     j=0
-         (order-1)&#x2215;2
-       1-   &#x220F;                      2
-q  =   4          4(cosc2j+1 - cos&#x03C9; )
-            j=0
-          " class="math-display" ></center>
-          </div>
-          <!--l. 162--><p class="noindent" ><span id="textcolor2">*** the following is what oddlsp.png contains: ***</span> <div class="eqnarray">
-                                                                                    
-
-                                                                                    
-          <center class="math-display" >
-          <img 
-src="Vorbis_I_spec11x.png" alt="                  floor0xorder-3
-              2       2&#x220F;                                     2
-p  =   (1- cos &#x03C9; )          4(cos([coefficients ]2j+1 )- cos&#x03C9; )
-                     j=0
-       1 floor0&#x220F;x2order-1
+src="Vorbis_I_spec10x.png" alt="                  floor0x2order-3
+p  =   (1- cos2&#x03C9; )    &#x220F;     4(cos([coefficients ]    )- cos&#x03C9; )2
+                     j=0                        2j+1
+         floor0xorder-1
+       1 ---&#x220F;2-----
 q  =   --          4(cos([coefficients ]2j) - cos&#x03C9;)2
        4    j=0
           " class="math-display" ></center>
           </div>
           </li></ol>
-     <!--l. 169--><p class="noindent" >else <span 
+     <!--l. 162--><p class="noindent" >else <span 
 class="cmtt-10x-x-109">[floor0_order] </span>is even
           <ol  class="enumerate2" >
           <li 
-  class="enumerate" id="x1-94012x1">calculate <span 
+  class="enumerate" id="x1-94011x1">calculate <span 
 class="cmtt-10x-x-109">[p] </span>and <span 
-class="cmtt-10x-x-109">[q] </span>according to: <span id="textcolor3">*** the following is generated from the TeX code
-          embedded into the DocBook files: ***</span> <div class="eqnarray">
-          <center class="math-display" >
-          <img 
-src="Vorbis_I_spec12x.png" alt="       (1--cos2&#x03C9;-)(orde&#x220F;r-2)&#x2215;2                2
-p  =        2              4(cosc2j - cos&#x03C9; )
-                     j=0
-       (1+ cos2&#x03C9; )(orde&#x220F;r-2)&#x2215;2
-q  =   -----------         4(cosc2j - cos&#x03C9; )2
-            2        j=0
-          " class="math-display" ></center>
-          </div>
-          <!--l. 178--><p class="noindent" ><span id="textcolor4">*** the following is what oddlsp.png contains: ***</span> <div class="eqnarray">
+class="cmtt-10x-x-109">[q] </span>according to: <div class="eqnarray">
                                                                                     
 
                                                                                     
           <center class="math-display" >
           <img 
-src="Vorbis_I_spec13x.png" alt="                  floor0xorder-2
+src="Vorbis_I_spec11x.png" alt="                  floor0xorder-2
        (1--cos2&#x03C9;-)    &#x220F;2                                     2
 p  =        2               4(cos([coefficients  ]2j+1)- cos&#x03C9; )
                       j=0
@@ -5574,43 +5546,43 @@
           </li></ol>
      </li>
      <li 
-  class="enumerate" id="x1-94016x4">calculate <span 
+  class="enumerate" id="x1-94014x4">calculate <span 
 class="cmtt-10x-x-109">[linear_floor_value] </span>according to:
      <center class="math-display" >
      <img 
-src="Vorbis_I_spec14x.png" alt="   (          (                                                                 ))
+src="Vorbis_I_spec12x.png" alt="   (          (                                                                 ))
 exp  .11512925  amplitude--&#x22C5;floor0xamplitutex&#x221A;offset-- - floor0xamplitudexoffset
                    (2floor0xamplitudexbits - 1) p + q
      " class="math-display" ></center>
-     <!--l. 191--><p class="nopar" >
+     <!--l. 177--><p class="nopar" >
      </li>
      <li 
-  class="enumerate" id="x1-94018x5"><span 
+  class="enumerate" id="x1-94016x5"><span 
 class="cmtt-10x-x-109">[iteration_condition] </span>= map element <span 
 class="cmtt-10x-x-109">[i]</span>
      </li>
      <li 
-  class="enumerate" id="x1-94020x6"><span 
+  class="enumerate" id="x1-94018x6"><span 
 class="cmtt-10x-x-109">[output] </span>element <span 
 class="cmtt-10x-x-109">[i] </span>= <span 
 class="cmtt-10x-x-109">[linear_floor_value]</span>
      </li>
      <li 
-  class="enumerate" id="x1-94022x7">increment <span 
+  class="enumerate" id="x1-94020x7">increment <span 
 class="cmtt-10x-x-109">[i]</span>
      </li>
      <li 
-  class="enumerate" id="x1-94024x8">if ( map element <span 
+  class="enumerate" id="x1-94022x8">if ( map element <span 
 class="cmtt-10x-x-109">[i] </span>is equal to <span 
 class="cmtt-10x-x-109">[iteration_condition] </span>) continue at step 5
      </li>
      <li 
-  class="enumerate" id="x1-94026x9">if ( <span 
+  class="enumerate" id="x1-94024x9">if ( <span 
 class="cmtt-10x-x-109">[i] </span>is less than <span 
 class="cmtt-10x-x-109">[n] </span>) continue at step 2
      </li>
      <li 
-  class="enumerate" id="x1-94028x10">done</li></ol>
+  class="enumerate" id="x1-94026x10">done</li></ol>
                                                                                     
 
                                                                                     
@@ -8495,8 +8467,9 @@
 class="cmtt-10">&#x00A0;into</span><span 
 class="cmtt-10">&#x00A0;the</span><span 
 class="cmtt-10">&#x00A0;vector</span><span 
-class="cmtt-10">&#x00A0;</span><span 
-class="cmbx-10">??</span>
+class="cmtt-10">&#x00A0;</span><a 
+href="#x1-12500010.1"><span 
+class="cmtt-10">[floor1_inverse_dB_static_table]</span></a>
 <br class="fancyvrb" /><a 
  id="x1-101206r30"></a><span 
 class="cmtt-10">&#x00A0;</span><span 
@@ -12923,8 +12896,8 @@
 <h3 class="likesectionHead"><a 
  id="x1-133000B"></a>Colophon</h3>
 <!--l. 6--><p class="noindent" ><img 
-src="Vorbis_I_spec15x.png" alt="PIC" class="graphics"><!--tex4ht:graphics  
-name="Vorbis_I_spec15x.png" src="xifish.pdf"  
+src="Vorbis_I_spec13x.png" alt="PIC" class="graphics"><!--tex4ht:graphics  
+name="Vorbis_I_spec13x.png" src="xifish.pdf"  
 -->
 <!--l. 10--><p class="noindent" >Ogg is a <a 
 href="http://www.xiph.org/" >Xiph.org Foundation</a> effort to protect essential tenets of Internet multimedia from
@@ -12949,7 +12922,7 @@
                                                                                     
 <h3 class="likesectionHead"><a 
  id="x1-134000B"></a>References</h3>
-<!--l. 129--><p class="noindent" >
+<!--l. 130--><p class="noindent" >
     <div class="thebibliography">
     <p class="bibitem" ><span class="biblabel">
   [1]<span class="bibsp">&#x00A0;&#x00A0;&#x00A0;</span></span><a 

Modified: trunk/vorbis/doc/Vorbis_I_spec.pdf
===================================================================
(Binary files differ)

Modified: trunk/vorbis/doc/xml/06-floor0.xml
===================================================================
--- trunk/vorbis/doc/xml/06-floor0.xml	2009-04-08 00:53:57 UTC (rev 15921)
+++ trunk/vorbis/doc/xml/06-floor0.xml	2009-04-08 01:46:27 UTC (rev 15922)
@@ -194,7 +194,7 @@
 	   <![CDATA[
            \begin{eqnarray*}
              p & = & (1 - \cos^2\omega)\prod_{j=0}^{(\mathtt{order}-3)/2} 4 (\cos c_{2j+1} - \cos \omega)^2 \\
-             q & = & \frac{1}{4} \prod_{j=0}^{(\mathtt{order}-1)/2} 4 (\cos c_{2j+1} - \cos \omega)^2
+             q & = & \frac{1}{4} \prod_{j=0}^{(\mathtt{order}-1)/2} 4 (\cos c_{2j} - \cos \omega)^2
            \end{eqnarray*}
 	   ]]>
           </phrase></textobject>
@@ -212,7 +212,7 @@
 	  <textobject role="tex"><phrase>
 	   <![CDATA[
            \begin{eqnarray*}
-             p & = & \frac{(1 - \cos^2\omega)}{2} \prod_{j=0}^{(\mathtt{order}-2)/2} 4 (\cos c_{2j} - \cos \omega)^2 \\
+             p & = & \frac{(1 - \cos^2\omega)}{2} \prod_{j=0}^{(\mathtt{order}-2)/2} 4 (\cos c_{2j+1} - \cos \omega)^2 \\
              q & = & \frac{(1 + \cos^2\omega)}{2} \prod_{j=0}^{(\mathtt{order}-2)/2} 4 (\cos c_{2j} - \cos \omega)^2
            \end{eqnarray*}
 	   ]]>



More information about the commits mailing list