Skip to content

Commit 776fd4b

Browse files
committed
Cleanup pass on the vorbisenc documentation.
svn path=/trunk/vorbis/; revision=16757
1 parent 1028f15 commit 776fd4b

15 files changed

+36
-29
lines changed

doc/vorbisenc/vorbis_analysis.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h1>vorbis_analysis</h1>
2222
dispatches the block to the forward transform provided by that mode.
2323
</p>
2424
<p>When using a basic encoding mode, with no bitrate management,
25-
an ogg_packet pointer can be given, and an the coded block is returned
25+
an ogg_packet pointer can be given, and the coded block is returned
2626
directly through that structure and can be placed in the output stream.
2727
</p>
2828
<p>Otherwise, NULL should be passed for the ogg_packet pointer. In
@@ -46,9 +46,9 @@ <h3>Parameters</h3>
4646
<dt><i>vb</i></dt>
4747
<dd>Pointer to the vorbis_block to be encoded.</dd>
4848
<dt><i>op</i></dt>
49-
<dd>Optional pointer to an ogg_packet. This should normally NULL,
50-
and the final output obtained by passing <i>vb</i> though the
51-
vorbis_bitrate_*() interface to perform any further refinement.
49+
<dd>Optional pointer to an ogg_packet. This is normally NULL,
50+
and the final output is obtained by passing <i>vb</i> though the
51+
vorbis_bitrate_*() interface to perform further refinement.
5252
However, when not using a bitrate managed encoding mode, it
5353
is possible to skip that step by providing an ogg_packet pointer
5454
here, obtaining the compressed data directly.</dd>

doc/vorbisenc/vorbis_analysis_blockout.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ <h1>vorbis_analysis_blockout</h1>
1717

1818
<p><i>declared in "vorbis/codec.h";</i></p>
1919

20-
<p>This fuction examines the available encoder and tries to break it
21-
into appropriate sized blocks. It should be called in a loop after
22-
adding new data with vorbis_analysis_buffer()/vorbis_analysis_wrote()
20+
<p>This fuction examines the available uncompressed data and tries to
21+
break it into appropriate sized blocks. It should be called in a loop
22+
after adding new data with vorbis_analysis_buffer()/vorbis_analysis_wrote()
2323
until it returns zero (need more data) or an negative value (error).
2424
</p>
2525
<p>
@@ -42,7 +42,7 @@ <h3>Parameters</h3>
4242
<dt><i>v</i></dt>
4343
<dd>Pointer to the vorbis_dsp_state representing the encoder.</dd>
4444
<dt><i>vb</i></dt>
45-
<dd>Pointer to a previously initialize vorbis_block object to store the
45+
<dd>Pointer to a previously initialized vorbis_block object to hold the
4646
returned data.
4747
</dl>
4848

doc/vorbisenc/vorbis_analysis_buffer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h3>Parameters</h3>
4747
<dt><i>v</i></dt>
4848
<dd>Pointer to the vorbis_dsp_state representing the encoder.</dd>
4949
<dt><i>vals</i></dt>
50-
<dd>Number of samples to provide in the request buffer.</dd>
50+
<dd>Number of samples to provide space for in the returned buffer. 1024 is a reasonable choice.</dd>
5151
</dl>
5252

5353

doc/vorbisenc/vorbis_analysis_headerout.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h1>vorbis_analysis_headerout</h1>
1818
<p><i>declared in "vorbis/codec.h";</i></p>
1919

2020
<p>This function creates and returns the three header packets needed
21-
to configure a decoder to accept subsequent data. I should be called
21+
to configure a decoder to accept compressed data. I should be called
2222
after all encoder initialization and configuration is complete. The
2323
output packets should be placed in order at the start of the compressed
2424
vorbis stream, prior to the first data packet.

doc/vorbisenc/vorbis_analysis_init.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ <h3>Parameters</h3>
3737
<dt><i>v</i</dt>
3838
<dd>Pointer to the vorbis_dsp_state structure to be initialized for encoding.</dd>
3939
<dt><i>vi</i></dt>
40-
<dd>File pointer to an initialized <a href="vorbis_info.html">vorbis_info</a> struct.</dd>
40+
<dd>Pointer to an initialized <a href="vorbis_info.html">vorbis_info</a> struct describing the encoder configuration.</dd>
4141
</dl>
4242

4343

doc/vorbisenc/vorbis_analysis_wrote.html

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ <h1>vorbis_analysis_wrote</h1>
2222
vorbis_analysis_buffer().
2323
</p>
2424

