mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 10:41:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

decklinksrc: Fix memory leaks

Browse source 
Buffers now hold on to a reference for the input, so the input
object doesn't get freed (and carry the buffers with it) before
all the buffers are freed.
This commit is contained in:
David Schleef 2012-09-22 13:56:57 -07:00 committed by Tim-Philipp Müller
parent 167d44a978
commit dd66252f23
1 changed files with 25 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
sys/decklink/gstdecklinksrc.cpp
View file

@ -53,6 +53,13 @@ GST_DEBUG_CATEGORY (gst_decklink_src_debug_category);
/* prototypes */ /* prototypes */
typedef struct _VideoFrame VideoFrame;
struct _VideoFrame
{
IDeckLinkVideoInputFrame *frame;
IDeckLinkInput *input;
};
static void gst_decklink_src_set_property (GObject * object, static void gst_decklink_src_set_property (GObject * object,
guint property_id, const GValue * value, GParamSpec * pspec); guint property_id, const GValue * value, GParamSpec * pspec);
@ -589,6 +596,7 @@ gst_decklink_src_start (GstElement * element)
switch (decklinksrc->audio_connection) { switch (decklinksrc->audio_connection) {
default: default:
case GST_DECKLINK_AUDIO_CONNECTION_AUTO: case GST_DECKLINK_AUDIO_CONNECTION_AUTO:
/* set above */
break; break;
case GST_DECKLINK_AUDIO_CONNECTION_EMBEDDED: case GST_DECKLINK_AUDIO_CONNECTION_EMBEDDED:
aconn = bmdAudioConnectionEmbedded; aconn = bmdAudioConnectionEmbedded;
@ -1218,13 +1226,14 @@ gst_decklink_src_video_src_iterintlink (GstPad * pad)
return iter; return iter;
} }
static void static void
video_frame_free (void *data) video_frame_free (void *data)
{ {
IDeckLinkVideoInputFrame *video_frame = (IDeckLinkVideoInputFrame *) data; VideoFrame *video_frame = (VideoFrame *) data;
video_frame->Release (); video_frame->frame->Release ();
video_frame->input->Release ();
g_free (video_frame);
} }
static void static void
@ -1253,6 +1262,10 @@ gst_decklink_src_task (void *priv)
g_mutex_unlock (decklinksrc->mutex); g_mutex_unlock (decklinksrc->mutex);
if (decklinksrc->stop) { if (decklinksrc->stop) {
if (video_frame)
video_frame->Release ();
if (audio_frame)
audio_frame->Release ();
GST_DEBUG ("stopping task"); GST_DEBUG ("stopping task");
return; return;
} }
@ -1291,13 +1304,19 @@ gst_decklink_src_task (void *priv)
video_frame->Release (); video_frame->Release ();
} else { } else {
VideoFrame *vf;
vf = (VideoFrame *) g_malloc0 (sizeof (VideoFrame));
buffer = gst_buffer_new (); buffer = gst_buffer_new ();
GST_BUFFER_SIZE (buffer) = mode->width * mode->height * 2; GST_BUFFER_SIZE (buffer) = mode->width * mode->height * 2;
GST_BUFFER_DATA (buffer) = (guint8 *) data; GST_BUFFER_DATA (buffer) = (guint8 *) data;
GST_BUFFER_FREE_FUNC (buffer) = video_frame_free; GST_BUFFER_FREE_FUNC (buffer) = video_frame_free;
GST_BUFFER_MALLOCDATA (buffer) = (guint8 *) video_frame; GST_BUFFER_MALLOCDATA (buffer) = (guint8 *) vf;
vf->frame = video_frame;
vf->input = decklinksrc->input;
vf->input->AddRef ();
} }
GST_BUFFER_TIMESTAMP (buffer) = GST_BUFFER_TIMESTAMP (buffer) =
@ -1400,7 +1419,8 @@ gst_decklink_src_task (void *priv)
("stream stopped, reason %s", gst_flow_get_name (ret))); ("stream stopped, reason %s", gst_flow_get_name (ret)));
} }
} }
audio_frame->Release (); if (audio_frame)
audio_frame->Release ();
} }