From bfb7bace389ea43ecfe62ca8e5c36b168d56a6af Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 20 Jun 2008 11:24:03 +0000 Subject: [PATCH] libs/gst/base/gsttypefindhelper.c: Increase code readability. Original commit message from CVS: * libs/gst/base/gsttypefindhelper.c: (helper_find_peek): Increase code readability. Don't try to compare buffer offsets when ther are invalid. --- ChangeLog | 6 ++++++ libs/gst/base/gsttypefindhelper.c | 10 +++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3021a7a5d7..82a13b845a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-20 Wim Taymans + + * libs/gst/base/gsttypefindhelper.c: (helper_find_peek): + Increase code readability. + Don't try to compare buffer offsets when ther are invalid. + 2008-06-20 Tim-Philipp Müller * docs/design/Makefile.am: diff --git a/libs/gst/base/gsttypefindhelper.c b/libs/gst/base/gsttypefindhelper.c index ce5dece2fb..9061d2c9e1 100644 --- a/libs/gst/base/gsttypefindhelper.c +++ b/libs/gst/base/gsttypefindhelper.c @@ -86,6 +86,8 @@ helper_find_peek (gpointer data, gint64 offset, guint size) GstBuffer *buffer; GstFlowReturn ret; GSList *insert_pos = NULL; + guint buf_size; + guint64 buf_offset; helper = (GstTypeFindHelper *) data; @@ -139,11 +141,13 @@ helper_find_peek (gpointer data, gint64 offset, guint size) /* getrange might silently return shortened buffers at the end of a file, * we must, however, always return either the full requested data or NULL */ - if (GST_BUFFER_OFFSET (buffer) != offset || GST_BUFFER_SIZE (buffer) < size) { + buf_offset = GST_BUFFER_OFFSET (buffer); + buf_size = GST_BUFFER_SIZE (buffer); + + if ((buf_offset != -1 && buf_offset != offset) || buf_size < size) { GST_DEBUG ("droping short buffer: %" G_GUINT64_FORMAT "-%" G_GUINT64_FORMAT " instead of %" G_GUINT64_FORMAT "-%" G_GUINT64_FORMAT, - GST_BUFFER_OFFSET (buffer), GST_BUFFER_OFFSET (buffer) + - GST_BUFFER_SIZE (buffer) - 1, offset, offset + size - 1); + buf_offset, buf_offset + buf_size - 1, offset, offset + size - 1); gst_buffer_unref (buffer); return NULL; }