-/**
- * @file
- * Vorbis I decoder
- * @author Denes Balatoni ( dbalatoni programozo hu )
- *
+/*
* This file is part of Libav.
*
* Libav is free software; you can redistribute it and/or
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
-#undef V_DEBUG
-//#define V_DEBUG
-//#define AV_DEBUG(...) av_log(NULL, AV_LOG_INFO, __VA_ARGS__)
+/**
+ * @file
+ * Vorbis I decoder
+ * @author Denes Balatoni ( dbalatoni programozo hu )
+ */
+#include <inttypes.h>
#include <math.h>
#define ALT_BITSTREAM_READER_LE
#define V_MAX_VLCS (1 << 16)
#define V_MAX_PARTITIONS (1 << 20)
-#ifndef V_DEBUG
-#define AV_DEBUG(...)
-#endif
-
#undef NDEBUG
#include <assert.h>
typedef struct {
- uint_fast8_t dimensions;
- uint_fast8_t lookup_type;
- uint_fast8_t maxdepth;
- VLC vlc;
- float *codevectors;
+ uint8_t dimensions;
+ uint8_t lookup_type;
+ uint8_t maxdepth;
+ VLC vlc;
+ float *codevectors;
unsigned int nb_bits;
} vorbis_codebook;
int (* vorbis_floor_decode_func)
(struct vorbis_context_s *, vorbis_floor_data *, float *);
typedef struct {
- uint_fast8_t floor_type;
+ uint8_t floor_type;
vorbis_floor_decode_func decode;
union vorbis_floor_u {
struct vorbis_floor0_s {
- uint_fast8_t order;
- uint_fast16_t rate;
- uint_fast16_t bark_map_size;
- int_fast32_t *map[2];
- uint_fast32_t map_size[2];
- uint_fast8_t amplitude_bits;
- uint_fast8_t amplitude_offset;
- uint_fast8_t num_books;
- uint_fast8_t *book_list;
+ uint8_t order;
+ uint16_t rate;
+ uint16_t bark_map_size;
+ int32_t *map[2];
+ uint32_t map_size[2];
+ uint8_t amplitude_bits;
+ uint8_t amplitude_offset;
+ uint8_t num_books;
+ uint8_t *book_list;
float *lsp;
} t0;
struct vorbis_floor1_s {
- uint_fast8_t partitions;
- uint8_t partition_class[32];
- uint_fast8_t class_dimensions[16];
- uint_fast8_t class_subclasses[16];
- uint_fast8_t class_masterbook[16];
- int_fast16_t subclass_books[16][8];
- uint_fast8_t multiplier;
- uint_fast16_t x_list_dim;
+ uint8_t partitions;
+ uint8_t partition_class[32];
+ uint8_t class_dimensions[16];
+ uint8_t class_subclasses[16];
+ uint8_t class_masterbook[16];
+ int16_t subclass_books[16][8];
+ uint8_t multiplier;
+ uint16_t x_list_dim;
vorbis_floor1_entry *list;
} t1;
} data;
} vorbis_floor;
typedef struct {
- uint_fast16_t type;
- uint_fast32_t begin;
- uint_fast32_t end;
+ uint16_t type;
+ uint32_t begin;
+ uint32_t end;
unsigned partition_size;
- uint_fast8_t classifications;
- uint_fast8_t classbook;
- int_fast16_t books[64][8];
- uint_fast8_t maxpass;
- uint_fast16_t ptns_to_read;
- uint8_t *classifs;
+ uint8_t classifications;
+ uint8_t classbook;
+ int16_t books[64][8];
+ uint8_t maxpass;
+ uint16_t ptns_to_read;
+ uint8_t *classifs;
} vorbis_residue;
typedef struct {
- uint_fast8_t submaps;
- uint_fast16_t coupling_steps;
- uint_fast8_t *magnitude;
- uint_fast8_t *angle;
- uint_fast8_t *mux;
- uint_fast8_t submap_floor[16];
- uint_fast8_t submap_residue[16];
+ uint8_t submaps;
+ uint16_t coupling_steps;
+ uint8_t *magnitude;
+ uint8_t *angle;
+ uint8_t *mux;
+ uint8_t submap_floor[16];
+ uint8_t submap_residue[16];
} vorbis_mapping;
typedef struct {
- uint_fast8_t blockflag;
- uint_fast16_t windowtype;
- uint_fast16_t transformtype;
- uint_fast8_t mapping;
+ uint8_t blockflag;
+ uint16_t windowtype;
+ uint16_t transformtype;
+ uint8_t mapping;
} vorbis_mode;
typedef struct vorbis_context_s {
FmtConvertContext fmt_conv;
FFTContext mdct[2];
- uint_fast8_t first_frame;
- uint_fast32_t version;
- uint_fast8_t audio_channels;
- uint_fast32_t audio_samplerate;
- uint_fast32_t bitrate_maximum;
- uint_fast32_t bitrate_nominal;
- uint_fast32_t bitrate_minimum;
- uint_fast32_t blocksize[2];
+ uint8_t first_frame;
+ uint32_t version;
+ uint8_t audio_channels;
+ uint32_t audio_samplerate;
+ uint32_t bitrate_maximum;
+ uint32_t bitrate_nominal;
+ uint32_t bitrate_minimum;
+ uint32_t blocksize[2];
const float *win[2];
- uint_fast16_t codebook_count;
+ uint16_t codebook_count;
vorbis_codebook *codebooks;
- uint_fast8_t floor_count;
+ uint8_t floor_count;
vorbis_floor *floors;
- uint_fast8_t residue_count;
+ uint8_t residue_count;
vorbis_residue *residues;
- uint_fast8_t mapping_count;
+ uint8_t mapping_count;
vorbis_mapping *mappings;
- uint_fast8_t mode_count;
+ uint8_t mode_count;
vorbis_mode *modes;
- uint_fast8_t mode_number; // mode number for the current packet
- uint_fast8_t previous_window;
+ uint8_t mode_number; // mode number for the current packet
+ uint8_t previous_window;
float *channel_residues;
float *channel_floors;
float *saved;
VALIDATE_INDEX(idx, limit)\
}
-static float vorbisfloat2float(uint_fast32_t val)
+static float vorbisfloat2float(unsigned val)
{
double mant = val & 0x1fffff;
long exp = (val & 0x7fe00000L) >> 21;
static void vorbis_free(vorbis_context *vc)
{
- int_fast16_t i;
+ int i;
av_freep(&vc->channel_residues);
av_freep(&vc->channel_floors);
static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc)
{
- uint_fast16_t cb;
+ unsigned cb;
uint8_t *tmp_vlc_bits;
uint32_t *tmp_vlc_codes;
GetBitContext *gb = &vc->gb;
- uint_fast16_t *codebook_multiplicands;
+ uint16_t *codebook_multiplicands;
vc->codebook_count = get_bits(gb, 8) + 1;
- AV_DEBUG(" Codebooks: %d \n", vc->codebook_count);
+ av_dlog(NULL, " Codebooks: %d \n", vc->codebook_count);
- vc->codebooks = av_mallocz(vc->codebook_count * sizeof(vorbis_codebook));
- tmp_vlc_bits = av_mallocz(V_MAX_VLCS * sizeof(uint8_t));
- tmp_vlc_codes = av_mallocz(V_MAX_VLCS * sizeof(uint32_t));
+ vc->codebooks = av_mallocz(vc->codebook_count * sizeof(*vc->codebooks));
+ tmp_vlc_bits = av_mallocz(V_MAX_VLCS * sizeof(*tmp_vlc_bits));
+ tmp_vlc_codes = av_mallocz(V_MAX_VLCS * sizeof(*tmp_vlc_codes));
codebook_multiplicands = av_malloc(V_MAX_VLCS * sizeof(*codebook_multiplicands));
for (cb = 0; cb < vc->codebook_count; ++cb) {
vorbis_codebook *codebook_setup = &vc->codebooks[cb];
- uint_fast8_t ordered;
- uint_fast32_t t, used_entries = 0;
- uint_fast32_t entries;
+ unsigned ordered, t, entries, used_entries = 0;
- AV_DEBUG(" %d. Codebook \n", cb);
+ av_dlog(NULL, " %u. Codebook\n", cb);
if (get_bits(gb, 24) != 0x564342) {
- av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook setup data corrupt. \n", cb);
+ av_log(vc->avccontext, AV_LOG_ERROR,
+ " %u. Codebook setup data corrupt.\n", cb);
goto error;
}
codebook_setup->dimensions=get_bits(gb, 16);
if (codebook_setup->dimensions > 16 || codebook_setup->dimensions == 0) {
- av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook's dimension is invalid (%d). \n", cb, codebook_setup->dimensions);
+ av_log(vc->avccontext, AV_LOG_ERROR,
+ " %u. Codebook's dimension is invalid (%d).\n",
+ cb, codebook_setup->dimensions);
goto error;
}
entries = get_bits(gb, 24);
if (entries > V_MAX_VLCS) {
- av_log(vc->avccontext, AV_LOG_ERROR, " %"PRIdFAST16". Codebook has too many entries (%"PRIdFAST32"). \n", cb, entries);
+ av_log(vc->avccontext, AV_LOG_ERROR,
+ " %u. Codebook has too many entries (%u).\n",
+ cb, entries);
goto error;
}
ordered = get_bits1(gb);
- AV_DEBUG(" codebook_dimensions %d, codebook_entries %d \n", codebook_setup->dimensions, entries);
+ av_dlog(NULL, " codebook_dimensions %d, codebook_entries %u\n",
+ codebook_setup->dimensions, entries);
if (!ordered) {
- uint_fast16_t ce;
- uint_fast8_t flag;
- uint_fast8_t sparse = get_bits1(gb);
+ unsigned ce, flag;
+ unsigned sparse = get_bits1(gb);
- AV_DEBUG(" not ordered \n");
+ av_dlog(NULL, " not ordered \n");
if (sparse) {
- AV_DEBUG(" sparse \n");
+ av_dlog(NULL, " sparse \n");
used_entries = 0;
for (ce = 0; ce < entries; ++ce) {
tmp_vlc_bits[ce] = 0;
}
} else {
- AV_DEBUG(" not sparse \n");
+ av_dlog(NULL, " not sparse \n");
used_entries = entries;
for (ce = 0; ce < entries; ++ce)
tmp_vlc_bits[ce] = get_bits(gb, 5) + 1;
}
} else {
- uint_fast16_t current_entry = 0;
- uint_fast8_t current_length = get_bits(gb, 5)+1;
+ unsigned current_entry = 0;
+ unsigned current_length = get_bits(gb, 5) + 1;
- AV_DEBUG(" ordered, current length: %d \n", current_length); //FIXME
+ av_dlog(NULL, " ordered, current length: %u\n", current_length); //FIXME
used_entries = entries;
for (; current_entry < used_entries && current_length <= 32; ++current_length) {
- uint_fast16_t i, number;
+ unsigned i, number;
- AV_DEBUG(" number bits: %d ", ilog(entries - current_entry));
+ av_dlog(NULL, " number bits: %u ", ilog(entries - current_entry));
number = get_bits(gb, ilog(entries - current_entry));
- AV_DEBUG(" number: %d \n", number);
+ av_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_DEBUG(" lookup type: %d : %s \n", codebook_setup->lookup_type, codebook_setup->lookup_type ? "vq" : "no lookup");
+ av_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.
if (codebook_setup->lookup_type == 1) {
- uint_fast16_t i, j, k;
- uint_fast16_t codebook_lookup_values = ff_vorbis_nth_root(entries, codebook_setup->dimensions);
+ unsigned i, j, k;
+ unsigned codebook_lookup_values = ff_vorbis_nth_root(entries, codebook_setup->dimensions);
float codebook_minimum_value = vorbisfloat2float(get_bits_long(gb, 32));
float codebook_delta_value = vorbisfloat2float(get_bits_long(gb, 32));
- uint_fast8_t codebook_value_bits = get_bits(gb, 4)+1;
- uint_fast8_t codebook_sequence_p = get_bits1(gb);
+ unsigned codebook_value_bits = get_bits(gb, 4) + 1;
+ unsigned codebook_sequence_p = get_bits1(gb);
- AV_DEBUG(" We expect %d numbers for building the codevectors. \n", codebook_lookup_values);
- AV_DEBUG(" delta %f minmum %f \n", codebook_delta_value, codebook_minimum_value);
+ av_dlog(NULL, " We expect %d numbers for building the codevectors. \n",
+ codebook_lookup_values);
+ av_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_DEBUG(" multiplicands*delta+minmum : %e \n", (float)codebook_multiplicands[i]*codebook_delta_value+codebook_minimum_value);
- AV_DEBUG(" multiplicand %d \n", codebook_multiplicands[i]);
+ av_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]);
}
// Weed out unused vlcs and build codevector vector
- codebook_setup->codevectors = used_entries ? av_mallocz(used_entries*codebook_setup->dimensions * sizeof(float)) : NULL;
+ codebook_setup->codevectors = used_entries ? av_mallocz(used_entries *
+ codebook_setup->dimensions *
+ sizeof(*codebook_setup->codevectors))
+ : NULL;
for (j = 0, i = 0; i < entries; ++i) {
- uint_fast8_t dim = codebook_setup->dimensions;
+ unsigned dim = codebook_setup->dimensions;
if (tmp_vlc_bits[i]) {
float last = 0.0;
- uint_fast32_t lookup_offset = i;
+ unsigned lookup_offset = i;
-#ifdef V_DEBUG
- av_log(vc->avccontext, AV_LOG_INFO, "Lookup offset %d ,", i);
-#endif
+ av_dlog(vc->avccontext, "Lookup offset %u ,", i);
for (k = 0; k < dim; ++k) {
- uint_fast32_t multiplicand_offset = lookup_offset % codebook_lookup_values;
+ unsigned multiplicand_offset = lookup_offset % codebook_lookup_values;
codebook_setup->codevectors[j * dim + k] = codebook_multiplicands[multiplicand_offset] * codebook_delta_value + codebook_minimum_value + last;
if (codebook_sequence_p)
last = codebook_setup->codevectors[j * dim + k];
}
tmp_vlc_bits[j] = tmp_vlc_bits[i];
-#ifdef V_DEBUG
- av_log(vc->avccontext, AV_LOG_INFO, "real lookup offset %d, vector: ", j);
+ av_dlog(vc->avccontext, "real lookup offset %u, vector: ", j);
for (k = 0; k < dim; ++k)
- av_log(vc->avccontext, AV_LOG_INFO, " %f ", codebook_setup->codevectors[j * dim + k]);
- av_log(vc->avccontext, AV_LOG_INFO, "\n");
-#endif
+ av_dlog(vc->avccontext, " %f ",
+ codebook_setup->codevectors[j * dim + k]);
+ av_dlog(vc->avccontext, "\n");
++j;
}
static int vorbis_parse_setup_hdr_tdtransforms(vorbis_context *vc)
{
GetBitContext *gb = &vc->gb;
- uint_fast8_t i;
- uint_fast8_t vorbis_time_count = get_bits(gb, 6) + 1;
+ unsigned i, vorbis_time_count = get_bits(gb, 6) + 1;
for (i = 0; i < vorbis_time_count; ++i) {
- uint_fast16_t vorbis_tdtransform = get_bits(gb, 16);
+ unsigned vorbis_tdtransform = get_bits(gb, 16);
- AV_DEBUG(" Vorbis time domain transform %d: %d \n", vorbis_time_count, vorbis_tdtransform);
+ av_dlog(NULL, " Vorbis time domain transform %u: %u\n",
+ vorbis_time_count, vorbis_tdtransform);
if (vorbis_tdtransform) {
av_log(vc->avccontext, AV_LOG_ERROR, "Vorbis time domain transform data nonzero. \n");
static int vorbis_floor0_decode(vorbis_context *vc,
vorbis_floor_data *vfu, float *vec);
-static void create_map(vorbis_context *vc, uint_fast8_t floor_number);
+static void create_map(vorbis_context *vc, unsigned floor_number);
static int vorbis_floor1_decode(vorbis_context *vc,
vorbis_floor_data *vfu, float *vec);
static int vorbis_parse_setup_hdr_floors(vorbis_context *vc)
vc->floor_count = get_bits(gb, 6) + 1;
- vc->floors = av_mallocz(vc->floor_count * sizeof(vorbis_floor));
+ vc->floors = av_mallocz(vc->floor_count * sizeof(*vc->floors));
for (i = 0; i < vc->floor_count; ++i) {
vorbis_floor *floor_setup = &vc->floors[i];
floor_setup->floor_type = get_bits(gb, 16);
- AV_DEBUG(" %d. floor type %d \n", i, floor_setup->floor_type);
+ av_dlog(NULL, " %d. floor type %d \n", i, floor_setup->floor_type);
if (floor_setup->floor_type == 1) {
int maximum_class = -1;
- uint_fast8_t rangebits;
- uint_fast32_t rangemax;
- uint_fast16_t floor1_values = 2;
+ unsigned rangebits, rangemax, floor1_values = 2;
floor_setup->decode = vorbis_floor1_decode;
floor_setup->data.t1.partitions = get_bits(gb, 5);
- AV_DEBUG(" %d.floor: %d partitions \n", i, floor_setup->data.t1.partitions);
+ av_dlog(NULL, " %d.floor: %d partitions \n",
+ i, floor_setup->data.t1.partitions);
for (j = 0; j < floor_setup->data.t1.partitions; ++j) {
floor_setup->data.t1.partition_class[j] = get_bits(gb, 4);
if (floor_setup->data.t1.partition_class[j] > maximum_class)
maximum_class = floor_setup->data.t1.partition_class[j];
- AV_DEBUG(" %d. floor %d partition class %d \n", i, j, floor_setup->data.t1.partition_class[j]);
+ av_dlog(NULL, " %d. floor %d partition class %d \n",
+ i, j, floor_setup->data.t1.partition_class[j]);
}
- AV_DEBUG(" maximum class %d \n", maximum_class);
+ av_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_DEBUG(" %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]);
+ av_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_DEBUG(" masterbook: %d \n", floor_setup->data.t1.class_masterbook[j]);
+ av_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_DEBUG(" book %d. : %d \n", k, floor_setup->data.t1.subclass_books[j][k]);
+ av_dlog(NULL, " book %d. : %d \n", k, floor_setup->data.t1.subclass_books[j][k]);
}
}
for (j = 0; j < floor_setup->data.t1.partitions; ++j)
floor_setup->data.t1.x_list_dim+=floor_setup->data.t1.class_dimensions[floor_setup->data.t1.partition_class[j]];
- floor_setup->data.t1.list = av_mallocz(floor_setup->data.t1.x_list_dim * sizeof(vorbis_floor1_entry));
+ floor_setup->data.t1.list = av_mallocz(floor_setup->data.t1.x_list_dim *
+ sizeof(*floor_setup->data.t1.list));
rangebits = get_bits(gb, 4);
rangemax = (1 << rangebits);
if (rangemax > vc->blocksize[1] / 2) {
av_log(vc->avccontext, AV_LOG_ERROR,
- "Floor value is too large for blocksize: %"PRIuFAST32" (%"PRIuFAST32")\n",
+ "Floor value is too large for blocksize: %u (%"PRIu32")\n",
rangemax, vc->blocksize[1] / 2);
return -1;
}
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_DEBUG(" %d. floor1 Y coord. %d \n", floor1_values, floor_setup->data.t1.list[floor1_values].x);
+ av_dlog(NULL, " %u. floor1 Y coord. %d\n", floor1_values,
+ floor_setup->data.t1.list[floor1_values].x);
}
}
// Precalculate order of x coordinates - needed for decode
ff_vorbis_ready_floor1_list(floor_setup->data.t1.list, floor_setup->data.t1.x_list_dim);
} else if (floor_setup->floor_type == 0) {
- uint_fast8_t max_codebook_dim = 0;
+ unsigned max_codebook_dim = 0;
floor_setup->decode = vorbis_floor0_decode;
/* read book indexes */
{
int idx;
- uint_fast8_t book_idx;
+ unsigned book_idx;
for (idx = 0; idx < floor_setup->data.t0.num_books; ++idx) {
GET_VALIDATED_INDEX(book_idx, 8, vc->codebook_count)
floor_setup->data.t0.book_list[idx] = book_idx;
/* codebook dim is for padding if codebook dim doesn't *
* divide order+1 then we need to read more data */
floor_setup->data.t0.lsp =
- av_malloc((floor_setup->data.t0.order+1 + max_codebook_dim)
- * sizeof(float));
+ av_malloc((floor_setup->data.t0.order + 1 + max_codebook_dim)
+ * sizeof(*floor_setup->data.t0.lsp));
if (!floor_setup->data.t0.lsp)
return -1;
-#ifdef V_DEBUG /* debug output parsed headers */
- AV_DEBUG("floor0 order: %u\n", floor_setup->data.t0.order);
- AV_DEBUG("floor0 rate: %u\n", floor_setup->data.t0.rate);
- AV_DEBUG("floor0 bark map size: %u\n",
- floor_setup->data.t0.bark_map_size);
- AV_DEBUG("floor0 amplitude bits: %u\n",
- floor_setup->data.t0.amplitude_bits);
- AV_DEBUG("floor0 amplitude offset: %u\n",
- floor_setup->data.t0.amplitude_offset);
- AV_DEBUG("floor0 number of books: %u\n",
- floor_setup->data.t0.num_books);
- AV_DEBUG("floor0 book list pointer: %p\n",
- floor_setup->data.t0.book_list);
+ /* 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",
+ floor_setup->data.t0.bark_map_size);
+ av_dlog(NULL, "floor0 amplitude bits: %u\n",
+ floor_setup->data.t0.amplitude_bits);
+ av_dlog(NULL, "floor0 amplitude offset: %u\n",
+ floor_setup->data.t0.amplitude_offset);
+ av_dlog(NULL, "floor0 number of books: %u\n",
+ floor_setup->data.t0.num_books);
+ av_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_DEBUG(" Book %d: %u\n",
- idx+1,
- floor_setup->data.t0.book_list[idx]);
+ av_dlog(NULL, " Book %d: %u\n", idx + 1,
+ floor_setup->data.t0.book_list[idx]);
}
}
-#endif
} else {
av_log(vc->avccontext, AV_LOG_ERROR, "Invalid floor type!\n");
return -1;
static int vorbis_parse_setup_hdr_residues(vorbis_context *vc)
{
GetBitContext *gb = &vc->gb;
- uint_fast8_t i, j, k;
+ unsigned i, j, k;
vc->residue_count = get_bits(gb, 6)+1;
- vc->residues = av_mallocz(vc->residue_count * sizeof(vorbis_residue));
+ vc->residues = av_mallocz(vc->residue_count * sizeof(*vc->residues));
- AV_DEBUG(" There are %d residues. \n", vc->residue_count);
+ av_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];
- uint_fast8_t cascade[64];
- uint_fast8_t high_bits;
- uint_fast8_t low_bits;
+ uint8_t cascade[64];
+ unsigned high_bits, low_bits;
res_setup->type = get_bits(gb, 16);
- AV_DEBUG(" %d. residue type %d \n", i, res_setup->type);
+ av_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->begin>res_setup->end ||
res_setup->end > vc->avccontext->channels * vc->blocksize[1] / 2 ||
(res_setup->end-res_setup->begin) / res_setup->partition_size > V_MAX_PARTITIONS) {
- av_log(vc->avccontext, AV_LOG_ERROR, "partition out of bounds: type, begin, end, size, blocksize: %"PRIdFAST16", %"PRIdFAST32", %"PRIdFAST32", %u, %"PRIdFAST32"\n", res_setup->type, res_setup->begin, res_setup->end, res_setup->partition_size, vc->blocksize[1] / 2);
+ av_log(vc->avccontext, AV_LOG_ERROR,
+ "partition out of bounds: type, begin, end, size, blocksize: %"PRIu16", %"PRIu32", %"PRIu32", %u, %"PRIu32"\n",
+ res_setup->type, res_setup->begin, res_setup->end,
+ res_setup->partition_size, vc->blocksize[1] / 2);
return -1;
}
if (!res_setup->classifs)
return AVERROR(ENOMEM);
- AV_DEBUG(" 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);
+ av_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);
for (j = 0; j < res_setup->classifications; ++j) {
high_bits = 0;
high_bits = get_bits(gb, 5);
cascade[j] = (high_bits << 3) + low_bits;
- AV_DEBUG(" %d class casscade depth: %d \n", j, ilog(cascade[j]));
+ av_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_DEBUG(" %d class casscade depth %d book: %d \n", j, k, res_setup->books[j][k]);
+ av_dlog(NULL, " %u class cascade depth %u book: %d\n",
+ j, k, res_setup->books[j][k]);
if (k>res_setup->maxpass)
res_setup->maxpass = k;
static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc)
{
GetBitContext *gb = &vc->gb;
- uint_fast8_t i, j;
+ unsigned i, j;
vc->mapping_count = get_bits(gb, 6)+1;
- vc->mappings = av_mallocz(vc->mapping_count * sizeof(vorbis_mapping));
+ vc->mappings = av_mallocz(vc->mapping_count * sizeof(*vc->mappings));
- AV_DEBUG(" There are %d mappings. \n", vc->mapping_count);
+ av_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];
if (get_bits1(gb)) {
mapping_setup->coupling_steps = get_bits(gb, 8) + 1;
- mapping_setup->magnitude = av_mallocz(mapping_setup->coupling_steps * sizeof(uint_fast8_t));
- mapping_setup->angle = av_mallocz(mapping_setup->coupling_steps * sizeof(uint_fast8_t));
+ mapping_setup->magnitude = av_mallocz(mapping_setup->coupling_steps *
+ sizeof(*mapping_setup->magnitude));
+ mapping_setup->angle = av_mallocz(mapping_setup->coupling_steps *
+ sizeof(*mapping_setup->angle));
for (j = 0; j < mapping_setup->coupling_steps; ++j) {
GET_VALIDATED_INDEX(mapping_setup->magnitude[j], ilog(vc->audio_channels - 1), vc->audio_channels)
GET_VALIDATED_INDEX(mapping_setup->angle[j], ilog(vc->audio_channels - 1), vc->audio_channels)
mapping_setup->coupling_steps = 0;
}
- AV_DEBUG(" %d mapping coupling steps: %d \n", i, mapping_setup->coupling_steps);
+ av_dlog(NULL, " %u mapping coupling steps: %d\n",
+ i, mapping_setup->coupling_steps);
if (get_bits(gb, 2)) {
- av_log(vc->avccontext, AV_LOG_ERROR, "%d. mapping setup data invalid. \n", i);
+ av_log(vc->avccontext, AV_LOG_ERROR, "%u. mapping setup data invalid.\n", i);
return -1; // following spec.
}
if (mapping_setup->submaps>1) {
- mapping_setup->mux = av_mallocz(vc->audio_channels * sizeof(uint_fast8_t));
+ mapping_setup->mux = av_mallocz(vc->audio_channels *
+ sizeof(*mapping_setup->mux));
for (j = 0; j < vc->audio_channels; ++j)
mapping_setup->mux[j] = get_bits(gb, 4);
}
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_DEBUG(" %d mapping %d submap : floor %d, residue %d \n", i, j, mapping_setup->submap_floor[j], mapping_setup->submap_residue[j]);
+ av_dlog(NULL, " %u mapping %u submap : floor %d, residue %d\n", i, j,
+ mapping_setup->submap_floor[j],
+ mapping_setup->submap_residue[j]);
}
}
return 0;
// Process modes part
-static void create_map(vorbis_context *vc, uint_fast8_t floor_number)
+static void create_map(vorbis_context *vc, unsigned floor_number)
{
vorbis_floor *floors = vc->floors;
vorbis_floor0 *vf;
int idx;
- int_fast8_t blockflag;
- int_fast32_t *map;
- int_fast32_t n; //TODO: could theoretically be smaller?
+ int blockflag, n;
+ int32_t *map;
for (blockflag = 0; blockflag < 2; ++blockflag) {
n = vc->blocksize[blockflag] / 2;
floors[floor_number].data.t0.map[blockflag] =
- av_malloc((n+1) * sizeof(int_fast32_t)); // n + sentinel
+ av_malloc((n + 1) * sizeof(int32_t)); // n + sentinel
map = floors[floor_number].data.t0.map[blockflag];
vf = &floors[floor_number].data.t0;
vf->map_size[blockflag] = n;
}
-#ifdef V_DEBUG
for (idx = 0; idx <= n; ++idx) {
- AV_DEBUG("floor0 map: map at pos %d is %d\n",
- idx, map[idx]);
+ av_dlog(NULL, "floor0 map: map at pos %d is %d\n", idx, map[idx]);
}
-#endif
}
static int vorbis_parse_setup_hdr_modes(vorbis_context *vc)
{
GetBitContext *gb = &vc->gb;
- uint_fast8_t i;
+ unsigned i;
vc->mode_count = get_bits(gb, 6) + 1;
- vc->modes = av_mallocz(vc->mode_count * sizeof(vorbis_mode));
+ vc->modes = av_mallocz(vc->mode_count * sizeof(*vc->modes));
- AV_DEBUG(" There are %d modes.\n", vc->mode_count);
+ av_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_DEBUG(" %d mode: blockflag %d, windowtype %d, transformtype %d, mapping %d \n", i, mode_setup->blockflag, mode_setup->windowtype, mode_setup->transformtype, mode_setup->mapping);
+ av_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);
}
return 0;
}
static int vorbis_parse_id_hdr(vorbis_context *vc)
{
GetBitContext *gb = &vc->gb;
- uint_fast8_t bl0, bl1;
+ unsigned bl0, bl1;
if ((get_bits(gb, 8) != 'v') || (get_bits(gb, 8) != 'o') ||
(get_bits(gb, 8) != 'r') || (get_bits(gb, 8) != 'b') ||
return -2;
}
- vc->channel_residues = av_malloc((vc->blocksize[1] / 2) * vc->audio_channels * sizeof(float));
- vc->channel_floors = av_malloc((vc->blocksize[1] / 2) * vc->audio_channels * sizeof(float));
- vc->saved = av_mallocz((vc->blocksize[1] / 4) * vc->audio_channels * sizeof(float));
+ vc->channel_residues = av_malloc((vc->blocksize[1] / 2) * vc->audio_channels * sizeof(*vc->channel_residues));
+ vc->channel_floors = av_malloc((vc->blocksize[1] / 2) * vc->audio_channels * sizeof(*vc->channel_floors));
+ vc->saved = av_mallocz((vc->blocksize[1] / 4) * vc->audio_channels * sizeof(*vc->saved));
vc->previous_window = 0;
ff_mdct_init(&vc->mdct[0], bl0, 1, -vc->scale_bias);
ff_mdct_init(&vc->mdct[1], bl1, 1, -vc->scale_bias);
- AV_DEBUG(" 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 ",
+ 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 ",
vc->version, vc->audio_channels, vc->audio_samplerate, vc->bitrate_maximum, vc->bitrate_nominal, vc->bitrate_minimum, vc->blocksize[0], vc->blocksize[1]);
/*
dsputil_init(&vc->dsp, avccontext);
ff_fmt_convert_init(&vc->fmt_conv, avccontext);
- vc->scale_bias = 32768.0f;
+ if (avccontext->request_sample_fmt == AV_SAMPLE_FMT_FLT) {
+ avccontext->sample_fmt = AV_SAMPLE_FMT_FLT;
+ vc->scale_bias = 1.0f;
+ } else {
+ avccontext->sample_fmt = AV_SAMPLE_FMT_S16;
+ vc->scale_bias = 32768.0f;
+ }
if (!headers_len) {
av_log(avccontext, AV_LOG_ERROR, "Extradata missing.\n");
avccontext->channels = vc->audio_channels;
avccontext->sample_rate = vc->audio_samplerate;
avccontext->frame_size = FFMIN(vc->blocksize[0], vc->blocksize[1]) >> 2;
- avccontext->sample_fmt = AV_SAMPLE_FMT_S16;
return 0 ;
}
{
vorbis_floor0 *vf = &vfu->t0;
float *lsp = vf->lsp;
- uint_fast32_t amplitude;
- uint_fast32_t book_idx;
- uint_fast8_t blockflag = vc->modes[vc->mode_number].blockflag;
+ unsigned amplitude, book_idx;
+ unsigned blockflag = vc->modes[vc->mode_number].blockflag;
amplitude = get_bits(&vc->gb, vf->amplitude_bits);
if (amplitude > 0) {
float last = 0;
- uint_fast16_t lsp_len = 0;
- uint_fast16_t idx;
+ unsigned idx, lsp_len = 0;
vorbis_codebook codebook;
book_idx = get_bits(&vc->gb, ilog(vf->num_books));
"floor0 dec: booknumber too high!\n");
book_idx = 0;
}
- AV_DEBUG("floor0 dec: booknumber: %u\n", book_idx);
+ av_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_DEBUG("floor0 dec: book dimension: %d\n", codebook.dimensions);
- AV_DEBUG("floor0 dec: maximum depth: %d\n", codebook.maxdepth);
+ av_dlog(NULL, "floor0 dec: book dimension: %d\n", codebook.dimensions);
+ av_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_DEBUG("floor0 dec: vector offset: %d\n", vec_off);
+ av_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;
lsp_len += codebook.dimensions;
}
-#ifdef V_DEBUG
/* DEBUG: output lsp coeffs */
{
int idx;
for (idx = 0; idx < lsp_len; ++idx)
- AV_DEBUG("floor0 dec: coeff at %d is %f\n", idx, lsp[idx]);
+ av_dlog(NULL, "floor0 dec: coeff at %d is %f\n", idx, lsp[idx]);
}
-#endif
/* synthesize floor output vector */
{
for (i = 0; i < order; i++)
lsp[i] = 2.0f * cos(lsp[i]);
- AV_DEBUG("floor0 synth: map_size = %d; m = %d; wstep = %f\n",
- vf->map_size, order, wstep);
+ av_dlog(NULL, "floor0 synth: map_size = %"PRIu32"; m = %d; wstep = %f\n",
+ vf->map_size[blockflag], order, wstep);
i = 0;
while (i < vf->map_size[blockflag]) {
return 1;
}
- AV_DEBUG(" Floor0 decoded\n");
+ av_dlog(NULL, " Floor0 decoded\n");
return 0;
}
{
vorbis_floor1 *vf = &vfu->t1;
GetBitContext *gb = &vc->gb;
- uint_fast16_t range_v[4] = { 256, 128, 86, 64 };
- uint_fast16_t range = range_v[vf->multiplier-1];
- uint_fast16_t floor1_Y[258];
- uint_fast16_t floor1_Y_final[258];
+ uint16_t range_v[4] = { 256, 128, 86, 64 };
+ unsigned range = range_v[vf->multiplier - 1];
+ uint16_t floor1_Y[258];
+ uint16_t floor1_Y_final[258];
int floor1_flag[258];
- uint_fast8_t class_;
- uint_fast8_t cdim;
- uint_fast8_t cbits;
- uint_fast8_t csub;
- uint_fast8_t cval;
- int_fast16_t book;
- uint_fast16_t offset;
- uint_fast16_t i,j;
- int_fast16_t adx, ady, dy, off, predicted;
- int_fast32_t err;
+ unsigned class, cdim, cbits, csub, cval, offset, i, j;
+ int book, adx, ady, dy, off, predicted, err;
if (!get_bits1(gb)) // silence
floor1_Y[0] = get_bits(gb, ilog(range - 1));
floor1_Y[1] = get_bits(gb, ilog(range - 1));
- AV_DEBUG("floor 0 Y %d floor 1 Y %d \n", floor1_Y[0], floor1_Y[1]);
+ av_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) {
- class_ = vf->partition_class[i];
- cdim = vf->class_dimensions[class_];
- cbits = vf->class_subclasses[class_];
+ class = vf->partition_class[i];
+ cdim = vf->class_dimensions[class];
+ cbits = vf->class_subclasses[class];
csub = (1 << cbits) - 1;
cval = 0;
- AV_DEBUG("Cbits %d \n", cbits);
+ av_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,
- vc->codebooks[vf->class_masterbook[class_]].nb_bits, 3);
+ cval = get_vlc2(gb, vc->codebooks[vf->class_masterbook[class]].vlc.table,
+ vc->codebooks[vf->class_masterbook[class]].nb_bits, 3);
for (j = 0; j < cdim; ++j) {
- book = vf->subclass_books[class_][cval & csub];
+ book = vf->subclass_books[class][cval & csub];
- AV_DEBUG("book %d Cbits %d cval %d bits:%d \n", book, cbits, cval, get_bits_count(gb));
+ av_dlog(NULL, "book %d Cbits %u cval %u bits:%d\n",
+ book, cbits, cval, get_bits_count(gb));
cval = cval >> cbits;
if (book > -1) {
floor1_Y[offset+j] = 0;
}
- AV_DEBUG(" floor(%d) = %d \n", vf->list[offset+j].x, floor1_Y[offset+j]);
+ av_dlog(NULL, " floor(%d) = %d \n",
+ vf->list[offset+j].x, floor1_Y[offset+j]);
}
offset+=cdim;
}
floor1_Y_final[1] = floor1_Y[1];
for (i = 2; i < vf->x_list_dim; ++i) {
- uint_fast16_t val, highroom, lowroom, room;
- uint_fast16_t high_neigh_offs;
- uint_fast16_t low_neigh_offs;
+ unsigned val, highroom, lowroom, room, high_neigh_offs, low_neigh_offs;
low_neigh_offs = vf->list[i].low;
high_neigh_offs = vf->list[i].high;
floor1_Y_final[i] = predicted;
}
- AV_DEBUG(" Decoded floor(%d) = %d / val %d \n", vf->list[i].x, floor1_Y_final[i], val);
+ av_dlog(NULL, " Decoded floor(%d) = %u / val %u\n",
+ vf->list[i].x, floor1_Y_final[i], val);
}
// Curve synth - connect the calculated dots and convert from dB scale FIXME optimize ?
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");
+ av_dlog(NULL, " Floor decoded\n");
return 0;
}
static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc,
vorbis_residue *vr,
- uint_fast8_t ch,
- uint_fast8_t *do_not_decode,
+ unsigned ch,
+ uint8_t *do_not_decode,
float *vec,
- uint_fast16_t vlen,
+ unsigned vlen,
int vr_type)
{
GetBitContext *gb = &vc->gb;
- uint_fast8_t c_p_c = vc->codebooks[vr->classbook].dimensions;
- uint_fast16_t ptns_to_read = vr->ptns_to_read;
+ unsigned c_p_c = vc->codebooks[vr->classbook].dimensions;
+ unsigned ptns_to_read = vr->ptns_to_read;
uint8_t *classifs = vr->classifs;
- uint_fast8_t pass;
- uint_fast8_t ch_used;
- uint_fast8_t i,j,l;
- uint_fast16_t k;
+ unsigned pass, ch_used, i, j, k, l;
if (vr_type == 2) {
for (j = 1; j < ch; ++j)
ch_used = ch;
}
- AV_DEBUG(" residue type 0/1/2 decode begin, ch: %d cpc %d \n", ch, c_p_c);
+ av_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?
- uint_fast16_t voffset;
- uint_fast16_t partition_count;
- uint_fast16_t j_times_ptns_to_read;
+ uint16_t voffset, partition_count, j_times_ptns_to_read;
voffset = vr->begin;
for (partition_count = 0; partition_count < ptns_to_read;) { // SPEC error
if (!pass) {
- uint_fast32_t inverse_class = ff_inverse[vr->classifications];
+ 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]) {
- uint_fast32_t temp = get_vlc2(gb, vc->codebooks[vr->classbook].vlc.table,
- vc->codebooks[vr->classbook].nb_bits, 3);
+ unsigned temp = get_vlc2(gb, vc->codebooks[vr->classbook].vlc.table,
+ vc->codebooks[vr->classbook].nb_bits, 3);
- AV_DEBUG("Classword: %d \n", temp);
+ av_dlog(NULL, "Classword: %u\n", temp);
assert(vr->classifications > 1 && temp <= 65536); //needed for inverse[]
for (i = 0; i < c_p_c; ++i) {
- uint_fast32_t temp2;
+ unsigned temp2;
- temp2 = (((uint_fast64_t)temp) * inverse_class) >> 32;
+ 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;
}
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) {
- uint_fast16_t voffs;
+ unsigned voffs;
if (!do_not_decode[j]) {
- uint_fast8_t vqclass = classifs[j_times_ptns_to_read+partition_count];
- int_fast16_t vqbook = vr->books[vqclass][pass];
+ unsigned vqclass = classifs[j_times_ptns_to_read + partition_count];
+ int vqbook = vr->books[vqclass][pass];
if (vqbook >= 0 && vc->codebooks[vqbook].codevectors) {
- uint_fast16_t coffs;
- unsigned dim = vc->codebooks[vqbook].dimensions; // not uint_fast8_t: 64bit is slower here on amd64
- uint_fast16_t step = dim == 1 ? vr->partition_size
- : FASTDIV(vr->partition_size, dim);
+ unsigned coffs;
+ unsigned dim = vc->codebooks[vqbook].dimensions;
+ unsigned step = dim == 1 ? vr->partition_size
+ : FASTDIV(vr->partition_size, dim);
vorbis_codebook codebook = vc->codebooks[vqbook];
if (vr_type == 0) {
for (l = 0; l < dim; ++l, ++voffs) {
vec[voffs]+=codebook.codevectors[coffs+l]; // FPMATH
- AV_DEBUG(" pass %d offs: %d curr: %f change: %f cv offs.: %d \n", pass, voffs, vec[voffs], codebook.codevectors[coffs+l], coffs);
+ av_dlog(NULL, " pass %d offs: %d curr: %f change: %f cv offs.: %d \n",
+ pass, voffs, vec[voffs], codebook.codevectors[coffs+l], coffs);
}
}
} else if (vr_type == 2 && ch == 2 && (voffset & 1) == 0 && (dim & 1) == 0) { // most frequent case optimized
vec[voffs ] += codebook.codevectors[coffs + l ]; // FPMATH
vec[voffs + vlen] += codebook.codevectors[coffs + l + 1]; // FPMATH
- AV_DEBUG(" 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);
+ av_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);
}
}
for (l = 0; l < dim; ++l, ++voffs) {
vec[voffs / ch + (voffs % ch) * vlen] += codebook.codevectors[coffs + l]; // FPMATH FIXME use if and counter instead of / and %
- AV_DEBUG(" 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);
+ av_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);
}
}
}
}
static inline int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr,
- uint_fast8_t ch,
- uint_fast8_t *do_not_decode,
- float *vec, uint_fast16_t vlen)
+ unsigned ch,
+ uint8_t *do_not_decode,
+ float *vec, unsigned vlen)
{
if (vr->type == 2)
return vorbis_residue_decode_internal(vc, vr, ch, do_not_decode, vec, vlen, 2);
{
GetBitContext *gb = &vc->gb;
FFTContext *mdct;
- uint_fast8_t previous_window = vc->previous_window;
- uint_fast8_t mode_number;
- uint_fast8_t blockflag;
- uint_fast16_t blocksize;
- int_fast32_t i,j;
- uint_fast8_t no_residue[255];
- uint_fast8_t do_not_decode[255];
+ unsigned previous_window = vc->previous_window;
+ unsigned mode_number, blockflag, blocksize;
+ int i, j;
+ uint8_t no_residue[255];
+ uint8_t do_not_decode[255];
vorbis_mapping *mapping;
float *ch_res_ptr = vc->channel_residues;
float *ch_floor_ptr = vc->channel_floors;
- uint_fast8_t res_chan[255];
- uint_fast8_t res_num = 0;
- int_fast16_t retlen = 0;
+ uint8_t res_chan[255];
+ unsigned res_num = 0;
+ int retlen = 0;
if (get_bits1(gb)) {
av_log(vc->avccontext, AV_LOG_ERROR, "Not a Vorbis I audio packet.\n");
vc->mode_number = mode_number;
mapping = &vc->mappings[vc->modes[mode_number].mapping];
- AV_DEBUG(" Mode number: %d , mapping: %d , blocktype %d \n", mode_number, vc->modes[mode_number].mapping, vc->modes[mode_number].blockflag);
+ av_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;
blocksize = vc->blocksize[blockflag];
for (i = 0; i < mapping->submaps; ++i) {
vorbis_residue *residue;
- uint_fast8_t ch = 0;
+ unsigned ch = 0;
for (j = 0; j < vc->audio_channels; ++j) {
if ((mapping->submaps == 1) || (i == mapping->mux[j])) {
retlen = (blocksize + vc->blocksize[previous_window]) / 4;
for (j = 0; j < vc->audio_channels; j++) {
- uint_fast16_t bs0 = vc->blocksize[0];
- uint_fast16_t bs1 = vc->blocksize[1];
+ unsigned bs0 = vc->blocksize[0];
+ unsigned bs1 = vc->blocksize[1];
float *residue = vc->channel_residues + res_chan[j] * blocksize / 2;
float *saved = vc->saved + j * bs1 / 4;
float *ret = vc->channel_floors + j * retlen;
vorbis_context *vc = avccontext->priv_data ;
GetBitContext *gb = &(vc->gb);
const float *channel_ptrs[255];
- int i;
-
- int_fast16_t len;
+ int i, len;
if (!buf_size)
return 0;
- AV_DEBUG("packet length %d \n", buf_size);
+ av_dlog(NULL, "packet length %d \n", buf_size);
init_get_bits(gb, buf, buf_size*8);
return buf_size ;
}
- AV_DEBUG("parsed %d bytes %d bits, returned %d samples (*ch*bits) \n", get_bits_count(gb)/8, get_bits_count(gb)%8, len);
+ av_dlog(NULL, "parsed %d bytes %d bits, returned %d samples (*ch*bits) \n",
+ get_bits_count(gb) / 8, get_bits_count(gb) % 8, len);
if (vc->audio_channels > 8) {
for (i = 0; i < vc->audio_channels; i++)
len * ff_vorbis_channel_layout_offsets[vc->audio_channels - 1][i];
}
- vc->fmt_conv.float_to_int16_interleave(data, channel_ptrs, len,
- vc->audio_channels);
- *data_size = len * 2 * vc->audio_channels;
+ if (avccontext->sample_fmt == AV_SAMPLE_FMT_FLT)
+ vc->fmt_conv.float_interleave(data, channel_ptrs, len, vc->audio_channels);
+ else
+ vc->fmt_conv.float_to_int16_interleave(data, channel_ptrs, len,
+ vc->audio_channels);
+
+ *data_size = len * vc->audio_channels *
+ av_get_bytes_per_sample(avccontext->sample_fmt);
return buf_size ;
}
}
AVCodec ff_vorbis_decoder = {
- "vorbis",
- AVMEDIA_TYPE_AUDIO,
- CODEC_ID_VORBIS,
- sizeof(vorbis_context),
- vorbis_decode_init,
- NULL,
- vorbis_decode_close,
- vorbis_decode_frame,
+ .name = "vorbis",
+ .type = AVMEDIA_TYPE_AUDIO,
+ .id = CODEC_ID_VORBIS,
+ .priv_data_size = sizeof(vorbis_context),
+ .init = vorbis_decode_init,
+ .close = vorbis_decode_close,
+ .decode = vorbis_decode_frame,
.long_name = NULL_IF_CONFIG_SMALL("Vorbis"),
.channel_layouts = ff_vorbis_channel_layouts,
+ .sample_fmts = (const enum AVSampleFormat[]) {
+ AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE
+ },
};
projects / ffmpeg / blobdiff