25+
<p>
26+
Call with the <i>vals</i> parameter set to zero to signal the end
27+
of the input data.
28+
</p>
29+
2530
<table border=0 color=black cellspacing=0 cellpadding=7>
2631
<tr bgcolor=#cccccc>
2732
<td>
@@ -38,7 +43,9 @@ <h3>Parameters</h3>
3843
<dd>Pointer to the vorbis_dsp_state representing the encoder.</dd>
3944
<dt><i>vals</i></dt>
4045
<dd>Number of samples successfully written. This must be less than
41-
or equal to the value passed to vorbis_analysis_buffer().</dd>
46+
or equal to the value passed to vorbis_analysis_buffer(). A value
47+
of zero means all input data has been provided and the compressed
48+
stream should be finalized.</dd>
4249
</dl>
4350

4451

doc/vorbisenc/vorbis_bitrate_addblock.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ <h1>vorbis_bitrate_addblock</h1>
1818
<p><i>declared in "vorbis/codec.h";</i></p>
1919

2020
<p>This fuction submits a transformed block to the bitrate management
21-
engine for final encoding. Packets are submitted and, depending on the
22-
encoding mode, buffered and the packet boundaries adjusted and padded
23-
to meet the target bitrate.</p>
21+
engine for final encoding. Packets are buffered and the packet boundaries
22+
adjusted and padded to meet the target bitrate, if any.</p>
23+
2424
<p>After calling vorbis_bitrate_addblock(), the passed vorbis_block
2525
structure can be reused in another call to vorbis_analysis_blockout().
2626
Call vorbis_bitrate_flushpacket() to obtain the final compressed data.
@@ -38,7 +38,7 @@ <h1>vorbis_bitrate_addblock</h1>
3838

3939
<h3>Parameters</h3>
4040
<dl>
41-
<dt><i>v</i></dt>
41+
<dt><i>vb</i></dt>
4242
<dd>Pointer to the vorbis_block to be submitted.</dd>
4343
</dl>
4444

doc/vorbisenc/vorbis_bitrate_flushpacket.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ <h1>vorbis_bitrate_flushpacket</h1>
1717

1818
<p><i>declared in "vorbis/codec.h";</i></p>
1919

20-
<p>This function returns the next available packet from the bitrate
21-
management engine. It should be called in a loop after any calls to
22-
vorbis_bitrate_addblock() until it returns either 0 (more data needed)
20+
<p>This function returns the next available completed packet from the
21+
bitrate management engine. It should be called in a loop after any call
22+
to vorbis_bitrate_addblock() until it returns either 0 (more data needed)
2323
or a negative value (error).
2424
</p>
2525

doc/vorbisenc/vorbis_block_init.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ <h1>vorbis_block_init</h1>
1717

1818
<p><i>declared in "vorbis/codec.h";</i></p>
1919

20-
<p>This function allocates and initializes internal state associated
21-
with dividing the input into blocks for further analysis, stored inside
22-
a vorbis_block structure.
20+
<p>This function initializes a vorbis_block structure and allocates its
21+
internal storage. A vorbis_block is used to represent a particular block
22+
of input audio which can be analyzed and coded as a unit.
2323
</p>
2424

2525
<table border=0 color=black cellspacing=0 cellpadding=7>
@@ -36,7 +36,7 @@ <h3>Parameters</h3>
3636
<dl>
3737
<dt><i>v</i</dt>
3838
<dd>Pointer to an initialized vorbis_dsp_state with which to associate the new block.</dd>
39-
<dt><i>vi</i></dt>
39+
<dt><i>vb</i></dt>
4040
<dd>Pointer to a vorbis_block struct to be initialized.</dd>
4141
</dl>
4242

doc/vorbisenc/vorbis_encode_ctl.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ <h1>vorbis_encode_ctl</h1>
4646
<h3>Parameters</h3>
4747
<dl>
4848
<dt><i>vi</i></dt>
49-
<dd>File pointer to an initialized <a href="vorbis_info.html">vorbis_info</a> struct.</dd><p>
49+
<dd>Pointer to an initialized <a href="vorbis_info.html">vorbis_info</a> struct.</dd><p>
5050
<dt><i>request</i></dt>
5151
<dd>Specifies the desired action; possible request fields are detailed below.</dd><p>
5252
<dt><i>arg</i></dt>

0 commit comments

Comments
 (0)