diff --git a/ChangeLog b/ChangeLog index 515bcf40b3..b40192dd9a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-03-11 Ronald Bultje + + * gst/gstqueue.c: (gst_queue_init): + Reset default max. values in queues. Reason is simply to avoid + braindead use. If you want wider values, use the properties. The + default is supposed to always work. Wider values would make this + beast a memory hog by default (250 full-PAL RGB32 video frames? + That's 440 MB! No thank you). + 2004-03-10 David Schleef * tools/gst-run.c: (main): Fix crash when no relevant tools diff --git a/gst/gstqueue.c b/gst/gstqueue.c index 239b1a88bf..8dfd62f4df 100644 --- a/gst/gstqueue.c +++ b/gst/gstqueue.c @@ -267,9 +267,9 @@ gst_queue_init (GstQueue *queue) queue->cur_level.buffers = 0; /* no content */ queue->cur_level.bytes = 0; /* no content */ queue->cur_level.time = 0; /* no content */ - queue->max_size.buffers = 250; /* high limit */ - queue->max_size.bytes = 0; /* unlimited */ - queue->max_size.time = 0; /* unlimited */ + queue->max_size.buffers = 100; /* 100 buffers */ + queue->max_size.bytes = 10 * 1024 * 1024; /* 10 MB */ + queue->max_size.time = GST_SECOND; /* 1 s. */ queue->min_threshold.buffers = 0; /* no threshold */ queue->min_threshold.bytes = 0; /* no threshold */ queue->min_threshold.time = 0; /* no threshold */ diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index 239b1a88bf..8dfd62f4df 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -267,9 +267,9 @@ gst_queue_init (GstQueue *queue) queue->cur_level.buffers = 0; /* no content */ queue->cur_level.bytes = 0; /* no content */ queue->cur_level.time = 0; /* no content */ - queue->max_size.buffers = 250; /* high limit */ - queue->max_size.bytes = 0; /* unlimited */ - queue->max_size.time = 0; /* unlimited */ + queue->max_size.buffers = 100; /* 100 buffers */ + queue->max_size.bytes = 10 * 1024 * 1024; /* 10 MB */ + queue->max_size.time = GST_SECOND; /* 1 s. */ queue->min_threshold.buffers = 0; /* no threshold */ queue->min_threshold.bytes = 0; /* no threshold */ queue->min_threshold.time = 0; /* no threshold */