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

libs/gst/base/gsttypefindhelper.c: Increase code readability.

Browse source 
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.
This commit is contained in:
Wim Taymans 2008-06-20 11:24:03 +00:00
parent 88d605bded
commit bfb7bace38
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-06-20 Wim Taymans <wim.taymans@collabora.co.uk>
* 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 <tim.muller at collabora co uk> 2008-06-20 Tim-Philipp Müller <tim.muller at collabora co uk>
* docs/design/Makefile.am: * docs/design/Makefile.am:

10
libs/gst/base/gsttypefindhelper.c
View file

@ -86,6 +86,8 @@ helper_find_peek (gpointer data, gint64 offset, guint size)
GstBuffer *buffer; GstBuffer *buffer;
GstFlowReturn ret; GstFlowReturn ret;
GSList *insert_pos = NULL; GSList *insert_pos = NULL;
guint buf_size;
guint64 buf_offset;
helper = (GstTypeFindHelper *) data; 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, /* getrange might silently return shortened buffers at the end of a file,
* we must, however, always return either the full requested data or NULL */ * 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 GST_DEBUG ("droping short buffer: %" G_GUINT64_FORMAT "-%" G_GUINT64_FORMAT
" instead of %" G_GUINT64_FORMAT "-%" G_GUINT64_FORMAT, " instead of %" G_GUINT64_FORMAT "-%" G_GUINT64_FORMAT,
GST_BUFFER_OFFSET (buffer), GST_BUFFER_OFFSET (buffer) + buf_offset, buf_offset + buf_size - 1, offset, offset + size - 1);
GST_BUFFER_SIZE (buffer) - 1, offset, offset + size - 1);
gst_buffer_unref (buffer); gst_buffer_unref (buffer);
return NULL; return NULL;
} }