mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 01:00:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

avaudenc: fix output timestamping

Browse source 
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
This commit is contained in:
Tim-Philipp Müller 2012-12-01 23:05:23 +00:00
parent 4132a73f0e
commit 819d4d2a04
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/libav/gstavaudenc.c
View file

@ -357,6 +357,7 @@ static GstFlowReturn
gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc, gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
guint8 * audio_in, guint in_size, gint * have_data) guint8 * audio_in, guint in_size, gint * have_data)
{ {
GstAudioEncoder *enc;
AVCodecContext *ctx; AVCodecContext *ctx;
gint res; gint res;
GstFlowReturn ret; GstFlowReturn ret;
@ -364,6 +365,8 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
AVPacket pkt; AVPacket pkt;
AVFrame frame; AVFrame frame;
enc = GST_AUDIO_ENCODER (ffmpegaudenc);
ctx = ffmpegaudenc->context; ctx = ffmpegaudenc->context;
GST_LOG_OBJECT (ffmpegaudenc, "encoding buffer "); GST_LOG_OBJECT (ffmpegaudenc, "encoding buffer ");
@ -371,7 +374,7 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
memset (&pkt, 0, sizeof (pkt)); memset (&pkt, 0, sizeof (pkt));
memset (&frame, 0, sizeof (frame)); 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.data[0] = audio_in;
frame.linesize[0] = in_size; frame.linesize[0] = in_size;
frame.nb_samples = in_size / info->bpf; frame.nb_samples = in_size / info->bpf;
@ -385,15 +388,20 @@ gst_ffmpegaudenc_encode_audio (GstFFMpegAudEnc * ffmpegaudenc,
if (*have_data) { if (*have_data) {
GstBuffer *outbuf; GstBuffer *outbuf;
AVCodec *codec;
GST_LOG_OBJECT (ffmpegaudenc, "pushing size %d", pkt.size); GST_LOG_OBJECT (ffmpegaudenc, "pushing size %d", pkt.size);
outbuf = outbuf =
gst_buffer_new_wrapped_full (0, pkt.data, pkt.size, 0, pkt.size, gst_buffer_new_wrapped_full (0, pkt.data, pkt.size, 0, pkt.size,
pkt.data, av_free); pkt.data, av_free);
ret =
gst_audio_encoder_finish_frame (GST_AUDIO_ENCODER (ffmpegaudenc), codec = ffmpegaudenc->context->codec;
outbuf, 1); 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 { } else {
GST_LOG_OBJECT (ffmpegaudenc, "no output produced"); GST_LOG_OBJECT (ffmpegaudenc, "no output produced");
ret = GST_FLOW_OK; ret = GST_FLOW_OK;