X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fvorbisenc.c;h=830e5d184f94e7331adf1109ad810b6654b1ef5c;hb=49676eb7301e775d08bdbba5380159b106ee258f;hp=42713f98cc4e8bc7b6b0f2843dbd1ff5d1836138;hpb=233783e2c12a224035f49562e4cba3ebd8aa7651;p=ffmpeg diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index 42713f98cc4..830e5d184f9 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -25,10 +25,11 @@ */ #include + #include "avcodec.h" -#include "dsputil.h" #include "internal.h" #include "fft.h" +#include "mathops.h" #include "vorbis.h" #include "vorbis_enc_data.h" @@ -190,7 +191,7 @@ static int ready_codebook(vorbis_enc_codebook *cb) cb->pow2[i] += cb->dimensions[i * cb->ndimensions + j] * cb->dimensions[i * cb->ndimensions + j]; div *= vals; } - cb->pow2[i] /= 2.; + cb->pow2[i] /= 2.0; } } return 0; @@ -236,15 +237,15 @@ static int ready_residue(vorbis_enc_residue *rc, vorbis_enc_context *venc) } static int create_vorbis_context(vorbis_enc_context *venc, - AVCodecContext *avccontext) + AVCodecContext *avctx) { vorbis_enc_floor *fc; vorbis_enc_residue *rc; vorbis_enc_mapping *mc; int i, book, ret; - venc->channels = avccontext->channels; - venc->sample_rate = avccontext->sample_rate; + venc->channels = avctx->channels; + venc->sample_rate = avctx->sample_rate; venc->log2_blocksize[0] = venc->log2_blocksize[1] = 11; venc->ncodebooks = FF_ARRAY_ELEMS(cvectors); @@ -340,7 +341,7 @@ static int create_vorbis_context(vorbis_enc_context *venc, }; fc->list[i].x = a[i - 2]; } - if (ff_vorbis_ready_floor1_list(avccontext, fc->list, fc->values)) + if (ff_vorbis_ready_floor1_list(avctx, fc->list, fc->values)) return AVERROR_BUG; venc->nresidues = 1; @@ -729,7 +730,7 @@ static void floor_fit(vorbis_enc_context *venc, vorbis_enc_floor *fc, { int range = 255 / fc->multiplier + 1; int i; - float tot_average = 0.; + float tot_average = 0.0; float averages[MAX_FLOOR_VALUES]; for (i = 0; i < fc->values; i++) { averages[i] = get_floor_average(fc, coeffs, i); @@ -882,7 +883,7 @@ static int residue_encode(vorbis_enc_context *venc, vorbis_enc_residue *rc, assert(rc->type == 2); assert(real_ch == 2); for (p = 0; p < partitions; p++) { - float max1 = 0., max2 = 0.; + float max1 = 0.0, max2 = 0.0; int s = rc->begin + p * psize; for (k = s; k < s + psize; k += 2) { max1 = FFMAX(max1, fabs(coeffs[ k / real_ch])); @@ -969,7 +970,7 @@ static int apply_window_and_mdct(vorbis_enc_context *venc, int i, channel; const float * win = venc->win[0]; int window_len = 1 << (venc->log2_blocksize[0] - 1); - float n = (float)(1 << venc->log2_blocksize[0]) / 4.; + float n = (float)(1 << venc->log2_blocksize[0]) / 4.0; // FIXME use dsp if (!venc->have_saved && !samples) @@ -1015,10 +1016,10 @@ static int apply_window_and_mdct(vorbis_enc_context *venc, } -static int vorbis_encode_frame(AVCodecContext *avccontext, AVPacket *avpkt, +static int vorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, const AVFrame *frame, int *got_packet_ptr) { - vorbis_enc_context *venc = avccontext->priv_data; + vorbis_enc_context *venc = avctx->priv_data; float **audio = frame ? (float **)frame->extended_data : NULL; int samples = frame ? frame->nb_samples : 0; vorbis_enc_mode *mode; @@ -1031,14 +1032,14 @@ static int vorbis_encode_frame(AVCodecContext *avccontext, AVPacket *avpkt, samples = 1 << (venc->log2_blocksize[0] - 1); if ((ret = ff_alloc_packet(avpkt, 8192))) { - av_log(avccontext, AV_LOG_ERROR, "Error getting output packet\n"); + av_log(avctx, AV_LOG_ERROR, "Error getting output packet\n"); return ret; } init_put_bits(&pb, avpkt->data, avpkt->size); if (pb.size_in_bits - put_bits_count(&pb) < 1 + ilog(venc->nmodes - 1)) { - av_log(avccontext, AV_LOG_ERROR, "output buffer is too small\n"); + av_log(avctx, AV_LOG_ERROR, "output buffer is too small\n"); return AVERROR(EINVAL); } @@ -1058,7 +1059,7 @@ static int vorbis_encode_frame(AVCodecContext *avccontext, AVPacket *avpkt, uint16_t posts[MAX_FLOOR_VALUES]; floor_fit(venc, fc, &venc->coeffs[i * samples], posts, samples); if (floor_encode(venc, fc, &pb, posts, &venc->floor[i * samples], samples)) { - av_log(avccontext, AV_LOG_ERROR, "output buffer is too small\n"); + av_log(avctx, AV_LOG_ERROR, "output buffer is too small\n"); return AVERROR(EINVAL); } } @@ -1082,17 +1083,17 @@ static int vorbis_encode_frame(AVCodecContext *avccontext, AVPacket *avpkt, if (residue_encode(venc, &venc->residues[mapping->residue[mapping->mux[0]]], &pb, venc->coeffs, samples, venc->channels)) { - av_log(avccontext, AV_LOG_ERROR, "output buffer is too small\n"); + av_log(avctx, AV_LOG_ERROR, "output buffer is too small\n"); return AVERROR(EINVAL); } flush_put_bits(&pb); avpkt->size = put_bits_count(&pb) >> 3; - avpkt->duration = ff_samples_to_time_base(avccontext, avccontext->frame_size); + avpkt->duration = ff_samples_to_time_base(avctx, avctx->frame_size); if (frame) if (frame->pts != AV_NOPTS_VALUE) - avpkt->pts = ff_samples_to_time_base(avccontext, frame->pts); + avpkt->pts = ff_samples_to_time_base(avctx, frame->pts); else avpkt->pts = venc->next_pts; if (avpkt->pts != AV_NOPTS_VALUE) @@ -1103,9 +1104,9 @@ static int vorbis_encode_frame(AVCodecContext *avccontext, AVPacket *avpkt, } -static av_cold int vorbis_encode_close(AVCodecContext *avccontext) +static av_cold int vorbis_encode_close(AVCodecContext *avctx) { - vorbis_enc_context *venc = avccontext->priv_data; + vorbis_enc_context *venc = avctx->priv_data; int i; if (venc->codebooks) @@ -1157,56 +1158,46 @@ static av_cold int vorbis_encode_close(AVCodecContext *avccontext) ff_mdct_end(&venc->mdct[0]); ff_mdct_end(&venc->mdct[1]); -#if FF_API_OLD_ENCODE_AUDIO - av_freep(&avccontext->coded_frame); -#endif - av_freep(&avccontext->extradata); + av_freep(&avctx->extradata); return 0 ; } -static av_cold int vorbis_encode_init(AVCodecContext *avccontext) +static av_cold int vorbis_encode_init(AVCodecContext *avctx) { - vorbis_enc_context *venc = avccontext->priv_data; + vorbis_enc_context *venc = avctx->priv_data; int ret; - if (avccontext->channels != 2) { - av_log(avccontext, AV_LOG_ERROR, "Current Libav Vorbis encoder only supports 2 channels.\n"); + if (avctx->channels != 2) { + av_log(avctx, AV_LOG_ERROR, "Current Libav Vorbis encoder only supports 2 channels.\n"); return -1; } - if ((ret = create_vorbis_context(venc, avccontext)) < 0) + if ((ret = create_vorbis_context(venc, avctx)) < 0) goto error; - avccontext->bit_rate = 0; - if (avccontext->flags & CODEC_FLAG_QSCALE) - venc->quality = avccontext->global_quality / (float)FF_QP2LAMBDA; + avctx->bit_rate = 0; + if (avctx->flags & CODEC_FLAG_QSCALE) + venc->quality = avctx->global_quality / (float)FF_QP2LAMBDA; else venc->quality = 3.0; venc->quality *= venc->quality; - if ((ret = put_main_header(venc, (uint8_t**)&avccontext->extradata)) < 0) + if ((ret = put_main_header(venc, (uint8_t**)&avctx->extradata)) < 0) goto error; - avccontext->extradata_size = ret; - - avccontext->frame_size = 1 << (venc->log2_blocksize[0] - 1); + avctx->extradata_size = ret; -#if FF_API_OLD_ENCODE_AUDIO - avccontext->coded_frame = avcodec_alloc_frame(); - if (!avccontext->coded_frame) { - ret = AVERROR(ENOMEM); - goto error; - } -#endif + avctx->frame_size = 1 << (venc->log2_blocksize[0] - 1); return 0; error: - vorbis_encode_close(avccontext); + vorbis_encode_close(avctx); return ret; } AVCodec ff_vorbis_encoder = { .name = "vorbis", + .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), .type = AVMEDIA_TYPE_AUDIO, .id = AV_CODEC_ID_VORBIS, .priv_data_size = sizeof(vorbis_enc_context), @@ -1216,5 +1207,4 @@ AVCodec ff_vorbis_encoder = { .capabilities = CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, - .long_name = NULL_IF_CONFIG_SMALL("Vorbis"), };