*/
#include "avcodec.h"
-
-#define BITSTREAM_H // don't include this
-typedef int VLC;
-typedef int GetBitContext;
+#include "dsputil.h"
#include "vorbis.h"
#undef NDEBUG
venc->floor = av_malloc(sizeof(float) * venc->channels * (1 << venc->blocksize[1]) / 2);
venc->coeffs = av_malloc(sizeof(float) * venc->channels * (1 << venc->blocksize[1]) / 2);
- {
- const float *vwin[8]={ vwin64, vwin128, vwin256, vwin512, vwin1024, vwin2048, vwin4096, vwin8192 };
- venc->win[0] = vwin[venc->blocksize[0] - 6];
- venc->win[1] = vwin[venc->blocksize[1] - 6];
- }
+ venc->win[0] = ff_vorbis_vwin[venc->blocksize[0] - 6];
+ venc->win[1] = ff_vorbis_vwin[venc->blocksize[1] - 6];
ff_mdct_init(&venc->mdct[0], venc->blocksize[0], 0);
ff_mdct_init(&venc->mdct[1], venc->blocksize[1], 0);
int j;
average /= pow(average, 0.5) / tot_average * pow(0.8, position/200.); // MAGIC!
- for (j = 0; j < range - 1; j++) if (floor1_inverse_db_table[j * fc->multiplier] > average) break;
+ for (j = 0; j < range - 1; j++) if (ff_vorbis_floor1_inverse_db_table[j * fc->multiplier] > average) break;
posts[fc->list[i].sort] = j;
}
}
else sy = base + 1;
ady = ady - FFMAX(base, -base) * adx;
if (x >= n) return;
- buf[x] = floor1_inverse_db_table[y];
+ buf[x] = ff_vorbis_floor1_inverse_db_table[y];
for (x = x0 + 1; x < x1; x++) {
if (x >= n) return;
err += ady;
} else {
y += base;
}
- buf[x] = floor1_inverse_db_table[y];
+ buf[x] = ff_vorbis_floor1_inverse_db_table[y];
}
}