mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-03 16:09:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

faad: give up after some number of decoding failures

Browse source
This commit is contained in:
Mark Nauwelaerts 2010-02-10 21:49:00 +01:00
parent b4739124dc
commit 2230469113
1 changed files with 20 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ext/faad/gstfaad.c
View file

@ -72,8 +72,6 @@ extern gint8 faacDecInit2 (faacDecHandle, guint8 *, guint32,
GST_DEBUG_CATEGORY_STATIC (faad_debug); GST_DEBUG_CATEGORY_STATIC (faad_debug);
#define GST_CAT_DEFAULT faad_debug #define GST_CAT_DEFAULT faad_debug
#define MAX_DECODE_ERRORS 5
static const GstElementDetails faad_details = static const GstElementDetails faad_details =
GST_ELEMENT_DETAILS ("AAC audio decoder", GST_ELEMENT_DETAILS ("AAC audio decoder",
"Codec/Decoder/Audio", "Codec/Decoder/Audio",
@ -972,6 +970,7 @@ looks_like_valid_header (guint8 * input_data, guint input_size)
return FALSE; return FALSE;
} }
#define FAAD_MAX_ERROR 10
#define FAAD_MAX_SYNC 10 * 8 * 1024 #define FAAD_MAX_SYNC 10 * 8 * 1024
static GstFlowReturn static GstFlowReturn
@ -1096,14 +1095,23 @@ gst_faad_chain (GstPad * pad, GstBuffer * buffer)
out = faacDecDecode (faad->handle, &info, input_data, input_size); out = faacDecDecode (faad->handle, &info, input_data, input_size);
if (info.error > 0) { if (info.error > 0) {
GST_WARNING_OBJECT (faad, "decoding error: %s",
faacDecGetErrorMessage (info.error));
/* mark discont for the next buffer */ /* mark discont for the next buffer */
faad->discont = TRUE; faad->discont = TRUE;
/* flush a bit, arranges for resync next time */ /* flush a bit, arranges for resync next time */
input_size--; input_size--;
faad->error_count++;
/* do not bail out at once, but know when to stop */
if (faad->error_count > FAAD_MAX_ERROR)
goto decode_failed;
else {
GST_WARNING_OBJECT (faad, "decoding error: %s",
faacDecGetErrorMessage (info.error));
goto out; goto out;
} }
}
/* ok again */
faad->error_count = 0;
if (info.bytesconsumed > input_size) if (info.bytesconsumed > input_size)
info.bytesconsumed = input_size; info.bytesconsumed = input_size;
@ -1197,6 +1205,13 @@ init2_failed:
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
goto out; goto out;
} }
decode_failed:
{
GST_ELEMENT_ERROR (faad, STREAM, DECODE, (NULL),
("decoding error: %s", faacDecGetErrorMessage (info.error)));
ret = GST_FLOW_ERROR;
goto out;
}
negotiation_failed: negotiation_failed:
{ {
GST_ELEMENT_ERROR (faad, CORE, NEGOTIATION, (NULL), GST_ELEMENT_ERROR (faad, CORE, NEGOTIATION, (NULL),