mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 16:21:17 +00:00
Code Issues 1 Projects Releases Wiki Activity
11277 commits 44 branches 1509 tags 635 MiB
Commit graph

76 commits

Author SHA1 Message Date
Sebastian Dröge
14eb517849 multiqueue: Exit loop function if the pad is flushing 
Fixes possible deadlocks when flushing an unlinked pad that waits
for other pads to advance.
 2011-03-21 16:29:40 +01:00
Mark Nauwelaerts
e0f15e666a multiqueue: return upon input when already eos 
... rather than hanging incoming thread (as considered full in eos).
 2010-12-03 13:35:49 +01:00
Jan Schmidt
691807d634 multiqueue: Fix tracking of unlinked streams. 
33082eb9e4 introduced a bug
preventing sparse unlinked streams from advancing properly,
leading to the queue blocking.

Fixes: #633176
 2010-10-27 18:12:36 +02:00
Edward Hervey
518364e7ac multiqueue: Remove unused variable and simplify code 
oldid was only used when we were doing multiple pops per loop.
 2010-10-08 13:26:37 +02:00
Sebastian Dröge
33082eb9e4 multiqueue: Don't do an infinite loop in the loop function 
Instead return after every iteration, which makes sure that the
stream lock is released for a short time after every iteration,
task state changes are checked, etc and this allows the task
to be stopped properly.
 2010-08-27 16:59:09 +02:00
Sebastian Dröge
8035f13bbf multiqueue: Flush the data queue if downstream return WRONG_STATE too 2010-08-27 16:59:09 +02:00
Sebastian Dröge
2e6f80bf81 elements: Stop using GST_FLOW_IS_FATAL() 2010-08-27 16:59:09 +02:00
Wim Taymans
808298833a multiqueue: implement acceptcaps function 
Our acceptcaps function can simply forward the query.
 2010-06-29 09:57:41 +02:00
Edward Hervey
4e0b2dc832 multiqueue: Don't stop threads on UNEXPECTED and forward flow returns. 
When a downstream element returns GST_FLOW_UNEXPECTED we want to:
* let the dataqueue task running
* forward the flow return upstream.

This allows upstream elements to push EOS, and have that EOS event come
downstream.

Fixes #609274
 2010-02-09 16:15:18 +01:00
Edward Hervey
9cc47f8cba Revert "multiqueue: handle UNEXPECTED flowreturn better" 
This reverts commit fbdf4dceda.

Partly fixes #609274
 2010-02-09 15:58:36 +01:00
Wim Taymans
fbdf4dceda multiqueue: handle UNEXPECTED flowreturn better 
When we receive an UNEXPECTED flowreturn from downstream, we must not shutdown
the pushing thread because upstream will at some point push an EOS that we still
need to push further downstream.

To achieve this, convert the UNEXPECTED return value to OK. Add a fixme so that
we implement the right logic to propagate the flowreturn upstream at some point.

Also clean up the unit test a little.

Fixes #608136
 2010-01-26 17:07:31 +01:00
Tim-Philipp Müller
745b35e7d4 docs: minor gtk-doc markup fixes 2010-01-20 01:48:56 +00:00
Mark Nauwelaerts
7b2c5f5168 multiqueue: set iterate_interal_links function on source pad 2009-12-30 22:59:29 +01:00
Tim-Philipp Müller
daecaf0e8a Remove GST_DEBUG_FUNCPTR where they're pointless 
There's not much point in using GST_DEBUG_FUNCPTR with GObject
virtual functions such as get_property, set_propery, finalize and
dispose, since they'll never be used by anyone anyway. Saves a
few bytes and possibly a tenth of a polar bear.
 2009-10-28 00:44:24 +00:00
Wim Taymans
03baa04059 multiqueue: buffering is implemented now 2009-10-27 14:40:19 +01:00
Wim Taymans
b852da60d4 multiqueue: make sure percent increases 
Keep track of the last posted percent message and make sure the next percent
messages are strictly increasing.
 2009-10-27 14:40:17 +01:00
Wim Taymans
30fc865162 multiqueue: refactor buffering code 
Move the buffering update code to a separate function so that we can call it
when the buffering state changes due to EOS.
Avoid dividing by 0.
 2009-10-27 14:40:15 +01:00
Wim Taymans
99dd9830a9 multiqueue: add buffering support 
Add support for buffering mode where we post BUFFERING messages based on the
level of the queues. It currently operates on the first queue that goes over or
under the high/low thresholds.
 2009-10-27 14:40:12 +01:00
