* 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
*
*/
#include "dsputil.h"
#include "vorbis.h"
+#include "xiph.h"
#define V_NB_BITS 8
#define V_NB_BITS2 11
uint8_t *header_start[3];
int header_len[3];
GetBitContext *gb = &(vc->gb);
- int i, j, hdr_type;
+ int hdr_type;
vc->avccontext = avccontext;
dsputil_init(&vc->dsp, avccontext);
return -1;
}
- if(headers[0] == 0 && headers[1] == 30) {
- for(i = 0; i < 3; i++){
- header_len[i] = *headers++ << 8;
- header_len[i] += *headers++;
- header_start[i] = headers;
- headers += header_len[i];
- }
- } else if(headers[0] == 2) {
- for(j=1,i=0;i<2;++i, ++j) {
- header_len[i]=0;
- while(j<headers_len && headers[j]==0xff) {
- header_len[i]+=0xff;
- ++j;
- }
- if (j>=headers_len) {
- av_log(avccontext, AV_LOG_ERROR, "Extradata corrupt.\n");
- return -1;
- }
- header_len[i]+=headers[j];
- }
- header_len[2]=headers_len-header_len[0]-header_len[1]-j;
- headers+=j;
- header_start[0] = headers;
- header_start[1] = header_start[0] + header_len[0];
- header_start[2] = header_start[1] + header_len[1];
- } else {
+ if (ff_split_xiph_headers(headers, headers_len, 30, header_start, header_len) < 0) {
av_log(avccontext, AV_LOG_ERROR, "Extradata corrupt.\n");
return -1;
}
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
- hy=floor1_Y_final[vf->list[i].sort]*vf->multiplier;
- hx=vf->list[vf->list[i].sort].x;
-
- render_line(lx, ly, hx, hy, vec, vc->blocksize[1]);
-
- lx=hx;
- ly=hy;
- }
- }
-
- if (hx<vf->list[1].x) {
- render_line(hx, hy, vf->list[1].x, hy, vec, vc->blocksize[1]);
- }
+ 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,