X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvorbisdec.c;h=9289c82cf449ab5cf7d85497e4c021127345b108;hb=f5950b8fd61ec85e0ad8790bea56b37ceea19436;hp=158bd6f57c99c3857b7c05cb424157fc975ca2e6;hpb=ee6ca11b657515ad736ec0d2b8635e098d0a2680;p=ffmpeg diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 158bd6f57c9..9289c82cf44 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -25,14 +25,13 @@ #include #include -#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" @@ -42,10 +41,7 @@ #define V_MAX_VLCS (1 << 16) #define V_MAX_PARTITIONS (1 << 20) -#undef NDEBUG -#include - -typedef struct { +typedef struct vorbis_codebook { uint8_t dimensions; uint8_t lookup_type; uint8_t maxdepth; @@ -61,7 +57,7 @@ struct vorbis_context_s; 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 { @@ -91,7 +87,7 @@ typedef struct { } data; } vorbis_floor; -typedef struct { +typedef struct vorbis_residue { uint16_t type; uint32_t begin; uint32_t end; @@ -104,7 +100,7 @@ typedef struct { uint8_t *classifs; } vorbis_residue; -typedef struct { +typedef struct vorbis_mapping { uint8_t submaps; uint16_t coupling_steps; uint8_t *magnitude; @@ -114,7 +110,7 @@ typedef struct { uint8_t submap_residue[16]; } vorbis_mapping; -typedef struct { +typedef struct vorbis_mode { uint8_t blockflag; uint16_t windowtype; uint16_t transformtype; @@ -122,11 +118,10 @@ typedef struct { } vorbis_mode; typedef struct vorbis_context_s { - AVCodecContext *avccontext; + AVCodecContext *avctx; GetBitContext gb; VorbisDSPContext dsp; AVFloatDSPContext fdsp; - FmtConvertContext fmt_conv; FFTContext mdct[2]; uint8_t first_frame; @@ -162,7 +157,7 @@ typedef struct vorbis_context_s { static const char idx_err_str[] = "Index value %d out of range (0 - %d) for %s at %s:%i\n"; #define VALIDATE_INDEX(idx, limit) \ if (idx >= limit) {\ - av_log(vc->avccontext, AV_LOG_ERROR,\ + av_log(vc->avctx, AV_LOG_ERROR,\ idx_err_str,\ (int)(idx), (int)(limit - 1), #idx, __FILE__, __LINE__);\ return AVERROR_INVALIDDATA;\ @@ -233,29 +228,34 @@ static void vorbis_free(vorbis_context *vc) static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) { unsigned cb; - uint8_t *tmp_vlc_bits; - uint32_t *tmp_vlc_codes; + uint8_t *tmp_vlc_bits = NULL; + uint32_t *tmp_vlc_codes = NULL; GetBitContext *gb = &vc->gb; - uint16_t *codebook_multiplicands; + uint16_t *codebook_multiplicands = NULL; int ret = 0; 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)); tmp_vlc_codes = av_mallocz(V_MAX_VLCS * sizeof(*tmp_vlc_codes)); codebook_multiplicands = av_malloc(V_MAX_VLCS * sizeof(*codebook_multiplicands)); + if (!vc->codebooks || + !tmp_vlc_bits || !tmp_vlc_codes || !codebook_multiplicands) { + ret = AVERROR(ENOMEM); + goto error; + } for (cb = 0; cb < vc->codebook_count; ++cb) { 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->avccontext, AV_LOG_ERROR, + av_log(vc->avctx, AV_LOG_ERROR, " %u. Codebook setup data corrupt.\n", cb); ret = AVERROR_INVALIDDATA; goto error; @@ -263,7 +263,7 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) codebook_setup->dimensions=get_bits(gb, 16); if (codebook_setup->dimensions > 16 || codebook_setup->dimensions == 0) { - av_log(vc->avccontext, AV_LOG_ERROR, + av_log(vc->avctx, AV_LOG_ERROR, " %u. Codebook's dimension is invalid (%d).\n", cb, codebook_setup->dimensions); ret = AVERROR_INVALIDDATA; @@ -271,7 +271,7 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) } entries = get_bits(gb, 24); if (entries > V_MAX_VLCS) { - av_log(vc->avccontext, AV_LOG_ERROR, + av_log(vc->avctx, AV_LOG_ERROR, " %u. Codebook has too many entries (%u).\n", cb, entries); ret = AVERROR_INVALIDDATA; @@ -280,17 +280,17 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) 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) { @@ -302,7 +302,7 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) 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) @@ -312,17 +312,17 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) 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) @@ -331,7 +331,7 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) current_entry+=number; } if (current_entry>used_entries) { - av_log(vc->avccontext, AV_LOG_ERROR, " More codelengths than codes in codebook. \n"); + av_log(vc->avctx, AV_LOG_ERROR, " More codelengths than codes in codebook. \n"); ret = AVERROR_INVALIDDATA; goto error; } @@ -339,7 +339,7 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) 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. @@ -353,24 +353,29 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) 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; @@ -378,7 +383,7 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) float last = 0.0; unsigned lookup_offset = i; - av_dlog(vc->avccontext, "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; @@ -389,30 +394,30 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) } tmp_vlc_bits[j] = tmp_vlc_bits[i]; - av_dlog(vc->avccontext, "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->avccontext, " %f ", + ff_dlog(vc->avctx, " %f ", codebook_setup->codevectors[j * dim + k]); - av_dlog(vc->avccontext, "\n"); + ff_dlog(vc->avctx, "\n"); ++j; } } if (j != used_entries) { - av_log(vc->avccontext, AV_LOG_ERROR, "Bug in codevector vector building code. \n"); + av_log(vc->avctx, AV_LOG_ERROR, "Bug in codevector vector building code. \n"); ret = AVERROR_INVALIDDATA; goto error; } entries = used_entries; } else if (codebook_setup->lookup_type >= 2) { - av_log(vc->avccontext, AV_LOG_ERROR, "Codebook lookup type not supported. \n"); + av_log(vc->avctx, AV_LOG_ERROR, "Codebook lookup type not supported. \n"); ret = AVERROR_INVALIDDATA; goto error; } // Initialize VLC table 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"); + av_log(vc->avctx, AV_LOG_ERROR, " Invalid code lengths while generating vlcs. \n"); ret = AVERROR_INVALIDDATA; goto error; } @@ -433,7 +438,7 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) sizeof(*tmp_vlc_bits), tmp_vlc_codes, sizeof(*tmp_vlc_codes), sizeof(*tmp_vlc_codes), INIT_VLC_LE))) { - av_log(vc->avccontext, AV_LOG_ERROR, " Error generating vlc tables. \n"); + av_log(vc->avctx, AV_LOG_ERROR, " Error generating vlc tables. \n"); goto error; } } @@ -461,11 +466,11 @@ static int vorbis_parse_setup_hdr_tdtransforms(vorbis_context *vc) 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) { - av_log(vc->avccontext, AV_LOG_ERROR, "Vorbis time domain transform data nonzero. \n"); + av_log(vc->avctx, AV_LOG_ERROR, "Vorbis time domain transform data nonzero. \n"); return AVERROR_INVALIDDATA; } } @@ -476,24 +481,26 @@ static int vorbis_parse_setup_hdr_tdtransforms(vorbis_context *vc) static int vorbis_floor0_decode(vorbis_context *vc, vorbis_floor_data *vfu, float *vec); -static void create_map(vorbis_context *vc, unsigned floor_number); +static int 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) { GetBitContext *gb = &vc->gb; - int i,j,k; + int i, j, k, ret; vc->floor_count = get_bits(gb, 6) + 1; vc->floors = av_mallocz(vc->floor_count * sizeof(*vc->floors)); + if (!vc->floors) + return AVERROR(ENOMEM); for (i = 0; i < vc->floor_count; ++i) { vorbis_floor *floor_setup = &vc->floors[i]; 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; @@ -503,7 +510,7 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) 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) { @@ -511,25 +518,25 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) 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) { @@ -538,7 +545,7 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) 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]); } } @@ -550,12 +557,13 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) floor_setup->data.t1.list = av_mallocz(floor_setup->data.t1.x_list_dim * sizeof(*floor_setup->data.t1.list)); - + if (!floor_setup->data.t1.list) + return AVERROR(ENOMEM); rangebits = get_bits(gb, 4); rangemax = (1 << rangebits); if (rangemax > vc->blocksize[1] / 2) { - av_log(vc->avccontext, AV_LOG_ERROR, + av_log(vc->avctx, AV_LOG_ERROR, "Floor value is too large for blocksize: %u (%"PRIu32")\n", rangemax, vc->blocksize[1] / 2); return AVERROR_INVALIDDATA; @@ -567,13 +575,13 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) 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); } } // Precalculate order of x coordinates - needed for decode - if (ff_vorbis_ready_floor1_list(vc->avccontext, + if (ff_vorbis_ready_floor1_list(vc->avctx, floor_setup->data.t1.list, floor_setup->data.t1.x_list_dim)) { return AVERROR_INVALIDDATA; @@ -584,16 +592,22 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) floor_setup->decode = vorbis_floor0_decode; floor_setup->data.t0.order = get_bits(gb, 8); + if (!floor_setup->data.t0.order) { + av_log(vc->avctx, AV_LOG_ERROR, "Floor 0 order is 0.\n"); + return AVERROR_INVALIDDATA; + } floor_setup->data.t0.rate = get_bits(gb, 16); + if (!floor_setup->data.t0.rate) { + av_log(vc->avctx, AV_LOG_ERROR, "Floor 0 rate is 0.\n"); + return AVERROR_INVALIDDATA; + } floor_setup->data.t0.bark_map_size = get_bits(gb, 16); - floor_setup->data.t0.amplitude_bits = get_bits(gb, 6); - /* zero would result in a div by zero later * - * 2^0 - 1 == 0 */ - if (floor_setup->data.t0.amplitude_bits == 0) { - av_log(vc->avccontext, AV_LOG_ERROR, - "Floor 0 amplitude bits is 0.\n"); + if (!floor_setup->data.t0.bark_map_size) { + av_log(vc->avctx, AV_LOG_ERROR, + "Floor 0 bark map size is 0.\n"); return AVERROR_INVALIDDATA; } + floor_setup->data.t0.amplitude_bits = get_bits(gb, 6); floor_setup->data.t0.amplitude_offset = get_bits(gb, 8); floor_setup->data.t0.num_books = get_bits(gb, 4) + 1; @@ -614,7 +628,8 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) } } - create_map(vc, i); + if ((ret = create_map(vc, i)) < 0) + return ret; /* codebook dim is for padding if codebook dim doesn't * * divide order+1 then we need to read more data */ @@ -625,27 +640,27 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) 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]); } } } else { - av_log(vc->avccontext, AV_LOG_ERROR, "Invalid floor type!\n"); + av_log(vc->avctx, AV_LOG_ERROR, "Invalid floor type!\n"); return AVERROR_INVALIDDATA; } } @@ -661,8 +676,10 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc) vc->residue_count = get_bits(gb, 6)+1; vc->residues = av_mallocz(vc->residue_count * sizeof(*vc->residues)); + 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]; @@ -671,16 +688,16 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc) 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); res_setup->partition_size = get_bits(gb, 24) + 1; /* Validations to prevent a buffer overflow later. */ if (res_setup->begin>res_setup->end || - res_setup->end > (res_setup->type == 2 ? vc->avccontext->channels : 1) * vc->blocksize[1] / 2 || + res_setup->end > (res_setup->type == 2 ? vc->avctx->channels : 1) * vc->blocksize[1] / 2 || (res_setup->end-res_setup->begin) / res_setup->partition_size > V_MAX_PARTITIONS) { - av_log(vc->avccontext, AV_LOG_ERROR, + av_log(vc->avctx, 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); @@ -698,7 +715,7 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc) 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 %"PRIu32" end %"PRIu32" part.size %u classif.s %"PRIu8" classbook %"PRIu8"\n", res_setup->begin, res_setup->end, res_setup->partition_size, res_setup->classifications, res_setup->classbook); @@ -709,7 +726,7 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc) 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; @@ -718,7 +735,7 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc) 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) @@ -741,14 +758,16 @@ static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc) vc->mapping_count = get_bits(gb, 6)+1; vc->mappings = av_mallocz(vc->mapping_count * sizeof(*vc->mappings)); + 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]; if (get_bits(gb, 16)) { - av_log(vc->avccontext, AV_LOG_ERROR, "Other mappings than type 0 are not compliant with the Vorbis I specification. \n"); + av_log(vc->avctx, AV_LOG_ERROR, "Other mappings than type 0 are not compliant with the Vorbis I specification. \n"); return AVERROR_INVALIDDATA; } if (get_bits1(gb)) { @@ -763,6 +782,9 @@ static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc) sizeof(*mapping_setup->magnitude)); mapping_setup->angle = av_mallocz(mapping_setup->coupling_steps * sizeof(*mapping_setup->angle)); + if (!mapping_setup->angle || !mapping_setup->magnitude) + return AVERROR(ENOMEM); + 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) @@ -771,17 +793,20 @@ static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc) 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)) { - av_log(vc->avccontext, AV_LOG_ERROR, "%u. mapping setup data invalid.\n", i); + av_log(vc->avctx, AV_LOG_ERROR, "%u. mapping setup data invalid.\n", i); return AVERROR_INVALIDDATA; // following spec. } if (mapping_setup->submaps>1) { mapping_setup->mux = av_mallocz(vc->audio_channels * sizeof(*mapping_setup->mux)); + if (!mapping_setup->mux) + return AVERROR(ENOMEM); + for (j = 0; j < vc->audio_channels; ++j) mapping_setup->mux[j] = get_bits(gb, 4); } @@ -791,7 +816,7 @@ static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc) 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]); } @@ -801,7 +826,7 @@ static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc) // Process modes part -static void create_map(vorbis_context *vc, unsigned floor_number) +static int create_map(vorbis_context *vc, unsigned floor_number) { vorbis_floor *floors = vc->floors; vorbis_floor0 *vf; @@ -813,6 +838,8 @@ static void create_map(vorbis_context *vc, unsigned floor_number) n = vc->blocksize[blockflag] / 2; floors[floor_number].data.t0.map[blockflag] = av_malloc((n + 1) * sizeof(int32_t)); // n + sentinel + if (!floors[floor_number].data.t0.map[blockflag]) + return AVERROR(ENOMEM); map = floors[floor_number].data.t0.map[blockflag]; vf = &floors[floor_number].data.t0; @@ -828,8 +855,10 @@ static void create_map(vorbis_context *vc, unsigned floor_number) } 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 %"PRId32"\n", idx, map[idx]); } + + return 0; } static int vorbis_parse_setup_hdr_modes(vorbis_context *vc) @@ -839,8 +868,10 @@ static int vorbis_parse_setup_hdr_modes(vorbis_context *vc) vc->mode_count = get_bits(gb, 6) + 1; vc->modes = av_mallocz(vc->mode_count * sizeof(*vc->modes)); + 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]; @@ -850,7 +881,7 @@ static int vorbis_parse_setup_hdr_modes(vorbis_context *vc) 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); } @@ -867,36 +898,36 @@ static int vorbis_parse_setup_hdr(vorbis_context *vc) if ((get_bits(gb, 8) != 'v') || (get_bits(gb, 8) != 'o') || (get_bits(gb, 8) != 'r') || (get_bits(gb, 8) != 'b') || (get_bits(gb, 8) != 'i') || (get_bits(gb, 8) != 's')) { - av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (no vorbis signature). \n"); + av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (no vorbis signature). \n"); return AVERROR_INVALIDDATA; } if ((ret = vorbis_parse_setup_hdr_codebooks(vc))) { - av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (codebooks). \n"); + av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (codebooks). \n"); return ret; } if ((ret = vorbis_parse_setup_hdr_tdtransforms(vc))) { - av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (time domain transforms). \n"); + av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (time domain transforms). \n"); return ret; } if ((ret = vorbis_parse_setup_hdr_floors(vc))) { - av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (floors). \n"); + av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (floors). \n"); return ret; } if ((ret = vorbis_parse_setup_hdr_residues(vc))) { - av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (residues). \n"); + av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (residues). \n"); return ret; } if ((ret = vorbis_parse_setup_hdr_mappings(vc))) { - av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (mappings). \n"); + av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (mappings). \n"); return ret; } if ((ret = vorbis_parse_setup_hdr_modes(vc))) { - av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (modes). \n"); + av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (modes). \n"); return ret; } if (!get_bits1(gb)) { - av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis setup header packet corrupt (framing flag). \n"); + av_log(vc->avctx, AV_LOG_ERROR, " Vorbis setup header packet corrupt (framing flag). \n"); return AVERROR_INVALIDDATA; // framing flag bit unset error } @@ -913,19 +944,19 @@ static int vorbis_parse_id_hdr(vorbis_context *vc) if ((get_bits(gb, 8) != 'v') || (get_bits(gb, 8) != 'o') || (get_bits(gb, 8) != 'r') || (get_bits(gb, 8) != 'b') || (get_bits(gb, 8) != 'i') || (get_bits(gb, 8) != 's')) { - av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (no vorbis signature). \n"); + av_log(vc->avctx, AV_LOG_ERROR, " Vorbis id header packet corrupt (no vorbis signature). \n"); return AVERROR_INVALIDDATA; } vc->version = get_bits_long(gb, 32); //FIXME check 0 vc->audio_channels = get_bits(gb, 8); if (vc->audio_channels <= 0) { - av_log(vc->avccontext, AV_LOG_ERROR, "Invalid number of channels\n"); + av_log(vc->avctx, AV_LOG_ERROR, "Invalid number of channels\n"); return AVERROR_INVALIDDATA; } vc->audio_samplerate = get_bits_long(gb, 32); if (vc->audio_samplerate <= 0) { - av_log(vc->avccontext, AV_LOG_ERROR, "Invalid samplerate\n"); + av_log(vc->avctx, AV_LOG_ERROR, "Invalid samplerate\n"); return AVERROR_INVALIDDATA; } vc->bitrate_maximum = get_bits_long(gb, 32); @@ -936,25 +967,28 @@ static int vorbis_parse_id_hdr(vorbis_context *vc) vc->blocksize[0] = (1 << bl0); vc->blocksize[1] = (1 << bl1); if (bl0 > 13 || bl0 < 6 || bl1 > 13 || bl1 < 6 || bl1 < bl0) { - av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (illegal blocksize). \n"); + av_log(vc->avctx, AV_LOG_ERROR, " Vorbis id header packet corrupt (illegal blocksize). \n"); return AVERROR_INVALIDDATA; } vc->win[0] = ff_vorbis_vwin[bl0 - 6]; vc->win[1] = ff_vorbis_vwin[bl1 - 6]; if ((get_bits1(gb)) == 0) { - av_log(vc->avccontext, AV_LOG_ERROR, " Vorbis id header packet corrupt (framing flag not set). \n"); + av_log(vc->avctx, AV_LOG_ERROR, " Vorbis id header packet corrupt (framing flag not set). \n"); return AVERROR_INVALIDDATA; } vc->channel_residues = av_malloc((vc->blocksize[1] / 2) * vc->audio_channels * sizeof(*vc->channel_residues)); vc->saved = av_mallocz((vc->blocksize[1] / 4) * vc->audio_channels * sizeof(*vc->saved)); + if (!vc->channel_residues || !vc->saved) + return AVERROR(ENOMEM); + vc->previous_window = 0; 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 %"PRIu32" \n audio_channels %"PRIu8" \n audio_samplerate %"PRIu32" \n bitrate_max %"PRIu32" \n bitrate_nom %"PRIu32" \n bitrate_min %"PRIu32" \n blk_0 %"PRIu32" blk_1 %"PRIu32" \n ", vc->version, vc->audio_channels, vc->audio_samplerate, vc->bitrate_maximum, vc->bitrate_nominal, vc->bitrate_minimum, vc->blocksize[0], vc->blocksize[1]); /* @@ -969,41 +1003,40 @@ static int vorbis_parse_id_hdr(vorbis_context *vc) // Process the extradata using the functions above (identification header, setup header) -static av_cold int vorbis_decode_init(AVCodecContext *avccontext) +static av_cold int vorbis_decode_init(AVCodecContext *avctx) { - vorbis_context *vc = avccontext->priv_data; - uint8_t *headers = avccontext->extradata; - int headers_len = avccontext->extradata_size; + vorbis_context *vc = avctx->priv_data; + uint8_t *headers = avctx->extradata; + int headers_len = avctx->extradata_size; uint8_t *header_start[3]; int header_len[3]; GetBitContext *gb = &vc->gb; int hdr_type, ret; - vc->avccontext = avccontext; + vc->avctx = avctx; ff_vorbisdsp_init(&vc->dsp); - avpriv_float_dsp_init(&vc->fdsp, avccontext->flags & CODEC_FLAG_BITEXACT); - ff_fmt_convert_init(&vc->fmt_conv, avccontext); + avpriv_float_dsp_init(&vc->fdsp, avctx->flags & AV_CODEC_FLAG_BITEXACT); - avccontext->sample_fmt = AV_SAMPLE_FMT_FLTP; + avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; if (!headers_len) { - av_log(avccontext, AV_LOG_ERROR, "Extradata missing.\n"); + av_log(avctx, AV_LOG_ERROR, "Extradata missing.\n"); return AVERROR_INVALIDDATA; } if ((ret = avpriv_split_xiph_headers(headers, headers_len, 30, header_start, header_len)) < 0) { - av_log(avccontext, AV_LOG_ERROR, "Extradata corrupt.\n"); + av_log(avctx, AV_LOG_ERROR, "Extradata corrupt.\n"); return ret; } init_get_bits(gb, header_start[0], header_len[0]*8); hdr_type = get_bits(gb, 8); if (hdr_type != 1) { - av_log(avccontext, AV_LOG_ERROR, "First header is not the id header.\n"); + av_log(avctx, AV_LOG_ERROR, "First header is not the id header.\n"); return AVERROR_INVALIDDATA; } if ((ret = vorbis_parse_id_hdr(vc))) { - av_log(avccontext, AV_LOG_ERROR, "Id header corrupt.\n"); + av_log(avctx, AV_LOG_ERROR, "Id header corrupt.\n"); vorbis_free(vc); return ret; } @@ -1011,23 +1044,23 @@ static av_cold int vorbis_decode_init(AVCodecContext *avccontext) init_get_bits(gb, header_start[2], header_len[2]*8); hdr_type = get_bits(gb, 8); if (hdr_type != 5) { - av_log(avccontext, AV_LOG_ERROR, "Third header is not the setup header.\n"); + av_log(avctx, AV_LOG_ERROR, "Third header is not the setup header.\n"); vorbis_free(vc); return AVERROR_INVALIDDATA; } if ((ret = vorbis_parse_setup_hdr(vc))) { - av_log(avccontext, AV_LOG_ERROR, "Setup header corrupt.\n"); + av_log(avctx, AV_LOG_ERROR, "Setup header corrupt.\n"); vorbis_free(vc); return ret; } if (vc->audio_channels > 8) - avccontext->channel_layout = 0; + avctx->channel_layout = 0; else - avccontext->channel_layout = ff_vorbis_channel_layouts[vc->audio_channels - 1]; + avctx->channel_layout = ff_vorbis_channel_layouts[vc->audio_channels - 1]; - avccontext->channels = vc->audio_channels; - avccontext->sample_rate = vc->audio_samplerate; + avctx->channels = vc->audio_channels; + avctx->sample_rate = vc->audio_samplerate; return 0; } @@ -1044,6 +1077,9 @@ static int vorbis_floor0_decode(vorbis_context *vc, unsigned amplitude, book_idx; unsigned blockflag = vc->modes[vc->mode_number].blockflag; + if (!vf->amplitude_bits) + return 1; + amplitude = get_bits(&vc->gb, vf->amplitude_bits); if (amplitude > 0) { float last = 0; @@ -1052,11 +1088,10 @@ static int vorbis_floor0_decode(vorbis_context *vc, book_idx = get_bits(&vc->gb, ilog(vf->num_books)); if (book_idx >= vf->num_books) { - av_log(vc->avccontext, AV_LOG_ERROR, - "floor0 dec: booknumber too high!\n"); + 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) @@ -1065,13 +1100,13 @@ static int vorbis_floor0_decode(vorbis_context *vc, while (lsp_lenorder) { 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; @@ -1083,7 +1118,7 @@ static int vorbis_floor0_decode(vorbis_context *vc, { 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 */ @@ -1095,7 +1130,7 @@ static int vorbis_floor0_decode(vorbis_context *vc, 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; @@ -1137,7 +1172,7 @@ static int vorbis_floor0_decode(vorbis_context *vc, return 1; } - av_dlog(NULL, " Floor0 decoded\n"); + ff_dlog(NULL, " Floor0 decoded\n"); return 0; } @@ -1164,7 +1199,7 @@ static int vorbis_floor1_decode(vorbis_context *vc, 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) { @@ -1174,7 +1209,7 @@ static int vorbis_floor1_decode(vorbis_context *vc, 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, @@ -1183,7 +1218,7 @@ static int vorbis_floor1_decode(vorbis_context *vc, 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; @@ -1194,7 +1229,7 @@ static int vorbis_floor1_decode(vorbis_context *vc, 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; @@ -1253,7 +1288,7 @@ static int vorbis_floor1_decode(vorbis_context *vc, 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); } @@ -1261,11 +1296,47 @@ static int vorbis_floor1_decode(vorbis_context *vc, 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, @@ -1279,10 +1350,10 @@ 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) @@ -1297,38 +1368,21 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc, } if (max_output > ch_left * vlen) { - av_log(vc->avccontext, AV_LOG_ERROR, "Insufficient output buffer\n"); - return -1; + av_log(vc->avctx, AV_LOG_ERROR, "Insufficient output buffer\n"); + 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) { @@ -1359,7 +1413,7 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc, 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); } } @@ -1387,7 +1441,7 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc, 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); @@ -1404,7 +1458,7 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc, 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); @@ -1441,7 +1495,7 @@ static inline int vorbis_residue_decode(vorbis_context *vc, vorbis_residue *vr, else if (vr->type == 0) return vorbis_residue_decode_internal(vc, vr, ch, do_not_decode, vec, vlen, ch_left, 0); else { - av_log(vc->avccontext, AV_LOG_ERROR, " Invalid residue type while residue decode?! \n"); + av_log(vc->avctx, AV_LOG_ERROR, " Invalid residue type while residue decode?! \n"); return AVERROR_INVALIDDATA; } } @@ -1490,7 +1544,7 @@ static int vorbis_parse_audio_packet(vorbis_context *vc, float **floor_ptr) unsigned vlen; if (get_bits1(gb)) { - av_log(vc->avccontext, AV_LOG_ERROR, "Not a Vorbis I audio packet.\n"); + av_log(vc->avctx, AV_LOG_ERROR, "Not a Vorbis I audio packet.\n"); return AVERROR_INVALIDDATA; // packet type not audio } @@ -1502,7 +1556,7 @@ static int vorbis_parse_audio_packet(vorbis_context *vc, float **floor_ptr) 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; @@ -1531,7 +1585,7 @@ static int vorbis_parse_audio_packet(vorbis_context *vc, float **floor_ptr) ret = floor->decode(vc, &floor->data, floor_ptr[i]); if (ret < 0) { - av_log(vc->avccontext, AV_LOG_ERROR, "Invalid codebook in vorbis_floor_decode.\n"); + av_log(vc->avctx, AV_LOG_ERROR, "Invalid codebook in vorbis_floor_decode.\n"); return AVERROR_INVALIDDATA; } no_residue[i] = ret; @@ -1567,8 +1621,8 @@ static int vorbis_parse_audio_packet(vorbis_context *vc, float **floor_ptr) } residue = &vc->residues[mapping->submap_residue[i]]; if (ch_left < ch) { - av_log(vc->avccontext, AV_LOG_ERROR, "Too many channels in vorbis_floor_decode.\n"); - return -1; + av_log(vc->avctx, AV_LOG_ERROR, "Too many channels in vorbis_floor_decode.\n"); + return AVERROR_INVALIDDATA; } if (ch) { ret = vorbis_residue_decode(vc, residue, ch, do_not_decode, ch_res_ptr, vlen, ch_left); @@ -1633,23 +1687,23 @@ static int vorbis_parse_audio_packet(vorbis_context *vc, float **floor_ptr) // Return the decoded audio packet through the standard api -static int vorbis_decode_frame(AVCodecContext *avccontext, void *data, +static int vorbis_decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; - vorbis_context *vc = avccontext->priv_data; + vorbis_context *vc = avctx->priv_data; AVFrame *frame = data; GetBitContext *gb = &vc->gb; 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; - if ((ret = ff_get_buffer(avccontext, frame)) < 0) { - av_log(avccontext, AV_LOG_ERROR, "get_buffer() failed\n"); + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { + av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } @@ -1671,10 +1725,11 @@ static int vorbis_decode_frame(AVCodecContext *avccontext, void *data, if (!vc->first_frame) { vc->first_frame = 1; *got_frame_ptr = 0; + av_frame_unref(frame); 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; @@ -1685,18 +1740,18 @@ static int vorbis_decode_frame(AVCodecContext *avccontext, void *data, // Close decoder -static av_cold int vorbis_decode_close(AVCodecContext *avccontext) +static av_cold int vorbis_decode_close(AVCodecContext *avctx) { - vorbis_context *vc = avccontext->priv_data; + vorbis_context *vc = avctx->priv_data; vorbis_free(vc); return 0; } -static av_cold void vorbis_decode_flush(AVCodecContext *avccontext) +static av_cold void vorbis_decode_flush(AVCodecContext *avctx) { - vorbis_context *vc = avccontext->priv_data; + vorbis_context *vc = avctx->priv_data; if (vc->saved) { memset(vc->saved, 0, (vc->blocksize[1] / 4) * vc->audio_channels * @@ -1707,6 +1762,7 @@ static av_cold void vorbis_decode_flush(AVCodecContext *avccontext) 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), @@ -1714,8 +1770,7 @@ AVCodec ff_vorbis_decoder = { .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 },