Wim Taymans
07991ae4ab multiqueue: don't check visible items in buffering 
In buffering mode we want to ignore the max visible items to decide when the
queue is filled. Instead, we only look at the number of bytes and/or time in the
queue.
 2009-10-27 14:40:09 +01:00
Wim Taymans
6ac9191527 multiqueue: hook up low/high percent 
Hook up the low/high percent properties for the buffering mode.
 2009-10-27 14:40:07 +01:00
Wim Taymans
b9d4f6e550 multiqueue: hook up property for buffering 2009-10-27 14:40:02 +01:00
Wim Taymans
c6b0d4a43d multiqueue: small cleanups 
Remove unused variable to avoid confusion
Fix some typo
 2009-10-27 13:22:47 +01:00
Wim Taymans
6082b0bc89 multiqueue: add FIXME for wrong code 
Needs further investigation
 2009-10-27 13:18:31 +01:00
Wim Taymans
354cf53f81 multiqueue: fix debug output 2009-10-27 13:18:29 +01:00
Wim Taymans
606852c586 multiqueue: avoid shadowing function argument 
Don't shadow the sq argument in the underrun_cb function but use
a different variable name to iterate the other queues.
Use the same variable name in the overrun_cb function.
 2009-10-27 13:18:25 +01:00
Wim Taymans
814ee012e7 multiqueue: make queue arg explicit 
Make the queue argument to IS_FILLED explicit
 2009-10-27 13:18:20 +01:00
Wim Taymans
c490d7542c multiqueue: fix properties 
Fix properties, make the extra-size properties as not implemented.
 2009-10-27 13:18:00 +01:00
Wim Taymans
b95cc5031b multiqueue: avoid lock for taking the counter 
The counter for incomming data is already protected with the STREAM_LOCK so we
don't need to add another lock around it.
 2009-10-21 13:38:57 -04:00
Stefan Kost
963932b1f1 multiqueue: split gst_multi_queue_item_new 
Split gst_multi_queue_item_new into buffer and event variant to make save an if
and make code more readable.
 2009-10-08 10:54:35 +03:00
Mark Nauwelaerts
e51a34985f multiqueue: flush queue upon fatal flowreturn and release upstream thread 2009-10-07 18:51:52 +02:00
Edward Hervey
61ec6a561c plugins/multiqueue: Avoid instance check 
We know earlier on in the code whether we're handling an event or a buffer,
just pass that information through.

This commit and the previous commit reduce instruction fetch:
* when pushing buffer (_chain) by 10%
* when popping buffer (_loop) by 3%
 2009-10-07 10:07:01 +02:00
Edward Hervey
c15879f94e plugins/multiqueue: Cache input/output time, avoid expensive calls. 
* Cache the input/output time
* Only recalculate it when needed.

Avoids 50% calls to gst_segment_to_running_time
 2009-10-07 10:07:01 +02:00
Edward Hervey
7c6d555848 plugins/multiqueue: Use new GstDataQueue constructor 2009-10-07 09:32:47 +02:00
Edward Hervey
8c67b6390e plugins/multiqueue: Use cached value instead of expensive object get. 
The task will always exist as long as its owner (i.e. the pad) and that
owner's owner (i.e. multiqueue) exist.

Reduces the number of instruction fetches by 36%.
 2009-10-07 09:25:41 +02:00
Sebastian Dröge
d6de0e4cce multiqueue: Improve iterate internal links function 
Pads have their GstSingleQueue stored as element private data
so there's no need to iterate over the list of single queues
every time. Also every pad only has a single internal link so
use a single iterator instead of a complex custom iterator.

Set the element private data of the pad to NULL when freeing the
single queue.
 2009-10-07 07:18:04 +02:00
Tim-Philipp Müller
6ce1f0cbce dataqueue, elements: avoid unnecessary runtime type checks 2009-10-06 20:04:10 +01:00
Sebastian Dröge
269d3581c5 multiqueue: Use iterate_internal_links instead of deprecated get_internal_links 2009-08-18 14:57:18 +02:00
Jan Schmidt
3c87b8850f multiqueue: Fire the overrun signal on EOS 
Fixes startup of some short MPEG files with decodebin2/playbin2
where all the data fits in the multiqueue and EOS arrives before
the group is exposed.
 2009-06-24 15:22:51 +01:00
Jan Schmidt
2e2695f594 multiqueue: Use the slice allocator for MultiQueueItems 2009-06-11 10:34:28 +01:00
Wim Taymans
5a77f18278 multiqueue: check byte range even when we have timestamps 
As found by thaytan on IRC.
Also check the byte limit, even if we have timestamps because there might just
not be a time limit.
 2009-06-09 13:08:54 +02:00
