From c0f1db7ebe3e6247f91f3fc7e1cf387319d6fbcf Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Thu, 26 Feb 2009 11:02:06 +0200 Subject: [PATCH] baseparse: remove checks for buffer==NULL Accordifn to docs for GstPadChainFunction buffer cannot be NULL. If we would leave the check, we would also need more such check below. --- gst/aacparse/gstbaseparse.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gst/aacparse/gstbaseparse.c b/gst/aacparse/gstbaseparse.c index baa5682..5f9a949 100644 --- a/gst/aacparse/gstbaseparse.c +++ b/gst/aacparse/gstbaseparse.c @@ -838,7 +838,7 @@ gst_base_parse_chain (GstPad * pad, GstBuffer * buffer) parse = GST_BASE_PARSE (GST_OBJECT_PARENT (pad)); bclass = GST_BASE_PARSE_GET_CLASS (parse); - if (parse->pending_segment) { + if (G_UNLIKELY (parse->pending_segment)) { GST_DEBUG_OBJECT (parse, "chain pushing a pending segment"); gst_pad_push_event (parse->srcpad, parse->pending_segment); parse->pending_segment = NULL; @@ -854,7 +854,7 @@ gst_base_parse_chain (GstPad * pad, GstBuffer * buffer) gst_adapter_clear (parse->adapter); } - if (parse->priv->pending_events) { + if (G_UNLIKELY (parse->priv->pending_events)) { GList *l; for (l = parse->priv->pending_events; l != NULL; l = l->next) { @@ -864,13 +864,9 @@ gst_base_parse_chain (GstPad * pad, GstBuffer * buffer) parse->priv->pending_events = NULL; } - if (buffer) { - GST_LOG_OBJECT (parse, "buffer size: %d, offset = %lld", - GST_BUFFER_SIZE (buffer), GST_BUFFER_OFFSET (buffer)); - - - gst_adapter_push (parse->adapter, buffer); - } + GST_LOG_OBJECT (parse, "buffer size: %d, offset = %lld", + GST_BUFFER_SIZE (buffer), GST_BUFFER_OFFSET (buffer)); + gst_adapter_push (parse->adapter, buffer); /* Parse and push as many frames as possible */ /* Stop either when adapter is empty or we are flushing */ -- 2.7.4