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

faad: refactor src caps (re)negotiation and reflow some error exits

Browse source
This commit is contained in:
Mark Nauwelaerts 2010-02-10 18:46:16 +01:00
parent 50e4914edc
commit 6407329deb
1 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
ext/faad/gstfaad.c
View file

@ -820,6 +820,23 @@ gst_faad_update_caps (GstFaad * faad, faacDecFrameInfo * info)
gboolean ret; gboolean ret;
gboolean channel_map_failed; gboolean channel_map_failed;
GstCaps *caps; GstCaps *caps;
gboolean fmt_change = FALSE;
/* see if we need to renegotiate */
if (info->samplerate != faad->samplerate ||
info->channels != faad->channels || !faad->channel_positions) {
fmt_change = TRUE;
} else {
gint i;
for (i = 0; i < info->channels; i++) {
if (info->channel_position[i] != faad->channel_positions[i])
fmt_change = TRUE;
}
}
if (G_LIKELY (!fmt_change))
return TRUE;
/* store new negotiation information */ /* store new negotiation information */
faad->samplerate = info->samplerate; faad->samplerate = info->samplerate;
@ -1077,37 +1094,12 @@ gst_faad_chain (GstPad * pad, GstBuffer * buffer)
input_data += info.bytesconsumed; input_data += info.bytesconsumed;
if (out && info.samples > 0) { if (out && info.samples > 0) {
gboolean fmt_change = FALSE; if (!gst_faad_update_caps (faad, &info))
goto negotiation_failed;
/* see if we need to renegotiate */ /* C's lovely propensity for int overflow.. */
if (info.samplerate != faad->samplerate || if (info.samples > G_MAXUINT / faad->bps)
info.channels != faad->channels || !faad->channel_positions) { goto sample_overflow;
fmt_change = TRUE;
} else {
gint i;
for (i = 0; i < info.channels; i++) {
if (info.channel_position[i] != faad->channel_positions[i])
fmt_change = TRUE;
}
}
if (fmt_change) {
if (!gst_faad_update_caps (faad, &info)) {
GST_ELEMENT_ERROR (faad, CORE, NEGOTIATION, (NULL),
("Setting caps on source pad failed"));
ret = GST_FLOW_ERROR;
goto out;
}
}
if (info.samples > G_MAXUINT / faad->bps) {
/* C's lovely propensity for int overflow.. */
GST_ELEMENT_ERROR (faad, STREAM, DECODE, (NULL),
("Output buffer too large"));
ret = GST_FLOW_ERROR;
goto out;
}
/* play decoded data */ /* play decoded data */
if (info.samples > 0) { if (info.samples > 0) {
@ -1197,6 +1189,20 @@ init2_failed:
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
goto out; goto out;
} }
negotiation_failed:
{
GST_ELEMENT_ERROR (faad, CORE, NEGOTIATION, (NULL),
("Setting caps on source pad failed"));
ret = GST_FLOW_ERROR;
goto out;
}
sample_overflow:
{
GST_ELEMENT_ERROR (faad, STREAM, DECODE, (NULL),
("Output buffer too large"));
ret = GST_FLOW_ERROR;
goto out;
}
} }
static gboolean static gboolean