* Vorbis I decoder
* @author Denes Balatoni ( dbalatoni programozo hu )
- * This library is free software; you can redistribute it and/or
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
*
- * This library is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
/* Helper functions */
-#define ilog(i) av_log2(2*(i))
-
#define BARK(x) \
(13.1f*atan(0.00074f*(x))+2.24f*atan(1.85e-8f*(x)*(x))+1e-4f*(x))
-static unsigned int nth_root(unsigned int x, unsigned int n) { // x^(1/n)
+unsigned int ff_vorbis_nth_root(unsigned int x, unsigned int n) { // x^(1/n)
unsigned int ret=0, i, j;
do {
// Generate vlc codes from vorbis huffman code lengths
-static int vorbis_len2vlc(vorbis_context *vc, uint_fast8_t *bits, uint_fast32_t *codes, uint_fast32_t num) {
+int ff_vorbis_len2vlc(uint8_t *bits, uint32_t *codes, uint_fast32_t num) {
uint_fast32_t exit_at_level[33]={404,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
}
#ifdef V_DEBUG
- av_log(vc->avccontext, AV_LOG_INFO, " %d. of %d code len %d code %d - ", p, num, bits[p], codes[p]);
+ av_log(NULL, AV_LOG_INFO, " %d. of %d code len %d code %d - ", p, num, bits[p], codes[p]);
init_get_bits(&gb, (uint_fast8_t *)&codes[p], bits[p]);
for(i=0;i<bits[p];++i) {
- av_log(vc->avccontext, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0");
+ av_log(NULL, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0");
}
- av_log(vc->avccontext, AV_LOG_INFO, "\n");
+ av_log(NULL, AV_LOG_INFO, "\n");
#endif
++p;
codes[p]=code;
#ifdef V_DEBUG
- av_log(vc->avccontext, AV_LOG_INFO, " %d. code len %d code %d - ", p, bits[p], codes[p]);
+ av_log(NULL, AV_LOG_INFO, " %d. code len %d code %d - ", p, bits[p], codes[p]);
init_get_bits(&gb, (uint_fast8_t *)&codes[p], bits[p]);
for(i=0;i<bits[p];++i) {
- av_log(vc->avccontext, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0");
+ av_log(NULL, AV_LOG_INFO, "%s", get_bits1(&gb) ? "1" : "0");
}
- av_log(vc->avccontext, AV_LOG_INFO, "\n");
+ av_log(NULL, AV_LOG_INFO, "\n");
#endif
}
- //FIXME no exits should be left (underspecified tree - ie. unused valid vlcs - not allowed by SPEC)
+ //no exits should be left (underspecified tree - ie. unused valid vlcs - not allowed by SPEC)
+ for (p=1; p<33; p++)
+ if (exit_at_level[p]) return 1;
return 0;
}
static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) {
uint_fast16_t cb;
- uint_fast8_t *tmp_vlc_bits;
- uint_fast32_t *tmp_vlc_codes;
+ uint8_t *tmp_vlc_bits;
+ uint32_t *tmp_vlc_codes;
GetBitContext *gb=&vc->gb;
vc->codebook_count=get_bits(gb,8)+1;
AV_DEBUG(" Codebooks: %d \n", vc->codebook_count);
vc->codebooks=(vorbis_codebook *)av_mallocz(vc->codebook_count * sizeof(vorbis_codebook));
- tmp_vlc_bits=(uint_fast8_t *)av_mallocz(V_MAX_VLCS * sizeof(uint_fast8_t));
- tmp_vlc_codes=(uint_fast32_t *)av_mallocz(V_MAX_VLCS * sizeof(uint_fast32_t));
+ tmp_vlc_bits=(uint8_t *)av_mallocz(V_MAX_VLCS * sizeof(uint8_t));
+ tmp_vlc_codes=(uint32_t *)av_mallocz(V_MAX_VLCS * sizeof(uint32_t));
for(cb=0;cb<vc->codebook_count;++cb) {
vorbis_codebook *codebook_setup=&vc->codebooks[cb];
if (codebook_setup->lookup_type==1) {
uint_fast16_t i, j, k;
- uint_fast16_t codebook_lookup_values=nth_root(entries, codebook_setup->dimensions);
+ uint_fast16_t codebook_lookup_values=ff_vorbis_nth_root(entries, codebook_setup->dimensions);
uint_fast16_t codebook_multiplicands[codebook_lookup_values];
float codebook_minimum_value=vorbisfloat2float(get_bits_long(gb, 32));
}
// Initialize VLC table
- if (vorbis_len2vlc(vc, tmp_vlc_bits, tmp_vlc_codes, entries)) {
+ if (ff_vorbis_len2vlc(tmp_vlc_bits, tmp_vlc_codes, entries)) {
av_log(vc->avccontext, AV_LOG_ERROR, " Invalid code lengths while generating vlcs. \n");
goto error;
}
return 0;
}
+
+static void render_line(int x0, int y0, int x1, int y1, float * buf, int n) {
+ int dy = y1 - y0;
+ int adx = x1 - x0;
+ int ady = FFABS(dy);
+ int base = dy / adx;
+ int x = x0;
+ int y = y0;
+ int err = 0;
+ int sy;
+ if (dy < 0) sy = base - 1;
+ else sy = base + 1;
+ ady = ady - FFABS(base) * adx;
+ if (x >= n) return;
+ buf[x] = ff_vorbis_floor1_inverse_db_table[y];
+ for (x = x0 + 1; x < x1; x++) {
+ if (x >= n) return;
+ err += ady;
+ if (err >= adx) {
+ err -= adx;
+ y += sy;
+ } else {
+ y += base;
+ }
+ buf[x] = ff_vorbis_floor1_inverse_db_table[y];
+ }
+}
+
+void ff_vorbis_floor1_render_list(floor1_entry_t * list, int values, uint_fast16_t * y_list, int * flag, int multiplier, float * out, int samples) {
+ int lx, ly, i;
+ lx = 0;
+ ly = y_list[0] * multiplier;
+ for (i = 1; i < values; i++) {
+ int pos = list[i].sort;
+ if (flag[pos]) {
+ render_line(lx, ly, list[pos].x, y_list[pos] * multiplier, out, samples);
+ lx = list[pos].x;
+ ly = y_list[pos] * multiplier;
+ }
+ if (lx >= samples) break;
+ }
+ if (lx < samples) render_line(lx, ly, samples, ly, out, samples);
+}
+
static uint_fast8_t vorbis_floor1_decode(vorbis_context *vc, vorbis_floor_data *vfu, float *vec) {
vorbis_floor1 * vf=&vfu->t1;
GetBitContext *gb=&vc->gb;
uint_fast16_t range=range_v[vf->multiplier-1];
uint_fast16_t floor1_Y[vf->x_list_dim];
uint_fast16_t floor1_Y_final[vf->x_list_dim];
- uint_fast8_t floor1_flag[vf->x_list_dim];
+ int floor1_flag[vf->x_list_dim];
uint_fast8_t class_;
uint_fast8_t cdim;
uint_fast8_t cbits;
uint_fast16_t i,j;
/*u*/int_fast16_t adx, ady, off, predicted; // WTF ? dy/adx= (unsigned)dy/adx ?
int_fast16_t dy, err;
- uint_fast16_t lx,hx, ly, hy=0;
if (!get_bits1(gb)) return 1; // silence
high_neigh_offs=vf->list[i].high;
dy=floor1_Y_final[high_neigh_offs]-floor1_Y_final[low_neigh_offs]; // render_point begin
adx=vf->list[high_neigh_offs].x-vf->list[low_neigh_offs].x;
- ady= ABS(dy);
+ ady= FFABS(dy);
err=ady*(vf->list[i].x-vf->list[low_neigh_offs].x);
off=(int16_t)err/(int16_t)adx;
if (dy<0) {
// Curve synth - connect the calculated dots and convert from dB scale FIXME optimize ?
- hx=0;
- lx=0;
- ly=floor1_Y_final[0]*vf->multiplier; // conforms to SPEC
-
- vec[0]=ff_vorbis_floor1_inverse_db_table[ly];
-
- for(i=1;i<vf->x_list_dim;++i) {
- AV_DEBUG(" Looking at post %d \n", i);
-
- if (floor1_flag[vf->list[i].sort]) { // SPEC mispelled
- int_fast16_t x, y, dy, base, sy; // if uncommented: dy = -32 adx = 2 base = 2blablabla ?????
-
- hy=floor1_Y_final[vf->list[i].sort]*vf->multiplier;
- hx=vf->list[vf->list[i].sort].x;
-
- dy=hy-ly;
- adx=hx-lx;
- ady= (dy<0) ? -dy:dy;//ABS(dy);
- base=(int16_t)dy/(int16_t)adx;
-
- AV_DEBUG(" dy %d adx %d base %d = %d \n", dy, adx, base, dy/adx);
-
- x=lx;
- y=ly;
- err=0;
- if (dy<0) {
- sy=base-1;
- } else {
- sy=base+1;
- }
- ady=ady-(base<0 ? -base : base)*adx;
- vec[x]=ff_vorbis_floor1_inverse_db_table[y];
-
- AV_DEBUG(" vec[ %d ] = %d \n", x, y);
-
- for(x=lx+1;(x<hx) && (x<vf->list[1].x);++x) {
- err+=ady;
- if (err>=adx) {
- err-=adx;
- y+=sy;
- } else {
- y+=base;
- }
- vec[x]=ff_vorbis_floor1_inverse_db_table[y];
-
- AV_DEBUG(" vec[ %d ] = %d \n", x, y);
- }
-
-/* for(j=1;j<hx-lx+1;++j) { // iterating render_point
- dy=hy-ly;
- adx=hx-lx;
- ady= dy<0 ? -dy : dy;
- err=ady*j;
- off=err/adx;
- if (dy<0) {
- predicted=ly-off;
- } else {
- predicted=ly+off;
- }
- if (lx+j < vf->x_list[1]) {
- vec[lx+j]=ff_vorbis_floor1_inverse_db_table[predicted];
- }
- }*/
-
- lx=hx;
- ly=hy;
- }
- }
-
- if (hx<vf->list[1].x) {
- for(i=hx;i<vf->list[1].x;++i) {
- vec[i]=ff_vorbis_floor1_inverse_db_table[hy];
- }
- }
+ ff_vorbis_floor1_render_list(vf->list, vf->x_list_dim, floor1_Y_final, floor1_flag, vf->multiplier, vec, vf->list[1].x);
AV_DEBUG(" Floor decoded\n");
voffset=vr->begin;
for(partition_count=0;partition_count<ptns_to_read;) { // SPEC error
if (!pass) {
- uint_fast32_t inverse_class = inverse[vr->classifications];
+ uint_fast32_t inverse_class = ff_inverse[vr->classifications];
for(j_times_ptns_to_read=0, j=0;j<ch_used;++j) {
if (!do_not_decode[j]) {
uint_fast32_t temp=get_vlc2(gb, vc->codebooks[vr->classbook].vlc.table,
projects / ffmpeg / blobdiff