Thijs Vermeir
6d4dc1a807 plugins/elements/gstmultiqueue.*: revert extra-size-buffers stuff, caused some race conditions and extra-size-buffers... 
Original commit message from CVS:
* plugins/elements/gstmultiqueue.c:
* plugins/elements/gstmultiqueue.h:
revert extra-size-buffers stuff, caused some race conditions
and extra-size-buffers is not used anymore. Docs needs some updates
 2008-06-26 20:27:00 +00:00
Thijs Vermeir
e25fd35125 plugins/elements/gstmultiqueue.*: Fix dead-lock in underrun_cb 
Original commit message from CVS:
* plugins/elements/gstmultiqueue.c:
* plugins/elements/gstmultiqueue.h:
Fix dead-lock in underrun_cb
 2008-06-25 15:39:02 +00:00
Thijs Vermeir
15b694fc7a plugins/elements/gstmultiqueue.c: Add functionality to extra-size-buffers property. 
Original commit message from CVS:
* plugins/elements/gstmultiqueue.c:
Add functionality to extra-size-buffers property.
 2008-06-22 19:19:35 +00:00
Thijs Vermeir
d7d1eecb97 plugins/elements/gstmultiqueue.c: Don't update the cur_time on GST_CLOCK_TIME_NONE (#537804) and don't activate the p... 
Original commit message from CVS:
* plugins/elements/gstmultiqueue.c:
Don't update the cur_time on GST_CLOCK_TIME_NONE (#537804) and don't
activate the pads if they are added in STATE_NULL.
 2008-06-22 14:35:13 +00:00
Stefan Kost
ef70805d24 plugins/elements/: Remove short_description. Add basic docs for gsttypefindelement. 
Original commit message from CVS:
* plugins/elements/gstcapsfilter.c:
* plugins/elements/gstfakesink.c:
* plugins/elements/gstfakesrc.c:
* plugins/elements/gstfdsink.c:
* plugins/elements/gstfdsrc.c:
* plugins/elements/gstfilesink.c:
* plugins/elements/gstfilesrc.c:
* plugins/elements/gstidentity.c:
* plugins/elements/gstmultiqueue.c:
* plugins/elements/gstqueue.c:
* plugins/elements/gsttee.c:
* plugins/elements/gsttypefindelement.c:
Remove short_description. Add basic docs for gsttypefindelement.
Simplify markup for fakesrc/fdsrc.
 2008-06-20 10:14:54 +00:00
Jan Schmidt
4fa54750f6 plugins/elements/gstmultiqueue.c: Add documentation for the signals to push our core plugin docs coverage back up to ... 
Original commit message from CVS:
* plugins/elements/gstmultiqueue.c:
Add documentation for the signals to push our core plugin docs
coverage back up to 100%.
 2008-05-09 14:02:53 +00:00
Tim-Philipp Müller
76f4e0eec9 plugins/elements/gstmultiqueue.c: Small docs fix. 
Original commit message from CVS:
* plugins/elements/gstmultiqueue.c:
Small docs fix.
 2008-05-05 16:25:23 +00:00
Wim Taymans
60da0d3654 plugins/elements/gstmultiqueue.c: When trying to make room in the queue, bump the max allowed buffers bigger than the... 
Original commit message from CVS:
* plugins/elements/gstmultiqueue.c: (single_queue_overrun_cb),
(single_queue_underrun_cb):
When trying to make room in the queue, bump the max allowed buffers
bigger than the current amount of buffers in the queue. this fixes some
nasty deadlocks in multiqueue when dynamically changing the limits of
the queue.
 2008-03-24 10:38:31 +00:00
