avaudenc: fix output timestamping

We need to pass the number of samples encode in the output buffer
to gst_audio_encoder_finish_frame(), not the number of frames.
Fixes output timestamps being way too small, and transcoding
problems.

https://bugzilla.gnome.org/show_bug.cgi?id=689398

diff --git a/ext/libav/gstavaudenc.c b/ext/libav/gstavaudenc.c
index 648ca0f..b9a1a39 100644 (file)
--- a/ext/libav/gstavaudenc.c
+++ b/ext/libav/gstavaudenc.c
@@ -357,6 +357,7 @@ static GstFlowReturn
 gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
     guint8 * audio_in, guint in_size, gint * have_data)
 {
+  GstAudioEncoder *enc;
   AVCodecContext *ctx;
   gint res;
   GstFlowReturn ret;
@@ -364,6 +365,8 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
   AVPacket pkt;
   AVFrame frame;
 
+  enc = GST_AUDIO_ENCODER (ffmpegaudenc);
+
   ctx = ffmpegaudenc->context;
 
   GST_LOG_OBJECT (ffmpegaudenc, "encoding buffer ");
@@ -371,7 +374,7 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
   memset (&pkt, 0, sizeof (pkt));
   memset (&frame, 0, sizeof (frame));
 
-  info = gst_audio_encoder_get_audio_info (GST_AUDIO_ENCODER (ffmpegaudenc));
+  info = gst_audio_encoder_get_audio_info (enc);
   frame.data[0] = audio_in;
   frame.linesize[0] = in_size;
   frame.nb_samples = in_size / info->bpf;
@@ -385,15 +388,20 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
 
   if (*have_data) {
     GstBuffer *outbuf;
+    AVCodec *codec;
 
     GST_LOG_OBJECT (ffmpegaudenc, "pushing size %d", pkt.size);
 
     outbuf =
         gst_buffer_new_wrapped_full (0, pkt.data, pkt.size, 0, pkt.size,
         pkt.data, av_free);
-    ret =
-        gst_audio_encoder_finish_frame (GST_AUDIO_ENCODER (ffmpegaudenc),
-        outbuf, 1);
+
+    codec = ffmpegaudenc->context->codec;
+    if ((codec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)) {
+      ret = gst_audio_encoder_finish_frame (enc, outbuf, -1);
+    } else {
+      ret = gst_audio_encoder_finish_frame (enc, outbuf, frame.nb_samples);
+    }
   } else {
     GST_LOG_OBJECT (ffmpegaudenc, "no output produced");
     ret = GST_FLOW_OK;