# HG changeset patch # User koda # Date 1351395076 -3600 # Node ID d4bda0201cae4ca4b581e86c7d16ed227e0e9eaa # Parent fcbb024090a4051f6865ffb3bfb4934ef0df6bcc forgot to remove these files when reverting tremor diff -r fcbb024090a4 -r d4bda0201cae misc/libtremor/README --- a/misc/libtremor/README Sun Oct 28 04:28:39 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,12 +0,0 @@ -Tremor README - -[0] http://svn.xiph.org/trunk/Tremor/ -Original Tremor implementation, used in Hedgewars until the Tremor devteam branched the internal Ogg implementation. -More details: http://lists.xiph.org/pipermail/tremor/2010-August/001650.html - -[1] http://svn.xiph.org/branches/lowmem-no-byte/Tremor/ -A Tremor variant, suited for low memory devices, still contains an Ogg implementation, used in Hedgewars. - -[2] http://svn.xiph.org/branches/lowmem-branch/Tremolo/ -An interesting Tremor variant with a lot of ARM optimisations. - diff -r fcbb024090a4 -r d4bda0201cae misc/libtremor/tremor/debian/Makefile.am --- a/misc/libtremor/tremor/debian/Makefile.am Sun Oct 28 04:28:39 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ -## Process this file with automake to produce Makefile.in - -AUTOMAKE_OPTIONS = foreign - -EXTRA_DIST = changelog control copyright libvorbisidec1.install\ - libvorbisidec-dev.install rules diff -r fcbb024090a4 -r d4bda0201cae misc/libtremor/tremor/debian/changelog --- a/misc/libtremor/tremor/debian/changelog Sun Oct 28 04:28:39 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -libvorbisidec (1.2.0-1) unstable; urgency=low - - * Initial Release. - - -- Christopher L Cheney Wed, 09 Oct 2002 22:00:00 -0500 - -Local variables: -mode: debian-changelog -End: diff -r fcbb024090a4 -r d4bda0201cae misc/libtremor/tremor/debian/control --- a/misc/libtremor/tremor/debian/control Sun Oct 28 04:28:39 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ -Source: libvorbisidec -Section: libs -Priority: optional -Maintainer: Christopher L Cheney -Build-Depends: autotools-dev, debhelper (>> 4.0.18), devscripts, gawk -Standards-Version: 3.5.7.0 - -Package: libvorbisidec1 -Architecture: any -Section: libs -Depends: ${shlibs:Depends} -Description: Ogg Bitstream Library - Libogg is a library for manipulating ogg bitstreams. It handles - both making ogg bitstreams and getting packets from ogg bitstreams. - -Package: libvorbisidec-dev -Architecture: any -Section: devel -Depends: libvorbisidec1 (= ${Source-Version}), libc6-dev -Description: Ogg Bitstream Library Development - The libogg-dev package contains the header files and documentation - needed to develop applications with libogg. diff -r fcbb024090a4 -r d4bda0201cae misc/libtremor/tremor/debian/copyright --- a/misc/libtremor/tremor/debian/copyright Sun Oct 28 04:28:39 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,37 +0,0 @@ -This package was debianized by Christopher L Cheney on -Wed, 09 Oct 2002 22:00:00 -0500. - -It was downloaded from cvs. - -Upstream Author(s): Monty - -Copyright: -Copyright (c) 2002, Xiph.org Foundation - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -- Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - -- Redistributions in binary form must reproduce the above copyright -notice, this list of conditions and the following disclaimer in the -documentation and/or other materials provided with the distribution. - -- Neither the name of the Xiph.Org Foundation nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR -CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - diff -r fcbb024090a4 -r d4bda0201cae misc/libtremor/tremor/debian/libvorbisidec-dev.install --- a/misc/libtremor/tremor/debian/libvorbisidec-dev.install Sun Oct 28 04:28:39 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,8 +0,0 @@ -debian/tmp/usr/include/tremor/config_types.h -debian/tmp/usr/include/tremor/ivorbiscodec.h -debian/tmp/usr/include/tremor/ivorbisfile.h -debian/tmp/usr/include/tremor/ogg.h -debian/tmp/usr/include/tremor/os_types.h -debian/tmp/usr/lib/libvorbisidec.a -debian/tmp/usr/lib/libvorbisidec.la -debian/tmp/usr/lib/libvorbisidec.so diff -r fcbb024090a4 -r d4bda0201cae misc/libtremor/tremor/debian/libvorbisidec1.install --- a/misc/libtremor/tremor/debian/libvorbisidec1.install Sun Oct 28 04:28:39 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -debian/tmp/usr/lib/libvorbisidec.so.* diff -r fcbb024090a4 -r d4bda0201cae misc/libtremor/tremor/debian/rules --- a/misc/libtremor/tremor/debian/rules Sun Oct 28 04:28:39 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,151 +0,0 @@ -#!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# This is the debhelper compatibility version to use. -export DH_COMPAT=4 - -# This has to be exported to make some magic below work. -export DH_OPTIONS - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -objdir = $(CURDIR)/obj-$(DEB_BUILD_GNU_TYPE) - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - - # make build directory - mkdir $(objdir) - - # run configure with build tree $(objdir) - # change ../configure to ../autogen.sh for CVS build - cd $(objdir) && \ - ../configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \ - --prefix=/usr - - touch configure-stamp - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - - cd $(objdir) && \ - $(MAKE) - - touch build-stamp - -autotools: - OLDDATESUB=`./config.sub -t | tr -d -` ;\ - OLDDATEGUESS=`./config.guess -t | tr -d -` ;\ - NEWDATESUB=`/usr/share/misc/config.sub -t | tr -d -` ;\ - NEWDATEGUESS=`/usr/share/misc/config.guess -t | tr -d -` ;\ - if [ $$OLDDATESUB -lt $$NEWDATESUB -o \ - $$OLDDATEGUESS -lt $$NEWDATEGUESS ]; then \ - dch -a -p "GNU config automated update: config.sub\ - ($$OLDDATESUB to $$NEWDATESUB), config.guess\ - ($$OLDDATEGUESS to $$NEWDATEGUESS)" ;\ - cp -f /usr/share/misc/config.sub config.sub ;\ - cp -f /usr/share/misc/config.guess config.guess ;\ - echo WARNING: GNU config scripts updated from master copies 1>&2 ;\ - fi - -debian-clean: - dh_testdir - dh_testroot - - dh_clean - -clean: autotools - dh_testdir - dh_testroot - rm -f build-stamp configure-stamp - - # Remove build tree - rm -rf $(objdir) - - # if Makefile exists run distclean - if test -f Makefile; then \ - $(MAKE) distclean; \ - fi - - #if test -d CVS; then \ - $(MAKE) cvs-clean ;\ - fi - - dh_clean - -install: DH_OPTIONS= -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - - cd $(objdir) && \ - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - - dh_install --list-missing - -# This single target is used to build all the packages, all at once, or -# one at a time. So keep in mind: any options passed to commands here will -# affect _all_ packages. Anything you want to only affect one package -# should be put in another target, such as the install target. -binary-common: - dh_testdir - dh_testroot -# dh_installxfonts - dh_installchangelogs - dh_installdocs - dh_installexamples -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron -# dh_installinfo -# dh_undocumented - dh_installman - dh_strip - dh_link - dh_compress - dh_fixperms - dh_makeshlibs -V - dh_installdeb -# dh_perl - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture independant packages using the common target. -binary-indep: build install -# $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -# Build architecture dependant packages using the common target. -binary-arch: build install - $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common - -# Any other binary targets build just one binary package at a time. -binary-%: build install - $(MAKE) -f debian/rules binary-common DH_OPTIONS=-p$* - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff -r fcbb024090a4 -r d4bda0201cae misc/libtremor/tremor/dsp.c --- a/misc/libtremor/tremor/dsp.c Sun Oct 28 04:28:39 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,298 +0,0 @@ -/******************************************************************** - * * - * THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. * - * * - * 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 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2003 * - * BY THE Xiph.Org FOUNDATION http://www.xiph.org/ * - * * - ******************************************************************** - - function: PCM data vector blocking, windowing and dis/reassembly - - ********************************************************************/ - -#include -#include "ogg.h" -#include "mdct.h" -#include "ivorbiscodec.h" -#include "codec_internal.h" -#include "misc.h" -#include "window_lookup.h" - -int vorbis_dsp_restart(vorbis_dsp_state *v){ - if(!v)return -1; - { - vorbis_info *vi=v->vi; - codec_setup_info *ci; - - if(!vi)return -1; - ci=vi->codec_setup; - if(!ci)return -1; - - v->out_end=-1; - v->out_begin=-1; - - v->granulepos=-1; - v->sequence=-1; - v->sample_count=-1; - } - return 0; -} - -vorbis_dsp_state *vorbis_dsp_create(vorbis_info *vi){ - int i; - - vorbis_dsp_state *v=_ogg_calloc(1,sizeof(*v)); - codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; - - v->vi=vi; - - v->work=(ogg_int32_t **)_ogg_malloc(vi->channels*sizeof(*v->work)); - v->mdctright=(ogg_int32_t **)_ogg_malloc(vi->channels*sizeof(*v->mdctright)); - for(i=0;ichannels;i++){ - v->work[i]=(ogg_int32_t *)_ogg_calloc(1,(ci->blocksizes[1]>>1)* - sizeof(*v->work[i])); - v->mdctright[i]=(ogg_int32_t *)_ogg_calloc(1,(ci->blocksizes[1]>>2)* - sizeof(*v->mdctright[i])); - } - - v->lW=0; /* previous window size */ - v->W=0; /* current window size */ - - vorbis_dsp_restart(v); - return v; -} - -void vorbis_dsp_destroy(vorbis_dsp_state *v){ - int i; - if(v){ - vorbis_info *vi=v->vi; - - if(v->work){ - for(i=0;ichannels;i++) - if(v->work[i])_ogg_free(v->work[i]); - _ogg_free(v->work); - } - if(v->mdctright){ - for(i=0;ichannels;i++) - if(v->mdctright[i])_ogg_free(v->mdctright[i]); - _ogg_free(v->mdctright); - } - - _ogg_free(v); - } -} - -static LOOKUP_T *_vorbis_window(int left){ - switch(left){ - case 32: - return vwin64; - case 64: - return vwin128; - case 128: - return vwin256; - case 256: - return vwin512; - case 512: - return vwin1024; - case 1024: - return vwin2048; - case 2048: - return vwin4096; -#ifndef LIMIT_TO_64kHz - case 4096: - return vwin8192; -#endif - default: - return(0); - } -} - -/* pcm==0 indicates we just want the pending samples, no more */ -int vorbis_dsp_pcmout(vorbis_dsp_state *v,ogg_int16_t *pcm,int samples){ - vorbis_info *vi=v->vi; - codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; - if(v->out_begin>-1 && v->out_beginout_end){ - int n=v->out_end-v->out_begin; - if(pcm){ - int i; - if(n>samples)n=samples; - for(i=0;ichannels;i++) - mdct_unroll_lap(ci->blocksizes[0],ci->blocksizes[1], - v->lW,v->W,v->work[i],v->mdctright[i], - _vorbis_window(ci->blocksizes[0]>>1), - _vorbis_window(ci->blocksizes[1]>>1), - pcm+i,vi->channels, - v->out_begin,v->out_begin+n); - } - return(n); - } - return(0); -} - -int vorbis_dsp_read(vorbis_dsp_state *v,int s){ - if(s && v->out_begin+s>v->out_end)return(OV_EINVAL); - v->out_begin+=s; - return(0); -} - -long vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op){ - codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; - oggpack_buffer opb; - int mode; - int modebits=0; - int v=ci->modes; - - oggpack_readinit(&opb,op->packet); - - /* Check the packet type */ - if(oggpack_read(&opb,1)!=0){ - /* Oops. This is not an audio data packet */ - return(OV_ENOTAUDIO); - } - - while(v>1){ - modebits++; - v>>=1; - } - - /* read our mode and pre/post windowsize */ - mode=oggpack_read(&opb,modebits); - if(mode==-1)return(OV_EBADPACKET); - return(ci->blocksizes[ci->mode_param[mode].blockflag]); -} - - -static int ilog(ogg_uint32_t v){ - int ret=0; - if(v)--v; - while(v){ - ret++; - v>>=1; - } - return(ret); -} - -int vorbis_dsp_synthesis(vorbis_dsp_state *vd,ogg_packet *op,int decodep){ - vorbis_info *vi=vd->vi; - codec_setup_info *ci=(codec_setup_info *)vi->codec_setup; - int mode,i; - - oggpack_readinit(&vd->opb,op->packet); - - /* Check the packet type */ - if(oggpack_read(&vd->opb,1)!=0){ - /* Oops. This is not an audio data packet */ - return OV_ENOTAUDIO ; - } - - /* read our mode and pre/post windowsize */ - mode=oggpack_read(&vd->opb,ilog(ci->modes)); - if(mode==-1 || mode>=ci->modes) return OV_EBADPACKET; - - /* shift information we still need from last window */ - vd->lW=vd->W; - vd->W=ci->mode_param[mode].blockflag; - for(i=0;ichannels;i++) - mdct_shift_right(ci->blocksizes[vd->lW],vd->work[i],vd->mdctright[i]); - - if(vd->W){ - int temp; - oggpack_read(&vd->opb,1); - temp=oggpack_read(&vd->opb,1); - if(temp==-1) return OV_EBADPACKET; - } - - /* packet decode and portions of synthesis that rely on only this block */ - if(decodep){ - mapping_inverse(vd,ci->map_param+ci->mode_param[mode].mapping); - - if(vd->out_begin==-1){ - vd->out_begin=0; - vd->out_end=0; - }else{ - vd->out_begin=0; - vd->out_end=ci->blocksizes[vd->lW]/4+ci->blocksizes[vd->W]/4; - } - } - - /* track the frame number... This is for convenience, but also - making sure our last packet doesn't end with added padding. - - This is not foolproof! It will be confused if we begin - decoding at the last page after a seek or hole. In that case, - we don't have a starting point to judge where the last frame - is. For this reason, vorbisfile will always try to make sure - it reads the last two marked pages in proper sequence */ - - /* if we're out of sequence, dump granpos tracking until we sync back up */ - if(vd->sequence==-1 || vd->sequence+1 != op->packetno-3){ - /* out of sequence; lose count */ - vd->granulepos=-1; - vd->sample_count=-1; - } - - vd->sequence=op->packetno; - vd->sequence=vd->sequence-3; - - if(vd->sample_count==-1){ - vd->sample_count=0; - }else{ - vd->sample_count+= - ci->blocksizes[vd->lW]/4+ci->blocksizes[vd->W]/4; - } - - if(vd->granulepos==-1){ - if(op->granulepos!=-1){ /* only set if we have a - position to set to */ - - vd->granulepos=op->granulepos; - - /* is this a short page? */ - if(vd->sample_count>vd->granulepos){ - /* corner case; if this is both the first and last audio page, - then spec says the end is cut, not beginning */ - if(op->e_o_s){ - /* trim the end */ - /* no preceeding granulepos; assume we started at zero (we'd - have to in a short single-page stream) */ - /* granulepos could be -1 due to a seek, but that would result - in a long coun t, not short count */ - - vd->out_end-=vd->sample_count-vd->granulepos; - }else{ - /* trim the beginning */ - vd->out_begin+=vd->sample_count-vd->granulepos; - if(vd->out_begin>vd->out_end) - vd->out_begin=vd->out_end; - } - - } - - } - }else{ - vd->granulepos+= - ci->blocksizes[vd->lW]/4+ci->blocksizes[vd->W]/4; - if(op->granulepos!=-1 && vd->granulepos!=op->granulepos){ - - if(vd->granulepos>op->granulepos){ - long extra=vd->granulepos-op->granulepos; - - if(extra) - if(op->e_o_s){ - /* partial last frame. Strip the extra samples off */ - vd->out_end-=extra; - } /* else {Shouldn't happen *unless* the bitstream is out of - spec. Either way, believe the bitstream } */ - } /* else {Shouldn't happen *unless* the bitstream is out of - spec. Either way, believe the bitstream } */ - vd->granulepos=op->granulepos; - } - } - - return(0); -} diff -r fcbb024090a4 -r d4bda0201cae misc/libtremor/tremor/floor_lookup.c --- a/misc/libtremor/tremor/floor_lookup.c Sun Oct 28 04:28:39 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,92 +0,0 @@ -/******************************************************************** - * * - * THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. * - * * - * 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 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2003 * - * BY THE Xiph.Org FOUNDATION http://www.xiph.org/ * - * * - ******************************************************************** - - function: floor dB lookup - - ********************************************************************/ - -#include "os.h" - -#ifdef _LOW_ACCURACY_ -# define XdB(n) ((((n)>>8)+1)>>1) -#else -# define XdB(n) (n) -#endif - -const ogg_int32_t FLOOR_fromdB_LOOKUP[256]={ - XdB(0x000000e5), XdB(0x000000f4), XdB(0x00000103), XdB(0x00000114), - XdB(0x00000126), XdB(0x00000139), XdB(0x0000014e), XdB(0x00000163), - XdB(0x0000017a), XdB(0x00000193), XdB(0x000001ad), XdB(0x000001c9), - XdB(0x000001e7), XdB(0x00000206), XdB(0x00000228), XdB(0x0000024c), - XdB(0x00000272), XdB(0x0000029b), XdB(0x000002c6), XdB(0x000002f4), - XdB(0x00000326), XdB(0x0000035a), XdB(0x00000392), XdB(0x000003cd), - XdB(0x0000040c), XdB(0x00000450), XdB(0x00000497), XdB(0x000004e4), - XdB(0x00000535), XdB(0x0000058c), XdB(0x000005e8), XdB(0x0000064a), - XdB(0x000006b3), XdB(0x00000722), XdB(0x00000799), XdB(0x00000818), - XdB(0x0000089e), XdB(0x0000092e), XdB(0x000009c6), XdB(0x00000a69), - XdB(0x00000b16), XdB(0x00000bcf), XdB(0x00000c93), XdB(0x00000d64), - XdB(0x00000e43), XdB(0x00000f30), XdB(0x0000102d), XdB(0x0000113a), - XdB(0x00001258), XdB(0x0000138a), XdB(0x000014cf), XdB(0x00001629), - XdB(0x0000179a), XdB(0x00001922), XdB(0x00001ac4), XdB(0x00001c82), - XdB(0x00001e5c), XdB(0x00002055), XdB(0x0000226f), XdB(0x000024ac), - XdB(0x0000270e), XdB(0x00002997), XdB(0x00002c4b), XdB(0x00002f2c), - XdB(0x0000323d), XdB(0x00003581), XdB(0x000038fb), XdB(0x00003caf), - XdB(0x000040a0), XdB(0x000044d3), XdB(0x0000494c), XdB(0x00004e10), - XdB(0x00005323), XdB(0x0000588a), XdB(0x00005e4b), XdB(0x0000646b), - XdB(0x00006af2), XdB(0x000071e5), XdB(0x0000794c), XdB(0x0000812e), - XdB(0x00008993), XdB(0x00009283), XdB(0x00009c09), XdB(0x0000a62d), - XdB(0x0000b0f9), XdB(0x0000bc79), XdB(0x0000c8b9), XdB(0x0000d5c4), - XdB(0x0000e3a9), XdB(0x0000f274), XdB(0x00010235), XdB(0x000112fd), - XdB(0x000124dc), XdB(0x000137e4), XdB(0x00014c29), XdB(0x000161bf), - XdB(0x000178bc), XdB(0x00019137), XdB(0x0001ab4a), XdB(0x0001c70e), - XdB(0x0001e4a1), XdB(0x0002041f), XdB(0x000225aa), XdB(0x00024962), - XdB(0x00026f6d), XdB(0x000297f0), XdB(0x0002c316), XdB(0x0002f109), - XdB(0x000321f9), XdB(0x00035616), XdB(0x00038d97), XdB(0x0003c8b4), - XdB(0x000407a7), XdB(0x00044ab2), XdB(0x00049218), XdB(0x0004de23), - XdB(0x00052f1e), XdB(0x0005855c), XdB(0x0005e135), XdB(0x00064306), - XdB(0x0006ab33), XdB(0x00071a24), XdB(0x0007904b), XdB(0x00080e20), - XdB(0x00089422), XdB(0x000922da), XdB(0x0009bad8), XdB(0x000a5cb6), - XdB(0x000b091a), XdB(0x000bc0b1), XdB(0x000c8436), XdB(0x000d5471), - XdB(0x000e3233), XdB(0x000f1e5f), XdB(0x001019e4), XdB(0x001125c1), - XdB(0x00124306), XdB(0x001372d5), XdB(0x0014b663), XdB(0x00160ef7), - XdB(0x00177df0), XdB(0x001904c1), XdB(0x001aa4f9), XdB(0x001c603d), - XdB(0x001e384f), XdB(0x00202f0f), XdB(0x0022467a), XdB(0x002480b1), - XdB(0x0026dff7), XdB(0x002966b3), XdB(0x002c1776), XdB(0x002ef4fc), - XdB(0x0032022d), XdB(0x00354222), XdB(0x0038b828), XdB(0x003c67c2), - XdB(0x004054ae), XdB(0x004482e8), XdB(0x0048f6af), XdB(0x004db488), - XdB(0x0052c142), XdB(0x005821ff), XdB(0x005ddc33), XdB(0x0063f5b0), - XdB(0x006a74a7), XdB(0x00715faf), XdB(0x0078bdce), XdB(0x0080967f), - XdB(0x0088f1ba), XdB(0x0091d7f9), XdB(0x009b5247), XdB(0x00a56a41), - XdB(0x00b02a27), XdB(0x00bb9ce2), XdB(0x00c7ce12), XdB(0x00d4ca17), - XdB(0x00e29e20), XdB(0x00f15835), XdB(0x0101074b), XdB(0x0111bb4e), - XdB(0x01238531), XdB(0x01367704), XdB(0x014aa402), XdB(0x016020a7), - XdB(0x017702c3), XdB(0x018f6190), XdB(0x01a955cb), XdB(0x01c4f9cf), - XdB(0x01e269a8), XdB(0x0201c33b), XdB(0x0223265a), XdB(0x0246b4ea), - XdB(0x026c9302), XdB(0x0294e716), XdB(0x02bfda13), XdB(0x02ed9793), - XdB(0x031e4e09), XdB(0x03522ee4), XdB(0x03896ed0), XdB(0x03c445e2), - XdB(0x0402efd6), XdB(0x0445ac4b), XdB(0x048cbefc), XdB(0x04d87013), - XdB(0x05290c67), XdB(0x057ee5ca), XdB(0x05da5364), XdB(0x063bb204), - XdB(0x06a36485), XdB(0x0711d42b), XdB(0x0787710e), XdB(0x0804b299), - XdB(0x088a17ef), XdB(0x0918287e), XdB(0x09af747c), XdB(0x0a50957e), - XdB(0x0afc2f19), XdB(0x0bb2ef7f), XdB(0x0c759034), XdB(0x0d44d6ca), - XdB(0x0e2195bc), XdB(0x0f0cad0d), XdB(0x10070b62), XdB(0x1111aeea), - XdB(0x122da66c), XdB(0x135c120f), XdB(0x149e24d9), XdB(0x15f525b1), - XdB(0x176270e3), XdB(0x18e7794b), XdB(0x1a85c9ae), XdB(0x1c3f06d1), - XdB(0x1e14f07d), XdB(0x200963d7), XdB(0x221e5ccd), XdB(0x2455f870), - XdB(0x26b2770b), XdB(0x29363e2b), XdB(0x2be3db5c), XdB(0x2ebe06b6), - XdB(0x31c7a55b), XdB(0x3503ccd4), XdB(0x3875c5aa), XdB(0x3c210f44), - XdB(0x4009632b), XdB(0x4432b8cf), XdB(0x48a149bc), XdB(0x4d59959e), - XdB(0x52606733), XdB(0x57bad899), XdB(0x5d6e593a), XdB(0x6380b298), - XdB(0x69f80e9a), XdB(0x70dafda8), XdB(0x78307d76), XdB(0x7fffffff), -}; - diff -r fcbb024090a4 -r d4bda0201cae misc/libtremor/tremor/misc.c --- a/misc/libtremor/tremor/misc.c Sun Oct 28 04:28:39 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,209 +0,0 @@ -/******************************************************************** - * * - * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. * - * 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 (C) COPYRIGHT 1994-2002 * - * by the XIPHOPHORUS Company http://www.xiph.org/ * - * * - ********************************************************************/ - -#define HEAD_ALIGN 64 -#include -#include -#include -#define MISC_C -#include "misc.h" -#include - -static void **pointers=NULL; -static long *insertlist=NULL; /* We can't embed this in the pointer list; - a pointer can have any value... */ - -static char **files=NULL; -static long *file_bytes=NULL; -static int filecount=0; - -static int ptop=0; -static int palloced=0; -static int pinsert=0; - -typedef struct { - char *file; - long line; - long ptr; - long bytes; -} head; - -long global_bytes=0; -long start_time=-1; - -static void *_insert(void *ptr,long bytes,char *file,long line){ - ((head *)ptr)->file=file; - ((head *)ptr)->line=line; - ((head *)ptr)->ptr=pinsert; - ((head *)ptr)->bytes=bytes-HEAD_ALIGN; - - if(pinsert>=palloced){ - palloced+=64; - if(pointers){ - pointers=(void **)realloc(pointers,sizeof(void **)*palloced); - insertlist=(long *)realloc(insertlist,sizeof(long *)*palloced); - }else{ - pointers=(void **)malloc(sizeof(void **)*palloced); - insertlist=(long *)malloc(sizeof(long *)*palloced); - } - } - - pointers[pinsert]=ptr; - - if(pinsert==ptop) - pinsert=++ptop; - else - pinsert=insertlist[pinsert]; - -#ifdef _VDBG_GRAPHFILE - { - FILE *out; - struct timeval tv; - static struct timezone tz; - int i; - char buffer[80]; - gettimeofday(&tv,&tz); - - for(i=0;ifile; - long bytes =((head *)ptr)->bytes; - int i; - - gettimeofday(&tv,&tz); - fprintf(out,"%ld, %ld\n",-start_time+(tv.tv_sec*1000)+(tv.tv_usec/1000), - global_bytes); - fprintf(out,"%ld, %ld\n",-start_time+(tv.tv_sec*1000)+(tv.tv_usec/1000), - global_bytes-((head *)ptr)->bytes); - fclose(out); - - for(i=0;ibytes; - - insert=((head *)ptr)->ptr; - insertlist[insert]=pinsert; - pinsert=insert; - - if(pointers[insert]==NULL){ - fprintf(stderr,"DEBUGGING MALLOC ERROR: freeing previously freed memory\n"); - fprintf(stderr,"\t%s %ld\n",((head *)ptr)->file,((head *)ptr)->line); - } - - if(global_bytes<0){ - fprintf(stderr,"DEBUGGING MALLOC ERROR: freeing unmalloced memory\n"); - } - - pointers[insert]=NULL; -} - -void _VDBG_dump(void){ - int i; - for(i=0;ifile,ptr->line); - } - -} - -extern void *_VDBG_malloc(void *ptr,long bytes,char *file,long line){ - if(bytes<0) abort(); - bytes+=HEAD_ALIGN; - if(ptr){ - ptr-=HEAD_ALIGN; - _ripremove(ptr); - ptr=realloc(ptr,bytes); - }else{ - ptr=malloc(bytes); - memset(ptr,0,bytes); - } - return _insert(ptr,bytes,file,line); -} - -extern void _VDBG_free(void *ptr,char *file,long line){ - if(ptr){ - ptr-=HEAD_ALIGN; - _ripremove(ptr); - free(ptr); - } -} - diff -r fcbb024090a4 -r d4bda0201cae misc/libtremor/tremor/vorbisidec.pc.in --- a/misc/libtremor/tremor/vorbisidec.pc.in Sun Oct 28 04:28:39 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,14 +0,0 @@ -# libvorbisidec pkg-config source file - -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: vorbisidec -Description: vorbisidec is the integer Ogg Vorbis library -Version: @VERSION@ -Requires: ogg -Conflicts: -Libs: -L${libdir} -lvorbisidec -lm -Cflags: -I${includedir}