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

dataurisrc: Remove unnecessary else if condition

Browse source 
In gst_data_uri_src_create(), buf cannot be NULL, hence
else if (*buf != NULL) will be invalid so removing the
else if condition and adding a check to unreference buf
in else condition, just in case

https://bugzilla.gnome.org/show_bug.cgi?id=735861
This commit is contained in:
Vineeth T M 2014-09-04 13:38:21 +05:30 committed by Sebastian Dröge
parent 53efa969db
commit 23f7a2cc63
1 changed files with 6 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
plugins/elements/gstdataurisrc.c
View file

@ -227,21 +227,13 @@ gst_data_uri_src_create (GstBaseSrc * basesrc, guint64 offset, guint size,
* larger than the max. available size if a segment at the end is requested */ * larger than the max. available size if a segment at the end is requested */
if (offset + size > gst_buffer_get_size (src->buffer)) { if (offset + size > gst_buffer_get_size (src->buffer)) {
ret = GST_FLOW_EOS; ret = GST_FLOW_EOS;
} else if (*buf != NULL) {
GstMapInfo src_info;
GstMapInfo dest_info;
gsize fill_size;
gst_buffer_map (src->buffer, &src_info, GST_MAP_READ);
gst_buffer_map (*buf, &dest_info, GST_MAP_WRITE);
fill_size = gst_buffer_fill (*buf, 0, src_info.data + offset, size);
gst_buffer_unmap (*buf, &dest_info);
gst_buffer_unmap (src->buffer, &src_info);
gst_buffer_set_size (*buf, fill_size);
ret = GST_FLOW_OK;
} else { } else {
/* Adding a check to unreference the buffer if *buf != NULL,
* just in case a buffer is provided*/
if (*buf != NULL) {
gst_buffer_unref (*buf);
GST_FIXME_OBJECT (src, "Buffer is not supposed to be provided here");
}
*buf = *buf =
gst_buffer_copy_region (src->buffer, GST_BUFFER_COPY_ALL, offset, size); gst_buffer_copy_region (src->buffer, GST_BUFFER_COPY_ALL, offset, size);
ret = GST_FLOW_OK; ret = GST_FLOW_OK;