mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/multipart/: Small updates, fix a memleak

Browse source 
Original commit message from CVS:
* gst/multipart/multipartdemux.c: (gst_multipart_demux_base_init),
(gst_multipart_find_pad_by_mime), (gst_multipart_demux_chain),
(gst_multipart_demux_plugin_init):
* gst/multipart/multipartmux.c: (gst_multipart_mux_class_init),
(gst_multipart_mux_init), (gst_multipart_mux_loop),
(gst_multipart_mux_change_state):
Small updates, fix a memleak
This commit is contained in:
Wim Taymans 2004-06-07 16:32:45 +00:00
parent ef2468c353
commit 6a59b1923e
3 changed files with 66 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2004-06-07 Wim Taymans <wim@fluendo.com>
* gst/multipart/multipartdemux.c: (gst_multipart_demux_base_init),
(gst_multipart_find_pad_by_mime), (gst_multipart_demux_chain),
(gst_multipart_demux_plugin_init):
* gst/multipart/multipartmux.c: (gst_multipart_mux_class_init),
(gst_multipart_mux_init), (gst_multipart_mux_loop),
(gst_multipart_mux_change_state):
Small updates, fix a memleak
2004-06-07 Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
* configure.ac: OSS portability

4
gst/multipart/multipartdemux.c
View file

@ -40,7 +40,7 @@ GST_DEBUG_CATEGORY_STATIC (gst_multipart_demux_debug);
typedef struct _GstMultipartDemux GstMultipartDemux;
typedef struct _GstMultipartDemuxClass GstMultipartDemuxClass;
static gchar *toFind = "--ThisRandomString\nContent-type: "; //image/jpeg\n\n";
static gchar *toFind = "--ThisRandomString\nContent-type: ";
static gint toFindLen;
/* all information needed for one multipart stream */
@ -272,7 +272,7 @@ gst_multipart_demux_chain (GstPad * pad, GstData * buffer)
// find \n
while (multipart->scanpos < multipart->bufsize) {
if (multipart->buffer[multipart->scanpos] == '\n') {
break;
}
multipart->scanpos++;
}

58
gst/multipart/multipartmux.c
View file

@ -61,12 +61,6 @@ struct _GstMultipartMux
GSList *sinkpads;
gint numpads;
/* the pad we are currently pulling from to fill a page */
GstMultipartPad *pulling;
/* next timestamp for the page */
GstClockTime next_ts;
/* offset in stream */
guint64 offset;
@ -222,7 +216,6 @@ gst_multipart_mux_init (GstMultipartMux * multipart_mux)
GST_FLAG_SET (GST_ELEMENT (multipart_mux), GST_ELEMENT_EVENT_AWARE);
multipart_mux->sinkpads = NULL;
multipart_mux->pulling = NULL;
multipart_mux->boundary = g_strdup (DEFAULT_BOUNDARY);
multipart_mux->negotiated = FALSE;
@ -468,39 +461,31 @@ static void
gst_multipart_mux_loop (GstElement * element)
{
GstMultipartMux *mux;
GstMultipartPad *pad;
GstBuffer *newbuf, *buf;
gchar *header;
gint headerlen;
gint newlen;
mux = GST_MULTIPART_MUX (element);
/* if we don't know which pad to pull on, find one */
if (mux->pulling == NULL) {
mux->pulling = gst_multipart_mux_queue_pads (mux);
/* remember timestamp of first buffer for this new pad */
if (mux->pulling != NULL) {
mux->next_ts = GST_BUFFER_TIMESTAMP (mux->pulling->buffer);
} else {
/* we don't know which pad to pull on, find one */
pad = gst_multipart_mux_queue_pads (mux);
if (pad == NULL) {
/* no pad to pull on, send EOS */
if (GST_PAD_IS_USABLE (mux->srcpad))
gst_pad_push (mux->srcpad, GST_DATA (gst_event_new (GST_EVENT_EOS)));
gst_element_set_eos (element);
return;
}
}
if (mux->pulling != NULL) {
GstMultipartPad *pad = mux->pulling;
GstBuffer *newbuf, *buf;
gchar *header;
gint headerlen;
/* now see if we have a buffer */
buf = pad->buffer;
if (buf == NULL) {
/* no buffer, get one */
buf = gst_multipart_mux_next_buffer (pad);
/* data exhausted on this pad (EOS) */
if (buf == NULL) {
/* stop pulling from the pad */
mux->pulling = NULL;
/* data exhausted on this pad (EOS) */
return;
}
}
@ -523,20 +508,23 @@ gst_multipart_mux_loop (GstElement * element)
header = g_strdup_printf ("\n--%s\nContent-type: %s\n\n",
mux->boundary, pad->mimetype);
headerlen = strlen (header);
newbuf =
gst_pad_alloc_buffer (mux->srcpad, GST_BUFFER_OFFSET_NONE, headerlen);
GST_BUFFER_DATA (newbuf) = header;
GST_BUFFER_SIZE (newbuf) = headerlen;
newlen = headerlen + GST_BUFFER_SIZE (buf);
newbuf = gst_pad_alloc_buffer (mux->srcpad, GST_BUFFER_OFFSET_NONE, newlen);
memcpy (GST_BUFFER_DATA (newbuf), header, headerlen);
memcpy (GST_BUFFER_DATA (newbuf) + headerlen,
GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf));
GST_BUFFER_TIMESTAMP (newbuf) = GST_BUFFER_TIMESTAMP (buf);
GST_BUFFER_DURATION (newbuf) = GST_BUFFER_DURATION (buf);
GST_BUFFER_OFFSET (newbuf) = mux->offset;
g_free (header);
mux->offset += newlen;
gst_pad_push (mux->srcpad, GST_DATA (newbuf));
gst_pad_push (mux->srcpad, GST_DATA (buf));
pad->buffer = NULL;
/* we're done pulling on this pad, make sure to choose a new
* pad for pulling in the next iteration */
mux->pulling = NULL;
}
}
static void
@ -589,9 +577,7 @@ gst_multipart_mux_change_state (GstElement * element)
switch (transition) {
case GST_STATE_NULL_TO_READY:
case GST_STATE_READY_TO_PAUSED:
multipart_mux->next_ts = 0;
multipart_mux->offset = 0;
multipart_mux->pulling = NULL;
multipart_mux->negotiated = FALSE;
break;
case GST_STATE_PAUSED_TO_PLAYING: