#include <inttypes.h>
#include <math.h>
-#define BITSTREAM_READER_LE
#include "libavutil/float_dsp.h"
+
+#define BITSTREAM_READER_LE
#include "avcodec.h"
-#include "get_bits.h"
#include "fft.h"
-#include "fmtconvert.h"
+#include "get_bits.h"
#include "internal.h"
-
#include "vorbis.h"
#include "vorbisdsp.h"
#include "xiph.h"
#define V_MAX_VLCS (1 << 16)
#define V_MAX_PARTITIONS (1 << 20)
-#undef NDEBUG
-#include <assert.h>
-
-typedef struct {
+typedef struct vorbis_codebook {
uint8_t dimensions;
uint8_t lookup_type;
uint8_t maxdepth;
typedef
int (* vorbis_floor_decode_func)
(struct vorbis_context_s *, vorbis_floor_data *, float *);
-typedef struct {
+typedef struct vorbis_floor {
uint8_t floor_type;
vorbis_floor_decode_func decode;
union vorbis_floor_u {
} data;
} vorbis_floor;
-typedef struct {
+typedef struct vorbis_residue {
uint16_t type;
uint32_t begin;
uint32_t end;
uint8_t *classifs;
} vorbis_residue;
-typedef struct {
+typedef struct vorbis_mapping {
uint8_t submaps;
uint16_t coupling_steps;
uint8_t *magnitude;
uint8_t submap_residue[16];
} vorbis_mapping;
-typedef struct {
+typedef struct vorbis_mode {
uint8_t blockflag;
uint16_t windowtype;
uint16_t transformtype;
GetBitContext gb;
VorbisDSPContext dsp;
AVFloatDSPContext fdsp;
- FmtConvertContext fmt_conv;
FFTContext mdct[2];
uint8_t first_frame;
vc->codebook_count = get_bits(gb, 8) + 1;
- av_dlog(NULL, " Codebooks: %d \n", vc->codebook_count);
+ ff_dlog(NULL, " Codebooks: %d \n", vc->codebook_count);
vc->codebooks = av_mallocz(vc->codebook_count * sizeof(*vc->codebooks));
tmp_vlc_bits = av_mallocz(V_MAX_VLCS * sizeof(*tmp_vlc_bits));
vorbis_codebook *codebook_setup = &vc->codebooks[cb];
unsigned ordered, t, entries, used_entries = 0;
- av_dlog(NULL, " %u. Codebook\n", cb);
+ ff_dlog(NULL, " %u. Codebook\n", cb);
if (get_bits(gb, 24) != 0x564342) {
av_log(vc->avctx, AV_LOG_ERROR,
ordered = get_bits1(gb);
- av_dlog(NULL, " codebook_dimensions %d, codebook_entries %u\n",
+ ff_dlog(NULL, " codebook_dimensions %d, codebook_entries %u\n",
codebook_setup->dimensions, entries);
if (!ordered) {
unsigned ce, flag;
unsigned sparse = get_bits1(gb);
- av_dlog(NULL, " not ordered \n");
+ ff_dlog(NULL, " not ordered \n");
if (sparse) {
- av_dlog(NULL, " sparse \n");
+ ff_dlog(NULL, " sparse \n");
used_entries = 0;
for (ce = 0; ce < entries; ++ce) {
tmp_vlc_bits[ce] = 0;
}
} else {
- av_dlog(NULL, " not sparse \n");
+ ff_dlog(NULL, " not sparse \n");
used_entries = entries;
for (ce = 0; ce < entries; ++ce)
unsigned current_entry = 0;
unsigned current_length = get_bits(gb, 5) + 1;
- av_dlog(NULL, " ordered, current length: %u\n", current_length); //FIXME
+ ff_dlog(NULL, " ordered, current length: %u\n", current_length); //FIXME
used_entries = entries;
for (; current_entry < used_entries && current_length <= 32; ++current_length) {
unsigned i, number;
- av_dlog(NULL, " number bits: %u ", ilog(entries - current_entry));
+ ff_dlog(NULL, " number bits: %u ", ilog(entries - current_entry));
number = get_bits(gb, ilog(entries - current_entry));
- av_dlog(NULL, " number: %u\n", number);
+ ff_dlog(NULL, " number: %u\n", number);
for (i = current_entry; i < number+current_entry; ++i)
if (i < used_entries)
codebook_setup->lookup_type = get_bits(gb, 4);
- av_dlog(NULL, " lookup type: %d : %s \n", codebook_setup->lookup_type,
+ ff_dlog(NULL, " lookup type: %d : %s \n", codebook_setup->lookup_type,
codebook_setup->lookup_type ? "vq" : "no lookup");
// If the codebook is used for (inverse) VQ, calculate codevectors.
unsigned codebook_value_bits = get_bits(gb, 4) + 1;
unsigned codebook_sequence_p = get_bits1(gb);
- av_dlog(NULL, " We expect %d numbers for building the codevectors. \n",
+ ff_dlog(NULL, " We expect %d numbers for building the codevectors. \n",
codebook_lookup_values);
- av_dlog(NULL, " delta %f minmum %f \n",
+ ff_dlog(NULL, " delta %f minmum %f \n",
codebook_delta_value, codebook_minimum_value);
for (i = 0; i < codebook_lookup_values; ++i) {
codebook_multiplicands[i] = get_bits(gb, codebook_value_bits);
- av_dlog(NULL, " multiplicands*delta+minmum : %e \n",
+ ff_dlog(NULL, " multiplicands*delta+minmum : %e \n",
(float)codebook_multiplicands[i] * codebook_delta_value + codebook_minimum_value);
- av_dlog(NULL, " multiplicand %u\n", codebook_multiplicands[i]);
+ ff_dlog(NULL, " multiplicand %u\n", codebook_multiplicands[i]);
}
// Weed out unused vlcs and build codevector vector
- codebook_setup->codevectors = used_entries ? av_mallocz(used_entries *
- codebook_setup->dimensions *
- sizeof(*codebook_setup->codevectors))
- : NULL;
+ if (used_entries) {
+ codebook_setup->codevectors =
+ av_mallocz(used_entries * codebook_setup->dimensions *
+ sizeof(*codebook_setup->codevectors));
+ if (!codebook_setup->codevectors)
+ return AVERROR(ENOMEM);
+ } else
+ codebook_setup->codevectors = NULL;
+
for (j = 0, i = 0; i < entries; ++i) {
unsigned dim = codebook_setup->dimensions;
float last = 0.0;
unsigned lookup_offset = i;
- av_dlog(vc->avctx, "Lookup offset %u ,", i);
+ ff_dlog(vc->avctx, "Lookup offset %u ,", i);
for (k = 0; k < dim; ++k) {
unsigned multiplicand_offset = lookup_offset % codebook_lookup_values;
}
tmp_vlc_bits[j] = tmp_vlc_bits[i];
- av_dlog(vc->avctx, "real lookup offset %u, vector: ", j);
+ ff_dlog(vc->avctx, "real lookup offset %u, vector: ", j);
for (k = 0; k < dim; ++k)
- av_dlog(vc->avctx, " %f ",
+ ff_dlog(vc->avctx, " %f ",
codebook_setup->codevectors[j * dim + k]);
- av_dlog(vc->avctx, "\n");
+ ff_dlog(vc->avctx, "\n");
++j;
}
for (i = 0; i < vorbis_time_count; ++i) {
unsigned vorbis_tdtransform = get_bits(gb, 16);
- av_dlog(NULL, " Vorbis time domain transform %u: %u\n",
+ ff_dlog(NULL, " Vorbis time domain transform %u: %u\n",
vorbis_time_count, vorbis_tdtransform);
if (vorbis_tdtransform) {
floor_setup->floor_type = get_bits(gb, 16);
- av_dlog(NULL, " %d. floor type %d \n", i, floor_setup->floor_type);
+ ff_dlog(NULL, " %d. floor type %d \n", i, floor_setup->floor_type);
if (floor_setup->floor_type == 1) {
int maximum_class = -1;
floor_setup->data.t1.partitions = get_bits(gb, 5);
- av_dlog(NULL, " %d.floor: %d partitions \n",
+ ff_dlog(NULL, " %d.floor: %d partitions \n",
i, floor_setup->data.t1.partitions);
for (j = 0; j < floor_setup->data.t1.partitions; ++j) {
if (floor_setup->data.t1.partition_class[j] > maximum_class)
maximum_class = floor_setup->data.t1.partition_class[j];
- av_dlog(NULL, " %d. floor %d partition class %d \n",
+ ff_dlog(NULL, " %d. floor %d partition class %d \n",
i, j, floor_setup->data.t1.partition_class[j]);
}
- av_dlog(NULL, " maximum class %d \n", maximum_class);
+ ff_dlog(NULL, " maximum class %d \n", maximum_class);
for (j = 0; j <= maximum_class; ++j) {
floor_setup->data.t1.class_dimensions[j] = get_bits(gb, 3) + 1;
floor_setup->data.t1.class_subclasses[j] = get_bits(gb, 2);
- av_dlog(NULL, " %d floor %d class dim: %d subclasses %d \n", i, j,
+ ff_dlog(NULL, " %d floor %d class dim: %d subclasses %d \n", i, j,
floor_setup->data.t1.class_dimensions[j],
floor_setup->data.t1.class_subclasses[j]);
if (floor_setup->data.t1.class_subclasses[j]) {
GET_VALIDATED_INDEX(floor_setup->data.t1.class_masterbook[j], 8, vc->codebook_count)
- av_dlog(NULL, " masterbook: %d \n", floor_setup->data.t1.class_masterbook[j]);
+ ff_dlog(NULL, " masterbook: %d \n", floor_setup->data.t1.class_masterbook[j]);
}
for (k = 0; k < (1 << floor_setup->data.t1.class_subclasses[j]); ++k) {
VALIDATE_INDEX(bits, vc->codebook_count)
floor_setup->data.t1.subclass_books[j][k] = bits;
- av_dlog(NULL, " book %d. : %d \n", k, floor_setup->data.t1.subclass_books[j][k]);
+ ff_dlog(NULL, " book %d. : %d \n", k, floor_setup->data.t1.subclass_books[j][k]);
}
}
for (k = 0; k < floor_setup->data.t1.class_dimensions[floor_setup->data.t1.partition_class[j]]; ++k, ++floor1_values) {
floor_setup->data.t1.list[floor1_values].x = get_bits(gb, rangebits);
- av_dlog(NULL, " %u. floor1 Y coord. %d\n", floor1_values,
+ ff_dlog(NULL, " %u. floor1 Y coord. %d\n", floor1_values,
floor_setup->data.t1.list[floor1_values].x);
}
}
return AVERROR(ENOMEM);
/* debug output parsed headers */
- av_dlog(NULL, "floor0 order: %u\n", floor_setup->data.t0.order);
- av_dlog(NULL, "floor0 rate: %u\n", floor_setup->data.t0.rate);
- av_dlog(NULL, "floor0 bark map size: %u\n",
+ ff_dlog(NULL, "floor0 order: %u\n", floor_setup->data.t0.order);
+ ff_dlog(NULL, "floor0 rate: %u\n", floor_setup->data.t0.rate);
+ ff_dlog(NULL, "floor0 bark map size: %u\n",
floor_setup->data.t0.bark_map_size);
- av_dlog(NULL, "floor0 amplitude bits: %u\n",
+ ff_dlog(NULL, "floor0 amplitude bits: %u\n",
floor_setup->data.t0.amplitude_bits);
- av_dlog(NULL, "floor0 amplitude offset: %u\n",
+ ff_dlog(NULL, "floor0 amplitude offset: %u\n",
floor_setup->data.t0.amplitude_offset);
- av_dlog(NULL, "floor0 number of books: %u\n",
+ ff_dlog(NULL, "floor0 number of books: %u\n",
floor_setup->data.t0.num_books);
- av_dlog(NULL, "floor0 book list pointer: %p\n",
+ ff_dlog(NULL, "floor0 book list pointer: %p\n",
floor_setup->data.t0.book_list);
{
int idx;
for (idx = 0; idx < floor_setup->data.t0.num_books; ++idx) {
- av_dlog(NULL, " Book %d: %u\n", idx + 1,
+ ff_dlog(NULL, " Book %d: %u\n", idx + 1,
floor_setup->data.t0.book_list[idx]);
}
}
if (!vc->residues)
return AVERROR(ENOMEM);
- av_dlog(NULL, " There are %d residues. \n", vc->residue_count);
+ ff_dlog(NULL, " There are %d residues. \n", vc->residue_count);
for (i = 0; i < vc->residue_count; ++i) {
vorbis_residue *res_setup = &vc->residues[i];
res_setup->type = get_bits(gb, 16);
- av_dlog(NULL, " %u. residue type %d\n", i, res_setup->type);
+ ff_dlog(NULL, " %u. residue type %d\n", i, res_setup->type);
res_setup->begin = get_bits(gb, 24);
res_setup->end = get_bits(gb, 24);
if (!res_setup->classifs)
return AVERROR(ENOMEM);
- av_dlog(NULL, " begin %d end %d part.size %d classif.s %d classbook %d \n",
+ ff_dlog(NULL, " begin %d end %d part.size %d classif.s %d classbook %d \n",
res_setup->begin, res_setup->end, res_setup->partition_size,
res_setup->classifications, res_setup->classbook);
high_bits = get_bits(gb, 5);
cascade[j] = (high_bits << 3) + low_bits;
- av_dlog(NULL, " %u class cascade depth: %d\n", j, ilog(cascade[j]));
+ ff_dlog(NULL, " %u class cascade depth: %d\n", j, ilog(cascade[j]));
}
res_setup->maxpass = 0;
if (cascade[j]&(1 << k)) {
GET_VALIDATED_INDEX(res_setup->books[j][k], 8, vc->codebook_count)
- av_dlog(NULL, " %u class cascade depth %u book: %d\n",
+ ff_dlog(NULL, " %u class cascade depth %u book: %d\n",
j, k, res_setup->books[j][k]);
if (k>res_setup->maxpass)
if (!vc->mappings)
return AVERROR(ENOMEM);
- av_dlog(NULL, " There are %d mappings. \n", vc->mapping_count);
+ ff_dlog(NULL, " There are %d mappings. \n", vc->mapping_count);
for (i = 0; i < vc->mapping_count; ++i) {
vorbis_mapping *mapping_setup = &vc->mappings[i];
mapping_setup->coupling_steps = 0;
}
- av_dlog(NULL, " %u mapping coupling steps: %d\n",
+ ff_dlog(NULL, " %u mapping coupling steps: %d\n",
i, mapping_setup->coupling_steps);
if (get_bits(gb, 2)) {
GET_VALIDATED_INDEX(mapping_setup->submap_floor[j], 8, vc->floor_count)
GET_VALIDATED_INDEX(mapping_setup->submap_residue[j], 8, vc->residue_count)
- av_dlog(NULL, " %u mapping %u submap : floor %d, residue %d\n", i, j,
+ ff_dlog(NULL, " %u mapping %u submap : floor %d, residue %d\n", i, j,
mapping_setup->submap_floor[j],
mapping_setup->submap_residue[j]);
}
}
for (idx = 0; idx <= n; ++idx) {
- av_dlog(NULL, "floor0 map: map at pos %d is %d\n", idx, map[idx]);
+ ff_dlog(NULL, "floor0 map: map at pos %d is %d\n", idx, map[idx]);
}
return 0;
if (!vc->modes)
return AVERROR(ENOMEM);
- av_dlog(NULL, " There are %d modes.\n", vc->mode_count);
+ ff_dlog(NULL, " There are %d modes.\n", vc->mode_count);
for (i = 0; i < vc->mode_count; ++i) {
vorbis_mode *mode_setup = &vc->modes[i];
mode_setup->transformtype = get_bits(gb, 16); //FIXME check
GET_VALIDATED_INDEX(mode_setup->mapping, 8, vc->mapping_count);
- av_dlog(NULL, " %u mode: blockflag %d, windowtype %d, transformtype %d, mapping %d\n",
+ ff_dlog(NULL, " %u mode: blockflag %d, windowtype %d, transformtype %d, mapping %d\n",
i, mode_setup->blockflag, mode_setup->windowtype,
mode_setup->transformtype, mode_setup->mapping);
}
ff_mdct_init(&vc->mdct[0], bl0, 1, -1.0);
ff_mdct_init(&vc->mdct[1], bl1, 1, -1.0);
- av_dlog(NULL, " vorbis version %d \n audio_channels %d \n audio_samplerate %d \n bitrate_max %d \n bitrate_nom %d \n bitrate_min %d \n blk_0 %d blk_1 %d \n ",
+ ff_dlog(NULL, " vorbis version %d \n audio_channels %d \n audio_samplerate %d \n bitrate_max %d \n bitrate_nom %d \n bitrate_min %d \n blk_0 %d blk_1 %d \n ",
vc->version, vc->audio_channels, vc->audio_samplerate, vc->bitrate_maximum, vc->bitrate_nominal, vc->bitrate_minimum, vc->blocksize[0], vc->blocksize[1]);
/*
vc->avctx = avctx;
ff_vorbisdsp_init(&vc->dsp);
- avpriv_float_dsp_init(&vc->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
- ff_fmt_convert_init(&vc->fmt_conv, avctx);
+ avpriv_float_dsp_init(&vc->fdsp, avctx->flags & AV_CODEC_FLAG_BITEXACT);
avctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
av_log(vc->avctx, AV_LOG_ERROR, "floor0 dec: booknumber too high!\n");
book_idx = 0;
}
- av_dlog(NULL, "floor0 dec: booknumber: %u\n", book_idx);
+ ff_dlog(NULL, "floor0 dec: booknumber: %u\n", book_idx);
codebook = vc->codebooks[vf->book_list[book_idx]];
/* Invalid codebook! */
if (!codebook.codevectors)
while (lsp_len<vf->order) {
int vec_off;
- av_dlog(NULL, "floor0 dec: book dimension: %d\n", codebook.dimensions);
- av_dlog(NULL, "floor0 dec: maximum depth: %d\n", codebook.maxdepth);
+ ff_dlog(NULL, "floor0 dec: book dimension: %d\n", codebook.dimensions);
+ ff_dlog(NULL, "floor0 dec: maximum depth: %d\n", codebook.maxdepth);
/* read temp vector */
vec_off = get_vlc2(&vc->gb, codebook.vlc.table,
codebook.nb_bits, codebook.maxdepth)
* codebook.dimensions;
- av_dlog(NULL, "floor0 dec: vector offset: %d\n", vec_off);
+ ff_dlog(NULL, "floor0 dec: vector offset: %d\n", vec_off);
/* copy each vector component and add last to it */
for (idx = 0; idx < codebook.dimensions; ++idx)
lsp[lsp_len+idx] = codebook.codevectors[vec_off+idx] + last;
{
int idx;
for (idx = 0; idx < lsp_len; ++idx)
- av_dlog(NULL, "floor0 dec: coeff at %d is %f\n", idx, lsp[idx]);
+ ff_dlog(NULL, "floor0 dec: coeff at %d is %f\n", idx, lsp[idx]);
}
/* synthesize floor output vector */
for (i = 0; i < order; i++)
lsp[i] = 2.0f * cos(lsp[i]);
- av_dlog(NULL, "floor0 synth: map_size = %"PRIu32"; m = %d; wstep = %f\n",
+ ff_dlog(NULL, "floor0 synth: map_size = %"PRIu32"; m = %d; wstep = %f\n",
vf->map_size[blockflag], order, wstep);
i = 0;
return 1;
}
- av_dlog(NULL, " Floor0 decoded\n");
+ ff_dlog(NULL, " Floor0 decoded\n");
return 0;
}
floor1_Y[0] = get_bits(gb, ilog(range - 1));
floor1_Y[1] = get_bits(gb, ilog(range - 1));
- av_dlog(NULL, "floor 0 Y %d floor 1 Y %d \n", floor1_Y[0], floor1_Y[1]);
+ ff_dlog(NULL, "floor 0 Y %d floor 1 Y %d \n", floor1_Y[0], floor1_Y[1]);
offset = 2;
for (i = 0; i < vf->partitions; ++i) {
csub = (1 << cbits) - 1;
cval = 0;
- av_dlog(NULL, "Cbits %u\n", cbits);
+ ff_dlog(NULL, "Cbits %u\n", cbits);
if (cbits) // this reads all subclasses for this partition's class
cval = get_vlc2(gb, vc->codebooks[vf->class_masterbook[class]].vlc.table,
for (j = 0; j < cdim; ++j) {
book = vf->subclass_books[class][cval & csub];
- av_dlog(NULL, "book %d Cbits %u cval %u bits:%d\n",
+ ff_dlog(NULL, "book %d Cbits %u cval %u bits:%d\n",
book, cbits, cval, get_bits_count(gb));
cval = cval >> cbits;
floor1_Y[offset+j] = 0;
}
- av_dlog(NULL, " floor(%d) = %d \n",
+ ff_dlog(NULL, " floor(%d) = %d \n",
vf->list[offset+j].x, floor1_Y[offset+j]);
}
offset+=cdim;
floor1_Y_final[i] = av_clip_uint16(predicted);
}
- av_dlog(NULL, " Decoded floor(%d) = %u / val %u\n",
+ ff_dlog(NULL, " Decoded floor(%d) = %u / val %u\n",
vf->list[i].x, floor1_Y_final[i], val);
}
ff_vorbis_floor1_render_list(vf->list, vf->x_list_dim, floor1_Y_final, floor1_flag, vf->multiplier, vec, vf->list[1].x);
- av_dlog(NULL, " Floor decoded\n");
+ ff_dlog(NULL, " Floor decoded\n");
return 0;
}
+static av_always_inline int setup_classifs(vorbis_context *vc,
+ vorbis_residue *vr,
+ uint8_t *do_not_decode,
+ unsigned ch_used,
+ int partition_count)
+{
+ vorbis_codebook *codebook = vc->codebooks + vr->classbook;
+ int p, j, i;
+ unsigned c_p_c = codebook->dimensions;
+ unsigned inverse_class = ff_inverse[vr->classifications];
+ int temp, temp2;
+ for (p = 0, j = 0; j < ch_used; ++j) {
+ if (!do_not_decode[j]) {
+ temp = get_vlc2(&vc->gb, codebook->vlc.table,
+ codebook->nb_bits, 3);
+
+ ff_dlog(NULL, "Classword: %u\n", temp);
+
+ if (temp < 0) {
+ av_log(vc->avctx, AV_LOG_ERROR,
+ "Invalid vlc code decoding %d channel.", j);
+ return AVERROR_INVALIDDATA;
+ }
+
+ for (i = partition_count + c_p_c - 1; i >= partition_count; i--) {
+ temp2 = (((uint64_t)temp) * inverse_class) >> 32;
+
+ if (i < vr->ptns_to_read)
+ vr->classifs[p + i] = temp - temp2 * vr->classifications;
+ temp = temp2;
+ }
+ }
+ p += vr->ptns_to_read;
+ }
+ return 0;
+}
// Read and decode residue
static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc,
{
GetBitContext *gb = &vc->gb;
unsigned c_p_c = vc->codebooks[vr->classbook].dimensions;
- unsigned ptns_to_read = vr->ptns_to_read;
uint8_t *classifs = vr->classifs;
unsigned pass, ch_used, i, j, k, l;
unsigned max_output = (ch - 1) * vlen;
+ int ptns_to_read = vr->ptns_to_read;
if (vr_type == 2) {
for (j = 1; j < ch; ++j)
if (max_output > ch_left * vlen) {
av_log(vc->avctx, AV_LOG_ERROR, "Insufficient output buffer\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
- av_dlog(NULL, " residue type 0/1/2 decode begin, ch: %d cpc %d \n", ch, c_p_c);
+ ff_dlog(NULL, " residue type 0/1/2 decode begin, ch: %d cpc %d \n", ch, c_p_c);
for (pass = 0; pass <= vr->maxpass; ++pass) { // FIXME OPTIMIZE?
- uint16_t voffset, partition_count, j_times_ptns_to_read;
+ int voffset, partition_count, j_times_ptns_to_read;
voffset = vr->begin;
for (partition_count = 0; partition_count < ptns_to_read;) { // SPEC error
if (!pass) {
- unsigned inverse_class = ff_inverse[vr->classifications];
- for (j_times_ptns_to_read = 0, j = 0; j < ch_used; ++j) {
- if (!do_not_decode[j]) {
- unsigned temp = get_vlc2(gb, vc->codebooks[vr->classbook].vlc.table,
- vc->codebooks[vr->classbook].nb_bits, 3);
-
- av_dlog(NULL, "Classword: %u\n", temp);
-
- assert(vr->classifications > 1 && temp <= 65536); //needed for inverse[]
- for (i = 0; i < c_p_c; ++i) {
- unsigned temp2;
-
- temp2 = (((uint64_t)temp) * inverse_class) >> 32;
- if (partition_count + c_p_c - 1 - i < ptns_to_read)
- classifs[j_times_ptns_to_read + partition_count + c_p_c - 1 - i] = temp - temp2 * vr->classifications;
- temp = temp2;
- }
- }
- j_times_ptns_to_read += ptns_to_read;
- }
+ int ret = setup_classifs(vc, vr, do_not_decode, ch_used, partition_count);
+ if (ret < 0)
+ return ret;
}
for (i = 0; (i < c_p_c) && (partition_count < ptns_to_read); ++i) {
for (j_times_ptns_to_read = 0, j = 0; j < ch_used; ++j) {
for (l = 0; l < dim; ++l, ++voffs) {
vec[voffs]+=codebook.codevectors[coffs+l];
- av_dlog(NULL, " pass %d offs: %d curr: %f change: %f cv offs.: %d \n",
+ ff_dlog(NULL, " pass %d offs: %d curr: %f change: %f cv offs.: %d \n",
pass, voffs, vec[voffs], codebook.codevectors[coffs+l], coffs);
}
}
vec[voffs ] += codebook.codevectors[coffs + l ];
vec[voffs + vlen] += codebook.codevectors[coffs + l + 1];
- av_dlog(NULL, " pass %d offs: %d curr: %f change: %f cv offs.: %d+%d \n",
+ ff_dlog(NULL, " pass %d offs: %d curr: %f change: %f cv offs.: %d+%d \n",
pass, voffset / ch + (voffs % ch) * vlen,
vec[voffset / ch + (voffs % ch) * vlen],
codebook.codevectors[coffs + l], coffs, l);
vec[voffs_div + voffs_mod * vlen] +=
codebook.codevectors[coffs + l];
- av_dlog(NULL, " pass %d offs: %d curr: %f change: %f cv offs.: %d+%d \n",
+ ff_dlog(NULL, " pass %d offs: %d curr: %f change: %f cv offs.: %d+%d \n",
pass, voffs_div + voffs_mod * vlen,
vec[voffs_div + voffs_mod * vlen],
codebook.codevectors[coffs + l], coffs, l);
vc->mode_number = mode_number;
mapping = &vc->mappings[vc->modes[mode_number].mapping];
- av_dlog(NULL, " Mode number: %u , mapping: %d , blocktype %d\n", mode_number,
+ ff_dlog(NULL, " Mode number: %u , mapping: %d , blocktype %d\n", mode_number,
vc->modes[mode_number].mapping, vc->modes[mode_number].blockflag);
blockflag = vc->modes[mode_number].blockflag;
residue = &vc->residues[mapping->submap_residue[i]];
if (ch_left < ch) {
av_log(vc->avctx, AV_LOG_ERROR, "Too many channels in vorbis_floor_decode.\n");
- return -1;
+ return AVERROR_INVALIDDATA;
}
if (ch) {
ret = vorbis_residue_decode(vc, residue, ch, do_not_decode, ch_res_ptr, vlen, ch_left);
float *channel_ptrs[255];
int i, len, ret;
- av_dlog(NULL, "packet length %d \n", buf_size);
+ ff_dlog(NULL, "packet length %d \n", buf_size);
/* get output buffer */
frame->nb_samples = vc->blocksize[1] / 2;
return buf_size;
}
- av_dlog(NULL, "parsed %d bytes %d bits, returned %d samples (*ch*bits) \n",
+ ff_dlog(NULL, "parsed %d bytes %d bits, returned %d samples (*ch*bits) \n",
get_bits_count(gb) / 8, get_bits_count(gb) % 8, len);
frame->nb_samples = len;
AVCodec ff_vorbis_decoder = {
.name = "vorbis",
+ .long_name = NULL_IF_CONFIG_SMALL("Vorbis"),
.type = AVMEDIA_TYPE_AUDIO,
.id = AV_CODEC_ID_VORBIS,
.priv_data_size = sizeof(vorbis_context),
.close = vorbis_decode_close,
.decode = vorbis_decode_frame,
.flush = vorbis_decode_flush,
- .capabilities = CODEC_CAP_DR1,
- .long_name = NULL_IF_CONFIG_SMALL("Vorbis"),
+ .capabilities = AV_CODEC_CAP_DR1,
.channel_layouts = ff_vorbis_channel_layouts,
.sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP,
AV_SAMPLE_FMT_NONE },
projects / ffmpeg / blobdiff