Switch to the lowmem tremor branch
in addition to using slightly less memory, this branch also doesn't seem to have the same issues with `-O2` builds that the main branch has.
This commit is contained in:
jacqueline
+150
-258
@@ -1,12 +1,12 @@
|
||||
/********************************************************************
|
||||
* *
|
||||
* THIS FILE IS PART OF THE OggVorbis 'TREMOR' CODEC SOURCE CODE. *
|
||||
* THIS FILE IS PART OF THE TremorOggVorbis '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-2002 *
|
||||
* THE TremorOggVorbis 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2003 *
|
||||
* BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
|
||||
* *
|
||||
********************************************************************
|
||||
@@ -18,44 +18,29 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <math.h>
|
||||
#include <ogg/ogg.h>
|
||||
#include "tremor_ogg.h"
|
||||
#include "ivorbiscodec.h"
|
||||
#include "codec_internal.h"
|
||||
#include "registry.h"
|
||||
#include "codebook.h"
|
||||
#include "misc.h"
|
||||
#include "block.h"
|
||||
|
||||
extern const tremor_ogg_int32_t FLOOR_fromdB_LOOKUP[];
|
||||
#define floor1_rangedB 140 /* floor 1 fixed at -140dB to 0dB range */
|
||||
|
||||
typedef struct {
|
||||
int forward_index[VIF_POSIT+2];
|
||||
|
||||
int hineighbor[VIF_POSIT];
|
||||
int loneighbor[VIF_POSIT];
|
||||
int posts;
|
||||
|
||||
int n;
|
||||
int quant_q;
|
||||
vorbis_info_floor1 *vi;
|
||||
|
||||
} vorbis_look_floor1;
|
||||
#define VIF_POSIT 63
|
||||
|
||||
/***********************************************/
|
||||
|
||||
static void floor1_free_info(vorbis_info_floor *i){
|
||||
void floor1_free_info(vorbis_info_floor *i){
|
||||
vorbis_info_floor1 *info=(vorbis_info_floor1 *)i;
|
||||
if(info){
|
||||
if(info->class)_tremor_ogg_free(info->class);
|
||||
if(info->partitionclass)_tremor_ogg_free(info->partitionclass);
|
||||
if(info->postlist)_tremor_ogg_free(info->postlist);
|
||||
if(info->forward_index)_tremor_ogg_free(info->forward_index);
|
||||
if(info->hineighbor)_tremor_ogg_free(info->hineighbor);
|
||||
if(info->loneighbor)_tremor_ogg_free(info->loneighbor);
|
||||
memset(info,0,sizeof(*info));
|
||||
_ogg_free(info);
|
||||
}
|
||||
}
|
||||
|
||||
static void floor1_free_look(vorbis_look_floor *i){
|
||||
vorbis_look_floor1 *look=(vorbis_look_floor1 *)i;
|
||||
if(look){
|
||||
memset(look,0,sizeof(*look));
|
||||
_ogg_free(look);
|
||||
_tremor_ogg_free(info);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -68,65 +53,124 @@ static int ilog(unsigned int v){
|
||||
return(ret);
|
||||
}
|
||||
|
||||
static int icomp(const void *a,const void *b){
|
||||
return(**(int **)a-**(int **)b);
|
||||
static void vorbis_mergesort(char *index,tremor_ogg_uint16_t *vals,tremor_ogg_uint16_t n){
|
||||
tremor_ogg_uint16_t i,j;
|
||||
char *temp,*A=index,*B=_tremor_ogg_malloc(n*sizeof(*B));
|
||||
|
||||
for(i=1;i<n;i<<=1){
|
||||
for(j=0;j+i<n;){
|
||||
int k1=j;
|
||||
int mid=j+i;
|
||||
int k2=mid;
|
||||
int end=(j+i*2<n?j+i*2:n);
|
||||
while(k1<mid && k2<end){
|
||||
if(vals[A[k1]]<vals[A[k2]])
|
||||
B[j++]=A[k1++];
|
||||
else
|
||||
B[j++]=A[k2++];
|
||||
}
|
||||
while(k1<mid) B[j++]=A[k1++];
|
||||
while(k2<end) B[j++]=A[k2++];
|
||||
}
|
||||
for(;j<n;j++)B[j]=A[j];
|
||||
temp=A;A=B;B=temp;
|
||||
}
|
||||
|
||||
if(B==index){
|
||||
for(j=0;j<n;j++)B[j]=A[j];
|
||||
_tremor_ogg_free(A);
|
||||
}else
|
||||
_tremor_ogg_free(B);
|
||||
}
|
||||
|
||||
static vorbis_info_floor *floor1_unpack (vorbis_info *vi,oggpack_buffer *opb){
|
||||
|
||||
vorbis_info_floor *floor1_info_unpack (vorbis_info *vi,tremor_oggpack_buffer *opb){
|
||||
codec_setup_info *ci=(codec_setup_info *)vi->codec_setup;
|
||||
int j,k,count=0,maxclass=-1,rangebits;
|
||||
|
||||
vorbis_info_floor1 *info=(vorbis_info_floor1 *)_ogg_calloc(1,sizeof(*info));
|
||||
|
||||
vorbis_info_floor1 *info=(vorbis_info_floor1 *)_tremor_ogg_calloc(1,sizeof(*info));
|
||||
/* read partitions */
|
||||
info->partitions=oggpack_read(opb,5); /* only 0 to 31 legal */
|
||||
info->partitions=tremor_oggpack_read(opb,5); /* only 0 to 31 legal */
|
||||
info->partitionclass=
|
||||
(char *)_tremor_ogg_malloc(info->partitions*sizeof(*info->partitionclass));
|
||||
for(j=0;j<info->partitions;j++){
|
||||
info->partitionclass[j]=oggpack_read(opb,4); /* only 0 to 15 legal */
|
||||
if(info->partitionclass[j]<0)goto err_out;
|
||||
info->partitionclass[j]=tremor_oggpack_read(opb,4); /* only 0 to 15 legal */
|
||||
if(maxclass<info->partitionclass[j])maxclass=info->partitionclass[j];
|
||||
}
|
||||
|
||||
/* read partition classes */
|
||||
info->class=
|
||||
(floor1class *)_tremor_ogg_malloc((maxclass+1)*sizeof(*info->class));
|
||||
for(j=0;j<maxclass+1;j++){
|
||||
info->class_dim[j]=oggpack_read(opb,3)+1; /* 1 to 8 */
|
||||
info->class_subs[j]=oggpack_read(opb,2); /* 0,1,2,3 bits */
|
||||
if(info->class_subs[j]<0)
|
||||
goto err_out;
|
||||
if(info->class_subs[j])info->class_book[j]=oggpack_read(opb,8);
|
||||
if(info->class_book[j]<0 || info->class_book[j]>=ci->books)
|
||||
goto err_out;
|
||||
for(k=0;k<(1<<info->class_subs[j]);k++){
|
||||
info->class_subbook[j][k]=oggpack_read(opb,8)-1;
|
||||
if(info->class_subbook[j][k]<-1 || info->class_subbook[j][k]>=ci->books)
|
||||
goto err_out;
|
||||
info->class[j].class_dim=tremor_oggpack_read(opb,3)+1; /* 1 to 8 */
|
||||
info->class[j].class_subs=tremor_oggpack_read(opb,2); /* 0,1,2,3 bits */
|
||||
if(tremor_oggpack_eop(opb)<0) goto err_out;
|
||||
if(info->class[j].class_subs)
|
||||
info->class[j].class_book=tremor_oggpack_read(opb,8);
|
||||
else
|
||||
info->class[j].class_book=0;
|
||||
if(info->class[j].class_book>=ci->books)goto err_out;
|
||||
for(k=0;k<(1<<info->class[j].class_subs);k++){
|
||||
info->class[j].class_subbook[k]=tremor_oggpack_read(opb,8)-1;
|
||||
if(info->class[j].class_subbook[k]>=ci->books &&
|
||||
info->class[j].class_subbook[k]!=0xff)goto err_out;
|
||||
}
|
||||
}
|
||||
|
||||
/* read the post list */
|
||||
info->mult=oggpack_read(opb,2)+1; /* only 1,2,3,4 legal now */
|
||||
rangebits=oggpack_read(opb,4);
|
||||
if(rangebits<0)goto err_out;
|
||||
info->mult=tremor_oggpack_read(opb,2)+1; /* only 1,2,3,4 legal now */
|
||||
rangebits=tremor_oggpack_read(opb,4);
|
||||
|
||||
for(j=0,k=0;j<info->partitions;j++)
|
||||
count+=info->class[info->partitionclass[j]].class_dim;
|
||||
info->postlist=
|
||||
(tremor_ogg_uint16_t *)_tremor_ogg_malloc((count+2)*sizeof(*info->postlist));
|
||||
info->forward_index=
|
||||
(char *)_tremor_ogg_malloc((count+2)*sizeof(*info->forward_index));
|
||||
info->loneighbor=
|
||||
(char *)_tremor_ogg_malloc(count*sizeof(*info->loneighbor));
|
||||
info->hineighbor=
|
||||
(char *)_tremor_ogg_malloc(count*sizeof(*info->hineighbor));
|
||||
|
||||
count=0;
|
||||
for(j=0,k=0;j<info->partitions;j++){
|
||||
count+=info->class_dim[info->partitionclass[j]];
|
||||
count+=info->class[info->partitionclass[j]].class_dim;
|
||||
if(count>VIF_POSIT)goto err_out;
|
||||
for(;k<count;k++){
|
||||
int t=info->postlist[k+2]=oggpack_read(opb,rangebits);
|
||||
if(t<0 || t>=(1<<rangebits))
|
||||
goto err_out;
|
||||
int t=info->postlist[k+2]=tremor_oggpack_read(opb,rangebits);
|
||||
if(t>=(1<<rangebits))goto err_out;
|
||||
}
|
||||
}
|
||||
if(tremor_oggpack_eop(opb))goto err_out;
|
||||
info->postlist[0]=0;
|
||||
info->postlist[1]=1<<rangebits;
|
||||
info->posts=count+2;
|
||||
|
||||
/* don't allow repeated values in post list as they'd result in
|
||||
zero-length segments */
|
||||
{
|
||||
int *sortpointer[VIF_POSIT+2];
|
||||
for(j=0;j<count+2;j++)sortpointer[j]=info->postlist+j;
|
||||
qsort(sortpointer,count+2,sizeof(*sortpointer),icomp);
|
||||
|
||||
for(j=1;j<count+2;j++)
|
||||
if(*sortpointer[j-1]==*sortpointer[j])goto err_out;
|
||||
/* also store a sorted position index */
|
||||
for(j=0;j<info->posts;j++)info->forward_index[j]=j;
|
||||
vorbis_mergesort(info->forward_index,info->postlist,info->posts);
|
||||
|
||||
/* discover our neighbors for decode where we don't use fit flags
|
||||
(that would push the neighbors outward) */
|
||||
for(j=0;j<info->posts-2;j++){
|
||||
int lo=0;
|
||||
int hi=1;
|
||||
int lx=0;
|
||||
int hx=info->postlist[1];
|
||||
int currentx=info->postlist[j+2];
|
||||
for(k=0;k<j+2;k++){
|
||||
int x=info->postlist[k];
|
||||
if(x>lx && x<currentx){
|
||||
lo=k;
|
||||
lx=x;
|
||||
}
|
||||
if(x<hx && x>currentx){
|
||||
hi=k;
|
||||
hx=x;
|
||||
}
|
||||
}
|
||||
info->loneighbor[j]=lo;
|
||||
info->hineighbor[j]=hi;
|
||||
}
|
||||
|
||||
return(info);
|
||||
@@ -136,77 +180,6 @@ static vorbis_info_floor *floor1_unpack (vorbis_info *vi,oggpack_buffer *opb){
|
||||
return(NULL);
|
||||
}
|
||||
|
||||
static vorbis_look_floor *floor1_look(vorbis_dsp_state *vd,vorbis_info_mode *mi,
|
||||
vorbis_info_floor *in){
|
||||
|
||||
int *sortpointer[VIF_POSIT+2];
|
||||
vorbis_info_floor1 *info=(vorbis_info_floor1 *)in;
|
||||
vorbis_look_floor1 *look=(vorbis_look_floor1 *)_ogg_calloc(1,sizeof(*look));
|
||||
int i,j,n=0;
|
||||
|
||||
look->vi=info;
|
||||
look->n=info->postlist[1];
|
||||
|
||||
/* we drop each position value in-between already decoded values,
|
||||
and use linear interpolation to predict each new value past the
|
||||
edges. The positions are read in the order of the position
|
||||
list... we precompute the bounding positions in the lookup. Of
|
||||
course, the neighbors can change (if a position is declined), but
|
||||
this is an initial mapping */
|
||||
|
||||
for(i=0;i<info->partitions;i++)n+=info->class_dim[info->partitionclass[i]];
|
||||
n+=2;
|
||||
look->posts=n;
|
||||
|
||||
/* also store a sorted position index */
|
||||
for(i=0;i<n;i++)sortpointer[i]=info->postlist+i;
|
||||
qsort(sortpointer,n,sizeof(*sortpointer),icomp);
|
||||
|
||||
/* points from sort order back to range number */
|
||||
for(i=0;i<n;i++)look->forward_index[i]=sortpointer[i]-info->postlist;
|
||||
|
||||
/* quantize values to multiplier spec */
|
||||
switch(info->mult){
|
||||
case 1: /* 1024 -> 256 */
|
||||
look->quant_q=256;
|
||||
break;
|
||||
case 2: /* 1024 -> 128 */
|
||||
look->quant_q=128;
|
||||
break;
|
||||
case 3: /* 1024 -> 86 */
|
||||
look->quant_q=86;
|
||||
break;
|
||||
case 4: /* 1024 -> 64 */
|
||||
look->quant_q=64;
|
||||
break;
|
||||
}
|
||||
|
||||
/* discover our neighbors for decode where we don't use fit flags
|
||||
(that would push the neighbors outward) */
|
||||
for(i=0;i<n-2;i++){
|
||||
int lo=0;
|
||||
int hi=1;
|
||||
int lx=0;
|
||||
int hx=look->n;
|
||||
int currentx=info->postlist[i+2];
|
||||
for(j=0;j<i+2;j++){
|
||||
int x=info->postlist[j];
|
||||
if(x>lx && x<currentx){
|
||||
lo=j;
|
||||
lx=x;
|
||||
}
|
||||
if(x<hx && x>currentx){
|
||||
hi=j;
|
||||
hx=x;
|
||||
}
|
||||
}
|
||||
look->loneighbor[i]=lo;
|
||||
look->hineighbor[i]=hi;
|
||||
}
|
||||
|
||||
return(look);
|
||||
}
|
||||
|
||||
static int render_point(int x0,int x1,int y0,int y1,int x){
|
||||
y0&=0x7fff; /* mask off flag */
|
||||
y1&=0x7fff;
|
||||
@@ -223,80 +196,7 @@ static int render_point(int x0,int x1,int y0,int y1,int x){
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef _LOW_ACCURACY_
|
||||
# define XdB(n) ((((n)>>8)+1)>>1)
|
||||
#else
|
||||
# define XdB(n) (n)
|
||||
#endif
|
||||
|
||||
static 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),
|
||||
};
|
||||
|
||||
static void render_line(int n, int x0,int x1,int y0,int y1,ogg_int32_t *d){
|
||||
static void render_line(int n,int x0,int x1,int y0,int y1,tremor_ogg_int32_t *d){
|
||||
int dy=y1-y0;
|
||||
int adx=x1-x0;
|
||||
int ady=abs(dy);
|
||||
@@ -324,42 +224,48 @@ static void render_line(int n, int x0,int x1,int y0,int y1,ogg_int32_t *d){
|
||||
}
|
||||
}
|
||||
|
||||
static void *floor1_inverse1(vorbis_block *vb,vorbis_look_floor *in){
|
||||
vorbis_look_floor1 *look=(vorbis_look_floor1 *)in;
|
||||
vorbis_info_floor1 *info=look->vi;
|
||||
codec_setup_info *ci=(codec_setup_info *)vb->vd->vi->codec_setup;
|
||||
int floor1_memosize(vorbis_info_floor *i){
|
||||
vorbis_info_floor1 *info=(vorbis_info_floor1 *)i;
|
||||
return info->posts;
|
||||
}
|
||||
|
||||
static int quant_look[4]={256,128,86,64};
|
||||
|
||||
tremor_ogg_int32_t *floor1_inverse1(vorbis_dsp_state *vd,vorbis_info_floor *in,
|
||||
tremor_ogg_int32_t *fit_value){
|
||||
vorbis_info_floor1 *info=(vorbis_info_floor1 *)in;
|
||||
codec_setup_info *ci=(codec_setup_info *)vd->vi->codec_setup;
|
||||
|
||||
int i,j,k;
|
||||
codebook *books=ci->fullbooks;
|
||||
|
||||
codebook *books=ci->book_param;
|
||||
int quant_q=quant_look[info->mult-1];
|
||||
|
||||
/* unpack wrapped/predicted values from stream */
|
||||
if(oggpack_read(&vb->opb,1)==1){
|
||||
int *fit_value=(int *)_vorbis_block_alloc(vb,(look->posts)*sizeof(*fit_value));
|
||||
|
||||
fit_value[0]=oggpack_read(&vb->opb,ilog(look->quant_q-1));
|
||||
fit_value[1]=oggpack_read(&vb->opb,ilog(look->quant_q-1));
|
||||
if(tremor_oggpack_read(&vd->opb,1)==1){
|
||||
fit_value[0]=tremor_oggpack_read(&vd->opb,ilog(quant_q-1));
|
||||
fit_value[1]=tremor_oggpack_read(&vd->opb,ilog(quant_q-1));
|
||||
|
||||
/* partition by partition */
|
||||
/* partition by partition */
|
||||
for(i=0,j=2;i<info->partitions;i++){
|
||||
int classv=info->partitionclass[i];
|
||||
int cdim=info->class_dim[classv];
|
||||
int csubbits=info->class_subs[classv];
|
||||
int cdim=info->class[classv].class_dim;
|
||||
int csubbits=info->class[classv].class_subs;
|
||||
int csub=1<<csubbits;
|
||||
int cval=0;
|
||||
|
||||
/* decode the partition's first stage cascade value */
|
||||
if(csubbits){
|
||||
cval=vorbis_book_decode(books+info->class_book[classv],&vb->opb);
|
||||
cval=vorbis_book_decode(books+info->class[classv].class_book,&vd->opb);
|
||||
|
||||
if(cval==-1)goto eop;
|
||||
}
|
||||
|
||||
for(k=0;k<cdim;k++){
|
||||
int book=info->class_subbook[classv][cval&(csub-1)];
|
||||
int book=info->class[classv].class_subbook[cval&(csub-1)];
|
||||
cval>>=csubbits;
|
||||
if(book>=0){
|
||||
if((fit_value[j+k]=vorbis_book_decode(books+book,&vb->opb))==-1)
|
||||
if(book!=0xff){
|
||||
if((fit_value[j+k]=vorbis_book_decode(books+book,&vd->opb))==-1)
|
||||
goto eop;
|
||||
}else{
|
||||
fit_value[j+k]=0;
|
||||
@@ -369,13 +275,13 @@ static void *floor1_inverse1(vorbis_block *vb,vorbis_look_floor *in){
|
||||
}
|
||||
|
||||
/* unwrap positive values and reconsitute via linear interpolation */
|
||||
for(i=2;i<look->posts;i++){
|
||||
int predicted=render_point(info->postlist[look->loneighbor[i-2]],
|
||||
info->postlist[look->hineighbor[i-2]],
|
||||
fit_value[look->loneighbor[i-2]],
|
||||
fit_value[look->hineighbor[i-2]],
|
||||
for(i=2;i<info->posts;i++){
|
||||
int predicted=render_point(info->postlist[info->loneighbor[i-2]],
|
||||
info->postlist[info->hineighbor[i-2]],
|
||||
fit_value[info->loneighbor[i-2]],
|
||||
fit_value[info->hineighbor[i-2]],
|
||||
info->postlist[i]);
|
||||
int hiroom=look->quant_q-predicted;
|
||||
int hiroom=quant_q-predicted;
|
||||
int loroom=predicted;
|
||||
int room=(hiroom<loroom?hiroom:loroom)<<1;
|
||||
int val=fit_value[i];
|
||||
@@ -395,9 +301,9 @@ static void *floor1_inverse1(vorbis_block *vb,vorbis_look_floor *in){
|
||||
}
|
||||
}
|
||||
|
||||
fit_value[i]=(val+predicted)&0x7fff;;
|
||||
fit_value[look->loneighbor[i-2]]&=0x7fff;
|
||||
fit_value[look->hineighbor[i-2]]&=0x7fff;
|
||||
fit_value[i]=val+predicted;
|
||||
fit_value[info->loneighbor[i-2]]&=0x7fff;
|
||||
fit_value[info->hineighbor[i-2]]&=0x7fff;
|
||||
|
||||
}else{
|
||||
fit_value[i]=predicted|0x8000;
|
||||
@@ -411,34 +317,27 @@ static void *floor1_inverse1(vorbis_block *vb,vorbis_look_floor *in){
|
||||
return(NULL);
|
||||
}
|
||||
|
||||
static int floor1_inverse2(vorbis_block *vb,vorbis_look_floor *in,void *memo,
|
||||
ogg_int32_t *out){
|
||||
vorbis_look_floor1 *look=(vorbis_look_floor1 *)in;
|
||||
vorbis_info_floor1 *info=look->vi;
|
||||
int floor1_inverse2(vorbis_dsp_state *vd,vorbis_info_floor *in,
|
||||
tremor_ogg_int32_t *fit_value,tremor_ogg_int32_t *out){
|
||||
vorbis_info_floor1 *info=(vorbis_info_floor1 *)in;
|
||||
|
||||
codec_setup_info *ci=(codec_setup_info *)vb->vd->vi->codec_setup;
|
||||
int n=ci->blocksizes[vb->W]/2;
|
||||
codec_setup_info *ci=(codec_setup_info *)vd->vi->codec_setup;
|
||||
int n=ci->blocksizes[vd->W]/2;
|
||||
int j;
|
||||
|
||||
if(memo){
|
||||
if(fit_value){
|
||||
/* render the lines */
|
||||
int *fit_value=(int *)memo;
|
||||
int hx=0;
|
||||
int lx=0;
|
||||
int ly=fit_value[0]*info->mult;
|
||||
/* guard lookup against out-of-range values */
|
||||
ly=(ly<0?0:ly>255?255:ly);
|
||||
|
||||
for(j=1;j<look->posts;j++){
|
||||
int current=look->forward_index[j];
|
||||
for(j=1;j<info->posts;j++){
|
||||
int current=info->forward_index[j];
|
||||
int hy=fit_value[current]&0x7fff;
|
||||
if(hy==fit_value[current]){
|
||||
|
||||
hx=info->postlist[current];
|
||||
hy*=info->mult;
|
||||
/* guard lookup against out-of-range values */
|
||||
hy=(hy<0?0:hy>255?255:hy);
|
||||
|
||||
hx=info->postlist[current];
|
||||
|
||||
render_line(n,lx,hx,ly,hy,out);
|
||||
|
||||
lx=hx;
|
||||
@@ -451,10 +350,3 @@ static int floor1_inverse2(vorbis_block *vb,vorbis_look_floor *in,void *memo,
|
||||
memset(out,0,sizeof(*out)*n);
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* export hooks */
|
||||
vorbis_func_floor floor1_exportbundle={
|
||||
&floor1_unpack,&floor1_look,&floor1_free_info,
|
||||
&floor1_free_look,&floor1_inverse1,&floor1_inverse2
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user