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

audio: Always provide a buffer in gst_audio_(enc|dec)oder_allocate_output_buffer()

Browse source 
We have no way of tell the caller of the exact error (e.g. if we're flushing),
so will have to wait until the caller uses API that returns a GstFlowReturn,
for example when pushing this buffer.

https://bugzilla.gnome.org/show_bug.cgi?id=700006
This commit is contained in:
Sebastian Dröge 2013-05-24 16:52:50 +02:00
parent 0c2c909497
commit b8c6413a8e
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst-libs/gst/audio/gstaudiodecoder.c
View file

@ -2985,15 +2985,25 @@ gst_audio_decoder_allocate_output_buffer (GstAudioDecoder * dec, gsize size)
if (G_UNLIKELY (dec->priv->ctx.output_format_changed || if (G_UNLIKELY (dec->priv->ctx.output_format_changed ||
(GST_AUDIO_INFO_IS_VALID (&dec->priv->ctx.info) (GST_AUDIO_INFO_IS_VALID (&dec->priv->ctx.info)
&& gst_pad_check_reconfigure (dec->srcpad)))) { && gst_pad_check_reconfigure (dec->srcpad)))) {
if (!gst_audio_decoder_negotiate (dec)) if (!gst_audio_decoder_negotiate (dec)) {
goto done; GST_INFO_OBJECT (dec, "Failed to negotiate, fallback allocation");
goto fallback;
}
} }
buffer = buffer =
gst_buffer_new_allocate (dec->priv->ctx.allocator, size, gst_buffer_new_allocate (dec->priv->ctx.allocator, size,
&dec->priv->ctx.params); &dec->priv->ctx.params);
if (!buffer) {
GST_INFO_OBJECT (dec, "couldn't allocate output buffer");
goto fallback;
}
done: GST_AUDIO_DECODER_STREAM_UNLOCK (dec);
return buffer;
fallback:
buffer = gst_buffer_new_allocate (NULL, size, NULL);
GST_AUDIO_DECODER_STREAM_UNLOCK (dec); GST_AUDIO_DECODER_STREAM_UNLOCK (dec);
return buffer; return buffer;

17
gst-libs/gst/audio/gstaudioencoder.c
View file

@ -2726,15 +2726,26 @@ gst_audio_encoder_allocate_output_buffer (GstAudioEncoder * enc, gsize size)
if (G_UNLIKELY (enc->priv->ctx.output_caps_changed || (enc->priv->ctx.caps if (G_UNLIKELY (enc->priv->ctx.output_caps_changed || (enc->priv->ctx.caps
&& gst_pad_check_reconfigure (enc->srcpad)))) { && gst_pad_check_reconfigure (enc->srcpad)))) {
if (!gst_audio_encoder_negotiate (enc)) if (!gst_audio_encoder_negotiate (enc)) {
goto done; GST_INFO_OBJECT (enc, "Failed to negotiate, fallback allocation");
goto fallback;
}
} }
buffer = buffer =
gst_buffer_new_allocate (enc->priv->ctx.allocator, size, gst_buffer_new_allocate (enc->priv->ctx.allocator, size,
&enc->priv->ctx.params); &enc->priv->ctx.params);
if (!buffer) {
GST_INFO_OBJECT (enc, "couldn't allocate output buffer");
goto fallback;
}
done: GST_AUDIO_ENCODER_STREAM_UNLOCK (enc);
return buffer;
fallback:
buffer = gst_buffer_new_allocate (NULL, size, NULL);
GST_AUDIO_ENCODER_STREAM_UNLOCK (enc); GST_AUDIO_ENCODER_STREAM_UNLOCK (enc);
return buffer; return buffer;