From 6a85dfc830f51f1f5c2d36d4182d265c1ea3ba25 Mon Sep 17 00:00:00 2001 From: Vittorio Giovara Date: Mon, 16 Mar 2015 08:57:36 +0000 Subject: lavc: Replace av_dlog and tprintf with internal macros --- libavcodec/vorbisdec.c | 136 ++++++++++++++++++++++++------------------------- 1 file changed, 68 insertions(+), 68 deletions(-) (limited to 'libavcodec/vorbisdec.c') diff --git a/libavcodec/vorbisdec.c b/libavcodec/vorbisdec.c index 0865dc87fb..5812f9a5ac 100644 --- a/libavcodec/vorbisdec.c +++ b/libavcodec/vorbisdec.c @@ -236,7 +236,7 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) 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)); @@ -252,7 +252,7 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) 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, @@ -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) @@ -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,17 +353,17 @@ 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 @@ -383,7 +383,7 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) 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; @@ -394,11 +394,11 @@ static int vorbis_parse_setup_hdr_codebooks(vorbis_context *vc) } 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; } @@ -466,7 +466,7 @@ 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) { @@ -500,7 +500,7 @@ static int vorbis_parse_setup_hdr_floors(vorbis_context *vc) 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; @@ -510,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) { @@ -518,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) { @@ -545,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]); } } @@ -575,7 +575,7 @@ 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); } } @@ -640,22 +640,22 @@ 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]); } } @@ -679,7 +679,7 @@ static int vorbis_parse_setup_hdr_residues(vorbis_context *vc) 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]; @@ -688,7 +688,7 @@ 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); @@ -715,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 %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); @@ -726,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; @@ -735,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) @@ -761,7 +761,7 @@ static int vorbis_parse_setup_hdr_mappings(vorbis_context *vc) 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]; @@ -793,7 +793,7 @@ 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)) { @@ -816,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]); } @@ -855,7 +855,7 @@ static int 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 %d\n", idx, map[idx]); } return 0; @@ -871,7 +871,7 @@ static int vorbis_parse_setup_hdr_modes(vorbis_context *vc) 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]; @@ -881,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); } @@ -988,7 +988,7 @@ static int vorbis_parse_id_hdr(vorbis_context *vc) 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]); /* @@ -1091,7 +1091,7 @@ static int vorbis_floor0_decode(vorbis_context *vc, 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) @@ -1100,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; @@ -1118,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 */ @@ -1130,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; @@ -1172,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; } @@ -1199,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) { @@ -1209,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, @@ -1218,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; @@ -1229,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; @@ -1288,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); } @@ -1296,7 +1296,7 @@ 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; } @@ -1317,7 +1317,7 @@ static av_always_inline int setup_classifs(vorbis_context *vc, temp = get_vlc2(&vc->gb, codebook->vlc.table, codebook->nb_bits, 3); - av_dlog(NULL, "Classword: %u\n", temp); + ff_dlog(NULL, "Classword: %u\n", temp); if (temp < 0) { av_log(vc->avctx, AV_LOG_ERROR, @@ -1372,7 +1372,7 @@ static av_always_inline int vorbis_residue_decode_internal(vorbis_context *vc, 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? int voffset, partition_count, j_times_ptns_to_read; @@ -1413,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); } } @@ -1441,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); @@ -1458,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); @@ -1556,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; @@ -1698,7 +1698,7 @@ static int vorbis_decode_frame(AVCodecContext *avctx, void *data, 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; @@ -1729,7 +1729,7 @@ static int vorbis_decode_frame(AVCodecContext *avctx, void *data, 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; -- cgit v1.2.3