Sebastian Dröge
b0346dff44 Define G_PARAM_STATIC_STRINGS if it's undefined (GLib < 2.13.0) and use it everywhere for GParamSpecs that use static... 
Original commit message from CVS:
* docs/pwg/advanced-dparams.xml:
* docs/pwg/building-props.xml:
* docs/pwg/other-source.xml:
* gst/glib-compat.h:
* gst/gstbin.c: (gst_bin_class_init):
* gst/gstclock.c: (gst_clock_class_init):
* gst/gstindex.c: (gst_index_class_init):
* gst/gstobject.c: (gst_object_class_init):
* gst/gstpad.c: (gst_pad_class_init):
* gst/gstpipeline.c: (gst_pipeline_class_init):
* libs/gst/base/gstbasesink.c: (gst_base_sink_class_init):
* libs/gst/base/gstbasesrc.c: (gst_base_src_class_init):
* libs/gst/base/gstbasetransform.c:
(gst_base_transform_class_init):
* libs/gst/base/gstdataqueue.c: (gst_data_queue_class_init):
* libs/gst/check/gstcheck.c: (_gst_check_fault_handler_restore),
(_gst_check_fault_handler_sighandler),
(_gst_check_fault_handler_setup), (gst_check_init):
* libs/gst/controller/gstcontroller.c:
(_gst_controller_class_init):
* libs/gst/controller/gstlfocontrolsource.c:
(gst_lfo_control_source_class_init):
* libs/gst/net/gstnetclientclock.c:
(gst_net_client_clock_class_init):
* libs/gst/net/gstnettimeprovider.c:
(gst_net_time_provider_class_init):
* plugins/elements/gstcapsfilter.c: (gst_capsfilter_class_init):
* plugins/elements/gstfakesink.c: (gst_fake_sink_class_init):
* plugins/elements/gstfakesrc.c: (gst_fake_src_class_init):
* plugins/elements/gstfdsink.c: (gst_fd_sink_class_init):
* plugins/elements/gstfdsrc.c: (gst_fd_src_class_init):
* plugins/elements/gstfilesink.c: (gst_file_sink_class_init):
* plugins/elements/gstfilesrc.c: (gst_file_src_class_init):
* plugins/elements/gstidentity.c: (gst_identity_class_init):
* plugins/elements/gstmultiqueue.c: (gst_multi_queue_class_init):
* plugins/elements/gstqueue.c: (gst_queue_class_init):
* plugins/elements/gsttee.c: (gst_tee_class_init):
* plugins/elements/gsttypefindelement.c:
(gst_type_find_element_class_init):
* plugins/indexers/gstfileindex.c: (gst_file_index_class_init):
Define G_PARAM_STATIC_STRINGS if it's undefined (GLib < 2.13.0) and
use it everywhere for GParamSpecs that use static strings (i.e. all).
This gives us less memory usage, fewer allocations and thus less
memory defragmentation. Fixes bug #523806.
 2008-03-22 14:56:17 +00:00
Sebastian Dröge
b997b0545a Correct all relevant warnings found by the sparse semantic code analyzer. This include marking several symbols static... 
Original commit message from CVS:
* gst/gstconfig.h.in:
* libs/gst/base/gstcollectpads.c: (gst_collect_pads_read_buffer):
* libs/gst/check/gstcheck.c: (gst_check_log_message_func),
(gst_check_log_critical_func), (gst_check_drop_buffers),
(gst_check_element_push_buffer_list):
* libs/gst/controller/gstcontroller.c: (gst_controller_get),
(gst_controller_get_type):
* libs/gst/controller/gsthelper.c: (gst_object_control_properties),
(gst_object_get_controller), (gst_object_get_control_source):
* libs/gst/controller/gstinterpolationcontrolsource.c:
(gst_interpolation_control_source_new):
* libs/gst/controller/gstlfocontrolsource.c:
(gst_lfo_control_source_new):
* libs/gst/dataprotocol/dataprotocol.c:
(gst_dp_event_from_packet_0_2):
* plugins/elements/gstfdsrc.c:
* plugins/elements/gstmultiqueue.c:
* plugins/elements/gsttee.c:
* plugins/elements/gsttypefindelement.c:
* plugins/indexers/gstfileindex.c: (_file_index_id_save_xml),
(gst_file_index_add_association):
* plugins/indexers/gstmemindex.c:
* tests/benchmarks/gstpollstress.c: (mess_some_more):
* tests/check/elements/queue.c: (setup_queue):
* tests/check/gst/gstpipeline.c:
* tests/check/libs/collectpads.c: (setup), (teardown),
(gst_collect_pads_suite):
* tests/examples/adapter/adapter_test.c:
* tests/examples/metadata/read-metadata.c: (make_pipeline):
* tests/examples/xml/createxml.c:
* tests/examples/xml/runxml.c:
* tools/gst-inspect.c:
* tools/gst-run.c:
Correct all relevant warnings found by the sparse semantic code
analyzer. This include marking several symbols static, using
NULL instead of 0 for pointers, not using variable sized arrays
on the stack, moving variable declarations to the beginning of
a block and using "foo (void)" instead of "foo ()" for declarations.
 2008-02-29 12:41:33 +00:00