mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-19 23:06:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

avauddec: release_buffer is not supposed to be used for audio

Browse source 
And calling it causes crashes in some situations.
This commit is contained in:
Sebastian Dröge 2012-12-04 22:09:05 +01:00
parent e092f3d411
commit aa4a238506
1 changed files with 5 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
ext/libav/gstavauddec.c
View file

@ -265,26 +265,6 @@ fallback:
} }
} }
static void
gst_ffmpegauddec_release_buffer (AVCodecContext * context, AVFrame * frame)
{
GstFFMpegAudDec *ffmpegdec;
BufferInfo *buffer_info;
ffmpegdec = (GstFFMpegAudDec *) context->opaque;
buffer_info = frame->opaque;
/* check if it was our buffer */
if (frame->type != FF_BUFFER_TYPE_USER) {
GST_DEBUG_OBJECT (ffmpegdec, "default release buffer");
avcodec_default_release_buffer (context, frame);
} else if (buffer_info) {
gst_buffer_unmap (buffer_info->buffer, &buffer_info->map);
gst_buffer_unref (buffer_info->buffer);
g_slice_free (BufferInfo, buffer_info);
}
frame->opaque = NULL;
}
static gboolean static gboolean
gst_ffmpegauddec_set_format (GstAudioDecoder * decoder, GstCaps * caps) gst_ffmpegauddec_set_format (GstAudioDecoder * decoder, GstCaps * caps)
{ {
@ -328,7 +308,7 @@ gst_ffmpegauddec_set_format (GstAudioDecoder * decoder, GstCaps * caps)
ffmpegdec->context->opaque = ffmpegdec; ffmpegdec->context->opaque = ffmpegdec;
ffmpegdec->context->get_buffer = gst_ffmpegauddec_get_buffer; ffmpegdec->context->get_buffer = gst_ffmpegauddec_get_buffer;
ffmpegdec->context->reget_buffer = NULL; ffmpegdec->context->reget_buffer = NULL;
ffmpegdec->context->release_buffer = gst_ffmpegauddec_release_buffer; ffmpegdec->context->release_buffer = NULL;
/* open codec - we don't select an output pix_fmt yet, /* open codec - we don't select an output pix_fmt yet,
* simply because we don't know! We only get it * simply because we don't know! We only get it
@ -466,7 +446,10 @@ gst_ffmpegauddec_audio_frame (GstFFMpegAudDec * ffmpegdec,
GST_DEBUG_OBJECT (ffmpegdec, "Creating output buffer"); GST_DEBUG_OBJECT (ffmpegdec, "Creating output buffer");
if (buffer_info) { if (buffer_info) {
*outbuf = gst_buffer_ref (buffer_info->buffer); *outbuf = buffer_info->buffer;
gst_buffer_unmap (buffer_info->buffer, &buffer_info->map);
g_slice_free (BufferInfo, buffer_info);
frame.opaque = NULL;
} else if (av_sample_fmt_is_planar (ffmpegdec->context->sample_fmt)) { } else if (av_sample_fmt_is_planar (ffmpegdec->context->sample_fmt)) {
gint i, j; gint i, j;
gint nsamples, channels; gint nsamples, channels;
@ -536,7 +519,6 @@ gst_ffmpegauddec_audio_frame (GstFFMpegAudDec * ffmpegdec,
(ffmpegdec), frame.linesize[0]); (ffmpegdec), frame.linesize[0]);
gst_buffer_fill (*outbuf, 0, frame.data[0], frame.linesize[0]); gst_buffer_fill (*outbuf, 0, frame.data[0], frame.linesize[0]);
} }
ffmpegdec->context->release_buffer (ffmpegdec->context, &frame);
GST_DEBUG_OBJECT (ffmpegdec, "Buffer created. Size: %d", have_data); GST_DEBUG_OBJECT (ffmpegdec, "Buffer created. Size: %d", have_data);