mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-25 11:11:08 +00:00
Fixed memory leak in queue.
Original commit message from CVS: Fixed memory leak in queue.
This commit is contained in:
parent
b797f15e3a
commit
4660e95926
7 changed files with 14 additions and 7 deletions
|
@ -198,6 +198,7 @@ void gst_queue_push(GstConnection *connection) {
|
||||||
buf = (GstBuffer *)(front->data);
|
buf = (GstBuffer *)(front->data);
|
||||||
queue->queue = g_list_remove_link(queue->queue,front);
|
queue->queue = g_list_remove_link(queue->queue,front);
|
||||||
gst_pad_push(queue->srcpad,buf);
|
gst_pad_push(queue->srcpad,buf);
|
||||||
|
g_list_free(front);
|
||||||
queue->level_buffers--;
|
queue->level_buffers--;
|
||||||
// g_print("-");
|
// g_print("-");
|
||||||
|
|
||||||
|
|
|
@ -124,10 +124,12 @@ void gst_buffer_destroy(GstBuffer *buffer) {
|
||||||
|
|
||||||
g_return_if_fail(buffer != NULL);
|
g_return_if_fail(buffer != NULL);
|
||||||
|
|
||||||
if (buffer->parent != NULL)
|
if (buffer->parent != NULL) {
|
||||||
DEBUG("BUF: freeing subbuffer %p\n",buffer);
|
DEBUG("BUF: freeing subbuffer %p\n",buffer);
|
||||||
else
|
}
|
||||||
|
else {
|
||||||
DEBUG("BUF: freeing buffer %p\n",buffer);
|
DEBUG("BUF: freeing buffer %p\n",buffer);
|
||||||
|
}
|
||||||
|
|
||||||
// free the data only if there is some, DONTFREE isn't set, and not sub
|
// free the data only if there is some, DONTFREE isn't set, and not sub
|
||||||
if (GST_BUFFER_DATA(buffer) &&
|
if (GST_BUFFER_DATA(buffer) &&
|
||||||
|
@ -162,7 +164,7 @@ void gst_buffer_ref(GstBuffer *buffer) {
|
||||||
DEBUG("BUF: referencing buffer %p\n",buffer);
|
DEBUG("BUF: referencing buffer %p\n",buffer);
|
||||||
|
|
||||||
#ifdef HAVE_ATOMIC_H
|
#ifdef HAVE_ATOMIC_H
|
||||||
g_return_if_fail(atomic_read(&(buffer->refcount)) > 0);
|
//g_return_if_fail(atomic_read(&(buffer->refcount)) > 0);
|
||||||
atomic_inc(&(buffer->refcount))
|
atomic_inc(&(buffer->refcount))
|
||||||
#else
|
#else
|
||||||
g_return_if_fail(buffer->refcount > 0);
|
g_return_if_fail(buffer->refcount > 0);
|
||||||
|
|
|
@ -200,7 +200,7 @@ gboolean gst_plugin_load_absolute(gchar *name) {
|
||||||
* Returns: new plugin
|
* Returns: new plugin
|
||||||
*/
|
*/
|
||||||
GstPlugin *gst_plugin_new(gchar *name) {
|
GstPlugin *gst_plugin_new(gchar *name) {
|
||||||
GstPlugin *plugin = (GstPlugin *)malloc(sizeof(GstPlugin));
|
GstPlugin *plugin = (GstPlugin *)g_malloc(sizeof(GstPlugin));
|
||||||
|
|
||||||
plugin->name = g_strdup(name);
|
plugin->name = g_strdup(name);
|
||||||
plugin->longname = NULL;
|
plugin->longname = NULL;
|
||||||
|
|
|
@ -49,7 +49,7 @@ guint16 gst_type_register(GstTypeFactory *factory) {
|
||||||
// id = gst_type_find_by_mime(factory->mime);
|
// id = gst_type_find_by_mime(factory->mime);
|
||||||
id = 0;
|
id = 0;
|
||||||
if (!id) {
|
if (!id) {
|
||||||
type = (GstType *)malloc(sizeof(GstType));
|
type = (GstType *)g_malloc(sizeof(GstType));
|
||||||
|
|
||||||
type->id = _gst_maxtype++;
|
type->id = _gst_maxtype++;
|
||||||
type->mime = factory->mime;
|
type->mime = factory->mime;
|
||||||
|
|
|
@ -198,6 +198,7 @@ void gst_queue_push(GstConnection *connection) {
|
||||||
buf = (GstBuffer *)(front->data);
|
buf = (GstBuffer *)(front->data);
|
||||||
queue->queue = g_list_remove_link(queue->queue,front);
|
queue->queue = g_list_remove_link(queue->queue,front);
|
||||||
gst_pad_push(queue->srcpad,buf);
|
gst_pad_push(queue->srcpad,buf);
|
||||||
|
g_list_free(front);
|
||||||
queue->level_buffers--;
|
queue->level_buffers--;
|
||||||
// g_print("-");
|
// g_print("-");
|
||||||
|
|
||||||
|
|
|
@ -144,6 +144,8 @@ int main(int argc,char *argv[]) {
|
||||||
xmlSaveFile("mp1parse.xml",gst_xml_write(GST_ELEMENT(pipeline)));
|
xmlSaveFile("mp1parse.xml",gst_xml_write(GST_ELEMENT(pipeline)));
|
||||||
|
|
||||||
g_print("about to enter loop\n");
|
g_print("about to enter loop\n");
|
||||||
while (1)
|
while (1) {
|
||||||
gst_src_push(GST_SRC(src));
|
gst_src_push(GST_SRC(src));
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -62,6 +62,7 @@ int main(int argc,char *argv[]) {
|
||||||
gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_RUNNING);
|
gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_RUNNING);
|
||||||
|
|
||||||
g_print("about to enter loop\n");
|
g_print("about to enter loop\n");
|
||||||
while (1)
|
while (1) {
|
||||||
gst_src_push(GST_SRC(src));
|
gst_src_push(GST_SRC(src));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue