mpegvideo_enc: do not modify the input frame.

[ffmpeg] / libavcodec / vorbisenc.c

diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c
index 5082efca766ffd35966a209b456ba0dccd8999d0..42713f98cc4e8bc7b6b0f2843dbd1ff5d1836138 100644 (file)
--- a/libavcodec/vorbisenc.c
+++ b/libavcodec/vorbisenc.c
@@ -27,6 +27,7 @@
 #include <float.h>
 #include "avcodec.h"
 #include "dsputil.h"
+#include "internal.h"
 #include "fft.h"
 #include "vorbis.h"
 #include "vorbis_enc_data.h"
@@ -123,7 +124,7 @@ typedef struct {
     int nmodes;
     vorbis_enc_mode *modes;
 
-    int64_t sample_count;
+    int64_t next_pts;
 } vorbis_enc_context;
 
 #define MAX_CHANNELS     2
@@ -339,7 +340,8 @@ static int create_vorbis_context(vorbis_enc_context *venc,
         };
         fc->list[i].x = a[i - 2];
     }
-    ff_vorbis_ready_floor1_list(fc->list, fc->values);
+    if (ff_vorbis_ready_floor1_list(avccontext, fc->list, fc->values))
+        return AVERROR_BUG;
 
     venc->nresidues = 1;
     venc->residues  = av_malloc(sizeof(vorbis_enc_residue) * venc->nresidues);
@@ -961,10 +963,10 @@ static int residue_encode(vorbis_enc_context *venc, vorbis_enc_residue *rc,
     return 0;
 }
 
-static int apply_window_and_mdct(vorbis_enc_context *venc, const signed short *audio,
-                                 int samples)
+static int apply_window_and_mdct(vorbis_enc_context *venc,
+                                 float **audio, int samples)
 {
-    int i, j, channel;
+    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.;
@@ -986,9 +988,8 @@ static int apply_window_and_mdct(vorbis_enc_context *venc, const signed short *a
     if (samples) {
         for (channel = 0; channel < venc->channels; channel++) {
             float * offset = venc->samples + channel*window_len*2 + window_len;
-            j = channel;
-            for (i = 0; i < samples; i++, j += venc->channels)
-                offset[i] = audio[j] / 32768. / n * win[window_len - i - 1];
+            for (i = 0; i < samples; i++)
+                offset[i] = audio[channel][i] / n * win[window_len - i - 1];
         }
     } else {
         for (channel = 0; channel < venc->channels; channel++)
@@ -1003,9 +1004,8 @@ static int apply_window_and_mdct(vorbis_enc_context *venc, const signed short *a
     if (samples) {
         for (channel = 0; channel < venc->channels; channel++) {
             float *offset = venc->saved + channel * window_len;
-            j = channel;
-            for (i = 0; i < samples; i++, j += venc->channels)
-                offset[i] = audio[j] / 32768. / n * win[i];
+            for (i = 0; i < samples; i++)
+                offset[i] = audio[channel][i] / n * win[i];
         }
         venc->have_saved = 1;
     } else {
@@ -1015,23 +1015,27 @@ static int apply_window_and_mdct(vorbis_enc_context *venc, const signed short *a
 }
 
 
-static int vorbis_encode_frame(AVCodecContext *avccontext,
-                               unsigned char *packets,
-                               int buf_size, void *data)
+static int vorbis_encode_frame(AVCodecContext *avccontext, AVPacket *avpkt,
+                               const AVFrame *frame, int *got_packet_ptr)
 {
     vorbis_enc_context *venc = avccontext->priv_data;
-    const signed short *audio = data;
-    int samples = data ? avccontext->frame_size : 0;
+    float **audio = frame ? (float **)frame->extended_data : NULL;
+    int samples = frame ? frame->nb_samples : 0;
     vorbis_enc_mode *mode;
     vorbis_enc_mapping *mapping;
     PutBitContext pb;
-    int i;
+    int i, ret;
 
     if (!apply_window_and_mdct(venc, audio, samples))
         return 0;
     samples = 1 << (venc->log2_blocksize[0] - 1);
 
-    init_put_bits(&pb, packets, buf_size);
+    if ((ret = ff_alloc_packet(avpkt, 8192))) {
+        av_log(avccontext, 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");
@@ -1082,10 +1086,20 @@ static int vorbis_encode_frame(AVCodecContext *avccontext,
         return AVERROR(EINVAL);
     }
 
-    avccontext->coded_frame->pts = venc->sample_count;
-    venc->sample_count += avccontext->frame_size;
     flush_put_bits(&pb);
-    return put_bits_count(&pb) >> 3;
+    avpkt->size = put_bits_count(&pb) >> 3;
+
+    avpkt->duration = ff_samples_to_time_base(avccontext, avccontext->frame_size);
+    if (frame)
+        if (frame->pts != AV_NOPTS_VALUE)
+            avpkt->pts = ff_samples_to_time_base(avccontext, frame->pts);
+    else
+        avpkt->pts = venc->next_pts;
+    if (avpkt->pts != AV_NOPTS_VALUE)
+        venc->next_pts = avpkt->pts + avpkt->duration;
+
+    *got_packet_ptr = 1;
+    return 0;
 }
 
 
@@ -1143,7 +1157,9 @@ 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);
 
     return 0 ;
@@ -1162,10 +1178,11 @@ static av_cold int vorbis_encode_init(AVCodecContext *avccontext)
     if ((ret = create_vorbis_context(venc, avccontext)) < 0)
         goto error;
 
+    avccontext->bit_rate = 0;
     if (avccontext->flags & CODEC_FLAG_QSCALE)
-        venc->quality = avccontext->global_quality / (float)FF_QP2LAMBDA / 10.;
+        venc->quality = avccontext->global_quality / (float)FF_QP2LAMBDA;
     else
-        venc->quality = 0.03;
+        venc->quality = 3.0;
     venc->quality *= venc->quality;
 
     if ((ret = put_main_header(venc, (uint8_t**)&avccontext->extradata)) < 0)
@@ -1174,11 +1191,13 @@ static av_cold int vorbis_encode_init(AVCodecContext *avccontext)
 
     avccontext->frame_size = 1 << (venc->log2_blocksize[0] - 1);
 
+#if FF_API_OLD_ENCODE_AUDIO
     avccontext->coded_frame = avcodec_alloc_frame();
     if (!avccontext->coded_frame) {
         ret = AVERROR(ENOMEM);
         goto error;
     }
+#endif
 
     return 0;
 error:
@@ -1189,12 +1208,13 @@ error:
 AVCodec ff_vorbis_encoder = {
     .name           = "vorbis",
     .type           = AVMEDIA_TYPE_AUDIO,
-    .id             = CODEC_ID_VORBIS,
+    .id             = AV_CODEC_ID_VORBIS,
     .priv_data_size = sizeof(vorbis_enc_context),
     .init           = vorbis_encode_init,
-    .encode         = vorbis_encode_frame,
+    .encode2        = vorbis_encode_frame,
     .close          = vorbis_encode_close,
-    .capabilities= CODEC_CAP_DELAY | CODEC_CAP_EXPERIMENTAL,
-    .sample_fmts = (const enum AVSampleFormat[]){AV_SAMPLE_FMT_S16,AV_SAMPLE_FMT_NONE},
-    .long_name = NULL_IF_CONFIG_SMALL("Vorbis"),
+    .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"),
 };