Commit f9208aba authored by j's avatar j
Browse files

merge changes from /tags/vorbis/libvorbis-1.1.1/

svn path=/branches/vorbis-aotuv/; revision=12028
parent b0160514
libvorbis 1.1.1 (2005-06-27) -- "Xiph.Org libVorbis I 20050304"
* bug fix to the bitrate management encoder interface
* bug fix to properly set packetno field in the encoder
* new draft RTP encapsulation spec
* library API documentation improvements
libvorbis 1.1.0 (2004-09-22) -- "Xiph.Org libVorbis I 20040629"
* merges tuning improvements from Aoyumi's aoTuV with fixups
......
......@@ -32,7 +32,7 @@ echo "checking for automake... "
echo -n "checking for libtool... "
for LIBTOOLIZE in libtoolize glibtoolize nope; do
(which $LIBTOOLIZE) > /dev/null 2>&1 && break
(type $LIBTOOLIZE) > /dev/null 2>&1 && break
done
if test x$LIBTOOLIZE = xnope; then
echo "nope."
......@@ -72,4 +72,4 @@ echo " autoconf"
autoconf || exit 1
cd $olddir
$srcdir/configure "$@" && echo
$srcdir/configure --enable-maintainer-mode "$@" && echo
......@@ -11,7 +11,7 @@ AC_CANONICAL_TARGET
AM_CONFIG_HEADER([config.h])
AM_INIT_AUTOMAKE(libvorbis,1.1.0)
AM_INIT_AUTOMAKE(libvorbis,1.1.1)
AM_MAINTAINER_MODE
dnl Library versioning
......@@ -23,7 +23,7 @@ VF_LIB_CURRENT=4
VF_LIB_REVISION=0
VF_LIB_AGE=1
VE_LIB_CURRENT=2
VE_LIB_REVISION=0
VE_LIB_REVISION=1
VE_LIB_AGE=0
AC_SUBST(V_LIB_CURRENT)
AC_SUBST(V_LIB_REVISION)
......
version=2
http://downloads.xiph.org/releases/vorbis/libvorbis-(.*)\.tar\.gz debian uupdate
......@@ -112,10 +112,15 @@ Vorbis_I_spec.html: $(SPEC_PNG_BUILD) $(BUILDDIR)/Vorbis_I_spec.xml
Vorbis_I_spec.fo: $(BUILDDIR)/Vorbis_I_spec.xml
cd build; xsltproc --xinclude --output $@ spec-fo.xsl Vorbis_I_spec.xml && mv $@ ..
# we add the two newlines to pdfxmltex because on a number of Fedora systems
# tex prompts for input complaining about something;
# and surprisingly there's no way to tell tex to ignore that
# also, --interaction doesn't seem to actually do anything different
# if you change it
Vorbis_I_spec.pdf: Vorbis_I_spec.fo $(SPEC_PNG_BUILD) $(SPEC_PDF_BUILD)
cp $< build/spec.fo # work around a passivetex bug
cd build; pdfxmltex --interaction nonstopmode spec.fo
cd build; pdfxmltex --interaction nonstopmode spec.fo
cd build; echo -e -n "\n\n" | pdfxmltex --interaction nonstopmode spec.fo
cd build; echo -e -n "\n\n" | pdfxmltex --interaction nonstopmode spec.fo
rm build/spec.fo
mv build/spec.pdf $@
else
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -23,7 +23,7 @@ Ogg Vorbis Documentation
[<a href="Vorbis_I_spec.html">html</a>]
[<a href="Vorbis_I_spec.pdf">pdf</a>]
<li><a href="v-comment.html">Vorbis comment header specification</a>
<li><a href="draft-kerr-avt-vorbis-rtp-02.txt">Embedding Vorbis encoded
<li><a href="draft-kerr-avt-vorbis-rtp-03.txt">Embedding Vorbis encoded
audio in an RTP payload format</a>
</ul>
......
doc/lspmap.png

4.3 KB | W: | H:

doc/lspmap.png

4.18 KB | W: | H:

doc/lspmap.png
doc/lspmap.png
doc/lspmap.png
doc/lspmap.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -23,14 +23,14 @@ structure when using a data source other than a file. It allows you to specify
struct should be passed to all the libvorbisfile functions.
<p>
It is often useful to call <tt>ov_open_callbacks()</tt>
simply to determine whether a given file is a vorbis bitstream. If the
simply to determine whether a given stream is a vorbis bitstream. If the
<tt>ov_open_callbacks()</tt>
call fails, then the file is not recognizable as such. When you use <tt>ov_open_callbacks()
call fails, then the data is not recognizable as such. When you use <tt>ov_open_callbacks()
</tt>for
this, you should <tt>fclose()</tt> the file pointer if, and only if, the
this, you should close or otherwise deallocate your <tt>datasource</tt> if, and only if, the
<tt>ov_open_callbacks()</tt>
call fails. If it succeeds, you must call <a href=ov_clear.html>ov_clear()</a> to clear
the decoder's buffers and close the file for you.<p>
the decoder's buffers and call your close callback.<p>
See also <a href="callbacks.html">Callbacks and Non-stdio I/O</a> for information on designing and specifying the required callback functions.<p>
......@@ -47,24 +47,22 @@ int ov_open_callbacks(void *datasource, <a href="OggVorbis_File.html">OggVorbis_
<h3>Parameters</h3>
<dl>
<dt><i>f</i></dt>
<dd>File pointer to an already opened file
or pipe (it need not be seekable--though this obviously restricts what
can be done with the bitstream).</dd>
<dt><i>datasource</i></dt>
<dd>Pointer to a data structure allocated by the calling application, containing any state needed by the callbacks provided.</dd>
<dt><i>vf</i></dt>
<dd>A pointer to the OggVorbis_File structure--this is used for ALL the externally visible libvorbisfile
functions. Once this has been called, the same <tt>OggVorbis_File</tt>
struct should be passed to all the libvorbisfile functions.</dd>
<dt><i>initial</i></dt>
<dd>Typically set to NULL. This parameter is useful if some data has already been
read from the file and the stream is not seekable. It is used in conjunction with <tt>ibytes</tt>. In this case, <tt>initial</tt>
read from the stream and the stream is not seekable. It is used in conjunction with <tt>ibytes</tt>. In this case, <tt>initial</tt>
should be a pointer to a buffer containing the data read.</dd>
<dt><i>ibytes</i></dt>
<dd>Typically set to 0. This parameter is useful if some data has already been
read from the file and the stream is not seekable. In this case, <tt>ibytes</tt>
read from the stream and the stream is not seekable. In this case, <tt>ibytes</tt>
should contain the length (in bytes) of the buffer. Used together with <tt>initial</tt>.</dd>
<dt><i>callbacks</i></dt>
<dd>Pointer to a completed <a href="ov_callbacks.html">ov_callbacks</a> struct which indicates desired custom file manipulation routines.</dd>
<dd>A completed <a href="ov_callbacks.html">ov_callbacks</a> struct which indicates desired custom file manipulation routines.</dd>
</dl>
......
......@@ -45,7 +45,7 @@ functions.</dd>
<li>OV_EINVAL means that the argument was invalid. In this case, the requested bitstream did not exist or the bitstream is unseekable.</li>
<li>
total length in pcm samples of content if i=-1.</li>
<li>length in pcm samples of logical bitstream if i=1 to n.</li>
<li>length in pcm samples of logical bitstream if i=0 to n.</li>
</blockquote>
<p>
......
......@@ -45,7 +45,7 @@ functions.</dd>
<li>OV_EINVAL means that the argument was invalid. In this case, the requested bitstream did not exist or the bitstream is nonseekable</li>
<li><tt>n</tt>
total length in compressed bytes of content if i=-1.</li>
<li><tt>n</tt> length in compressed bytes of logical bitstream if i=1 to n.</li>
<li><tt>n</tt> length in compressed bytes of logical bitstream if i=0 to n.</li>
</blockquote>
<p>
......
......@@ -46,7 +46,6 @@ functions.</dd>
<dt><i>samples</i></dt>
<dd>Maximum number of decoded samples to produce.</dd>
<dt><i>bitstream</i></dt>
<dt><i>bitstream</i></dt>
<dd>A pointer to the number of the current logical bitstream.</dd>
</dl>
......
......@@ -52,7 +52,7 @@ should be a pointer to a buffer containing the data read.</dd>
read from the file and the stream is not seekable. In this case, <tt>ibytes</tt>
should contain the length (in bytes) of the buffer. Used together with <tt>initial</tt>.</dd>
<dt><i>callbacks</i></dt>
<dd>Pointer to a completed <a href="ov_callbacks.html">ov_callbacks</a> struct which indicates desired custom file manipulation routines.</dd>
<dd>A completed <a href="ov_callbacks.html">ov_callbacks</a> struct which indicates desired custom file manipulation routines.</dd>
</dl>
......
......@@ -46,7 +46,7 @@ functions.</dd>
<blockquote>
<li>OV_EINVAL means that the argument was invalid. In this case, the requested bitstream did not exist or the bitstream is nonseekable.</li>
<li><tt>n</tt> total length in seconds of content if i=-1.</li>
<li><tt>n</tt> length in seconds of logical bitstream if i=1 to n.</li>
<li><tt>n</tt> length in seconds of logical bitstream if i=0 to n.</li>
</blockquote>
<p>
......
......@@ -32,6 +32,7 @@
<br>
<b>Decoding</b><br>
<a href="ov_read.html">ov_read()</a><br>
<a href="ov_read_float.html">ov_read_float()</a><br>
<a href="ov_crosslap.html">ov_crosslap()</a><br>
<br>
<b>Seeking</b><br>
......
......@@ -170,7 +170,7 @@ synthesized:</para>
and
\begin{math}
\mathrm{bark}(x) = 13.1 \arctan (.00074x) + 2.24 \arctan (.0000000158x^2)+.0001x
\mathrm{bark}(x) = 13.1 \arctan (.00074x) + 2.24 \arctan (.0000000185x^2 + .0001x)
\end{math}
]]>
</phrase></textobject>
......
......@@ -106,7 +106,7 @@ int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb){
oggpack_writeinit(vbi->packetblob[i]);
}
}
return(0);
}
......@@ -287,16 +287,16 @@ int vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi){
b=v->backend_state;
b->psy_g_look=_vp_global_look(vi);
/* added by aoyumi */
b->nblock = _ogg_calloc((128*vi->channels), sizeof(*b->nblock));
b->tblock = _ogg_calloc((128*vi->channels), sizeof(*b->tblock));
/* Initialize the envelope state storage */
b->ve=_ogg_calloc(1,sizeof(*b->ve));
_ve_envelope_init(b->ve,vi);
vorbis_bitrate_init(vi,&b->bms);
/* compressed audio packets start after the headers
with sequence number 3 */
v->sequence=3;
return(0);
}
......@@ -348,10 +348,6 @@ void vorbis_dsp_clear(vorbis_dsp_state *v){
drft_clear(&b->fft_look[0]);
drft_clear(&b->fft_look[1]);
/* added by aoyumi */
if(b->nblock) _ogg_free(b->nblock);
if(b->tblock) _ogg_free(b->tblock);
}
......
......@@ -33,7 +33,10 @@ typedef struct vorbis_block_internal{
float ampmax;
int blocktype;
ogg_uint32_t packetblob_markers[PACKETBLOBS];
oggpack_buffer *packetblob[PACKETBLOBS]; /* initialized, must be freed;
blob [PACKETBLOBS/2] points to
the oggpack_buffer in the
main vorbis_block */
} vorbis_block_internal;
typedef void vorbis_look_floor;
......@@ -79,14 +82,6 @@ typedef struct private_state {
bitrate_manager_state bms;
ogg_int64_t sample_count;
/* encode only
added by aoyumi */
float *nblock; /* lW logmdct buffer */
float *tblock; /* temporal masking buffer (impulse block) */
int lW_blocktype; /* last window block type */
int lW_modenumber; /* last window mode number (0=short, 1=long) */
int lW_no; /* the number of continuous window blocks (last window) */
} private_state;
/* codec_setup_info contains all the setup information specific to the
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment