diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-05-21 11:12:23 +0200 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2012-05-21 11:12:23 +0200 |
| commit | 50f12103f5a136f45bd274ac6a99006a3db5ca4d (patch) | |
| tree | cb44f58b9f1cc9256a83b87d28d6cdaf10b2c4b4 | |
| parent | 54399760aad93cb3ec36162ced7649c8cd8286db (diff) | |
Imported Upstream version 0.11.91upstream/0.11.91
297 files changed, 5376 insertions, 3419 deletions
@@ -1,9 +1,619 @@ +=== release 0.11.91 === + +2012-05-13 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * configure.ac: + releasing 0.11.91, "I will give you five magic beans\!" + +2012-05-09 14:22:20 +0200 Sebastian Rasmussen <sebrn@axis.com> + + * gst/gst.c: + gst: Only include init/deinit of alloc tracing when enabled + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=675806 + +2012-05-11 09:07:16 +0200 Wim Taymans <wim.taymans@collabora.co.uk> + + * docs/design/part-block.txt: + * docs/design/part-element-sink.txt: + * docs/design/part-overview.txt: + * docs/design/part-preroll.txt: + * docs/design/part-probes.txt: + * docs/design/part-segments.txt: + * docs/design/part-states.txt: + * docs/pwg/advanced-events.xml: + * libs/gst/base/gstbasesrc.c: + docs: fix docs + GST_FLOW_WRONG_STATE -> GST_FLOW_FLUSHING + +2012-05-10 12:15:49 +0200 Wim Taymans <wim.taymans@collabora.co.uk> + + * docs/design/part-bufferpool.txt: + docs: improve bufferpool docs + +2012-05-08 20:12:42 +0300 Anton Belka <antonbelka@gmail.com> + + * tools/gst-launch.c: + gst-launch: print tags in toc + +2012-05-05 22:17:43 +0300 Raimo Järvi <raimo.jarvi@gmail.com> + + * gst/gstpoll.c: + * gst/gstsystemclock.c: + * plugins/elements/gstfilesrc.c: + * tests/check/elements/filesrc.c: + * tests/check/gst/gstpoll.c: + gst: Fix compiler warnings on mingw-w64 + https://bugzilla.gnome.org/show_bug.cgi?id=675525 + +2012-05-02 14:00:43 +0300 Sreerenj Balachandran <sreerenj.balachandran@intel.com> + + * gst/gstmemory.c: + memory: add missing parameter to default_mem_map() + Fixes function signature for correctness. + https://bugzilla.gnome.org/show_bug.cgi?id=675289 + +2012-05-02 08:08:15 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * win32/common/libgstreamer.def: + win32: update .def file for new API + +2012-05-01 22:35:38 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * gst/gst_private.h: + * gst/gsttypefindfactory.h: + typefindfactory: make object struct opaque for now + Make opaque until we have time to clean it up a little. + +2012-05-01 22:30:32 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * gst/gsttypefindfactory.c: + * gst/gsttypefindfactory.h: + typefindfactory: fix return type of gst_type_find_factory_get_extensions() + +2012-05-01 22:28:11 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * libs/gst/base/gsttypefindhelper.c: + * tools/gst-inspect.c: + tools, base: don't poke into GstTypeFindFactory struct, use public API + +2012-05-01 22:33:30 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * gst/gsttypefindfactory.c: + * gst/gsttypefindfactory.h: + * libs/gst/base/gsttypefindhelper.c: + typefindfactory: add gst_type_find_factory_has_function() + Add API so people don't have to poke the struct for this. + +2012-05-01 15:52:14 -0300 Thiago Santos <thiago.sousa.santos@collabora.com> + + * gst/gstcaps.c: + gstcaps: Update docs for gst_caps_is_equal + NULL caps aren't valid caps in 1.0 and aren't accepted in + gst_caps_is_equal + +2012-05-01 19:47:05 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * gst/gsturi.c: + * tests/check/gst/gsturi.c: + uri: require URI protocol bit to be at least 3 characters to be valid + We want to return FALSE when run on a windows-style file path. + https://bugzilla.gnome.org/show_bug.cgi?id=674296 + +2012-04-26 17:26:50 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * libs/gst/base/gstbasesrc.c: + * libs/gst/base/gstbasetransform.c: + basetransform/basesrc: Do bufferpool configuration inside the default decide_allocation() implementation + This allows subclasses to override it, as is necessary for e.g. the + video-crop meta. It is now necessary that after decide_allocation() + there is always a allocator and a configured buffer pool inside the + query. + +2012-04-28 21:37:56 +0200 Matej Knopp <matej.knopp@gmail.com> + + * gst/gstghostpad.c: + ghostpad: set result on accept caps query when there is no peer + +2012-05-01 10:50:32 +0200 Wim Taymans <wim.taymans@collabora.co.uk> + + * libs/gst/base/gstadapter.c: + * tests/check/libs/adapter.c: + adapter: remove _try_to_merge_up() + It causes the timestamp to go wrong, should not cause much of a performance + increase and in the cases where it is faster, it is broken in 0.10 as well. + We should try to review this when rewriting the adapter for 0.11 memory + features. + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=674791 + +2012-05-01 09:25:25 +0200 Wim Taymans <wim.taymans@collabora.co.uk> + + * libs/gst/base/gstadapter.c: + * libs/gst/base/gstadapter.h: + adapter: make internals private + Make the adapter fields private. + +2012-04-30 20:29:21 +0400 Руслан Ижбулатов <lrn1986@gmail.com> + + * plugins/elements/gstfilesrc.c: + filesrc: rearrange sys/stat.h inclusion point for MinGW + gstplugin.h used to include this for us, but doesn't any longer. + https://bugzilla.gnome.org/show_bug.cgi?id=675171 + +2012-04-30 09:58:09 +0100 Vincent Penquerc'h <vincent.penquerch@collabora.co.uk> + + * docs/design/part-seeking.txt: + * gst/gstsegment.h: + * win32/common/gstenumtypes.c: + event: add new seek snap flags + They can be used to select snapping behavior (to previous, next, or + nearest location, where relevant) when seeking. + The seeking implementation (eg, demuxer) may currently ignore some + or all of these flags. + +2012-04-29 20:06:58 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * gst/gstplugin.h: + docs: remove reference to removed API in plugin docs + +2012-04-29 20:06:38 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * gst/gstplugin.c: + plugin: avoid some relocations + +2012-04-29 18:35:11 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * docs/gst/gstreamer-sections.txt: + * gst/gstplugin.c: + * gst/gstplugin.h: + * gst/gstregistry.c: + * win32/common/libgstreamer.def: + plugin: remove gst_plugin_name_filter + It's only used internally, most other users will likely + want to use gst_registry_find_plugin() directly instead + (and if not, they can easily walk the list and doing the + strcmp themselves). + +2012-04-29 17:46:32 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * gst/gst_private.h: + * gst/gstplugin.h: + * gst/gstpluginloader.c: + * gst/gstregistry.c: + * gst/gstregistrybinary.c: + * gst/gstregistrychunks.c: + * tools/gst-inspect.c: + plugin: use GstObject flags for plugin flags + +2012-04-29 17:03:32 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * gst/gst_private.h: + * gst/gstplugin.h: + plugin: make GstPlugin object structure opaque for now + There's no reason anyone would want to derive from this, so + just make opaque until we manage to make all the private bits + private properly (which I'm not doing right now because it's + more invasive and I have registry modifications locally which + touch all that code as well). + +2012-04-29 16:49:57 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * tools/gst-inspect.c: + tools: use public accessors for plugin description details + Mostly anyway (flags still need sorting out). + +2012-04-29 16:46:55 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * docs/gst/gstreamer-sections.txt: + * gst/gstplugin.c: + * gst/gstplugin.h: + * win32/common/libgstreamer.def: + plugin: remove gst_plugin_get_module() + This is an implementation detail really, and it's not + clear what anyone would do with this. It's unused as + far as I'm aware, so just remove it for now. + +2012-04-29 16:20:50 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * docs/gst/gstreamer-sections.txt: + * gst/gstplugin.c: + * gst/gstplugin.h: + * win32/common/libgstreamer.def: + plugin: add accessor for release date time string in plugin description + API: gst_plugin_get_release_date_string() + +2012-04-29 15:53:05 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * tests/check/gst/gstplugin.c: + tests: use public accessors to get plugin description details + +2012-04-29 13:28:09 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * gst/gstobject.c: + gstobject: give the 20th queue element a different name than the first queue2 one + Fixes issue with the default naming scheme. + +2012-04-18 17:37:25 +0400 Руслан Ижбулатов <lrn1986@gmail.com> + + * gst/parse/grammar.y: + Fix format string in grammar.y + Fixes #674849 + +2012-04-25 20:14:13 +0200 Stefan Sauer <ensonic@users.sf.net> + + * libs/gst/controller/gstdirectcontrolbinding.c: + controlbindings: add comments for sparse control source + +2012-04-25 20:10:11 +0200 Stefan Sauer <ensonic@users.sf.net> + + * gst/gstcontrolbinding.c: + controller: emulate _get_g_value_array() + Add a default implementation on the baseclass. + +2012-04-25 09:47:10 +0200 Stefan Sauer <ensonic@users.sf.net> + + * docs/gst/gstreamer-sections.txt: + * gst/gstcontrolbinding.c: + * gst/gstcontrolbinding.h: + * gst/gstcontrolsource.c: + * gst/gstobject.c: + * gst/gstobject.h: + * libs/gst/controller/gstargbcontrolbinding.c: + * libs/gst/controller/gstdirectcontrolbinding.c: + * libs/gst/controller/gstdirectcontrolbinding.h: + * tests/check/libs/controller.c: + * tests/examples/controller/control-sources.c: + * win32/common/libgstreamer.def: + controller: expand the api to offer functions for plain and GValue arrays + Rename the _get_value_array() functions to _get_g_value_array() and reintroduce + the former to operate on plain unboxed c datatypes (like in 0.10). The _g_value + variants are for bindings while the _value ones are more suited to processing + in elements. + +2012-04-25 18:11:03 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * scripts/gst-uninstalled: + gst-uninstalled: Add insanity, insanity-gst and gst-editing-services + +2012-04-25 09:06:05 +0200 Wim Taymans <wim.taymans@collabora.co.uk> + + * gst/gstbufferpool.c: + * gst/gstbufferpool.h: + bufferpool: Reset the buffer before releasing into pool + Reset the buffer not after we acquire but before we release into the pool. This + makes sure that the pool only has buffers in a clean state and that we can set + extra metadata on buffers in the acquire method. this means that we need to + remove an argument from the method. + +2012-04-23 15:32:04 +0200 Wim Taymans <wim.taymans@collabora.co.uk> + + * gst/gstbuffer.h: + buffer: MARKER is for the start of a talkspurt + +2012-04-24 16:01:52 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + + * tests/check/elements/queue2.c: + * tests/check/gst/gstpad.c: + tests: plug some leaks + +2012-04-23 17:04:57 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + + * libs/gst/base/gstcollectpads.c: + collectpads: do not unref flush_start twice + Based on patch by Matej Knopp <matej.knopp@gmail.com> + +2012-04-23 16:57:16 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + + * libs/gst/base/gstadapter.c: + adapter: refresh skip following merge_up attempt + ... as the latter might now adjust skip as well. + +2012-04-23 09:18:48 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * gst/gstmessage.h: + message: Remove comma at end of enum list + This comma confuses some compilers. + +2012-04-18 15:31:23 +0400 Руслан Ижбулатов <lrn1986@gmail.com> + + * plugins/elements/gsttee.c: + tee: Remove unneeded unlock + +2012-04-18 05:12:55 +0400 Руслан Ижбулатов <lrn1986@gmail.com> + + * gst/gstregistry.c: + registry: fix hardcoded 0.10 version in win32 pluginscanner + https://bugzilla.gnome.org/show_bug.cgi?id=674294 + +2012-04-17 15:37:27 +0200 Wim Taymans <wim.taymans@collabora.co.uk> + + * gst/gstbuffer.c: + * gst/gstbufferpool.c: + * gst/gstbufferpool.h: + * gst/gstmeta.h: + * tests/check/gst/gstmeta.c: + meta: add LOCKED flag + Add a new LOCKED flag to the metadata. Refuse removing LOCKED metadata from + a buffer. + Mark the metadata from the bufferpool LOCKED. + Add unit test for LOCKED flag + +2012-04-17 14:38:01 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + + * docs/libs/gstreamer-libs-docs.sgml: + * docs/libs/gstreamer-libs-sections.txt: + * docs/libs/gstreamer-libs.types: + * libs/gst/base/Makefile.am: + * libs/gst/base/gstcollectpads.c: + * libs/gst/base/gstcollectpads.h: + * libs/gst/base/gstcollectpads2.c: + * libs/gst/base/gstcollectpads2.h: + * tests/check/Makefile.am: + * tests/check/libs/.gitignore: + * tests/check/libs/collectpads.c: + * tests/check/libs/collectpads2.c: + * tests/check/libs/gstlibscpp.cc: + * tests/check/libs/libsabi.c: + * win32/common/libgstbase.def: + * win32/vs10/base/base.vcxproj: + * win32/vs10/base/base.vcxproj.filters: + collectpads2: rename to collectpads + +2012-04-17 12:54:45 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + + * libs/gst/base/gstadapter.c: + adapter: ensure writable head buffer before skipping part of it + +2012-04-17 12:29:50 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + + Merge remote-tracking branch 'origin/0.10' + Conflicts: + libs/gst/base/gstcollectpads2.c + +2012-04-17 12:23:05 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + + * libs/gst/base/gstcollectpads2.c: + collectpads2: always recording incoming segment info if no buffer_func set + +2012-04-17 10:38:05 +0200 Wim Taymans <wim.taymans@collabora.co.uk> + + * docs/gst/running.xml: + docs: update the debug and trace env var docs + +2012-04-17 10:33:59 +0200 Wim Taymans <wim.taymans@collabora.co.uk> + + * gst/gsttrace.c: + trace: use g_parse_debug_string instead of atoi + Make the GST_TRACE env variable take a comma separated list of strings + describing the options to enable instead of a number. + +2012-04-16 21:14:17 +0000 Youness Alaoui <youness.alaoui@collabora.co.uk> + + * tools/gst-inspect.c: + gst-inspect: If running with --print-all, fix printing of the Children: line + +2012-04-16 21:14:02 +0000 Youness Alaoui <youness.alaoui@collabora.co.uk> + + * tools/gst-inspect.c: + gst-inspect: If running with --print-all, fix printing of signal names + +2012-04-16 16:36:52 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + + * win32/common/libgstbase.def: + win32: add new collectpads2 API to .def file + +2012-04-16 16:29:34 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + + Merge remote-tracking branch 'origin/0.10' + Conflicts: + libs/gst/base/gstcollectpads2.c + +2012-04-16 16:24:18 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + + * libs/gst/base/gstcollectpads2.c: + * libs/gst/base/gstcollectpads2.h: + collectpads2: provide query default and callback handling + ... which presently mainly serves to answer SEEKING query negatively + to dissuade upstream encoders from doing any seeking and + "header finalization" (since the returned result of pushing a + sticky event is fairly useless nowadays). + +2012-04-16 16:24:10 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + + * libs/gst/base/gstcollectpads2.c: + * libs/gst/base/gstcollectpads2.h: + collectpads2: modify event handling using a default event handler + ... that elements should "chain up" to. + +2012-04-16 15:35:23 +0200 Wim Taymans <wim.taymans@collabora.co.uk> + + * gst/gstvalue.c: + segment: add rude serialization + Ass serialize and deserialize functions for GstSegment so that gdp and + gst_structure_to_string show the segment values. We convert to a GstSegment + first to make things easier.. + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=674100 + +2012-02-03 17:08:35 +0000 Vincent Penquerc'h <vincent.penquerch@collabora.co.uk> + + * libs/gst/base/gstcollectpads2.c: + collectpads2: assume 0 based segment if no time segment was provided + https://bugzilla.gnome.org/show_bug.cgi?id=669305 + +2012-04-16 10:28:15 +0200 Wim Taymans <wim.taymans@collabora.co.uk> + + * gst/gstmemory.c: + memory: add size to debug log + +2012-04-16 10:27:29 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * plugins/elements/gstinputselector.c: + inputselector: Set sequence number on segment events + +2012-04-16 10:22:53 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * plugins/elements/gstinputselector.c: + inputselector: Forward all sticky events when switching pads + +2012-04-16 10:05:02 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * plugins/elements/gsttee.c: + tee: Store pad state directly inside the pads instead of GObject qdata + +2012-04-16 09:45:27 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * plugins/elements/gstinputselector.c: + inputselector: Send reconfigure event on the new active pad when pads are switched + +2012-04-16 09:08:46 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * common: + Automatic update of common submodule + From 6db25be to dc70203 + +2012-04-14 03:27:29 +0200 Matej Knopp <matej.knopp@gmail.com> + + * libs/gst/base/gstadapter.c: + Remove skipped part of buffer when mapping the adapter + Fixes https://bugzilla.gnome.org/show_bug.cgi?id=674085 + +2012-04-14 10:24:38 +0200 Wim Taymans <wim.taymans@collabora.co.uk> + + * tests/check/libs/adapter.c: + tests: add another adapter test + Test performance of merging + +2012-04-14 10:23:49 +0200 Wim Taymans <wim.taymans@collabora.co.uk> + + * gst/gstbuffer.c: + buffer: improve debug + +2012-04-13 14:22:34 +0200 Matej Knopp <matej.knopp@gmail.com> + + * plugins/elements/gstmultiqueue.c: + multiqueue: gst_single_queue_flush unlocks the queue twice + https://bugzilla.gnome.org/show_bug.cgi?id=674044 + +2012-04-13 13:36:37 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * autogen.sh: + * configure.ac: + configure: Modernize autotools setup a bit + Also we now only create tar.bz2 and tar.xz tarballs. + +2012-04-13 13:36:47 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * common: + Automatic update of common submodule + From 464fe15 to 6db25be + +2012-04-13 11:58:49 +0200 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk> + + * libs/gst/base/gstbasesink.c: + basesink: plug caps leak + +2012-04-13 08:10:19 +0200 Stefan Sauer <ensonic@users.sf.net> + + * gst/gstcontrolbinding.c: + controlbinding: only take a weak ref on the object + Fixes the leaks in the tests. Added a TODO comment to eventually rework this + some more (while we can). + +2012-04-12 18:15:27 -0400 Reynaldo H. Verdejo Pinochet <reynaldo@collabora.com> + + * Android.mk: + Sync Android.mk entries to the new major version + Change naming on the pkgconfig files to reflect + the 0.10 -> 1.0 bump. + +2012-04-12 14:59:52 +0200 Edward Hervey <edward.hervey@collabora.co.uk> + + * libs/gst/controller/gstargbcontrolbinding.c: + * libs/gst/controller/gstdirectcontrolbinding.c: + * libs/gst/controller/gstlfocontrolsource.c: + * libs/gst/controller/gsttimedvaluecontrolsource.c: + controller: Chain up to parent class dispose/finalize + Avoids leaks + +2012-04-12 14:59:31 +0200 Edward Hervey <edward.hervey@collabora.co.uk> + + * libs/gst/check/gstconsistencychecker.c: + consistencychecker: Use gst_object_{ref|unref} where applicable + Allows us to debug object life + +2012-04-12 14:58:47 +0200 Edward Hervey <edward.hervey@collabora.co.uk> + + * gst/gstobject.c: + * gst/gstpluginfeature.c: + gst: Use gst_object_{ref|unref} where applicable + Allows us to debug object life + +2012-04-12 11:53:00 +0200 Wim Taymans <wim.taymans@collabora.co.uk> + + * gst/gstbuffer.c: + buffer: improve arg checking + Allow idx == 0 and length == -1 on empty buffers for the _range methods. + +2012-04-12 11:18:22 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * configure.ac: + Back to development + === release 0.11.90 === -2012-04-12 Sebastian Dröge <sebastian.droege@collabora.co.uk> +2012-04-12 09:57:01 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk> + * ChangeLog: + * NEWS: + * RELEASE: * configure.ac: - releasing 0.11.90, "And all with pearl and ruby glowing was the fair palace door" + * docs/plugins/gstreamer-plugins.prerequisites: + * docs/plugins/inspect/plugin-coreelements.xml: + * docs/plugins/inspect/plugin-coreindexers.xml: + * gstreamer.doap: + * win32/common/config.h: + Release 0.11.90 + +2012-04-12 09:56:43 +0200 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * po/af.po: + * po/az.po: + * po/be.po: + * po/bg.po: + * po/ca.po: + * po/cs.po: + * po/da.po: + * po/de.po: + * po/el.po: + * po/en_GB.po: + * po/eo.po: + * po/es.po: + * po/eu.po: + * po/fi.po: + * po/fr.po: + * po/gl.po: + * po/hu.po: + * po/id.po: + * po/it.po: + * po/ja.po: + * po/lt.po: + * po/nb.po: + * po/nl.po: + * po/pl.po: + * po/pt_BR.po: + * po/ro.po: + * po/ru.po: + * po/rw.po: + * po/sk.po: + * po/sl.po: + * po/sq.po: + * po/sr.po: + * po/sv.po: + * po/tr.po: + * po/uk.po: + * po/vi.po: + * po/zh_CN.po: + * po/zh_TW.po: + Update .po files 2012-04-11 13:20:18 +0200 Wim Taymans <wim.taymans@collabora.co.uk> diff --git a/Makefile.in b/Makefile.in index b307364..e0990cf 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -207,8 +207,8 @@ am__relativize = \ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ done; \ reldir="$$dir2" -DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best +DIST_ARCHIVES = $(distdir).tar.xz distuninstallcheck_listfiles = find . -type f -print am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' @@ -522,9 +522,6 @@ EXTRA_DIST = \ CLEANFILES = gst-element-check-@GST_API_VERSION@.m4 DISTCLEANFILES = _stdint.h - -# make bz2 as well -AUTOMAKE_OPTIONS = dist-bzip2 @GST_GCOV_ENABLED_TRUE@GCOV_DIRS = gst libs # Do not run the check-exports test in case any option which causes the API to @@ -649,7 +646,7 @@ install-aclocalDATA: $(aclocal_DATA) @list='$(aclocal_DATA)'; test -n "$(aclocaldir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(aclocaldir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(aclocaldir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(aclocaldir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -871,6 +868,7 @@ distdir: $(DISTFILES) dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) + dist-bzip2: distdir tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 $(am__remove_distdir) @@ -882,7 +880,6 @@ dist-lzip: distdir dist-lzma: distdir tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) - dist-xz: distdir tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) @@ -901,8 +898,7 @@ dist-zip: distdir $(am__remove_distdir) dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz $(am__remove_distdir) # This target untars the dist file and tries a VPATH configuration. Then @@ -1183,8 +1179,7 @@ check-nonportable-print-format: dist-hook: check-exports win32-check-crlf release: dist - $(MAKE) $(PACKAGE)-$(VERSION).tar.gz.md5 - $(MAKE) $(PACKAGE)-$(VERSION).tar.bz2.md5 + $(MAKE) $(PACKAGE)-$(VERSION).tar.xz.md5 # generate md5 sum files %.md5: % @@ -1,4 +1,10 @@ -This is GStreamer 0.11.90 "And all with pearl and ruby glowing was the fair palace door" +This is GStreamer 0.11.91 "I will give you five magic beans!" + +New features in 0.11.91: + + * API cleanup and minor improvements + * More hiding of structs that don't need to be public + * Addition of SNAP flag for seek events New features in 0.11.90: @@ -1,5 +1,5 @@ -Release notes for GStreamer 0.11.90 "And all with pearl and ruby glowing was the fair palace door" +Release notes for GStreamer 0.11.91 "I will give you five magic beans!" @@ -39,10 +39,11 @@ contains a set of less supported plug-ins that haven't passed the Features of this release - * Lots of bugfixes, cleanup and other improvements - * Improvements to the buffer and memory managment API - * A new GstTOC interface, e.g. for handling chapters - * The GstChildProxy interface works with any GObject now + * Parallel installability with 0.10.x series + * Threadsafe design and API + * API cleanup and minor improvements + * More hiding of structs that don't need to be public + * Addition of SNAP flag for seek events There were no bugs fixed in this release @@ -77,20 +78,20 @@ Webkit, Jokosher, Transmageddon and others. We're working on porting more applic Contributors to this release - * Alessandro Decina - * Alexander Saprykin - * Christian Fredrik Kalager Schaller - * David Schleef + * Anton Belka * Edward Hervey - * Fabrizio (Misto) Milo * Mark Nauwelaerts * Matej Knopp - * Olivier Crête - * Ryan Lortie + * Raimo Järvi + * Reynaldo H. Verdejo Pinochet * Sebastian Dröge + * Sebastian Rasmussen * Sreerenj Balachandran * Stefan Sauer + * Thiago Santos * Tim-Philipp Müller + * Vincent Penquerc'h * Wim Taymans + * Youness Alaoui * Руслан Ижбулатов
\ No newline at end of file @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11.4 -*- Autoconf -*- +# generated automatically by aclocal 1.11.5 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, @@ -14,8 +14,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -38,7 +38,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.4], [], +m4_if([$1], [1.11.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -54,7 +54,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.4])dnl +[AM_AUTOMAKE_VERSION([1.11.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -867,6 +867,25 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 1 + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 @@ -45,14 +45,14 @@ autogen_options $@ printf "+ check for build tools" if test ! -z "$NOCHECK"; then echo ": skipped version checks"; else echo; fi -version_check "autoconf" "$AUTOCONF autoconf autoconf270 autoconf269 autoconf268 autoconf267 autoconf266 autoconf265 autoconf264 autoconf263 autoconf262 autoconf261 autoconf260" \ - "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 60 || DIE=1 -version_check "automake" "$AUTOMAKE automake automake-1.11 automake-1.10" \ - "ftp://ftp.gnu.org/pub/gnu/automake/" 1 10 || DIE=1 +version_check "autoconf" "$AUTOCONF autoconf autoconf270 autoconf269 autoconf268 autoconf267 autoconf266 autoconf265 autoconf264 autoconf263 autoconf262" \ + "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 62 || DIE=1 +version_check "automake" "$AUTOMAKE automake automake-1.11" \ + "ftp://ftp.gnu.org/pub/gnu/automake/" 1 11 || DIE=1 version_check "autopoint" "autopoint" \ "ftp://ftp.gnu.org/pub/gnu/gettext/" 0 17 || DIE=1 -version_check "libtoolize" "libtoolize libtoolize15 glibtoolize" \ - "ftp://ftp.gnu.org/pub/gnu/libtool/" 1 5 0 || DIE=1 +version_check "libtoolize" "libtoolize glibtoolize" \ + "ftp://ftp.gnu.org/pub/gnu/libtool/" 2 2 6 || DIE=1 version_check "pkg-config" "" \ "http://www.freedesktop.org/software/pkgconfig" 0 8 0 || DIE=1 diff --git a/common/Makefile.in b/common/Makefile.in index e45e7cd..db3ce35 100644 --- a/common/Makefile.in +++ b/common/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/common/gst-autogen.sh b/common/gst-autogen.sh index f05e021..e54dbcf 100644 --- a/common/gst-autogen.sh +++ b/common/gst-autogen.sh @@ -216,38 +216,6 @@ autoheader_check () } -autoconf_2_52d_check () -{ - # autoconf 2.52d has a weird issue involving a yes:no error - # so don't allow it's use - test -z "$NOCHECK" && { - ac_version=`$autoconf --version|head -n 1|sed 's/^[a-zA-Z\.\ ()]*//;s/ .*$//'` - if test "$ac_version" = "2.52d"; then - echo "autoconf 2.52d has an issue with our current build." - echo "We don't know who's to blame however. So until we do, get a" - echo "regular version. RPM's of a working version are on the gstreamer site." - exit 1 - fi - } - return 0 -} -libtool_2_2_gettext_check () -{ - # libtool 2.2 needs autopoint 0.17 or higher - version_compare LIBTOOLIZE 2 2 0 - if test $? -eq 0 - then - version_compare AUTOPOINT 0 17 0 - if test $? -ne 0 - then - echo "libtool 2.2 requires autopoint 0.17 or higher" - return 1 - fi - fi - return 0 -} - - die_check () { # call with $DIE diff --git a/common/m4/Makefile.in b/common/m4/Makefile.in index 999f436..8767f43 100644 --- a/common/m4/Makefile.in +++ b/common/m4/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/common/m4/as-libtool.m4 b/common/m4/as-libtool.m4 index 25de9d1..3b16095 100644 --- a/common/m4/as-libtool.m4 +++ b/common/m4/as-libtool.m4 @@ -41,5 +41,6 @@ AC_DEFUN([AS_LIBTOOL], fi AC_SUBST([$1]_LT_LDFLAGS) - AC_LIBTOOL_DLOPEN + LT_PREREQ([2.2.6]) + LT_INIT([dlopen win32-dll disable-static]) ]) diff --git a/common/release.mak b/common/release.mak index 4a9b7d5..7fbf4ca 100644 --- a/common/release.mak +++ b/common/release.mak @@ -1,12 +1,8 @@ # include this snippet to add a common release: target by using # include $(top_srcdir)/common/release.mak -# make bz2 as well -AUTOMAKE_OPTIONS = dist-bzip2 - release: dist - $(MAKE) $(PACKAGE)-$(VERSION).tar.gz.md5 - $(MAKE) $(PACKAGE)-$(VERSION).tar.bz2.md5 + $(MAKE) $(PACKAGE)-$(VERSION).tar.xz.md5 # generate md5 sum files %.md5: % diff --git a/config.h.in b/config.h.in index 1c3e844..d78a08e 100644 --- a/config.h.in +++ b/config.h.in @@ -377,6 +377,11 @@ # endif #endif +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for GStreamer 0.11.90. +# Generated by GNU Autoconf 2.69 for GStreamer 0.11.91. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer>. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -340,6 +368,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -461,6 +497,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -495,16 +535,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -516,28 +556,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -571,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GStreamer' PACKAGE_TARNAME='gstreamer' -PACKAGE_VERSION='0.11.90' -PACKAGE_STRING='GStreamer 0.11.90' +PACKAGE_VERSION='0.11.91' +PACKAGE_STRING='GStreamer 0.11.91' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer' PACKAGE_URL='' @@ -981,8 +1001,8 @@ ac_user_opts=' enable_option_checking enable_maintainer_mode enable_silent_rules -enable_shared enable_static +enable_shared with_pic enable_fast_install enable_dependency_tracking @@ -1504,8 +1524,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1591,7 +1609,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GStreamer 0.11.90 to adapt to many kinds of systems. +\`configure' configures GStreamer 0.11.91 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1661,7 +1679,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GStreamer 0.11.90:";; + short | recursive ) echo "Configuration of GStreamer 0.11.91:";; esac cat <<\_ACEOF @@ -1669,12 +1687,12 @@ Optional Features: --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode enable make rules and dependencies not useful + --disable-maintainer-mode disable make rules and dependencies not useful (and sometimes confusing) to the casual installer --enable-silent-rules less verbose build output (undo: `make V=1') --disable-silent-rules verbose build output (undo: `make V=0') + --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] - --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-dependency-tracking speeds up one-time build @@ -1830,10 +1848,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GStreamer configure 0.11.90 -generated by GNU Autoconf 2.68 +GStreamer configure 0.11.91 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1909,7 +1927,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2253,7 +2271,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2434,7 +2452,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2450,7 +2469,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2476,7 +2496,8 @@ int main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2492,7 +2513,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2526,7 +2548,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2598,8 +2621,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GStreamer $as_me 0.11.90, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by GStreamer $as_me 0.11.91, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3022,7 +3045,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -3191,7 +3214,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3231,7 +3254,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3282,7 +3305,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -3335,7 +3358,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -3421,7 +3444,7 @@ fi # Define the identity of the package. PACKAGE='gstreamer' - VERSION='0.11.90' + VERSION='0.11.91' cat >>confdefs.h <<_ACEOF @@ -3455,17 +3478,98 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' -am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to create a ustar tar archive" >&5 +$as_echo_n "checking how to create a ustar tar archive... " >&6; } +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar plaintar pax cpio none' +_am_tools=${am_cv_prog_tar_ustar-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + { echo "$as_me:$LINENO: $_am_tar --version" >&5 + ($_am_tar --version) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && break + done + am__tar="$_am_tar --format=ustar -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=ustar -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x ustar -w "$$tardir"' + am__tar_='pax -L -x ustar -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H ustar -L' + am__tar_='find "$tardir" -print | cpio -o -H ustar -L' + am__untar='cpio -i -H ustar -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_ustar}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + { echo "$as_me:$LINENO: tardir=conftest.dir && eval $am__tar_ >conftest.tar" >&5 + (tardir=conftest.dir && eval $am__tar_ >conftest.tar) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + rm -rf conftest.dir + if test -s conftest.tar; then + { echo "$as_me:$LINENO: $am__untar <conftest.tar" >&5 + ($am__untar <conftest.tar) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +if ${am_cv_prog_tar_ustar+:} false; then : + $as_echo_n "(cached) " >&6 +else + am_cv_prog_tar_ustar=$_am_tool +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_tar_ustar" >&5 +$as_echo "$am_cv_prog_tar_ustar" >&6; } - PACKAGE_VERSION_MAJOR=$(echo 0.11.90 | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo 0.11.90 | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo 0.11.90 | cut -d'.' -f3) + + PACKAGE_VERSION_MAJOR=$(echo 0.11.91 | cut -d'.' -f1) + PACKAGE_VERSION_MINOR=$(echo 0.11.91 | cut -d'.' -f2) + PACKAGE_VERSION_MICRO=$(echo 0.11.91 | cut -d'.' -f3) @@ -3476,7 +3580,7 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 $as_echo_n "checking nano version... " >&6; } - NANO=$(echo 0.11.90 | cut -d'.' -f4) + NANO=$(echo 0.11.91 | cut -d'.' -f4) if test x"$NANO" = x || test "x$NANO" = "x0" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 @@ -3511,7 +3615,7 @@ $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles if test "${enable_maintainer_mode+set}" = set; then : enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval else - USE_MAINTAINER_MODE=no + USE_MAINTAINER_MODE=yes fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5 @@ -3657,333 +3761,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF - - GST_CURRENT=0 - GST_REVISION=0 - GST_AGE=0 - GST_LIBVERSION=0:0:0 - - - - - - GST_LT_LDFLAGS="$GST_LT_LDFLAGS -version-info $GST_LIBVERSION" - if test ! -z "" - then - GST_LT_LDFLAGS="$GST_LT_LDFLAGS -release " - fi - - - enable_dlopen=yes - - - - - - -enable_win32_dll=yes - -case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. -set dummy ${ac_tool_prefix}as; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_AS+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$AS"; then - ac_cv_prog_AS="$AS" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_AS="${ac_tool_prefix}as" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -AS=$ac_cv_prog_AS -if test -n "$AS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 -$as_echo "$AS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_AS"; then - ac_ct_AS=$AS - # Extract the first word of "as", so it can be a program name with args. -set dummy as; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_AS+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_AS"; then - ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_AS="as" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_AS=$ac_cv_prog_ac_ct_AS -if test -n "$ac_ct_AS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 -$as_echo "$ac_ct_AS" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_AS" = x; then - AS="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - AS=$ac_ct_AS - fi -else - AS="$ac_cv_prog_AS" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$DLLTOOL"; then - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -DLLTOOL=$ac_cv_prog_DLLTOOL -if test -n "$DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 -$as_echo "$DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_DLLTOOL"; then - ac_ct_DLLTOOL=$DLLTOOL - # Extract the first word of "dlltool", so it can be a program name with args. -set dummy dlltool; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_DLLTOOL"; then - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_DLLTOOL="dlltool" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL -if test -n "$ac_ct_DLLTOOL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 -$as_echo "$ac_ct_DLLTOOL" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_DLLTOOL" = x; then - DLLTOOL="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - DLLTOOL=$ac_ct_DLLTOOL - fi -else - DLLTOOL="$ac_cv_prog_DLLTOOL" -fi - - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. -set dummy ${ac_tool_prefix}objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$OBJDUMP"; then - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -OBJDUMP=$ac_cv_prog_OBJDUMP -if test -n "$OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 -$as_echo "$OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_OBJDUMP"; then - ac_ct_OBJDUMP=$OBJDUMP - # Extract the first word of "objdump", so it can be a program name with args. -set dummy objdump; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_OBJDUMP"; then - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_OBJDUMP="objdump" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP -if test -n "$ac_ct_OBJDUMP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 -$as_echo "$ac_ct_OBJDUMP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_OBJDUMP" = x; then - OBJDUMP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - OBJDUMP=$ac_ct_OBJDUMP - fi -else - OBJDUMP="$ac_cv_prog_OBJDUMP" -fi - - ;; -esac - -test -z "$AS" && AS=as - - - - - -test -z "$DLLTOOL" && DLLTOOL=dlltool - - - - - -test -z "$OBJDUMP" && OBJDUMP=objdump - - - - - - - case `pwd` in *\ * | *\ *) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 @@ -4163,7 +3940,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4203,7 +3980,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4256,7 +4033,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4297,7 +4074,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4355,7 +4132,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4399,7 +4176,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4845,8 +4622,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -5081,7 +4857,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -5157,7 +4933,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -5223,7 +4999,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -5290,7 +5066,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -5546,7 +5322,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5590,7 +5366,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6014,7 +5790,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6054,7 +5830,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6357,7 +6133,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6397,7 +6173,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6498,7 +6274,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6542,7 +6318,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6667,7 +6443,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6707,7 +6483,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6766,7 +6542,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6806,7 +6582,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7455,7 +7231,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7495,7 +7271,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7575,7 +7351,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7615,7 +7391,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7667,7 +7443,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7707,7 +7483,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7759,7 +7535,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7799,7 +7575,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7851,7 +7627,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7891,7 +7667,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7943,7 +7719,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7983,7 +7759,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8463,36 +8239,350 @@ fi done + GST_CURRENT=0 + GST_REVISION=0 + GST_AGE=0 + GST_LIBVERSION=0:0:0 + + + + + + GST_LT_LDFLAGS="$GST_LT_LDFLAGS -version-info $GST_LIBVERSION" + if test ! -z "" + then + GST_LT_LDFLAGS="$GST_LT_LDFLAGS -release " + fi + + + + # Set options +enable_dlopen=yes +enable_win32_dll=yes + +case $host in +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. +set dummy ${ac_tool_prefix}as; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_AS+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$AS"; then + ac_cv_prog_AS="$AS" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_AS="${ac_tool_prefix}as" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +AS=$ac_cv_prog_AS +if test -n "$AS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 +$as_echo "$AS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi +fi +if test -z "$ac_cv_prog_AS"; then + ac_ct_AS=$AS + # Extract the first word of "as", so it can be a program name with args. +set dummy as; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_AS+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_AS"; then + ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_AS="as" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS +fi +fi +ac_ct_AS=$ac_cv_prog_ac_ct_AS +if test -n "$ac_ct_AS"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 +$as_echo "$ac_ct_AS" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi - # Check whether --enable-shared was given. -if test "${enable_shared+set}" = set; then : - enableval=$enable_shared; p=${PACKAGE-default} + if test "x$ac_ct_AS" = x; then + AS="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + AS=$ac_ct_AS + fi +else + AS="$ac_cv_prog_AS" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$DLLTOOL"; then + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +DLLTOOL=$ac_cv_prog_DLLTOOL +if test -n "$DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 +$as_echo "$DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_DLLTOOL"; then + ac_ct_DLLTOOL=$DLLTOOL + # Extract the first word of "dlltool", so it can be a program name with args. +set dummy dlltool; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_DLLTOOL"; then + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_DLLTOOL="dlltool" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL +if test -n "$ac_ct_DLLTOOL"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 +$as_echo "$ac_ct_DLLTOOL" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_DLLTOOL" = x; then + DLLTOOL="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + DLLTOOL=$ac_ct_DLLTOOL + fi +else + DLLTOOL="$ac_cv_prog_DLLTOOL" +fi + + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. +set dummy ${ac_tool_prefix}objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$OBJDUMP"; then + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +OBJDUMP=$ac_cv_prog_OBJDUMP +if test -n "$OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 +$as_echo "$OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_OBJDUMP"; then + ac_ct_OBJDUMP=$OBJDUMP + # Extract the first word of "objdump", so it can be a program name with args. +set dummy objdump; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_OBJDUMP"; then + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_OBJDUMP="objdump" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP +if test -n "$ac_ct_OBJDUMP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 +$as_echo "$ac_ct_OBJDUMP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_OBJDUMP" = x; then + OBJDUMP="false" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + OBJDUMP=$ac_ct_OBJDUMP + fi +else + OBJDUMP="$ac_cv_prog_OBJDUMP" +fi + + ;; +esac + +test -z "$AS" && AS=as + + + + + +test -z "$DLLTOOL" && DLLTOOL=dlltool + + + + + +test -z "$OBJDUMP" && OBJDUMP=objdump + + + + +# Check whether --enable-static was given. +if test "${enable_static+set}" = set; then : + enableval=$enable_static; p=${PACKAGE-default} case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; + yes) enable_static=yes ;; + no) enable_static=no ;; *) - enable_shared=no + enable_static=no # Look at the argument we got. We use all the common list separators. lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for pkg in $enableval; do IFS="$lt_save_ifs" if test "X$pkg" = "X$p"; then - enable_shared=yes + enable_static=yes fi done IFS="$lt_save_ifs" ;; esac else - enable_shared=yes + enable_static=no fi @@ -8503,27 +8593,30 @@ fi - # Check whether --enable-static was given. -if test "${enable_static+set}" = set; then : - enableval=$enable_static; p=${PACKAGE-default} + + + + # Check whether --enable-shared was given. +if test "${enable_shared+set}" = set; then : + enableval=$enable_shared; p=${PACKAGE-default} case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; + yes) enable_shared=yes ;; + no) enable_shared=no ;; *) - enable_static=no + enable_shared=no # Look at the argument we got. We use all the common list separators. lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," for pkg in $enableval; do IFS="$lt_save_ifs" if test "X$pkg" = "X$p"; then - enable_static=yes + enable_shared=yes fi done IFS="$lt_save_ifs" ;; esac else - enable_static=yes + enable_shared=yes fi @@ -8535,6 +8628,7 @@ fi + # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : withval=$with_pic; lt_p=${PACKAGE-default} @@ -12486,6 +12580,7 @@ CC="$lt_save_CC" + # Check whether --with-autoconf was given. if test "${with_autoconf+set}" = set; then : withval=$with_autoconf; @@ -12654,7 +12749,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14819,7 +14914,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14862,7 +14957,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16219,6 +16314,8 @@ _ACEOF esac rm -rf conftest* fi + + fi @@ -16245,7 +16342,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16285,7 +16382,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16338,7 +16435,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16379,7 +16476,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -16437,7 +16534,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16481,7 +16578,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -16677,8 +16774,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -17041,7 +17137,7 @@ main () return 0; } _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 do CC="$ac_save_CC $ac_arg" if ac_fn_c_try_compile "$LINENO"; then : @@ -17081,8 +17177,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -17474,7 +17569,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -17518,7 +17613,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21103,7 +21198,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PERL_PATH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21150,7 +21245,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_BISON_PATH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21208,7 +21303,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_FLEX_PATH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21277,7 +21372,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_VALGRIND_PATH="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21438,7 +21533,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAVE_DOCBOOK2PS="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21476,7 +21571,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAVE_DOCBOOK2HTML="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21514,7 +21609,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAVE_JADETEX="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21552,7 +21647,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAVE_PS2PDF="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21638,7 +21733,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_XSLTPROC="xsltproc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21711,7 +21806,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAVE_DVIPS="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21749,7 +21844,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAVE_XMLLINT="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21788,7 +21883,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAVE_FIG2DEV="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21853,7 +21948,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAVE_PNGTOPNM="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21891,7 +21986,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAVE_PNMTOPS="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -21929,7 +22024,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_HAVE_EPSTOPDF="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -22093,7 +22188,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -22168,7 +22263,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GTKDOC_CHECK="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -22250,7 +22345,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -26015,16 +26110,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -26084,28 +26179,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -26126,8 +26209,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GStreamer $as_me 0.11.90, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by GStreamer $as_me 0.11.91, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -26192,11 +26275,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GStreamer config.status 0.11.90 -configured by $0, generated by GNU Autoconf 2.68, +GStreamer config.status 0.11.91 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -26287,7 +26370,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -26321,13 +26404,13 @@ AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" sed_quote_subst='$sed_quote_subst' double_quote_subst='$double_quote_subst' delay_variable_subst='$delay_variable_subst' +macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' +macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`' DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' -macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' -macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' -enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' +enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' @@ -27534,6 +27617,10 @@ available_tags="CXX " # ### BEGIN LIBTOOL CONFIG +# Which release of libtool.m4 was used? +macro_version=$macro_version +macro_revision=$macro_revision + # Assembler program. AS=$lt_AS @@ -27543,16 +27630,12 @@ DLLTOOL=$lt_DLLTOOL # Object dumper program. OBJDUMP=$lt_OBJDUMP -# Which release of libtool.m4 was used? -macro_version=$macro_version -macro_revision=$macro_revision +# Whether or not to build static libraries. +build_old_libs=$enable_static # Whether or not to build shared libraries. build_libtool_libs=$enable_shared -# Whether or not to build static libraries. -build_old_libs=$enable_static - # What type of objects to build. pic_mode=$pic_mode diff --git a/configure.ac b/configure.ac index 2e2580a..4b0aa00 100644 --- a/configure.ac +++ b/configure.ac @@ -1,15 +1,15 @@ -AC_PREREQ(2.60) +AC_PREREQ(2.62) dnl initialize autoconf dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, git and prerelease does Werror too -AC_INIT(GStreamer, 0.11.90, +AC_INIT(GStreamer, 0.11.91, http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer, gstreamer) AG_GST_INIT dnl initialize automake (we require GNU make) -AM_INIT_AUTOMAKE([-Wno-portability 1.10]) +AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar]) dnl define PACKAGE_VERSION_* variables AS_VERSION @@ -24,7 +24,7 @@ dnl define the output header for config AM_CONFIG_HEADER([config.h]) dnl AM_MAINTAINER_MODE only provides the option to configure to enable it -AM_MAINTAINER_MODE +AM_MAINTAINER_MODE([enable]) dnl sets host_* variables AC_CANONICAL_HOST @@ -64,14 +64,6 @@ dnl - interfaces removed -> AGE = 0 dnl sets GST_LT_LDFLAGS AS_LIBTOOL(GST, 0, 0, 0) -dnl FIXME: this macro doesn't actually work; -dnl the generated libtool script has no support for the listed tags. -dnl So this needs to be fixed first if we want to use this -dnl AS_LIBTOOL_TAGS - -AC_LIBTOOL_WIN32_DLL -AM_PROG_LIBTOOL - dnl *** autotools stuff **** dnl allow for different autotools @@ -269,7 +261,7 @@ AG_GST_PLUGIN_DOCS([1.3],[2.1]) dnl *** checks for libraries *** dnl check for libm, for sin() -AC_CHECK_LIBM +LT_LIB_M AC_SUBST(LIBM) dnl *** checks for header files *** diff --git a/docs/Makefile.in b/docs/Makefile.in index 14612de..942e178 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/docs/design/Makefile.in b/docs/design/Makefile.in index 9e94c62..ed6ed53 100644 --- a/docs/design/Makefile.in +++ b/docs/design/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/docs/design/part-block.txt b/docs/design/part-block.txt index deaedbf..fe2ab6a 100644 --- a/docs/design/part-block.txt +++ b/docs/design/part-block.txt @@ -40,8 +40,8 @@ waiting to be unblocked. When sending a flushing seek upstream on elem1.src, the FLUSH_START event will temporary unblock the streaming thread and make all pad functions that -triggers a block (_push/_alloc_buffer/_push_event/_pull_range) return -GST_FLOW_WRONG_STATE. This will then eventually pause the streaming thread +can trigger a block (_push/_query/_push_event/_pull_range) return +GST_FLOW_FLUSHING. This will then eventually pause the streaming thread and release the STREAM_LOCK. Since no STREAM lock is taken after the pad block it is not needed to send diff --git a/docs/design/part-element-sink.txt b/docs/design/part-element-sink.txt index 9402da5..6cda060 100644 --- a/docs/design/part-element-sink.txt +++ b/docs/design/part-element-sink.txt @@ -81,7 +81,7 @@ sink overview if (need_commit) need_commit = FALSE if (!commit) - return WRONG_STATE + return FLUSHING if (need_preroll) # release PREROLL_LOCK and wait. prerolled can be observed @@ -90,7 +90,7 @@ sink overview PREROLL_WAIT (releasing PREROLL_LOCK) prerolled = FALSE if (flushing) - return WRONG_STATE + return FLUSHING if (valid (start || stop)) PREROLL_UNLOCK @@ -98,7 +98,7 @@ sink overview ret = wait_clock (obj,start) PREROLL_LOCK if (flushing) - return WRONG_STATE + return FLUSHING # if the clock was unscheduled, we redo the # preroll if (ret == UNSCHEDULED) @@ -124,7 +124,7 @@ sink overview render (buffer) ----->| PREROLL_WAIT (releasing PREROLL_LOCK) | prerolled = FALSE | if (flushing) - | return WRONG_STATE + | return FLUSHING | # queue a prerollable item (EOS or buffer). It is @@ -146,7 +146,7 @@ sink overview if (need_commit) need_commit = FALSE if (!commit) - return WRONG_STATE + return FLUSHING # then see if we need more preroll items before we # can block @@ -173,7 +173,7 @@ sink overview if (flushing) return FALSE ret = queue (event, TRUE) - if (ret == WRONG_STATE) + if (ret == FLUSHING) return FALSE PREROLL_UNLOCK STREAM_UNLOCK @@ -188,7 +188,7 @@ sink overview return FALSE set_clip ret = queue (event, FALSE) - if (ret == WRONG_STATE) + if (ret == FLUSHING) return FALSE PREROLL_UNLOCK STREAM_UNLOCK @@ -225,7 +225,7 @@ sink overview STREAM_LOCK PREROLL_LOCK if (flushing) - return WRONG_STATE + return FLUSHING if (clip) queue (buffer, TRUE) PREROLL_UNLOCK diff --git a/docs/design/part-overview.txt b/docs/design/part-overview.txt index ddc9757..99dd508 100644 --- a/docs/design/part-overview.txt +++ b/docs/design/part-overview.txt @@ -447,14 +447,14 @@ In the next PAUSED to READY state change the pipeline has to shut down and all streaming threads must stop sending data. This happens in the following sequence: alsasink to READY: alsasink unblocks from the _chain() function and returns a - WRONG_STATE return value to the peer element. The sinkpad is + FLUSHING return value to the peer element. The sinkpad is deactivated and becomes unusable for sending more data. mp3dec to READY: the pads are deactivated and the state change completes when mp3dec leaves its _chain() function. filesrc to READY: the pads are deactivated and the thread is paused. The upstream elements finish their chain() function because the downstream element -returned an error code (WRONG_STATE) from the _push() functions. These error codes +returned an error code (FLUSHING) from the _push() functions. These error codes are eventually returned to the element that started the streaming thread (filesrc), which pauses the thread and completes the state change. diff --git a/docs/design/part-preroll.txt b/docs/design/part-preroll.txt index 4ecd78f..5b2630f 100644 --- a/docs/design/part-preroll.txt +++ b/docs/design/part-preroll.txt @@ -47,12 +47,12 @@ The following conditions unlock the preroll: - a flush event When the preroll is unlocked by a flush event, a return value of -GST_FLOW_WRONG_STATE is to be returned to the peer pad. +GST_FLOW_FLUSHING is to be returned to the peer pad. When preroll is unlocked by a state change to PLAYING, playback and rendering of the buffers shall start. When preroll is unlocked by a state change to READY, the buffer is -to be discarded and a GST_FLOW_WRONG_STATE shall be returned to the +to be discarded and a GST_FLOW_FLUSHING shall be returned to the peer element. diff --git a/docs/design/part-seeking.txt b/docs/design/part-seeking.txt index 38bb33c..ee97acf 100644 --- a/docs/design/part-seeking.txt +++ b/docs/design/part-seeking.txt @@ -174,6 +174,12 @@ implemented demuxer/parser-side, e.g. make demuxers/parsers ignore the KEY_UNIT flag if the position adjustment would be larger than 1/10th of the duration or somesuch. +Flags can be used to influence snapping direction for those cases where it +matters. SNAP_BEFORE will select the preceding position to the seek target, +and SNAP_AFTER will select the following one. If both flags are set, the +nearest one to the seek target will be used. If none of these flags are set, +the seeking implemention is free to select whichever it wants. + Summary: - if the KEY_UNIT flag is *not* specified, the demuxer/parser should diff --git a/docs/design/part-segments.txt b/docs/design/part-segments.txt index 21926ae..88f44ac 100644 --- a/docs/design/part-segments.txt +++ b/docs/design/part-segments.txt @@ -40,7 +40,7 @@ Use case: FLUSHING seek Avidemux starts by sending a FLUSH_START event downstream and upstream. This will cause its streaming task to PAUSED because _pad_pull_range() and - _pad_push() will return WRONG_STATE. It then waits for the STREAM_LOCK, + _pad_push() will return FLUSHING. It then waits for the STREAM_LOCK, which will be unlocked when the streaming task pauses. At this point no streaming is happening anymore in the pipeline and a FLUSH_STOP is sent upstream and downstream. diff --git a/docs/design/part-states.txt b/docs/design/part-states.txt index d1b9c8b..bc2c9ab 100644 --- a/docs/design/part-states.txt +++ b/docs/design/part-states.txt @@ -77,7 +77,7 @@ the following state changes are possible: PAUSED -> READY - Sinks unblock any waits in the preroll. - Elements unblock any waits on devices - - Chain or get_range functions return WRONG_STATE. + - Chain or get_range functions return FLUSHING. - The element pads are deactivated so that streaming becomes impossible and all streaming threads are stopped. - The sink forgets all negotiated formats @@ -195,7 +195,7 @@ The children are iterated from the sink elements to the source elements. This ma sure that when changing the state of an element, the downstream elements are in the correct state to process the eventual buffers. In the case of a downwards state change, the sink elements will shut down first which makes the upstream -elements shut down as well since the _push() function returns a GST_FLOW_WRONG_STATE +elements shut down as well since the _push() function returns a GST_FLOW_FLUSHING error. If all the children return SUCCESS, the function returns SUCCESS as well. diff --git a/docs/faq/Makefile.in b/docs/faq/Makefile.in index 601dba1..5b8a72f 100644 --- a/docs/faq/Makefile.in +++ b/docs/faq/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -550,7 +550,7 @@ install-faqDATA: $(faq_DATA) @list='$(faq_DATA)'; test -n "$(faqdir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(faqdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(faqdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(faqdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ diff --git a/docs/gst/Makefile.in b/docs/gst/Makefile.in index cc68ada..d2d4c7b 100644 --- a/docs/gst/Makefile.in +++ b/docs/gst/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index c66ccc1..8e7ebfb 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -615,6 +615,7 @@ GstControlBindingConvert gst_control_binding_sync_values gst_control_binding_get_value gst_control_binding_get_value_array +gst_control_binding_get_g_value_array gst_control_binding_set_disabled gst_control_binding_is_disabled <SUBSECTION Standard> @@ -1560,6 +1561,7 @@ gst_object_get_control_binding gst_object_remove_control_binding gst_object_get_value gst_object_get_value_array +gst_object_get_g_value_array gst_object_get_control_rate gst_object_set_control_rate @@ -1992,11 +1994,10 @@ gst_plugin_get_package gst_plugin_get_origin gst_plugin_get_source gst_plugin_get_version -gst_plugin_get_module +gst_plugin_get_release_date_string gst_plugin_is_loaded gst_plugin_get_cache_data gst_plugin_set_cache_data -gst_plugin_name_filter gst_plugin_load_file gst_plugin_load gst_plugin_load_by_name diff --git a/docs/gst/html/GstBin.html b/docs/gst/html/GstBin.html index a4b5bc9..be76ba1 100644 --- a/docs/gst/html/GstBin.html +++ b/docs/gst/html/GstBin.html @@ -157,7 +157,7 @@ element is removed from the bin. <p> </p> <div class="refsect2"> -<a name="idp9169136"></a><h3>Notes</h3> +<a name="idp11074672"></a><h3>Notes</h3> <p> A <a class="link" href="GstBin.html" title="GstBin"><span class="type">GstBin</span></a> internally intercepts every <a class="link" href="gstreamer-GstMessage.html#GstMessage" title="struct GstMessage"><span class="type">GstMessage</span></a> posted by its children and implements the following default behaviour for each of them: diff --git a/docs/gst/html/GstControlBinding.html b/docs/gst/html/GstControlBinding.html index 3ed254c..ac541c4 100644 --- a/docs/gst/html/GstControlBinding.html +++ b/docs/gst/html/GstControlBinding.html @@ -59,6 +59,12 @@ struct <a class="link" href="GstControlBinding.html#GstControlBindi <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>, <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> interval</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_values</code></em>, + <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> values</code></em>); +<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstControlBinding.html#gst-control-binding-get-g-value-array" title="gst_control_binding_get_g_value_array ()">gst_control_binding_get_g_value_array</a> + (<em class="parameter"><code><a class="link" href="GstControlBinding.html" title="GstControlBinding"><span class="type">GstControlBinding</span></a> *binding</code></em>, + <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>, + <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> interval</code></em>, + <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_values</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *values</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstControlBinding.html#gst-control-binding-set-disabled" title="gst_control_binding_set_disabled ()">gst_control_binding_set_disabled</a> (<em class="parameter"><code><a class="link" href="GstControlBinding.html" title="GstControlBinding"><span class="type">GstControlBinding</span></a> *self</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> disabled</code></em>); @@ -122,7 +128,8 @@ The instance structure of <a class="link" href="GstControlBinding.html" title="G /* virtual methods */ gboolean (* sync_values) (GstControlBinding *self, GstObject *object, GstClockTime timestamp, GstClockTime last_sync); GValue * (* get_value) (GstControlBinding *self, GstClockTime timestamp); - gboolean (* get_value_array) (GstControlBinding *self, GstClockTime timestamp,GstClockTime interval, guint n_values, GValue *values); + gboolean (* get_value_array) (GstControlBinding *self, GstClockTime timestamp,GstClockTime interval, guint n_values, gpointer values); + gboolean (* get_g_value_array) (GstControlBinding *self, GstClockTime timestamp,GstClockTime interval, guint n_values, GValue *values); }; </pre> <p> @@ -147,6 +154,10 @@ The class structure of <a class="link" href="GstControlBinding.html" title="GstC <td><p><span class="term"><em class="structfield"><code><a name="GstControlBindingClass.get-value-array"></a>get_value_array</code></em> ()</span></p></td> <td></td> </tr> +<tr> +<td><p><span class="term"><em class="structfield"><code><a name="GstControlBindingClass.get-g-value-array"></a>get_g_value_array</code></em> ()</span></p></td> +<td></td> +</tr> </tbody> </table></div> </div> @@ -185,7 +196,7 @@ Function to map a control-value to the target GValue. <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>, <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> last_sync</code></em>);</pre> <p> -Sets the property of the <em class="parameter"><code>object</code></em>, according to the <a href="../gstreamer-1.0/GstControlSource.html"><span class="type">GstControlSources</span></a> that +Sets the property of the <em class="parameter"><code>object</code></em>, according to the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html"><span class="type">GstControlSources</span></a> that handle them and for the given timestamp. </p> <p> @@ -254,9 +265,9 @@ property isn't controlled.</td> <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>, <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> interval</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_values</code></em>, - <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *values</code></em>);</pre> + <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> values</code></em>);</pre> <p> -Gets a number of values for the given controllered property starting at the +Gets a number of values for the given controlled property starting at the requested time. The array <em class="parameter"><code>values</code></em> need to hold enough space for <em class="parameter"><code>n_values</code></em> of the same type as the objects property's type. </p> @@ -264,6 +275,60 @@ the same type as the objects property's type. This function is useful if one wants to e.g. draw a graph of the control curve or apply a control curve sample by sample. </p> +<p> +The values are unboxed and ready to be used. The similar function +<a class="link" href="GstControlBinding.html#gst-control-binding-get-g-value-array" title="gst_control_binding_get_g_value_array ()"><code class="function">gst_control_binding_get_g_value_array()</code></a> returns the array as <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValues</span></a> and is +better suites for bindings. +</p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>self</code></em> :</span></p></td> +<td>the control binding</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>timestamp</code></em> :</span></p></td> +<td>the time that should be processed</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>interval</code></em> :</span></p></td> +<td>the time spacing between subsequent values</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>n_values</code></em> :</span></p></td> +<td>the number of values</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>values</code></em> :</span></p></td> +<td>array to put control-values in</td> +</tr> +<tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> +<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the given array could be filled, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</td> +</tr> +</tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> +<a name="gst-control-binding-get-g-value-array"></a><h3>gst_control_binding_get_g_value_array ()</h3> +<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gst_control_binding_get_g_value_array + (<em class="parameter"><code><a class="link" href="GstControlBinding.html" title="GstControlBinding"><span class="type">GstControlBinding</span></a> *binding</code></em>, + <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>, + <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> interval</code></em>, + <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_values</code></em>, + <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *values</code></em>);</pre> +<p> +Gets a number of <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValues</span></a> for the given controlled property starting at the +requested time. The array <em class="parameter"><code>values</code></em> need to hold enough space for <em class="parameter"><code>n_values</code></em> of +<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a>. +</p> +<p> +This function is useful if one wants to e.g. draw a graph of the control +curve or apply a control curve sample by sample. +</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> diff --git a/docs/gst/html/GstControlSource.html b/docs/gst/html/GstControlSource.html index 68c7982..2f5d457 100644 --- a/docs/gst/html/GstControlSource.html +++ b/docs/gst/html/GstControlSource.html @@ -282,7 +282,8 @@ Gets the value for this <a class="link" href="GstControlSource.html" title="GstC <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_values</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> *values</code></em>);</pre> <p> -Gets an array of values for for this <a class="link" href="GstControlSource.html" title="GstControlSource"><span class="type">GstControlSource</span></a>. +Gets an array of values for for this <a class="link" href="GstControlSource.html" title="GstControlSource"><span class="type">GstControlSource</span></a>. Values that are +undefined contain NANs. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> diff --git a/docs/gst/html/GstElementFactory.html b/docs/gst/html/GstElementFactory.html index 7e2127f..720eac0 100644 --- a/docs/gst/html/GstElementFactory.html +++ b/docs/gst/html/GstElementFactory.html @@ -139,7 +139,7 @@ The following code example shows you how to create a GstFileSrc element. <p> </p> <div class="example"> -<a name="idp13088976"></a><p class="title"><b>Example 6. Using an element factory</b></p> +<a name="idp19312496"></a><p class="title"><b>Example 6. Using an element factory</b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -161,11 +161,11 @@ The following code example shows you how to create a GstFileSrc element. GstElement <span class="gtkdoc opt">*</span>src<span class="gtkdoc opt">;</span> GstElementFactory <span class="gtkdoc opt">*</span>srcfactory<span class="gtkdoc opt">;</span> -<span class="function"><a href="../gstreamer-1.0/gstreamer-Gst.html#gst-init">gst_init</a></span> <span class="gtkdoc opt">(&</span>argc<span class="gtkdoc opt">, &</span>argv<span class="gtkdoc opt">);</span> +<span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-Gst.html#gst-init">gst_init</a></span> <span class="gtkdoc opt">(&</span>argc<span class="gtkdoc opt">, &</span>argv<span class="gtkdoc opt">);</span> -srcfactory <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/GstElementFactory.html#gst-element-factory-find">gst_element_factory_find</a></span> <span class="gtkdoc opt">(</span><span class="string">"filesrc"</span><span class="gtkdoc opt">);</span> +srcfactory <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElementFactory.html#gst-element-factory-find">gst_element_factory_find</a></span> <span class="gtkdoc opt">(</span><span class="string">"filesrc"</span><span class="gtkdoc opt">);</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-return-if-fail">g_return_if_fail</a></span> <span class="gtkdoc opt">(</span>srcfactory <span class="gtkdoc opt">!=</span> NULL<span class="gtkdoc opt">);</span> -src <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/GstElementFactory.html#gst-element-factory-create">gst_element_factory_create</a></span> <span class="gtkdoc opt">(</span>srcfactory<span class="gtkdoc opt">,</span> <span class="string">"src"</span><span class="gtkdoc opt">);</span> +src <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElementFactory.html#gst-element-factory-create">gst_element_factory_create</a></span> <span class="gtkdoc opt">(</span>srcfactory<span class="gtkdoc opt">,</span> <span class="string">"src"</span><span class="gtkdoc opt">);</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-return-if-fail">g_return_if_fail</a></span> <span class="gtkdoc opt">(</span>src <span class="gtkdoc opt">!=</span> NULL<span class="gtkdoc opt">);</span> <span class="gtkdoc opt">...</span></pre></td> </tr> diff --git a/docs/gst/html/GstObject.html b/docs/gst/html/GstObject.html index 6f237bb..13bb8b8 100644 --- a/docs/gst/html/GstObject.html +++ b/docs/gst/html/GstObject.html @@ -114,6 +114,12 @@ enum <a class="link" href="GstObject.html#GstObjectFlags" title=" <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>, <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> interval</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_values</code></em>, + <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> values</code></em>); +<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstObject.html#gst-object-get-g-value-array" title="gst_object_get_g_value_array ()">gst_object_get_g_value_array</a> (<em class="parameter"><code><a class="link" href="GstObject.html" title="GstObject"><span class="type">GstObject</span></a> *object</code></em>, + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property_name</code></em>, + <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>, + <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> interval</code></em>, + <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_values</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *values</code></em>); <a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="returnvalue">GstClockTime</span></a> <a class="link" href="GstObject.html#gst-object-get-control-rate" title="gst_object_get_control_rate ()">gst_object_get_control_rate</a> (<em class="parameter"><code><a class="link" href="GstObject.html" title="GstObject"><span class="type">GstObject</span></a> *object</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstObject.html#gst-object-set-control-rate" title="gst_object_set_control_rate ()">gst_object_set_control_rate</a> (<em class="parameter"><code><a class="link" href="GstObject.html" title="GstObject"><span class="type">GstObject</span></a> *object</code></em>, @@ -179,7 +185,7 @@ of the object. <p> </p> <div class="refsect2"> -<a name="idp25919984"></a><h3>controlled properties</h3> +<a name="idp27000992"></a><h3>controlled properties</h3> <p> Controlled properties offers a lightweight way to adjust gobject properties over stream-time. It works by using time-stamped value pairs that @@ -994,7 +1000,7 @@ if no control-rate was set.</td> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gst_object_sync_values (<em class="parameter"><code><a class="link" href="GstObject.html" title="GstObject"><span class="type">GstObject</span></a> *object</code></em>, <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>);</pre> <p> -Sets the properties of the object, according to the <a href="../gstreamer-1.0/GstControlSource.html"><span class="type">GstControlSources</span></a> that +Sets the properties of the object, according to the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html"><span class="type">GstControlSources</span></a> that (maybe) handle them and for the given timestamp. </p> <p> @@ -1228,9 +1234,9 @@ property isn't controlled.</td> <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>, <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> interval</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_values</code></em>, - <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *values</code></em>);</pre> + <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> values</code></em>);</pre> <p> -Gets a number of values for the given controllered property starting at the +Gets a number of values for the given controlled property starting at the requested time. The array <em class="parameter"><code>values</code></em> need to hold enough space for <em class="parameter"><code>n_values</code></em> of the same type as the objects property's type. </p> @@ -1238,6 +1244,64 @@ the same type as the objects property's type. This function is useful if one wants to e.g. draw a graph of the control curve or apply a control curve sample by sample. </p> +<p> +The values are unboxed and ready to be used. The similar function +<a class="link" href="GstObject.html#gst-object-get-g-value-array" title="gst_object_get_g_value_array ()"><code class="function">gst_object_get_g_value_array()</code></a> returns the array as <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValues</span></a> and is +better suites for bindings. +</p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>object</code></em> :</span></p></td> +<td>the object that has controlled properties</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>property_name</code></em> :</span></p></td> +<td>the name of the property to get</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>timestamp</code></em> :</span></p></td> +<td>the time that should be processed</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>interval</code></em> :</span></p></td> +<td>the time spacing between subsequent values</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>n_values</code></em> :</span></p></td> +<td>the number of values</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>values</code></em> :</span></p></td> +<td>array to put control-values in</td> +</tr> +<tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td> +<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> if the given array could be filled, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise</td> +</tr> +</tbody> +</table></div> +</div> +<hr> +<div class="refsect2"> +<a name="gst-object-get-g-value-array"></a><h3>gst_object_get_g_value_array ()</h3> +<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gst_object_get_g_value_array (<em class="parameter"><code><a class="link" href="GstObject.html" title="GstObject"><span class="type">GstObject</span></a> *object</code></em>, + <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *property_name</code></em>, + <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>, + <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> interval</code></em>, + <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> n_values</code></em>, + <em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a> *values</code></em>);</pre> +<p> +Gets a number of <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValues</span></a> for the given controlled property starting at the +requested time. The array <em class="parameter"><code>values</code></em> need to hold enough space for <em class="parameter"><code>n_values</code></em> of +<a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#GValue"><span class="type">GValue</span></a>. +</p> +<p> +This function is useful if one wants to e.g. draw a graph of the control +curve or apply a control curve sample by sample. +</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> diff --git a/docs/gst/html/GstPadTemplate.html b/docs/gst/html/GstPadTemplate.html index 6786bf0..82811af 100644 --- a/docs/gst/html/GstPadTemplate.html +++ b/docs/gst/html/GstPadTemplate.html @@ -132,7 +132,7 @@ or <a class="link" href="GstPad.html#gst-pad-new-from-static-template" title="gs The following code example shows the code to create a pad from a padtemplate. </p> <div class="example"> -<a name="idp9782048"></a><p class="title"><b>Example 11. Create a pad from a padtemplate</b></p> +<a name="idp21238544"></a><p class="title"><b>Example 11. Create a pad from a padtemplate</b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -155,11 +155,11 @@ The following code example shows the code to create a pad from a padtemplate. 16 17</pre></td> <td class="listing_code"><pre class="programlisting">GstStaticPadTemplate my_template <span class="gtkdoc opt">=</span> -<span class="function"><a href="../gstreamer-1.0/GstPadTemplate.html#GST-STATIC-PAD-TEMPLATE:CAPS">GST_STATIC_PAD_TEMPLATE</a></span> <span class="gtkdoc opt">(</span> +<span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPadTemplate.html#GST-STATIC-PAD-TEMPLATE:CAPS">GST_STATIC_PAD_TEMPLATE</a></span> <span class="gtkdoc opt">(</span> <span class="string">"sink"</span><span class="gtkdoc opt">,</span> <span class="gtkdoc slc">// the name of the pad</span> GST_PAD_SINK<span class="gtkdoc opt">,</span> <span class="gtkdoc slc">// the direction of the pad</span> GST_PAD_ALWAYS<span class="gtkdoc opt">,</span> <span class="gtkdoc slc">// when this pad will be present</span> - <span class="function"><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GST-STATIC-CAPS">GST_STATIC_CAPS</a></span> <span class="gtkdoc opt">(</span> <span class="gtkdoc slc">// the capabilities of the padtemplate</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GST-STATIC-CAPS">GST_STATIC_CAPS</a></span> <span class="gtkdoc opt">(</span> <span class="gtkdoc slc">// the capabilities of the padtemplate</span> <span class="string">"audio/x-raw, "</span> <span class="string">"channels = (int) [ 1, 6 ]"</span> <span class="gtkdoc opt">)</span> @@ -168,7 +168,7 @@ The following code example shows the code to create a pad from a padtemplate. <span class="function">my_method</span> <span class="gtkdoc opt">(</span><span class="gtkdoc kwb">void</span><span class="gtkdoc opt">)</span> <span class="gtkdoc opt">{</span> GstPad <span class="gtkdoc opt">*</span>pad<span class="gtkdoc opt">;</span> - pad <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/GstPad.html#gst-pad-new-from-static-template">gst_pad_new_from_static_template</a></span> <span class="gtkdoc opt">(&</span>my_template<span class="gtkdoc opt">,</span> <span class="string">"sink"</span><span class="gtkdoc opt">);</span> + pad <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#gst-pad-new-from-static-template">gst_pad_new_from_static_template</a></span> <span class="gtkdoc opt">(&</span>my_template<span class="gtkdoc opt">,</span> <span class="string">"sink"</span><span class="gtkdoc opt">);</span> <span class="gtkdoc opt">...</span> <span class="gtkdoc opt">}</span></pre></td> </tr> @@ -200,8 +200,8 @@ element class, this is usually done in the class_init of the class: <span class="gtkdoc opt">{</span> GstElementClass <span class="gtkdoc opt">*</span>gstelement_class <span class="gtkdoc opt">=</span> <span class="function">GST_ELEMENT_CLASS</span> <span class="gtkdoc opt">(</span>klass<span class="gtkdoc opt">);</span> - <span class="function"><a href="../gstreamer-1.0/GstElement.html#gst-element-class-add-pad-template">gst_element_class_add_pad_template</a></span> <span class="gtkdoc opt">(</span>gstelement_class<span class="gtkdoc opt">,</span> - <span class="function"><a href="../gstreamer-1.0/GstPadTemplate.html#gst-static-pad-template-get">gst_static_pad_template_get</a></span> <span class="gtkdoc opt">(&</span>my_template<span class="gtkdoc opt">));</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#gst-element-class-add-pad-template">gst_element_class_add_pad_template</a></span> <span class="gtkdoc opt">(</span>gstelement_class<span class="gtkdoc opt">,</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPadTemplate.html#gst-static-pad-template-get">gst_static_pad_template_get</a></span> <span class="gtkdoc opt">(&</span>my_template<span class="gtkdoc opt">));</span> <span class="gtkdoc opt">}</span></pre></td> </tr> </tbody> diff --git a/docs/gst/html/GstPlugin.html b/docs/gst/html/GstPlugin.html index 498bbc8..ae5d1bb 100644 --- a/docs/gst/html/GstPlugin.html +++ b/docs/gst/html/GstPlugin.html @@ -45,7 +45,7 @@ <a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="returnvalue">GQuark</span></a> <a class="link" href="GstPlugin.html#gst-plugin-error-quark" title="gst_plugin_error_quark ()">gst_plugin_error_quark</a> (<em class="parameter"><code><span class="type">void</span></code></em>); #define <a class="link" href="GstPlugin.html#GST-PLUGIN-ERROR:CAPS" title="GST_PLUGIN_ERROR">GST_PLUGIN_ERROR</a> enum <a class="link" href="GstPlugin.html#GstPluginError" title="enum GstPluginError">GstPluginError</a>; -struct <a class="link" href="GstPlugin.html#GstPlugin-struct" title="struct GstPlugin">GstPlugin</a>; + <a class="link" href="GstPlugin.html#GstPlugin-struct" title="GstPlugin">GstPlugin</a>; struct <a class="link" href="GstPlugin.html#GstPluginDesc" title="struct GstPluginDesc">GstPluginDesc</a>; <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (<a class="link" href="GstPlugin.html#GstPluginInitFunc" title="GstPluginInitFunc ()">*GstPluginInitFunc</a>) (<em class="parameter"><code><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="type">GstPlugin</span></a> *plugin</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (<a class="link" href="GstPlugin.html#GstPluginInitFullFunc" title="GstPluginInitFullFunc ()">*GstPluginInitFullFunc</a>) (<em class="parameter"><code><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="type">GstPlugin</span></a> *plugin</code></em>, @@ -70,13 +70,11 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.htm const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="GstPlugin.html#gst-plugin-get-origin" title="gst_plugin_get_origin ()">gst_plugin_get_origin</a> (<em class="parameter"><code><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="type">GstPlugin</span></a> *plugin</code></em>); const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="GstPlugin.html#gst-plugin-get-source" title="gst_plugin_get_source ()">gst_plugin_get_source</a> (<em class="parameter"><code><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="type">GstPlugin</span></a> *plugin</code></em>); const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="GstPlugin.html#gst-plugin-get-version" title="gst_plugin_get_version ()">gst_plugin_get_version</a> (<em class="parameter"><code><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="type">GstPlugin</span></a> *plugin</code></em>); -<a href="http://library.gnome.org/devel/glib/unstable/glib-Dynamic-Loading-of-Modules.html#GModule"><span class="returnvalue">GModule</span></a> * <a class="link" href="GstPlugin.html#gst-plugin-get-module" title="gst_plugin_get_module ()">gst_plugin_get_module</a> (<em class="parameter"><code><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="type">GstPlugin</span></a> *plugin</code></em>); +const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * <a class="link" href="GstPlugin.html#gst-plugin-get-release-date-string" title="gst_plugin_get_release_date_string ()">gst_plugin_get_release_date_string</a> (<em class="parameter"><code><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="type">GstPlugin</span></a> *plugin</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstPlugin.html#gst-plugin-is-loaded" title="gst_plugin_is_loaded ()">gst_plugin_is_loaded</a> (<em class="parameter"><code><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="type">GstPlugin</span></a> *plugin</code></em>); const <a class="link" href="gstreamer-GstStructure.html#GstStructure" title="struct GstStructure"><span class="returnvalue">GstStructure</span></a> * <a class="link" href="GstPlugin.html#gst-plugin-get-cache-data" title="gst_plugin_get_cache_data ()">gst_plugin_get_cache_data</a> (<em class="parameter"><code><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="type">GstPlugin</span></a> *plugin</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstPlugin.html#gst-plugin-set-cache-data" title="gst_plugin_set_cache_data ()">gst_plugin_set_cache_data</a> (<em class="parameter"><code><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="type">GstPlugin</span></a> *plugin</code></em>, <em class="parameter"><code><a class="link" href="gstreamer-GstStructure.html#GstStructure" title="struct GstStructure"><span class="type">GstStructure</span></a> *cache_data</code></em>); -<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstPlugin.html#gst-plugin-name-filter" title="gst_plugin_name_filter ()">gst_plugin_name_filter</a> (<em class="parameter"><code><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="type">GstPlugin</span></a> *plugin</code></em>, - <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>); <a class="link" href="GstPlugin.html" title="GstPlugin"><span class="returnvalue">GstPlugin</span></a> * <a class="link" href="GstPlugin.html#gst-plugin-load-file" title="gst_plugin_load_file ()">gst_plugin_load_file</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *filename</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>); <a class="link" href="GstPlugin.html" title="GstPlugin"><span class="returnvalue">GstPlugin</span></a> * <a class="link" href="GstPlugin.html#gst-plugin-load" title="gst_plugin_load ()">gst_plugin_load</a> (<em class="parameter"><code><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="type">GstPlugin</span></a> *plugin</code></em>); @@ -214,10 +212,10 @@ The plugin loading errors </div> <hr> <div class="refsect2"> -<a name="GstPlugin-struct"></a><h3>struct GstPlugin</h3> -<pre class="programlisting">struct GstPlugin;</pre> +<a name="GstPlugin-struct"></a><h3>GstPlugin</h3> +<pre class="programlisting">typedef struct _GstPlugin GstPlugin;</pre> <p> -The plugin object +The opaque plugin object </p> </div> <hr> @@ -424,8 +422,7 @@ If defined, the GST_PACKAGE_RELEASE_DATETIME will also be used for the <pre class="programlisting">#define GST_LICENSE_UNKNOWN "unknown" </pre> <p> -To be used in GST_PLUGIN_DEFINE or GST_PLUGIN_DEFINE_STATIC if usure about -the licence. +To be used in GST_PLUGIN_DEFINE if usure about the licence. </p> </div> <hr> @@ -626,24 +623,30 @@ get the version of the plugin </div> <hr> <div class="refsect2"> -<a name="gst-plugin-get-module"></a><h3>gst_plugin_get_module ()</h3> -<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Dynamic-Loading-of-Modules.html#GModule"><span class="returnvalue">GModule</span></a> * gst_plugin_get_module (<em class="parameter"><code><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="type">GstPlugin</span></a> *plugin</code></em>);</pre> +<a name="gst-plugin-get-release-date-string"></a><h3>gst_plugin_get_release_date_string ()</h3> +<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * gst_plugin_get_release_date_string (<em class="parameter"><code><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="type">GstPlugin</span></a> *plugin</code></em>);</pre> <p> -Gets the <a href="http://library.gnome.org/devel/glib/unstable/glib-Dynamic-Loading-of-Modules.html#GModule"><span class="type">GModule</span></a> of the plugin. If the plugin isn't loaded yet, NULL is -returned. +Get the release date (and possibly time) in form of a string, if available. +</p> +<p> +For normal GStreamer plugin releases this will usually just be a date in +the form of "YYYY-MM-DD", while pre-releases and builds from git may contain +a time component after the date as well, in which case the string will be +formatted like "YYYY-MM-DDTHH:MMZ" (e.g. "2012-04-30T09:30Z"). +</p> +<p> +There may be plugins that do not have a valid release date set on them. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>plugin</code></em> :</span></p></td> -<td>plugin to query</td> +<td>plugin to get the release date of</td> </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>module belonging to the plugin or NULL if the -plugin isn't loaded yet. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span> -</td> +<td>the date string of the plugin, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if not available.</td> </tr> </tbody> </table></div> @@ -723,33 +726,6 @@ The cache is flushed every time the registry is rebuilt. </div> <hr> <div class="refsect2"> -<a name="gst-plugin-name-filter"></a><h3>gst_plugin_name_filter ()</h3> -<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gst_plugin_name_filter (<em class="parameter"><code><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="type">GstPlugin</span></a> *plugin</code></em>, - <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre> -<p> -A standard filter that returns TRUE when the plugin is of the -given name. -</p> -<div class="variablelist"><table border="0"> -<col align="left" valign="top"> -<tbody> -<tr> -<td><p><span class="term"><em class="parameter"><code>plugin</code></em> :</span></p></td> -<td>the plugin to check</td> -</tr> -<tr> -<td><p><span class="term"><em class="parameter"><code>name</code></em> :</span></p></td> -<td>the name of the plugin</td> -</tr> -<tr> -<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>TRUE if the plugin is of the given name.</td> -</tr> -</tbody> -</table></div> -</div> -<hr> -<div class="refsect2"> <a name="gst-plugin-load-file"></a><h3>gst_plugin_load_file ()</h3> <pre class="programlisting"><a class="link" href="GstPlugin.html" title="GstPlugin"><span class="returnvalue">GstPlugin</span></a> * gst_plugin_load_file (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *filename</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#GError"><span class="type">GError</span></a> **error</code></em>);</pre> @@ -1019,8 +995,8 @@ of this plugin. <span class="annotation">[<acronym title="The callback is valid <div class="refsect2"> <a name="GstPluginFlags"></a><h3>enum GstPluginFlags</h3> <pre class="programlisting">typedef enum { - GST_PLUGIN_FLAG_CACHED = (1<<0), - GST_PLUGIN_FLAG_BLACKLISTED = (1<<1) + GST_PLUGIN_FLAG_CACHED = (GST_OBJECT_FLAG_LAST << 0), + GST_PLUGIN_FLAG_BLACKLISTED = (GST_OBJECT_FLAG_LAST << 1) } GstPluginFlags; </pre> <p> diff --git a/docs/gst/html/GstPluginFeature.html b/docs/gst/html/GstPluginFeature.html index 98e8968..72102c5 100644 --- a/docs/gst/html/GstPluginFeature.html +++ b/docs/gst/html/GstPluginFeature.html @@ -280,9 +280,9 @@ Normally this function is used like this: 6</pre></td> <td class="listing_code"><pre class="programlisting">GstPluginFeature <span class="gtkdoc opt">*</span>loaded_feature<span class="gtkdoc opt">;</span> -loaded_feature <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/GstPluginFeature.html#gst-plugin-feature-load">gst_plugin_feature_load</a></span> <span class="gtkdoc opt">(</span>feature<span class="gtkdoc opt">);</span> +loaded_feature <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPluginFeature.html#gst-plugin-feature-load">gst_plugin_feature_load</a></span> <span class="gtkdoc opt">(</span>feature<span class="gtkdoc opt">);</span> <span class="gtkdoc slc">// presumably, we're no longer interested in the potentially-unloaded feature</span> -<span class="function"><a href="../gstreamer-1.0/GstObject.html#gst-object-unref">gst_object_unref</a></span> <span class="gtkdoc opt">(</span>feature<span class="gtkdoc opt">);</span> +<span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html#gst-object-unref">gst_object_unref</a></span> <span class="gtkdoc opt">(</span>feature<span class="gtkdoc opt">);</span> feature <span class="gtkdoc opt">=</span> loaded_feature<span class="gtkdoc opt">;</span></pre></td> </tr> </tbody> diff --git a/docs/gst/html/GstTagSetter.html b/docs/gst/html/GstTagSetter.html index 401c5ea..1e65197 100644 --- a/docs/gst/html/GstTagSetter.html +++ b/docs/gst/html/GstTagSetter.html @@ -149,17 +149,17 @@ GstTagList <span class="gtkdoc opt">*</span>result<span class="gtkdoc opt">;</sp tagsetter <span class="gtkdoc opt">=</span> <span class="function">GST_TAG_SETTER</span> <span class="gtkdoc opt">(</span>element<span class="gtkdoc opt">);</span> -merge_mode <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/GstTagSetter.html#gst-tag-setter-get-tag-merge-mode">gst_tag_setter_get_tag_merge_mode</a></span> <span class="gtkdoc opt">(</span>tagsetter<span class="gtkdoc opt">);</span> -application_tags <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/GstTagSetter.html#gst-tag-setter-get-tag-list">gst_tag_setter_get_tag_list</a></span> <span class="gtkdoc opt">(</span>tagsetter<span class="gtkdoc opt">);</span> +merge_mode <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstTagSetter.html#gst-tag-setter-get-tag-merge-mode">gst_tag_setter_get_tag_merge_mode</a></span> <span class="gtkdoc opt">(</span>tagsetter<span class="gtkdoc opt">);</span> +application_tags <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstTagSetter.html#gst-tag-setter-get-tag-list">gst_tag_setter_get_tag_list</a></span> <span class="gtkdoc opt">(</span>tagsetter<span class="gtkdoc opt">);</span> event_tags <span class="gtkdoc opt">= (</span><span class="gtkdoc kwb">const</span> GstTagList <span class="gtkdoc opt">*)</span> element<span class="gtkdoc opt">-></span>event_tags<span class="gtkdoc opt">;</span> -<span class="function"><a href="../gstreamer-1.0/gstreamer-GstInfo.html#GST-LOG-OBJECT:CAPS">GST_LOG_OBJECT</a></span> <span class="gtkdoc opt">(</span>tagsetter<span class="gtkdoc opt">,</span> <span class="string">"merging tags, merge mode = %d"</span><span class="gtkdoc opt">,</span> merge_mode<span class="gtkdoc opt">);</span> -<span class="function"><a href="../gstreamer-1.0/gstreamer-GstInfo.html#GST-LOG-OBJECT:CAPS">GST_LOG_OBJECT</a></span> <span class="gtkdoc opt">(</span>tagsetter<span class="gtkdoc opt">,</span> <span class="string">"event tags: %"</span> GST_PTR_FORMAT<span class="gtkdoc opt">,</span> event_tags<span class="gtkdoc opt">);</span> -<span class="function"><a href="../gstreamer-1.0/gstreamer-GstInfo.html#GST-LOG-OBJECT:CAPS">GST_LOG_OBJECT</a></span> <span class="gtkdoc opt">(</span>tagsetter<span class="gtkdoc opt">,</span> <span class="string">"set tags: %"</span> GST_PTR_FORMAT<span class="gtkdoc opt">,</span> application_tags<span class="gtkdoc opt">);</span> +<span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#GST-LOG-OBJECT:CAPS">GST_LOG_OBJECT</a></span> <span class="gtkdoc opt">(</span>tagsetter<span class="gtkdoc opt">,</span> <span class="string">"merging tags, merge mode = %d"</span><span class="gtkdoc opt">,</span> merge_mode<span class="gtkdoc opt">);</span> +<span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#GST-LOG-OBJECT:CAPS">GST_LOG_OBJECT</a></span> <span class="gtkdoc opt">(</span>tagsetter<span class="gtkdoc opt">,</span> <span class="string">"event tags: %"</span> GST_PTR_FORMAT<span class="gtkdoc opt">,</span> event_tags<span class="gtkdoc opt">);</span> +<span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#GST-LOG-OBJECT:CAPS">GST_LOG_OBJECT</a></span> <span class="gtkdoc opt">(</span>tagsetter<span class="gtkdoc opt">,</span> <span class="string">"set tags: %"</span> GST_PTR_FORMAT<span class="gtkdoc opt">,</span> application_tags<span class="gtkdoc opt">);</span> -result <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/gstreamer-GstTagList.html#gst-tag-list-merge">gst_tag_list_merge</a></span> <span class="gtkdoc opt">(</span>application_tags<span class="gtkdoc opt">,</span> event_tags<span class="gtkdoc opt">,</span> merge_mode<span class="gtkdoc opt">);</span> +result <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstTagList.html#gst-tag-list-merge">gst_tag_list_merge</a></span> <span class="gtkdoc opt">(</span>application_tags<span class="gtkdoc opt">,</span> event_tags<span class="gtkdoc opt">,</span> merge_mode<span class="gtkdoc opt">);</span> -<span class="function"><a href="../gstreamer-1.0/gstreamer-GstInfo.html#GST-LOG-OBJECT:CAPS">GST_LOG_OBJECT</a></span> <span class="gtkdoc opt">(</span>tagsetter<span class="gtkdoc opt">,</span> <span class="string">"final tags: %"</span> GST_PTR_FORMAT<span class="gtkdoc opt">,</span> result<span class="gtkdoc opt">);</span></pre></td> +<span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#GST-LOG-OBJECT:CAPS">GST_LOG_OBJECT</a></span> <span class="gtkdoc opt">(</span>tagsetter<span class="gtkdoc opt">,</span> <span class="string">"final tags: %"</span> GST_PTR_FORMAT<span class="gtkdoc opt">,</span> result<span class="gtkdoc opt">);</span></pre></td> </tr> </tbody> </table> diff --git a/docs/gst/html/GstTypeFindFactory.html b/docs/gst/html/GstTypeFindFactory.html index 8eca280..af4e90c 100644 --- a/docs/gst/html/GstTypeFindFactory.html +++ b/docs/gst/html/GstTypeFindFactory.html @@ -42,9 +42,9 @@ <pre class="synopsis"> #include <gst/gst.h> -struct <a class="link" href="GstTypeFindFactory.html#GstTypeFindFactory-struct" title="struct GstTypeFindFactory">GstTypeFindFactory</a>; + <a class="link" href="GstTypeFindFactory.html#GstTypeFindFactory-struct" title="GstTypeFindFactory">GstTypeFindFactory</a>; <a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> * <a class="link" href="GstTypeFindFactory.html#gst-type-find-factory-get-list" title="gst_type_find_factory_get_list ()">gst_type_find_factory_get_list</a> (<em class="parameter"><code><span class="type">void</span></code></em>); -<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> ** <a class="link" href="GstTypeFindFactory.html#gst-type-find-factory-get-extensions" title="gst_type_find_factory_get_extensions ()">gst_type_find_factory_get_extensions</a> +const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * const * <a class="link" href="GstTypeFindFactory.html#gst-type-find-factory-get-extensions" title="gst_type_find_factory_get_extensions ()">gst_type_find_factory_get_extensions</a> (<em class="parameter"><code><a class="link" href="GstTypeFindFactory.html" title="GstTypeFindFactory"><span class="type">GstTypeFindFactory</span></a> *factory</code></em>); <a class="link" href="gstreamer-GstCaps.html#GstCaps" title="struct GstCaps"><span class="returnvalue">GstCaps</span></a> * <a class="link" href="GstTypeFindFactory.html#gst-type-find-factory-get-caps" title="gst_type_find_factory_get_caps ()">gst_type_find_factory_get_caps</a> (<em class="parameter"><code><a class="link" href="GstTypeFindFactory.html" title="GstTypeFindFactory"><span class="type">GstTypeFindFactory</span></a> *factory</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstTypeFindFactory.html#gst-type-find-factory-call-function" title="gst_type_find_factory_call_function ()">gst_type_find_factory_call_function</a> (<em class="parameter"><code><a class="link" href="GstTypeFindFactory.html" title="GstTypeFindFactory"><span class="type">GstTypeFindFactory</span></a> *factory</code></em>, @@ -72,7 +72,7 @@ the section <GTKDOCLINK HREF="gstreamer-Writing-typefind-functions"> <p> </p> <div class="example"> -<a name="idp37607504"></a><p class="title"><b>Example 13. how to write a simple typefinder</b></p> +<a name="idp33150528"></a><p class="title"><b>Example 13. how to write a simple typefinder</b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -137,7 +137,7 @@ the section <GTKDOCLINK HREF="gstreamer-Writing-typefind-functions"> MyTypeFind <span class="gtkdoc opt">*</span>find <span class="gtkdoc opt">= (</span>MyTypeFind <span class="gtkdoc opt">*)</span> data<span class="gtkdoc opt">;</span> <span class="keyword">if</span> <span class="gtkdoc opt">(</span>probability <span class="gtkdoc opt">></span> find<span class="gtkdoc opt">-></span>probability<span class="gtkdoc opt">) {</span> find<span class="gtkdoc opt">-></span>probability <span class="gtkdoc opt">=</span> probability<span class="gtkdoc opt">;</span> - <span class="function"><a href="../gstreamer-1.0/gstreamer-GstCaps.html#gst-caps-replace">gst_caps_replace</a></span> <span class="gtkdoc opt">(&</span>find<span class="gtkdoc opt">-></span>caps<span class="gtkdoc opt">,</span> caps<span class="gtkdoc opt">);</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#gst-caps-replace">gst_caps_replace</a></span> <span class="gtkdoc opt">(&</span>find<span class="gtkdoc opt">-></span>caps<span class="gtkdoc opt">,</span> caps<span class="gtkdoc opt">);</span> <span class="gtkdoc opt">}</span> <span class="gtkdoc opt">}</span> <span class="gtkdoc kwb">static</span> GstCaps <span class="gtkdoc opt">*</span> @@ -146,11 +146,11 @@ the section <GTKDOCLINK HREF="gstreamer-Writing-typefind-functions"> GList <span class="gtkdoc opt">*</span>walk<span class="gtkdoc opt">, *</span>type_list<span class="gtkdoc opt">;</span> MyTypeFind find <span class="gtkdoc opt">= {</span>data<span class="gtkdoc opt">,</span> size<span class="gtkdoc opt">,</span> <span class="number">0</span><span class="gtkdoc opt">,</span> NULL<span class="gtkdoc opt">};</span> GstTypeFind gst_find <span class="gtkdoc opt">= {</span>my_peek<span class="gtkdoc opt">,</span> my_suggest<span class="gtkdoc opt">, &</span>find<span class="gtkdoc opt">, };</span> - walk <span class="gtkdoc opt">=</span> type_list <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/GstTypeFindFactory.html#gst-type-find-factory-get-list">gst_type_find_factory_get_list</a></span> <span class="gtkdoc opt">();</span> + walk <span class="gtkdoc opt">=</span> type_list <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstTypeFindFactory.html#gst-type-find-factory-get-list">gst_type_find_factory_get_list</a></span> <span class="gtkdoc opt">();</span> <span class="keyword">while</span> <span class="gtkdoc opt">(</span>walk<span class="gtkdoc opt">) {</span> GstTypeFindFactory <span class="gtkdoc opt">*</span>factory <span class="gtkdoc opt">=</span> <span class="function">GST_TYPE_FIND_FACTORY</span> <span class="gtkdoc opt">(</span>walk<span class="gtkdoc opt">-></span>data<span class="gtkdoc opt">);</span> walk <span class="gtkdoc opt">=</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-next">g_list_next</a></span> <span class="gtkdoc opt">(</span>walk<span class="gtkdoc opt">)</span> - <span class="function"><a href="../gstreamer-1.0/GstTypeFindFactory.html#gst-type-find-factory-call-function">gst_type_find_factory_call_function</a></span> <span class="gtkdoc opt">(</span>factory<span class="gtkdoc opt">, &</span>gst_find<span class="gtkdoc opt">);</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstTypeFindFactory.html#gst-type-find-factory-call-function">gst_type_find_factory_call_function</a></span> <span class="gtkdoc opt">(</span>factory<span class="gtkdoc opt">, &</span>gst_find<span class="gtkdoc opt">);</span> <span class="gtkdoc opt">}</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#g-list-free">g_list_free</a></span> <span class="gtkdoc opt">(</span>type_list<span class="gtkdoc opt">);</span> <span class="keyword">return</span> find<span class="gtkdoc opt">.</span>caps<span class="gtkdoc opt">;</span> @@ -175,10 +175,10 @@ Last reviewed on 2005-11-09 (0.9.4) <div class="refsect1"> <a name="GstTypeFindFactory.details"></a><h2>Details</h2> <div class="refsect2"> -<a name="GstTypeFindFactory-struct"></a><h3>struct GstTypeFindFactory</h3> -<pre class="programlisting">struct GstTypeFindFactory;</pre> +<a name="GstTypeFindFactory-struct"></a><h3>GstTypeFindFactory</h3> +<pre class="programlisting">typedef struct _GstTypeFindFactory GstTypeFindFactory;</pre> <p> -Object that stores information about a typefind function. +Opaque object that stores information about a typefind function. </p> </div> <hr> @@ -209,7 +209,7 @@ registered <a class="link" href="GstTypeFindFactory.html" title="GstTypeFindFact <hr> <div class="refsect2"> <a name="gst-type-find-factory-get-extensions"></a><h3>gst_type_find_factory_get_extensions ()</h3> -<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> ** gst_type_find_factory_get_extensions +<pre class="programlisting">const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="returnvalue">gchar</span></a> * const * gst_type_find_factory_get_extensions (<em class="parameter"><code><a class="link" href="GstTypeFindFactory.html" title="GstTypeFindFactory"><span class="type">GstTypeFindFactory</span></a> *factory</code></em>);</pre> <p> Gets the extensions associated with a <a class="link" href="GstTypeFindFactory.html" title="GstTypeFindFactory"><span class="type">GstTypeFindFactory</span></a>. The returned diff --git a/docs/gst/html/api-index-full.html b/docs/gst/html/api-index-full.html index 41eb7bc..b651c45 100644 --- a/docs/gst/html/api-index-full.html +++ b/docs/gst/html/api-index-full.html @@ -1393,6 +1393,10 @@ </dt> <dd></dd> <dt> +<a class="link" href="GstControlBinding.html#gst-control-binding-get-g-value-array" title="gst_control_binding_get_g_value_array ()">gst_control_binding_get_g_value_array</a>, function in <a class="link" href="GstControlBinding.html" title="GstControlBinding">GstControlBinding</a> +</dt> +<dd></dd> +<dt> <a class="link" href="GstControlBinding.html#gst-control-binding-get-value" title="gst_control_binding_get_value ()">gst_control_binding_get_value</a>, function in <a class="link" href="GstControlBinding.html" title="GstControlBinding">GstControlBinding</a> </dt> <dd></dd> @@ -3550,6 +3554,10 @@ </dt> <dd></dd> <dt> +<a class="link" href="GstObject.html#gst-object-get-g-value-array" title="gst_object_get_g_value_array ()">gst_object_get_g_value_array</a>, function in <a class="link" href="GstObject.html" title="GstObject">GstObject</a> +</dt> +<dd></dd> +<dt> <a class="link" href="GstObject.html#GST-OBJECT-GET-LOCK:CAPS" title="GST_OBJECT_GET_LOCK()">GST_OBJECT_GET_LOCK</a>, macro in <a class="link" href="GstObject.html" title="GstObject">GstObject</a> </dt> <dd></dd> @@ -4415,7 +4423,7 @@ </dt> <dd></dd> <dt> -<a class="link" href="GstPlugin.html#GstPlugin-struct" title="struct GstPlugin">GstPlugin</a>, struct in <a class="link" href="GstPlugin.html" title="GstPlugin">GstPlugin</a> +<a class="link" href="GstPlugin.html#GstPlugin-struct" title="GstPlugin">GstPlugin</a>, struct in <a class="link" href="GstPlugin.html" title="GstPlugin">GstPlugin</a> </dt> <dd></dd> <dt> @@ -4531,10 +4539,6 @@ </dt> <dd></dd> <dt> -<a class="link" href="GstPlugin.html#gst-plugin-get-module" title="gst_plugin_get_module ()">gst_plugin_get_module</a>, function in <a class="link" href="GstPlugin.html" title="GstPlugin">GstPlugin</a> -</dt> -<dd></dd> -<dt> <a class="link" href="GstPlugin.html#gst-plugin-get-name" title="gst_plugin_get_name ()">gst_plugin_get_name</a>, function in <a class="link" href="GstPlugin.html" title="GstPlugin">GstPlugin</a> </dt> <dd></dd> @@ -4547,6 +4551,10 @@ </dt> <dd></dd> <dt> +<a class="link" href="GstPlugin.html#gst-plugin-get-release-date-string" title="gst_plugin_get_release_date_string ()">gst_plugin_get_release_date_string</a>, function in <a class="link" href="GstPlugin.html" title="GstPlugin">GstPlugin</a> +</dt> +<dd></dd> +<dt> <a class="link" href="GstPlugin.html#gst-plugin-get-source" title="gst_plugin_get_source ()">gst_plugin_get_source</a>, function in <a class="link" href="GstPlugin.html" title="GstPlugin">GstPlugin</a> </dt> <dd></dd> @@ -4575,10 +4583,6 @@ </dt> <dd></dd> <dt> -<a class="link" href="GstPlugin.html#gst-plugin-name-filter" title="gst_plugin_name_filter ()">gst_plugin_name_filter</a>, function in <a class="link" href="GstPlugin.html" title="GstPlugin">GstPlugin</a> -</dt> -<dd></dd> -<dt> <a class="link" href="GstPlugin.html#gst-plugin-register-static" title="gst_plugin_register_static ()">gst_plugin_register_static</a>, function in <a class="link" href="GstPlugin.html" title="GstPlugin">GstPlugin</a> </dt> <dd></dd> @@ -6755,7 +6759,7 @@ </dt> <dd></dd> <dt> -<a class="link" href="GstTypeFindFactory.html#GstTypeFindFactory-struct" title="struct GstTypeFindFactory">GstTypeFindFactory</a>, struct in <a class="link" href="GstTypeFindFactory.html" title="GstTypeFindFactory">GstTypeFindFactory</a> +<a class="link" href="GstTypeFindFactory.html#GstTypeFindFactory-struct" title="GstTypeFindFactory">GstTypeFindFactory</a>, struct in <a class="link" href="GstTypeFindFactory.html" title="GstTypeFindFactory">GstTypeFindFactory</a> </dt> <dd></dd> <dt> diff --git a/docs/gst/html/gst-building.html b/docs/gst/html/gst-building.html index 87d0467..54d9fa8 100644 --- a/docs/gst/html/gst-building.html +++ b/docs/gst/html/gst-building.html @@ -31,7 +31,7 @@ How to build the GStreamer framework and applications using it. <td valign="top" align="right"></td> </tr></table></div> <div class="refsect1"> -<a name="idp7535248"></a><h2>Building GStreamer on UNIX</h2> +<a name="idp11675168"></a><h2>Building GStreamer on UNIX</h2> <p> On UNIX, GStreamer uses the standard GNU build system, using <span class="application">autoconf</span> for package @@ -92,7 +92,7 @@ How to build the GStreamer framework and applications using it. </p> </div> <div class="refsect1"> -<a name="idp10350672"></a><h2>Building GStreamer Applications</h2> +<a name="idp10432048"></a><h2>Building GStreamer Applications</h2> <p> Applications and libraries can use <span class="command"><strong>pkg-config</strong></span> to get all the needed compiler and linker flags to build against GStreamer. Please note that diff --git a/docs/gst/html/gst-running.html b/docs/gst/html/gst-running.html index 2ad5d33..a7fe706 100644 --- a/docs/gst/html/gst-running.html +++ b/docs/gst/html/gst-running.html @@ -31,9 +31,9 @@ How to run and debug your GStreamer application <td valign="top" align="right"></td> </tr></table></div> <div class="refsect1"> -<a name="idp6093968"></a><h2>Running and debugging GStreamer Applications</h2> +<a name="idp7942416"></a><h2>Running and debugging GStreamer Applications</h2> <div class="refsect2"> -<a name="idp9576704"></a><h3>Environment variables</h3> +<a name="idp8901600"></a><h3>Environment variables</h3> <p> GStreamer inspects a few of environment variables in addition to standard variables like <code class="envar">LANG</code>, <code class="envar">PATH</code> or <code class="envar">HOME</code>. @@ -80,7 +80,7 @@ to print out different types of debugging information to stderr. The variable takes a comma-separated list of "category_name:level" pairs to set specific levels for the individual categories. -The level value ranges from 0 (nothing) to 5 (LOG). +The level value ranges from 0 (nothing) to 9 (MEMDUMP). </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -101,7 +101,16 @@ are expected to happen. </p></td> </tr> <tr> -<td><p><span class="term">3 - <code class="option">INFO</code></span></p></td> +<td><p><span class="term">3 - <code class="option">FIXME</code></span></p></td> +<td><p> +Logs all fixme messages. Fixme messages are messages that indicate that something +in the executed code path is not fully implemented or handled yet. The purpose +of this message is to make it easier to spot incomplete/unfinished pieces of +code when reading the debug log. +</p></td> +</tr> +<tr> +<td><p><span class="term">4 - <code class="option">INFO</code></span></p></td> <td><p> Logs all informational messages. These are typically used for events in the system that only happen once, or are important and rare enough to be @@ -109,7 +118,7 @@ logged at this level. </p></td> </tr> <tr> -<td><p><span class="term">4 - <code class="option">DEBUG</code></span></p></td> +<td><p><span class="term">5 - <code class="option">DEBUG</code></span></p></td> <td><p> Logs all debug messages. These are general debug messages for events that happen only a limited number of times during an object's lifetime; @@ -117,13 +126,29 @@ these include setup, teardown, change of parameters, ... </p></td> </tr> <tr> -<td><p><span class="term">5 - <code class="option">LOG</code></span></p></td> +<td><p><span class="term">6 - <code class="option">LOG</code></span></p></td> <td><p> Logs all log messages. These are messages for events that happen repeatedly during an object's lifetime; these include streaming and steady-state conditions. </p></td> </tr> +<tr> +<td><p><span class="term">7 - <code class="option">TRACE</code></span></p></td> +<td><p> +Logs all trace messages. These messages for events +that happen repeatedly during an object's lifetime such as the +ref/unref cycles. +</p></td> +</tr> +<tr> +<td><p><span class="term">9 - <code class="option">MEMDUMP</code></span></p></td> +<td><p> +Log all memory dump messages. Memory dump messages are used to log +(small) chunks of data as memory dumps in the log. They will be displayed +as hexdump with ASCII characters. +</p></td> +</tr> </tbody> </table></div> <p> @@ -131,14 +156,14 @@ these include streaming and steady-state conditions. The category_name can contain "<code class="option">*"</code> as a wildcard. For example, setting <code class="envar">GST_DEBUG</code> to -<code class="option">GST_AUTOPLUG:5,GST_ELEMENT_*:3</code>, will cause the +<code class="option">GST_AUTOPLUG:6,GST_ELEMENT_*:4</code>, will cause the <code class="option">GST_AUTOPLUG</code> category to be logged at full <code class="option">LOG</code> level, while all categories starting with <code class="option">GST_ELEMENT_</code> will be logged at <code class="option">INFO</code> level. To get all possible debug output, set <code class="envar">GST_DEBUG</code> -to <code class="option">*:5</code> +to <code class="option">*:9</code> </p> <p><a name="GST_DEBUG_NO_COLOR"></a><b><code class="envar">GST_DEBUG_NO_COLOR</code>. </b> Set this environment variable to any value ("1" typically) to switch off @@ -174,6 +199,37 @@ Set this environment variable to "no" to prevent GStreamer from updating the plugin registry. This is useful for embedded device which is not updating the plugins frequently, it will save time when doing gst_init(). </p> +<p><a name="GST_TRACE"></a><b><code class="envar">GST_TRACE</code>. </b> + Enable memory allocation tracing. Most GStreamer objects have support for + tracing the number of unfreed objects and their memory pointers. + +The variable takes a comma-separated list of tracing options to enable. + </p> +<div class="variablelist"><table border="0"> +<col align="left" valign="top"> +<tbody> +<tr> +<td><p><span class="term">live</span></p></td> +<td><p> + Counts all live objects and dumps an overview of the number of unfreed + objects at program exit. +</p></td> +</tr> +<tr> +<td><p><span class="term">mem-live</span></p></td> +<td><p> + Keep track of the unfreed memory pointers and dump an overview of all unfreed + memory at program exit. Together with a level 9 debug log this can be used to + follow the lifecycle of leaked objects in order to track down where they are + leaked. +</p></td> +</tr> +</tbody> +</table></div> +<p> + + Use <code class="option">all</code> to enable all tracing flags. + </p> <p><a name="ORC_CODE"></a><b><code class="envar">ORC_CODE</code>. </b> Useful Orc environment variable. Set ORC_CODE=debug to enable debuggers such as gdb to create useful backtraces from Orc-generated code. Set diff --git a/docs/gst/html/gstreamer-Gst.html b/docs/gst/html/gstreamer-Gst.html index a284203..06c170d 100644 --- a/docs/gst/html/gstreamer-Gst.html +++ b/docs/gst/html/gstreamer-Gst.html @@ -83,7 +83,7 @@ options, as shown in the following example. <p> </p> <div class="example"> -<a name="idp6669552"></a><p class="title"><b>Example 1. Initializing the gstreamer library</b></p> +<a name="idp7531552"></a><p class="title"><b>Example 1. Initializing the gstreamer library</b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -99,7 +99,7 @@ options, as shown in the following example. <span class="function">main</span> <span class="gtkdoc opt">(</span><span class="gtkdoc kwb">int</span> argc<span class="gtkdoc opt">,</span> <span class="gtkdoc kwb">char</span> <span class="gtkdoc opt">*</span>argv<span class="gtkdoc opt">[])</span> <span class="gtkdoc opt">{</span> <span class="gtkdoc slc">// initialize the GStreamer library</span> - <span class="function"><a href="../gstreamer-1.0/gstreamer-Gst.html#gst-init">gst_init</a></span> <span class="gtkdoc opt">(&</span>argc<span class="gtkdoc opt">, &</span>argv<span class="gtkdoc opt">);</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-Gst.html#gst-init">gst_init</a></span> <span class="gtkdoc opt">(&</span>argc<span class="gtkdoc opt">, &</span>argv<span class="gtkdoc opt">);</span> <span class="gtkdoc opt">...</span> <span class="gtkdoc opt">}</span></pre></td> </tr> @@ -119,7 +119,7 @@ You can also use GOption to initialize your own parameters as shown in the next code fragment: </p> <div class="example"> -<a name="idp5740560"></a><p class="title"><b>Example 2. Initializing own parameters when initializing gstreamer</b></p> +<a name="idp10114464"></a><p class="title"><b>Example 2. Initializing own parameters when initializing gstreamer</b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -162,9 +162,9 @@ the next code fragment: <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Deprecated-Thread-APIs.html#g-thread-init">g_thread_init</a></span> <span class="gtkdoc opt">(</span>NULL<span class="gtkdoc opt">);</span> ctx <span class="gtkdoc opt">=</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Commandline-option-parser.html#g-option-context-new">g_option_context_new</a></span> <span class="gtkdoc opt">(</span><span class="string">"[ADDITIONAL ARGUMENTS]"</span><span class="gtkdoc opt">);</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Commandline-option-parser.html#g-option-context-add-main-entries">g_option_context_add_main_entries</a></span> <span class="gtkdoc opt">(</span>ctx<span class="gtkdoc opt">,</span> options<span class="gtkdoc opt">,</span> GETTEXT_PACKAGE<span class="gtkdoc opt">);</span> - <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Commandline-option-parser.html#g-option-context-add-group">g_option_context_add_group</a></span> <span class="gtkdoc opt">(</span>ctx<span class="gtkdoc opt">,</span> <span class="function"><a href="../gstreamer-1.0/gstreamer-Gst.html#gst-init-get-option-group">gst_init_get_option_group</a></span> <span class="gtkdoc opt">());</span> + <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Commandline-option-parser.html#g-option-context-add-group">g_option_context_add_group</a></span> <span class="gtkdoc opt">(</span>ctx<span class="gtkdoc opt">,</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-Gst.html#gst-init-get-option-group">gst_init_get_option_group</a></span> <span class="gtkdoc opt">());</span> <span class="keyword">if</span> <span class="gtkdoc opt">(!</span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Commandline-option-parser.html#g-option-context-parse">g_option_context_parse</a></span> <span class="gtkdoc opt">(</span>ctx<span class="gtkdoc opt">, &</span>argc<span class="gtkdoc opt">, &</span>argv<span class="gtkdoc opt">, &</span>err<span class="gtkdoc opt">)) {</span> - <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="gtkdoc opt">(</span><span class="string">"Error initializing: %s</span><span class="gtkdoc esc">\n</span><span class="string">"</span><span class="gtkdoc opt">,</span> <span class="function"><a href="../gstreamer-1.0/gstreamer-GstInfo.html#GST-STR-NULL:CAPS">GST_STR_NULL</a></span> <span class="gtkdoc opt">(</span>err<span class="gtkdoc opt">-></span>message<span class="gtkdoc opt">));</span> + <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="gtkdoc opt">(</span><span class="string">"Error initializing: %s</span><span class="gtkdoc esc">\n</span><span class="string">"</span><span class="gtkdoc opt">,</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#GST-STR-NULL:CAPS">GST_STR_NULL</a></span> <span class="gtkdoc opt">(</span>err<span class="gtkdoc opt">-></span>message<span class="gtkdoc opt">));</span> <span class="function">exit</span> <span class="gtkdoc opt">(</span><span class="number">1</span><span class="gtkdoc opt">);</span> <span class="gtkdoc opt">}</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Commandline-option-parser.html#g-option-context-free">g_option_context_free</a></span> <span class="gtkdoc opt">(</span>ctx<span class="gtkdoc opt">);</span> @@ -229,7 +229,7 @@ use <a class="link" href="gstreamer-Gst.html#gst-init-check" title="gst_init_che </p> <p> WARNING: This function does not work in the same way as corresponding -functions in other glib-style libraries, such as <a href="http://library.gnome.org/devel/gtk/gtk3-General.html#gtk-init"><code class="function">gtk_init()</code></a>. In +functions in other glib-style libraries, such as <a href="http://developer.gnome.org/devel/gtk/gtk3-General.html#gtk-init"><code class="function">gtk_init()</code></a>. In particular, unknown command line options cause this function to abort program execution. </p> diff --git a/docs/gst/html/gstreamer-GstBuffer.html b/docs/gst/html/gstreamer-GstBuffer.html index 293c073..ffe7688 100644 --- a/docs/gst/html/gstreamer-GstBuffer.html +++ b/docs/gst/html/gstreamer-GstBuffer.html @@ -191,7 +191,7 @@ The following example creates a buffer that can hold a given video frame with a given width, height and bits per plane. </p> <div class="example"> -<a name="idp11730400"></a><p class="title"><b>Example 3. Creating a buffer for a video frame</b></p> +<a name="idp12554816"></a><p class="title"><b>Example 3. Creating a buffer for a video frame</b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -210,9 +210,9 @@ GstMemory <span class="gtkdoc opt">*</span>memory<span class="gtkdoc opt">;</spa gint size<span class="gtkdoc opt">,</span> width<span class="gtkdoc opt">,</span> height<span class="gtkdoc opt">,</span> bpp<span class="gtkdoc opt">;</span> <span class="gtkdoc opt">...</span> size <span class="gtkdoc opt">=</span> width <span class="gtkdoc opt">*</span> height <span class="gtkdoc opt">*</span> bpp<span class="gtkdoc opt">;</span> -buffer <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#gst-buffer-new">gst_buffer_new</a></span> <span class="gtkdoc opt">();</span> -memory <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/gstreamer-GstMemory.html#gst-allocator-alloc">gst_allocator_alloc</a></span> <span class="gtkdoc opt">(</span>NULL<span class="gtkdoc opt">,</span> size<span class="gtkdoc opt">,</span> NULL<span class="gtkdoc opt">);</span> -<span class="function"><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#gst-buffer-insert-memory">gst_buffer_insert_memory</a></span> <span class="gtkdoc opt">(</span>buffer<span class="gtkdoc opt">, -</span><span class="number">1</span><span class="gtkdoc opt">,</span> memory<span class="gtkdoc opt">);</span> +buffer <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#gst-buffer-new">gst_buffer_new</a></span> <span class="gtkdoc opt">();</span> +memory <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMemory.html#gst-allocator-alloc">gst_allocator_alloc</a></span> <span class="gtkdoc opt">(</span>NULL<span class="gtkdoc opt">,</span> size<span class="gtkdoc opt">,</span> NULL<span class="gtkdoc opt">);</span> +<span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#gst-buffer-insert-memory">gst_buffer_insert_memory</a></span> <span class="gtkdoc opt">(</span>buffer<span class="gtkdoc opt">, -</span><span class="number">1</span><span class="gtkdoc opt">,</span> memory<span class="gtkdoc opt">);</span> <span class="gtkdoc opt">...</span></pre></td> </tr> </tbody> @@ -426,7 +426,7 @@ A set of buffer flags used to describe properties of a <a class="link" href="gst <td><p><a name="GST-BUFFER-FLAG-MARKER:CAPS"></a><span class="term"><code class="literal">GST_BUFFER_FLAG_MARKER</code></span></p></td> <td>the buffer contains a media specific marker. for video this is typically the end of a frame boundary, for audio - this is usually the end of a talkspurt. + this is usually the start of a talkspurt. </td> </tr> <tr> diff --git a/docs/gst/html/gstreamer-GstBufferPool.html b/docs/gst/html/gstreamer-GstBufferPool.html index cc82cc7..57f202b 100644 --- a/docs/gst/html/gstreamer-GstBufferPool.html +++ b/docs/gst/html/gstreamer-GstBufferPool.html @@ -178,8 +178,7 @@ variables. GstBufferPoolAcquireParams *params); GstFlowReturn (*alloc_buffer) (GstBufferPool *pool, GstBuffer **buffer, GstBufferPoolAcquireParams *params); - void (*reset_buffer) (GstBufferPool *pool, GstBuffer *buffer, - GstBufferPoolAcquireParams *params); + void (*reset_buffer) (GstBufferPool *pool, GstBuffer *buffer); void (*release_buffer) (GstBufferPool *pool, GstBuffer *buffer); void (*free_buffer) (GstBufferPool *pool, GstBuffer *buffer); }; @@ -225,14 +224,15 @@ be released when there are no buffers available.</td> <td>allocate a buffer. the default implementation allocates buffers from the configured memory allocator and with the configured parameters. All metadata that is present on the allocated buffer will -be marked as <a class="link" href="gstreamer-GstMeta.html#GST-META-FLAG-POOLED:CAPS"><span class="type">GST_META_FLAG_POOLED</span></a> and will not be removed from the -buffer in <em class="parameter"><code>reset_buffer</code></em>.</td> +be marked as <a class="link" href="gstreamer-GstMeta.html#GST-META-FLAG-POOLED:CAPS"><span class="type">GST_META_FLAG_POOLED</span></a> and <a class="link" href="gstreamer-GstMeta.html#GST-META-FLAG-LOCKED:CAPS"><span class="type">GST_META_FLAG_LOCKED</span></a> and will +not be removed from the buffer in <em class="parameter"><code>reset_buffer</code></em>.</td> </tr> <tr> <td><p><span class="term"><em class="structfield"><code><a name="GstBufferPoolClass.reset-buffer"></a>reset_buffer</code></em> ()</span></p></td> <td>reset the buffer to its state when it was freshly allocated. The default implementation will clear the flags, timestamps and -will remove the metadata without the <a class="link" href="gstreamer-GstMeta.html#GST-META-FLAG-POOLED:CAPS"><span class="type">GST_META_FLAG_POOLED</span></a> flag.</td> +will remove the metadata without the <a class="link" href="gstreamer-GstMeta.html#GST-META-FLAG-POOLED:CAPS"><span class="type">GST_META_FLAG_POOLED</span></a> flag (even +the metadata with <a class="link" href="gstreamer-GstMeta.html#GST-META-FLAG-LOCKED:CAPS"><span class="type">GST_META_FLAG_LOCKED</span></a>).</td> </tr> <tr> <td><p><span class="term"><em class="structfield"><code><a name="GstBufferPoolClass.release-buffer"></a>release_buffer</code></em> ()</span></p></td> diff --git a/docs/gst/html/gstreamer-GstCaps.html b/docs/gst/html/gstreamer-GstCaps.html index 6c790f5..32e8d20 100644 --- a/docs/gst/html/gstreamer-GstCaps.html +++ b/docs/gst/html/gstreamer-GstCaps.html @@ -160,7 +160,7 @@ A <a class="link" href="gstreamer-GstCaps.html#GstCaps" title="struct GstCaps">< <p> </p> <div class="example"> -<a name="idp14695584"></a><p class="title"><b>Example 4. Creating caps</b></p> +<a name="idp15658784"></a><p class="title"><b>Example 4. Creating caps</b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -174,7 +174,7 @@ A <a class="link" href="gstreamer-GstCaps.html#GstCaps" title="struct GstCaps">< 7 8</pre></td> <td class="listing_code"><pre class="programlisting">GstCaps <span class="gtkdoc opt">*</span>caps<span class="gtkdoc opt">;</span> -caps <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/gstreamer-GstCaps.html#gst-caps-new-simple">gst_caps_new_simple</a></span> <span class="gtkdoc opt">(</span><span class="string">"video/x-raw"</span><span class="gtkdoc opt">,</span> +caps <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#gst-caps-new-simple">gst_caps_new_simple</a></span> <span class="gtkdoc opt">(</span><span class="string">"video/x-raw"</span><span class="gtkdoc opt">,</span> <span class="string">"format"</span><span class="gtkdoc opt">,</span> G_TYPE_STRING<span class="gtkdoc opt">,</span> <span class="string">"I420"</span><span class="gtkdoc opt">,</span> <span class="string">"framerate"</span><span class="gtkdoc opt">,</span> GST_TYPE_FRACTION<span class="gtkdoc opt">,</span> <span class="number">25</span><span class="gtkdoc opt">,</span> <span class="number">1</span><span class="gtkdoc opt">,</span> <span class="string">"pixel-aspect-ratio"</span><span class="gtkdoc opt">,</span> GST_TYPE_FRACTION<span class="gtkdoc opt">,</span> <span class="number">1</span><span class="gtkdoc opt">,</span> <span class="number">1</span><span class="gtkdoc opt">,</span> @@ -1199,9 +1199,6 @@ Checks if the given caps represent the same set of caps. are included on one caps and omitted on the other.</div> <p> </p> -<p> -This function deals correctly with passing NULL for any of the caps. -</p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -1610,7 +1607,7 @@ For debugging purposes its easier to do something like this: <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="function"><a href="../gstreamer-1.0/gstreamer-GstInfo.html#GST-LOG:CAPS">GST_LOG</a></span> <span class="gtkdoc opt">(</span><span class="string">"caps are %"</span> GST_PTR_FORMAT<span class="gtkdoc opt">,</span> caps<span class="gtkdoc opt">);</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#GST-LOG:CAPS">GST_LOG</a></span> <span class="gtkdoc opt">(</span><span class="string">"caps are %"</span> GST_PTR_FORMAT<span class="gtkdoc opt">,</span> caps<span class="gtkdoc opt">);</span></pre></td> </tr> </tbody> </table> diff --git a/docs/gst/html/gstreamer-GstEvent.html b/docs/gst/html/gstreamer-GstEvent.html index 1e9173d..dbb850c 100644 --- a/docs/gst/html/gstreamer-GstEvent.html +++ b/docs/gst/html/gstreamer-GstEvent.html @@ -216,7 +216,7 @@ To do that <a class="link" href="gstreamer-GstEvent.html#gst-event-new-seek" tit the needed parameters to specify seeking time and mode. </p> <div class="example"> -<a name="idp19681920"></a><p class="title"><b>Example 8. performing a seek on a pipeline</b></p> +<a name="idp20931696"></a><p class="title"><b>Example 8. performing a seek on a pipeline</b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -241,13 +241,13 @@ gboolean result<span class="gtkdoc opt">;</span> <span class="gtkdoc opt">...</span> <span class="gtkdoc slc">// construct a seek event to play the media from second 2 to 5, flush</span> <span class="gtkdoc slc">// the pipeline to decrease latency.</span> -event <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/gstreamer-GstEvent.html#gst-event-new-seek">gst_event_new_seek</a></span> <span class="gtkdoc opt">(</span><span class="number">1.0</span><span class="gtkdoc opt">,</span> +event <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstEvent.html#gst-event-new-seek">gst_event_new_seek</a></span> <span class="gtkdoc opt">(</span><span class="number">1.0</span><span class="gtkdoc opt">,</span> GST_FORMAT_TIME<span class="gtkdoc opt">,</span> GST_SEEK_FLAG_FLUSH<span class="gtkdoc opt">,</span> GST_SEEK_TYPE_SET<span class="gtkdoc opt">,</span> <span class="number">2</span> <span class="gtkdoc opt">*</span> GST_SECOND<span class="gtkdoc opt">,</span> GST_SEEK_TYPE_SET<span class="gtkdoc opt">,</span> <span class="number">5</span> <span class="gtkdoc opt">*</span> GST_SECOND<span class="gtkdoc opt">);</span> <span class="gtkdoc opt">...</span> -result <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/GstElement.html#gst-element-send-event">gst_element_send_event</a></span> <span class="gtkdoc opt">(</span>pipeline<span class="gtkdoc opt">,</span> event<span class="gtkdoc opt">);</span> +result <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#gst-element-send-event">gst_element_send_event</a></span> <span class="gtkdoc opt">(</span>pipeline<span class="gtkdoc opt">,</span> event<span class="gtkdoc opt">);</span> <span class="keyword">if</span> <span class="gtkdoc opt">(!</span>result<span class="gtkdoc opt">)</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Message-Logging.html#g-warning">g_warning</a></span> <span class="gtkdoc opt">(</span><span class="string">"seek failed"</span><span class="gtkdoc opt">);</span> <span class="gtkdoc opt">...</span></pre></td> @@ -1840,7 +1840,11 @@ The different types of seek events. When constructing a seek event with GST_SEEK_FLAG_ACCURATE = (1 << 1), GST_SEEK_FLAG_KEY_UNIT = (1 << 2), GST_SEEK_FLAG_SEGMENT = (1 << 3), - GST_SEEK_FLAG_SKIP = (1 << 4) + GST_SEEK_FLAG_SKIP = (1 << 4), + GST_SEEK_FLAG_SNAP_BEFORE = (1 << 5), + GST_SEEK_FLAG_SNAP_AFTER = (1 << 6), + GST_SEEK_FLAG_SNAP_NEAREST = GST_SEEK_FLAG_SNAP_BEFORE | GST_SEEK_FLAG_SNAP_AFTER, + /* Careful to restart next flag with 1<<7 here */ } GstSeekFlags; </pre> <p> @@ -1871,6 +1875,17 @@ and demuxers to adjust the playback rate by skipping frames. This can improve performance and decrease CPU usage because not all frames need to be decoded. </p> <p> +The <em class="parameter"><code>GST_SEEK_FLAG_SNAP_BEFORE</code></em> flag can be used to snap to the previous +relevant location, and the <em class="parameter"><code>GST_SEEK_FLAG_SNAP_AFTER</code></em> flag can be used to +select the next relevant location. If KEY_UNIT is specified, the relevant +location is a keyframe. If both flags are specified, the nearest of these +locations will be selected. If none are specified, the implementation is +free to select whichever it wants. +The before and after here are in running time, so when playing backwards, +the next location refers to the one that will played in next, and not the +one that is located after in the actual source stream. +</p> +<p> Also see part-seeking.txt in the GStreamer design documentation for more details on the meaning of these flags and the behaviour expected of elements that handle them. @@ -1912,6 +1927,29 @@ elements that handle them. frames. Since 0.10.22. </td> </tr> +<tr> +<td><p><a name="GST-SEEK-FLAG-SNAP-BEFORE:CAPS"></a><span class="term"><code class="literal">GST_SEEK_FLAG_SNAP_BEFORE</code></span></p></td> +<td>go to a location before the requested position, + if KEY_UNIT this means the keyframe at or before the + requested position the one at or before the seek target. + Since 0.10.37. +</td> +</tr> +<tr> +<td><p><a name="GST-SEEK-FLAG-SNAP-AFTER:CAPS"></a><span class="term"><code class="literal">GST_SEEK_FLAG_SNAP_AFTER</code></span></p></td> +<td>go to a location after the requested position, + if KEY_UNIT this means the keyframe at of after the + requested position. Since 0.10.37. +</td> +</tr> +<tr> +<td><p><a name="GST-SEEK-FLAG-SNAP-NEAREST:CAPS"></a><span class="term"><code class="literal">GST_SEEK_FLAG_SNAP_NEAREST</code></span></p></td> +<td>go to a position near the requested position, + if KEY_UNIT this means the keyframe closest to the + requested position, if both keyframes are at an equal + distance, behaves like SNAP_BEFORE. Since 0.10.37. +</td> +</tr> </tbody> </table></div> </div> diff --git a/docs/gst/html/gstreamer-GstGError.html b/docs/gst/html/gstreamer-GstGError.html index 392a39e..95800d6 100644 --- a/docs/gst/html/gstreamer-GstGError.html +++ b/docs/gst/html/gstreamer-GstGError.html @@ -115,14 +115,14 @@ Elements throw errors using the <a class="link" href="GstElement.html#GST-ELEMEN <p> </p> <div class="example"> -<a name="idp12241824"></a><p class="title"><b>Example 7. Throwing an error</b></p> +<a name="idp10587088"></a><p class="title"><b>Example 7. Throwing an error</b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> <tr> <td class="listing_lines" align="right"><pre>1 2</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="function"><a href="../gstreamer-1.0/GstElement.html#GST-ELEMENT-ERROR:CAPS">GST_ELEMENT_ERROR</a></span> <span class="gtkdoc opt">(</span>src<span class="gtkdoc opt">,</span> RESOURCE<span class="gtkdoc opt">,</span> NOT_FOUND<span class="gtkdoc opt">,</span> + <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#GST-ELEMENT-ERROR:CAPS">GST_ELEMENT_ERROR</a></span> <span class="gtkdoc opt">(</span>src<span class="gtkdoc opt">,</span> RESOURCE<span class="gtkdoc opt">,</span> NOT_FOUND<span class="gtkdoc opt">,</span> <span class="gtkdoc opt">(</span><span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-I18N.html#gettext-macro">_</a></span><span class="gtkdoc opt">(</span><span class="string">"No file name specified for reading."</span><span class="gtkdoc opt">)), (</span>NULL<span class="gtkdoc opt">));</span></pre></td> </tr> </tbody> diff --git a/docs/gst/html/gstreamer-GstInfo.html b/docs/gst/html/gstreamer-GstInfo.html index 8362c59..2129d3d 100644 --- a/docs/gst/html/gstreamer-GstInfo.html +++ b/docs/gst/html/gstreamer-GstInfo.html @@ -249,7 +249,7 @@ the variables and set the default category. <tr> <td class="listing_lines" align="right"><pre>1 2</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="function"><a href="../gstreamer-1.0/gstreamer-GstInfo.html#GST-DEBUG-CATEGORY-STATIC:CAPS">GST_DEBUG_CATEGORY_STATIC</a></span> <span class="gtkdoc opt">(</span>my_category<span class="gtkdoc opt">);</span> <span class="gtkdoc slc">// define category (statically)</span> + <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#GST-DEBUG-CATEGORY-STATIC:CAPS">GST_DEBUG_CATEGORY_STATIC</a></span> <span class="gtkdoc opt">(</span>my_category<span class="gtkdoc opt">);</span> <span class="gtkdoc slc">// define category (statically)</span> <span class="gtkdoc ppc">#define GST_CAT_DEFAULT my_category</span> <span class="gtkdoc slc">// set as default</span><span class="gtkdoc ppc"></span></pre></td> </tr> </tbody> @@ -265,7 +265,7 @@ After that you only need to initialize the category. <tr> <td class="listing_lines" align="right"><pre>1 2</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="function"><a href="../gstreamer-1.0/gstreamer-GstInfo.html#GST-DEBUG-CATEGORY-INIT:CAPS">GST_DEBUG_CATEGORY_INIT</a></span> <span class="gtkdoc opt">(</span>my_category<span class="gtkdoc opt">,</span> <span class="string">"my category"</span><span class="gtkdoc opt">,</span> + <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#GST-DEBUG-CATEGORY-INIT:CAPS">GST_DEBUG_CATEGORY_INIT</a></span> <span class="gtkdoc opt">(</span>my_category<span class="gtkdoc opt">,</span> <span class="string">"my category"</span><span class="gtkdoc opt">,</span> <span class="number">0</span><span class="gtkdoc opt">,</span> <span class="string">"This is my very own"</span><span class="gtkdoc opt">);</span></pre></td> </tr> </tbody> @@ -1267,12 +1267,12 @@ category is not found, but GST_CAT_DEFAULT is defined, that is assigned to 4 5 6</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="function"><a href="../gstreamer-1.0/gstreamer-GstInfo.html#GST-DEBUG-CATEGORY-STATIC:CAPS">GST_DEBUG_CATEGORY_STATIC</a></span> <span class="gtkdoc opt">(</span>gst_myplugin_debug<span class="gtkdoc opt">);</span> + <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#GST-DEBUG-CATEGORY-STATIC:CAPS">GST_DEBUG_CATEGORY_STATIC</a></span> <span class="gtkdoc opt">(</span>gst_myplugin_debug<span class="gtkdoc opt">);</span> <span class="gtkdoc ppc">#define GST_CAT_DEFAULT gst_myplugin_debug</span> -<span class="function"><a href="../gstreamer-1.0/gstreamer-GstInfo.html#GST-DEBUG-CATEGORY-STATIC:CAPS">GST_DEBUG_CATEGORY_STATIC</a></span> <span class="gtkdoc opt">(</span>GST_CAT_PERFORMANCE<span class="gtkdoc opt">);</span> +<span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#GST-DEBUG-CATEGORY-STATIC:CAPS">GST_DEBUG_CATEGORY_STATIC</a></span> <span class="gtkdoc opt">(</span>GST_CAT_PERFORMANCE<span class="gtkdoc opt">);</span> <span class="gtkdoc opt">...</span> -<span class="function"><a href="../gstreamer-1.0/gstreamer-GstInfo.html#GST-DEBUG-CATEGORY-INIT:CAPS">GST_DEBUG_CATEGORY_INIT</a></span> <span class="gtkdoc opt">(</span>gst_myplugin_debug<span class="gtkdoc opt">,</span> <span class="string">"myplugin"</span><span class="gtkdoc opt">,</span> <span class="number">0</span><span class="gtkdoc opt">,</span> <span class="string">"nice element"</span><span class="gtkdoc opt">);</span> -<span class="function"><a href="../gstreamer-1.0/gstreamer-GstInfo.html#GST-DEBUG-CATEGORY-GET:CAPS">GST_DEBUG_CATEGORY_GET</a></span> <span class="gtkdoc opt">(</span>GST_CAT_PERFORMANCE<span class="gtkdoc opt">,</span> <span class="string">"GST_PERFORMANCE"</span><span class="gtkdoc opt">);</span></pre></td> +<span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#GST-DEBUG-CATEGORY-INIT:CAPS">GST_DEBUG_CATEGORY_INIT</a></span> <span class="gtkdoc opt">(</span>gst_myplugin_debug<span class="gtkdoc opt">,</span> <span class="string">"myplugin"</span><span class="gtkdoc opt">,</span> <span class="number">0</span><span class="gtkdoc opt">,</span> <span class="string">"nice element"</span><span class="gtkdoc opt">);</span> +<span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#GST-DEBUG-CATEGORY-GET:CAPS">GST_DEBUG_CATEGORY_GET</a></span> <span class="gtkdoc opt">(</span>GST_CAT_PERFORMANCE<span class="gtkdoc opt">,</span> <span class="string">"GST_PERFORMANCE"</span><span class="gtkdoc opt">);</span></pre></td> </tr> </tbody> </table> @@ -2452,7 +2452,7 @@ Example: <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="function">printf</span><span class="gtkdoc opt">(</span><span class="string">"%"</span> GST_TIME_FORMAT <span class="string">"</span><span class="gtkdoc esc">\n</span><span class="string">"</span><span class="gtkdoc opt">,</span> <span class="function"><a href="../gstreamer-1.0/gstreamer-GstInfo.html#GST-TIME-ARGS:CAPS">GST_TIME_ARGS</a></span><span class="gtkdoc opt">(</span>ts<span class="gtkdoc opt">));</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="function">printf</span><span class="gtkdoc opt">(</span><span class="string">"%"</span> GST_TIME_FORMAT <span class="string">"</span><span class="gtkdoc esc">\n</span><span class="string">"</span><span class="gtkdoc opt">,</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#GST-TIME-ARGS:CAPS">GST_TIME_ARGS</a></span><span class="gtkdoc opt">(</span>ts<span class="gtkdoc opt">));</span></pre></td> </tr> </tbody> </table> diff --git a/docs/gst/html/gstreamer-GstIterator.html b/docs/gst/html/gstreamer-GstIterator.html index ef661c6..5915092 100644 --- a/docs/gst/html/gstreamer-GstIterator.html +++ b/docs/gst/html/gstreamer-GstIterator.html @@ -122,7 +122,7 @@ The basic use pattern of an iterator is as follows: <p> </p> <div class="example"> -<a name="idp19843648"></a><p class="title"><b>Example 9. Using an iterator</b></p> +<a name="idp21102944"></a><p class="title"><b>Example 9. Using an iterator</b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -153,14 +153,14 @@ The basic use pattern of an iterator is as follows: <td class="listing_code"><pre class="programlisting">it <span class="gtkdoc opt">=</span> <span class="function">_get_iterator</span><span class="gtkdoc opt">(</span>object<span class="gtkdoc opt">);</span> done <span class="gtkdoc opt">=</span> FALSE<span class="gtkdoc opt">;</span> <span class="keyword">while</span> <span class="gtkdoc opt">(!</span>done<span class="gtkdoc opt">) {</span> - <span class="keyword">switch</span> <span class="gtkdoc opt">(</span><span class="function"><a href="../gstreamer-1.0/gstreamer-GstIterator.html#gst-iterator-next">gst_iterator_next</a></span> <span class="gtkdoc opt">(</span>it<span class="gtkdoc opt">, &</span>item<span class="gtkdoc opt">)) {</span> + <span class="keyword">switch</span> <span class="gtkdoc opt">(</span><span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstIterator.html#gst-iterator-next">gst_iterator_next</a></span> <span class="gtkdoc opt">(</span>it<span class="gtkdoc opt">, &</span>item<span class="gtkdoc opt">)) {</span> <span class="keyword">case</span> GST_ITERATOR_OK<span class="gtkdoc opt">:</span> <span class="gtkdoc opt">...</span> use<span class="gtkdoc opt">/</span>change item here<span class="gtkdoc opt">...</span> <span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-reset">g_value_reset</a></span> <span class="gtkdoc opt">(&</span>item<span class="gtkdoc opt">);</span> <span class="keyword">break</span><span class="gtkdoc opt">;</span> <span class="keyword">case</span> GST_ITERATOR_RESYNC<span class="gtkdoc opt">:</span> <span class="gtkdoc opt">...</span>rollback changes to items<span class="gtkdoc opt">...</span> - <span class="function"><a href="../gstreamer-1.0/gstreamer-GstIterator.html#gst-iterator-resync">gst_iterator_resync</a></span> <span class="gtkdoc opt">(</span>it<span class="gtkdoc opt">);</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstIterator.html#gst-iterator-resync">gst_iterator_resync</a></span> <span class="gtkdoc opt">(</span>it<span class="gtkdoc opt">);</span> <span class="keyword">break</span><span class="gtkdoc opt">;</span> <span class="keyword">case</span> GST_ITERATOR_ERROR<span class="gtkdoc opt">:</span> <span class="gtkdoc opt">...</span>wrong parameters were given<span class="gtkdoc opt">...</span> @@ -172,7 +172,7 @@ done <span class="gtkdoc opt">=</span> FALSE<span class="gtkdoc opt">;</span> <span class="gtkdoc opt">}</span> <span class="gtkdoc opt">}</span> <span class="function"><a href="http://library.gnome.org/devel/gobject/unstable/gobject-Generic-values.html#g-value-unset">g_value_unset</a></span> <span class="gtkdoc opt">(&</span>item<span class="gtkdoc opt">);</span> -<span class="function"><a href="../gstreamer-1.0/gstreamer-GstIterator.html#gst-iterator-free">gst_iterator_free</a></span> <span class="gtkdoc opt">(</span>it<span class="gtkdoc opt">);</span></pre></td> +<span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstIterator.html#gst-iterator-free">gst_iterator_free</a></span> <span class="gtkdoc opt">(</span>it<span class="gtkdoc opt">);</span></pre></td> </tr> </tbody> </table> diff --git a/docs/gst/html/gstreamer-GstMessage.html b/docs/gst/html/gstreamer-GstMessage.html index 1c656bb..0e9d89b 100644 --- a/docs/gst/html/gstreamer-GstMessage.html +++ b/docs/gst/html/gstreamer-GstMessage.html @@ -273,13 +273,13 @@ The basic use pattern of posting a message on a <a class="link" href="GstBus.htm <p> </p> <div class="example"> -<a name="idp28281824"></a><p class="title"><b>Example 10. Posting a <a class="link" href="gstreamer-GstMessage.html#GstMessage" title="struct GstMessage"><span class="type">GstMessage</span></a></b></p> +<a name="idp29547376"></a><p class="title"><b>Example 10. Posting a <a class="link" href="gstreamer-GstMessage.html#GstMessage" title="struct GstMessage"><span class="type">GstMessage</span></a></b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="function"><a href="../gstreamer-1.0/GstBus.html#gst-bus-post">gst_bus_post</a></span> <span class="gtkdoc opt">(</span>bus<span class="gtkdoc opt">,</span> <span class="function"><a href="../gstreamer-1.0/gstreamer-GstMessage.html#gst-message-new-eos">gst_message_new_eos</a></span><span class="gtkdoc opt">());</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstBus.html#gst-bus-post">gst_bus_post</a></span> <span class="gtkdoc opt">(</span>bus<span class="gtkdoc opt">,</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#gst-message-new-eos">gst_message_new_eos</a></span><span class="gtkdoc opt">());</span></pre></td> </tr> </tbody> </table> @@ -1070,14 +1070,14 @@ Typical usage of this function might be: 16 17</pre></td> <td class="listing_code"><pre class="programlisting"><span class="gtkdoc opt">...</span> -<span class="keyword">switch</span> <span class="gtkdoc opt">(</span><span class="function"><a href="../gstreamer-1.0/gstreamer-GstMessage.html#GST-MESSAGE-TYPE:CAPS">GST_MESSAGE_TYPE</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">)) {</span> +<span class="keyword">switch</span> <span class="gtkdoc opt">(</span><span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#GST-MESSAGE-TYPE:CAPS">GST_MESSAGE_TYPE</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">)) {</span> <span class="keyword">case</span> GST_MESSAGE_ERROR<span class="gtkdoc opt">: {</span> GError <span class="gtkdoc opt">*</span>err <span class="gtkdoc opt">=</span> NULL<span class="gtkdoc opt">;</span> gchar <span class="gtkdoc opt">*</span>dbg_info <span class="gtkdoc opt">=</span> NULL<span class="gtkdoc opt">;</span> - <span class="function"><a href="../gstreamer-1.0/gstreamer-GstMessage.html#gst-message-parse-error">gst_message_parse_error</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">, &</span>err<span class="gtkdoc opt">, &</span>dbg_info<span class="gtkdoc opt">);</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#gst-message-parse-error">gst_message_parse_error</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">, &</span>err<span class="gtkdoc opt">, &</span>dbg_info<span class="gtkdoc opt">);</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-printerr">g_printerr</a></span> <span class="gtkdoc opt">(</span><span class="string">"ERROR from element %s: %s</span><span class="gtkdoc esc">\n</span><span class="string">"</span><span class="gtkdoc opt">,</span> - <span class="function"><a href="../gstreamer-1.0/GstObject.html#GST-OBJECT-NAME:CAPS">GST_OBJECT_NAME</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">-></span>src<span class="gtkdoc opt">),</span> err<span class="gtkdoc opt">-></span>message<span class="gtkdoc opt">);</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html#GST-OBJECT-NAME:CAPS">GST_OBJECT_NAME</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">-></span>src<span class="gtkdoc opt">),</span> err<span class="gtkdoc opt">-></span>message<span class="gtkdoc opt">);</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-printerr">g_printerr</a></span> <span class="gtkdoc opt">(</span><span class="string">"Debugging info: %s</span><span class="gtkdoc esc">\n</span><span class="string">"</span><span class="gtkdoc opt">, (</span>dbg_info<span class="gtkdoc opt">)</span> ? dbg_info <span class="gtkdoc opt">:</span> <span class="string">"none"</span><span class="gtkdoc opt">);</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Error-Reporting.html#g-error-free">g_error_free</a></span> <span class="gtkdoc opt">(</span>err<span class="gtkdoc opt">);</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Memory-Allocation.html#g-free">g_free</a></span> <span class="gtkdoc opt">(</span>dbg_info<span class="gtkdoc opt">);</span> @@ -1323,14 +1323,14 @@ Typical usage of this function might be: 13 14</pre></td> <td class="listing_code"><pre class="programlisting"><span class="gtkdoc opt">...</span> -<span class="keyword">switch</span> <span class="gtkdoc opt">(</span><span class="function"><a href="../gstreamer-1.0/gstreamer-GstMessage.html#GST-MESSAGE-TYPE:CAPS">GST_MESSAGE_TYPE</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">)) {</span> +<span class="keyword">switch</span> <span class="gtkdoc opt">(</span><span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#GST-MESSAGE-TYPE:CAPS">GST_MESSAGE_TYPE</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">)) {</span> <span class="keyword">case</span> GST_MESSAGE_TAG<span class="gtkdoc opt">: {</span> GstTagList <span class="gtkdoc opt">*</span>tags <span class="gtkdoc opt">=</span> NULL<span class="gtkdoc opt">;</span> - <span class="function"><a href="../gstreamer-1.0/gstreamer-GstMessage.html#gst-message-parse-tag">gst_message_parse_tag</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">, &</span>tags<span class="gtkdoc opt">);</span> - <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="gtkdoc opt">(</span><span class="string">"Got tags from element %s</span><span class="gtkdoc esc">\n</span><span class="string">"</span><span class="gtkdoc opt">,</span> <span class="function"><a href="../gstreamer-1.0/GstObject.html#GST-OBJECT-NAME:CAPS">GST_OBJECT_NAME</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">-></span>src<span class="gtkdoc opt">));</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#gst-message-parse-tag">gst_message_parse_tag</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">, &</span>tags<span class="gtkdoc opt">);</span> + <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="gtkdoc opt">(</span><span class="string">"Got tags from element %s</span><span class="gtkdoc esc">\n</span><span class="string">"</span><span class="gtkdoc opt">,</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html#GST-OBJECT-NAME:CAPS">GST_OBJECT_NAME</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">-></span>src<span class="gtkdoc opt">));</span> <span class="function">handle_tags</span> <span class="gtkdoc opt">(</span>tags<span class="gtkdoc opt">);</span> - <span class="function"><a href="../gstreamer-1.0/gstreamer-GstTagList.html#gst-tag-list-free">gst_tag_list_free</a></span> <span class="gtkdoc opt">(</span>tags<span class="gtkdoc opt">);</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstTagList.html#gst-tag-list-free">gst_tag_list_free</a></span> <span class="gtkdoc opt">(</span>tags<span class="gtkdoc opt">);</span> <span class="keyword">break</span><span class="gtkdoc opt">;</span> <span class="gtkdoc opt">}</span> <span class="gtkdoc opt">...</span> @@ -1585,15 +1585,15 @@ Typical usage of this function might be: 14 15</pre></td> <td class="listing_code"><pre class="programlisting"><span class="gtkdoc opt">...</span> -<span class="keyword">switch</span> <span class="gtkdoc opt">(</span><span class="function"><a href="../gstreamer-1.0/gstreamer-GstMessage.html#GST-MESSAGE-TYPE:CAPS">GST_MESSAGE_TYPE</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">)) {</span> +<span class="keyword">switch</span> <span class="gtkdoc opt">(</span><span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#GST-MESSAGE-TYPE:CAPS">GST_MESSAGE_TYPE</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">)) {</span> <span class="keyword">case</span> GST_MESSAGE_STATE_CHANGED<span class="gtkdoc opt">: {</span> GstState old_state<span class="gtkdoc opt">,</span> new_state<span class="gtkdoc opt">;</span> - <span class="function"><a href="../gstreamer-1.0/gstreamer-GstMessage.html#gst-message-parse-state-changed">gst_message_parse_state_changed</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">, &</span>old_state<span class="gtkdoc opt">, &</span>new_state<span class="gtkdoc opt">,</span> NULL<span class="gtkdoc opt">);</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#gst-message-parse-state-changed">gst_message_parse_state_changed</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">, &</span>old_state<span class="gtkdoc opt">, &</span>new_state<span class="gtkdoc opt">,</span> NULL<span class="gtkdoc opt">);</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="gtkdoc opt">(</span><span class="string">"Element %s changed state from %s to %s.</span><span class="gtkdoc esc">\n</span><span class="string">"</span><span class="gtkdoc opt">,</span> - <span class="function"><a href="../gstreamer-1.0/GstObject.html#GST-OBJECT-NAME:CAPS">GST_OBJECT_NAME</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">-></span>src<span class="gtkdoc opt">),</span> - <span class="function"><a href="../gstreamer-1.0/GstElement.html#gst-element-state-get-name">gst_element_state_get_name</a></span> <span class="gtkdoc opt">(</span>old_state<span class="gtkdoc opt">),</span> - <span class="function"><a href="../gstreamer-1.0/GstElement.html#gst-element-state-get-name">gst_element_state_get_name</a></span> <span class="gtkdoc opt">(</span>new_state<span class="gtkdoc opt">));</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html#GST-OBJECT-NAME:CAPS">GST_OBJECT_NAME</a></span> <span class="gtkdoc opt">(</span>msg<span class="gtkdoc opt">-></span>src<span class="gtkdoc opt">),</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#gst-element-state-get-name">gst_element_state_get_name</a></span> <span class="gtkdoc opt">(</span>old_state<span class="gtkdoc opt">),</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#gst-element-state-get-name">gst_element_state_get_name</a></span> <span class="gtkdoc opt">(</span>new_state<span class="gtkdoc opt">));</span> <span class="keyword">break</span><span class="gtkdoc opt">;</span> <span class="gtkdoc opt">}</span> <span class="gtkdoc opt">...</span> @@ -3262,7 +3262,7 @@ future. The object remains valid as long as <em class="parameter"><code>message< GST_PROGRESS_TYPE_CONTINUE = 1, GST_PROGRESS_TYPE_COMPLETE = 2, GST_PROGRESS_TYPE_CANCELED = 3, - GST_PROGRESS_TYPE_ERROR = 4, + GST_PROGRESS_TYPE_ERROR = 4 } GstProgressType; </pre> <p> diff --git a/docs/gst/html/gstreamer-GstMeta.html b/docs/gst/html/gstreamer-GstMeta.html index 15edc03..a12f9c6 100644 --- a/docs/gst/html/gstreamer-GstMeta.html +++ b/docs/gst/html/gstreamer-GstMeta.html @@ -142,6 +142,7 @@ as the first member of their structure. GST_META_FLAG_NONE = 0, GST_META_FLAG_READONLY = (1 << 0), GST_META_FLAG_POOLED = (1 << 1), + GST_META_FLAG_LOCKED = (1 << 2), GST_META_FLAG_LAST = (1 << 16) } GstMetaFlags; @@ -164,8 +165,12 @@ Extra metadata flags. </tr> <tr> <td><p><a name="GST-META-FLAG-POOLED:CAPS"></a><span class="term"><code class="literal">GST_META_FLAG_POOLED</code></span></p></td> -<td>metadata is managed by a bufferpool and should not - be removed +<td>metadata is managed by a bufferpool +</td> +</tr> +<tr> +<td><p><a name="GST-META-FLAG-LOCKED:CAPS"></a><span class="term"><code class="literal">GST_META_FLAG_LOCKED</code></span></p></td> +<td>metadata should not be removed </td> </tr> <tr> diff --git a/docs/gst/html/gstreamer-GstQuery.html b/docs/gst/html/gstreamer-GstQuery.html index 9d9b816..8e70d71 100644 --- a/docs/gst/html/gstreamer-GstQuery.html +++ b/docs/gst/html/gstreamer-GstQuery.html @@ -287,7 +287,7 @@ The following example shows how to query the duration of a pipeline: <p> </p> <div class="example"> -<a name="idp37816176"></a><p class="title"><b>Example 12. Query duration on a pipeline</b></p> +<a name="idp39112944"></a><p class="title"><b>Example 12. Query duration on a pipeline</b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -307,17 +307,17 @@ The following example shows how to query the duration of a pipeline: 13</pre></td> <td class="listing_code"><pre class="programlisting">GstQuery <span class="gtkdoc opt">*</span>query<span class="gtkdoc opt">;</span> gboolean res<span class="gtkdoc opt">;</span> -query <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/gstreamer-GstQuery.html#gst-query-new-duration">gst_query_new_duration</a></span> <span class="gtkdoc opt">(</span>GST_FORMAT_TIME<span class="gtkdoc opt">);</span> -res <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/GstElement.html#gst-element-query">gst_element_query</a></span> <span class="gtkdoc opt">(</span>pipeline<span class="gtkdoc opt">,</span> query<span class="gtkdoc opt">);</span> +query <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstQuery.html#gst-query-new-duration">gst_query_new_duration</a></span> <span class="gtkdoc opt">(</span>GST_FORMAT_TIME<span class="gtkdoc opt">);</span> +res <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#gst-element-query">gst_element_query</a></span> <span class="gtkdoc opt">(</span>pipeline<span class="gtkdoc opt">,</span> query<span class="gtkdoc opt">);</span> <span class="keyword">if</span> <span class="gtkdoc opt">(</span>res<span class="gtkdoc opt">) {</span> gint64 duration<span class="gtkdoc opt">;</span> - <span class="function"><a href="../gstreamer-1.0/gstreamer-GstQuery.html#gst-query-parse-duration">gst_query_parse_duration</a></span> <span class="gtkdoc opt">(</span>query<span class="gtkdoc opt">,</span> NULL<span class="gtkdoc opt">, &</span>duration<span class="gtkdoc opt">);</span> - <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="gtkdoc opt">(</span><span class="string">"duration = %"</span>GST_TIME_FORMAT<span class="gtkdoc opt">,</span> <span class="function"><a href="../gstreamer-1.0/gstreamer-GstInfo.html#GST-TIME-ARGS:CAPS">GST_TIME_ARGS</a></span> <span class="gtkdoc opt">(</span>duration<span class="gtkdoc opt">));</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstQuery.html#gst-query-parse-duration">gst_query_parse_duration</a></span> <span class="gtkdoc opt">(</span>query<span class="gtkdoc opt">,</span> NULL<span class="gtkdoc opt">, &</span>duration<span class="gtkdoc opt">);</span> + <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="gtkdoc opt">(</span><span class="string">"duration = %"</span>GST_TIME_FORMAT<span class="gtkdoc opt">,</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#GST-TIME-ARGS:CAPS">GST_TIME_ARGS</a></span> <span class="gtkdoc opt">(</span>duration<span class="gtkdoc opt">));</span> <span class="gtkdoc opt">}</span> <span class="keyword">else</span> <span class="gtkdoc opt">{</span> <span class="function"><a href="http://library.gnome.org/devel/glib/unstable/glib-Warnings-and-Assertions.html#g-print">g_print</a></span> <span class="gtkdoc opt">(</span><span class="string">"duration query failed..."</span><span class="gtkdoc opt">);</span> <span class="gtkdoc opt">}</span> -<span class="function"><a href="../gstreamer-1.0/gstreamer-GstQuery.html#gst-query-unref">gst_query_unref</a></span> <span class="gtkdoc opt">(</span>query<span class="gtkdoc opt">);</span></pre></td> +<span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstQuery.html#gst-query-unref">gst_query_unref</a></span> <span class="gtkdoc opt">(</span>query<span class="gtkdoc opt">);</span></pre></td> </tr> </tbody> </table> diff --git a/docs/gst/html/gstreamer-GstStructure.html b/docs/gst/html/gstreamer-GstStructure.html index 9cbf2a0..e7be901 100644 --- a/docs/gst/html/gstreamer-GstStructure.html +++ b/docs/gst/html/gstreamer-GstStructure.html @@ -2039,7 +2039,7 @@ For debugging purposes its easier to do something like this: <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="function"><a href="../gstreamer-1.0/gstreamer-GstInfo.html#GST-LOG:CAPS">GST_LOG</a></span> <span class="gtkdoc opt">(</span><span class="string">"structure is %"</span> GST_PTR_FORMAT<span class="gtkdoc opt">,</span> structure<span class="gtkdoc opt">);</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstInfo.html#GST-LOG:CAPS">GST_LOG</a></span> <span class="gtkdoc opt">(</span><span class="string">"structure is %"</span> GST_PTR_FORMAT<span class="gtkdoc opt">,</span> structure<span class="gtkdoc opt">);</span></pre></td> </tr> </tbody> </table> diff --git a/docs/gst/html/gstreamer-GstTagList.html b/docs/gst/html/gstreamer-GstTagList.html index 8ac2ad6..ece4620 100644 --- a/docs/gst/html/gstreamer-GstTagList.html +++ b/docs/gst/html/gstreamer-GstTagList.html @@ -336,7 +336,7 @@ In the table below this is shown for the cases that a tag exists in the list <p> </p> <div class="table"> -<a name="idp42464256"></a><p class="title"><b>Table 1. merge mode</b></p> +<a name="idp43764672"></a><p class="title"><b>Table 1. merge mode</b></p> <div class="table-contents"><table summary="merge mode" border="1"> <colgroup> <col> diff --git a/docs/gst/html/gstreamer-GstValue.html b/docs/gst/html/gstreamer-GstValue.html index f2dbe62..2b9118b 100644 --- a/docs/gst/html/gstreamer-GstValue.html +++ b/docs/gst/html/gstreamer-GstValue.html @@ -237,7 +237,7 @@ endianness. <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting">guint32 fourcc <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/gstreamer-GstValue.html#GST-MAKE-FOURCC:CAPS">GST_MAKE_FOURCC</a></span> <span class="gtkdoc opt">(</span><span class="string">'M'</span><span class="gtkdoc opt">,</span> <span class="string">'J'</span><span class="gtkdoc opt">,</span> <span class="string">'P'</span><span class="gtkdoc opt">,</span> <span class="string">'G'</span><span class="gtkdoc opt">);</span></pre></td> + <td class="listing_code"><pre class="programlisting">guint32 fourcc <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstValue.html#GST-MAKE-FOURCC:CAPS">GST_MAKE_FOURCC</a></span> <span class="gtkdoc opt">(</span><span class="string">'M'</span><span class="gtkdoc opt">,</span> <span class="string">'J'</span><span class="gtkdoc opt">,</span> <span class="string">'P'</span><span class="gtkdoc opt">,</span> <span class="string">'G'</span><span class="gtkdoc opt">);</span></pre></td> </tr> </tbody> </table> @@ -283,7 +283,7 @@ four characters. <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting">guint32 fourcc <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-1.0/gstreamer-GstValue.html#GST-STR-FOURCC:CAPS">GST_STR_FOURCC</a></span> <span class="gtkdoc opt">(</span><span class="string">"MJPG"</span><span class="gtkdoc opt">);</span></pre></td> + <td class="listing_code"><pre class="programlisting">guint32 fourcc <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstValue.html#GST-STR-FOURCC:CAPS">GST_STR_FOURCC</a></span> <span class="gtkdoc opt">(</span><span class="string">"MJPG"</span><span class="gtkdoc opt">);</span></pre></td> </tr> </tbody> </table> @@ -313,7 +313,7 @@ Can be used together with <a class="link" href="gstreamer-GstValue.html#GST-FOUR <tbody> <tr> <td class="listing_lines" align="right"><pre>1</pre></td> - <td class="listing_code"><pre class="programlisting"><span class="function">printf</span> <span class="gtkdoc opt">(</span><span class="string">"fourcc: %"</span> GST_FOURCC_FORMAT <span class="string">"</span><span class="gtkdoc esc">\n</span><span class="string">"</span><span class="gtkdoc opt">,</span> <span class="function"><a href="../gstreamer-1.0/gstreamer-GstValue.html#GST-FOURCC-ARGS:CAPS">GST_FOURCC_ARGS</a></span> <span class="gtkdoc opt">(</span>fcc<span class="gtkdoc opt">));</span></pre></td> + <td class="listing_code"><pre class="programlisting"><span class="function">printf</span> <span class="gtkdoc opt">(</span><span class="string">"fourcc: %"</span> GST_FOURCC_FORMAT <span class="string">"</span><span class="gtkdoc esc">\n</span><span class="string">"</span><span class="gtkdoc opt">,</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstValue.html#GST-FOURCC-ARGS:CAPS">GST_FOURCC_ARGS</a></span> <span class="gtkdoc opt">(</span>fcc<span class="gtkdoc opt">));</span></pre></td> </tr> </tbody> </table> diff --git a/docs/gst/html/gstreamer.devhelp2 b/docs/gst/html/gstreamer.devhelp2 index 08b9a19..a0e5b45 100644 --- a/docs/gst/html/gstreamer.devhelp2 +++ b/docs/gst/html/gstreamer.devhelp2 @@ -70,7 +70,7 @@ <sub name="Annotation Glossary" link="annotation-glossary.html"/> </chapters> <functions> - <keyword type="" name="Environment variables" link="gst-running.html#idp9576704"/> + <keyword type="" name="Environment variables" link="gst-running.html#idp8901600"/> <keyword type="function" name="gst_init ()" link="gstreamer-Gst.html#gst-init"/> <keyword type="function" name="gst_init_check ()" link="gstreamer-Gst.html#gst-init-check"/> <keyword type="function" name="gst_init_get_option_group ()" link="gstreamer-Gst.html#gst-init-get-option-group"/> @@ -91,7 +91,7 @@ <keyword type="function" name="gst_atomic_queue_peek ()" link="gstreamer-GstAtomicQueue.html#gst-atomic-queue-peek" since="0.10.33"/> <keyword type="function" name="gst_atomic_queue_pop ()" link="gstreamer-GstAtomicQueue.html#gst-atomic-queue-pop" since="0.10.33"/> <keyword type="function" name="gst_atomic_queue_length ()" link="gstreamer-GstAtomicQueue.html#gst-atomic-queue-length" since="0.10.33"/> - <keyword type="" name="Notes" link="GstBin.html#idp9169136"/> + <keyword type="" name="Notes" link="GstBin.html#idp11074672"/> <keyword type="struct" name="struct GstBin" link="GstBin.html#GstBin-struct"/> <keyword type="struct" name="struct GstBinClass" link="GstBin.html#GstBinClass"/> <keyword type="function" name="gst_bin_new ()" link="GstBin.html#gst-bin-new"/> @@ -407,6 +407,7 @@ <keyword type="function" name="gst_control_binding_sync_values ()" link="GstControlBinding.html#gst-control-binding-sync-values"/> <keyword type="function" name="gst_control_binding_get_value ()" link="GstControlBinding.html#gst-control-binding-get-value"/> <keyword type="function" name="gst_control_binding_get_value_array ()" link="GstControlBinding.html#gst-control-binding-get-value-array"/> + <keyword type="function" name="gst_control_binding_get_g_value_array ()" link="GstControlBinding.html#gst-control-binding-get-g-value-array"/> <keyword type="function" name="gst_control_binding_set_disabled ()" link="GstControlBinding.html#gst-control-binding-set-disabled"/> <keyword type="function" name="gst_control_binding_is_disabled ()" link="GstControlBinding.html#gst-control-binding-is-disabled"/> <keyword type="property" name="The "name" property" link="GstControlBinding.html#GstControlBinding--name"/> @@ -889,7 +890,7 @@ <keyword type="function" name="gst_mini_object_replace ()" link="gstreamer-GstMiniObject.html#gst-mini-object-replace"/> <keyword type="function" name="gst_mini_object_steal ()" link="gstreamer-GstMiniObject.html#gst-mini-object-steal"/> <keyword type="function" name="gst_mini_object_take ()" link="gstreamer-GstMiniObject.html#gst-mini-object-take"/> - <keyword type="" name="controlled properties" link="GstObject.html#idp25919984"/> + <keyword type="" name="controlled properties" link="GstObject.html#idp27000992"/> <keyword type="struct" name="struct GstObject" link="GstObject.html#GstObject-struct"/> <keyword type="struct" name="struct GstObjectClass" link="GstObject.html#GstObjectClass"/> <keyword type="enum" name="enum GstObjectFlags" link="GstObject.html#GstObjectFlags"/> @@ -929,6 +930,7 @@ <keyword type="function" name="gst_object_remove_control_binding ()" link="GstObject.html#gst-object-remove-control-binding"/> <keyword type="function" name="gst_object_get_value ()" link="GstObject.html#gst-object-get-value"/> <keyword type="function" name="gst_object_get_value_array ()" link="GstObject.html#gst-object-get-value-array"/> + <keyword type="function" name="gst_object_get_g_value_array ()" link="GstObject.html#gst-object-get-g-value-array"/> <keyword type="function" name="gst_object_get_control_rate ()" link="GstObject.html#gst-object-get-control-rate"/> <keyword type="function" name="gst_object_set_control_rate ()" link="GstObject.html#gst-object-set-control-rate"/> <keyword type="property" name="The "name" property" link="GstObject.html#GstObject--name"/> @@ -1130,7 +1132,7 @@ <keyword type="function" name="gst_plugin_error_quark ()" link="GstPlugin.html#gst-plugin-error-quark"/> <keyword type="macro" name="GST_PLUGIN_ERROR" link="GstPlugin.html#GST-PLUGIN-ERROR:CAPS"/> <keyword type="enum" name="enum GstPluginError" link="GstPlugin.html#GstPluginError"/> - <keyword type="struct" name="struct GstPlugin" link="GstPlugin.html#GstPlugin-struct"/> + <keyword type="struct" name="GstPlugin" link="GstPlugin.html#GstPlugin-struct"/> <keyword type="struct" name="struct GstPluginDesc" link="GstPlugin.html#GstPluginDesc"/> <keyword type="function" name="GstPluginInitFunc ()" link="GstPlugin.html#GstPluginInitFunc"/> <keyword type="function" name="GstPluginInitFullFunc ()" link="GstPlugin.html#GstPluginInitFullFunc" since="0.10.24"/> @@ -1145,11 +1147,10 @@ <keyword type="function" name="gst_plugin_get_origin ()" link="GstPlugin.html#gst-plugin-get-origin"/> <keyword type="function" name="gst_plugin_get_source ()" link="GstPlugin.html#gst-plugin-get-source"/> <keyword type="function" name="gst_plugin_get_version ()" link="GstPlugin.html#gst-plugin-get-version"/> - <keyword type="function" name="gst_plugin_get_module ()" link="GstPlugin.html#gst-plugin-get-module"/> + <keyword type="function" name="gst_plugin_get_release_date_string ()" link="GstPlugin.html#gst-plugin-get-release-date-string"/> <keyword type="function" name="gst_plugin_is_loaded ()" link="GstPlugin.html#gst-plugin-is-loaded"/> <keyword type="function" name="gst_plugin_get_cache_data ()" link="GstPlugin.html#gst-plugin-get-cache-data" since="0.10.24"/> <keyword type="function" name="gst_plugin_set_cache_data ()" link="GstPlugin.html#gst-plugin-set-cache-data" since="0.10.24"/> - <keyword type="function" name="gst_plugin_name_filter ()" link="GstPlugin.html#gst-plugin-name-filter"/> <keyword type="function" name="gst_plugin_load_file ()" link="GstPlugin.html#gst-plugin-load-file"/> <keyword type="function" name="gst_plugin_load ()" link="GstPlugin.html#gst-plugin-load"/> <keyword type="function" name="gst_plugin_load_by_name ()" link="GstPlugin.html#gst-plugin-load-by-name"/> @@ -1622,7 +1623,7 @@ <keyword type="function" name="gst_type_find_suggest_simple ()" link="gstreamer-GstTypeFind.html#gst-type-find-suggest-simple" since="0.10.20"/> <keyword type="function" name="gst_type_find_get_length ()" link="gstreamer-GstTypeFind.html#gst-type-find-get-length"/> <keyword type="function" name="gst_type_find_register ()" link="gstreamer-GstTypeFind.html#gst-type-find-register"/> - <keyword type="struct" name="struct GstTypeFindFactory" link="GstTypeFindFactory.html#GstTypeFindFactory-struct"/> + <keyword type="struct" name="GstTypeFindFactory" link="GstTypeFindFactory.html#GstTypeFindFactory-struct"/> <keyword type="function" name="gst_type_find_factory_get_list ()" link="GstTypeFindFactory.html#gst-type-find-factory-get-list"/> <keyword type="function" name="gst_type_find_factory_get_extensions ()" link="GstTypeFindFactory.html#gst-type-find-factory-get-extensions"/> <keyword type="function" name="gst_type_find_factory_get_caps ()" link="GstTypeFindFactory.html#gst-type-find-factory-get-caps"/> @@ -2069,6 +2070,9 @@ <keyword type="constant" name="GST_SEEK_FLAG_KEY_UNIT" link="gstreamer-GstEvent.html#GST-SEEK-FLAG-KEY-UNIT:CAPS"/> <keyword type="constant" name="GST_SEEK_FLAG_SEGMENT" link="gstreamer-GstEvent.html#GST-SEEK-FLAG-SEGMENT:CAPS"/> <keyword type="constant" name="GST_SEEK_FLAG_SKIP" link="gstreamer-GstEvent.html#GST-SEEK-FLAG-SKIP:CAPS"/> + <keyword type="constant" name="GST_SEEK_FLAG_SNAP_BEFORE" link="gstreamer-GstEvent.html#GST-SEEK-FLAG-SNAP-BEFORE:CAPS"/> + <keyword type="constant" name="GST_SEEK_FLAG_SNAP_AFTER" link="gstreamer-GstEvent.html#GST-SEEK-FLAG-SNAP-AFTER:CAPS"/> + <keyword type="constant" name="GST_SEEK_FLAG_SNAP_NEAREST" link="gstreamer-GstEvent.html#GST-SEEK-FLAG-SNAP-NEAREST:CAPS"/> <keyword type="constant" name="GST_STREAM_CONFIG_FLAG_NONE" link="gstreamer-GstEvent.html#GST-STREAM-CONFIG-FLAG-NONE:CAPS"/> <keyword type="constant" name="GST_FORMAT_UNDEFINED" link="gstreamer-GstFormat.html#GST-FORMAT-UNDEFINED:CAPS"/> <keyword type="constant" name="GST_FORMAT_DEFAULT" link="gstreamer-GstFormat.html#GST-FORMAT-DEFAULT:CAPS"/> @@ -2137,6 +2141,7 @@ <keyword type="constant" name="GST_META_FLAG_NONE" link="gstreamer-GstMeta.html#GST-META-FLAG-NONE:CAPS"/> <keyword type="constant" name="GST_META_FLAG_READONLY" link="gstreamer-GstMeta.html#GST-META-FLAG-READONLY:CAPS"/> <keyword type="constant" name="GST_META_FLAG_POOLED" link="gstreamer-GstMeta.html#GST-META-FLAG-POOLED:CAPS"/> + <keyword type="constant" name="GST_META_FLAG_LOCKED" link="gstreamer-GstMeta.html#GST-META-FLAG-LOCKED:CAPS"/> <keyword type="constant" name="GST_META_FLAG_LAST" link="gstreamer-GstMeta.html#GST-META-FLAG-LAST:CAPS"/> <keyword type="constant" name="GST_MINI_OBJECT_FLAG_LAST" link="gstreamer-GstMiniObject.html#GST-MINI-OBJECT-FLAG-LAST:CAPS"/> <keyword type="constant" name="GST_OBJECT_FLAG_LAST" link="GstObject.html#GST-OBJECT-FLAG-LAST:CAPS"/> diff --git a/docs/gst/html/index.html b/docs/gst/html/index.html index de32534..7bf76d8 100644 --- a/docs/gst/html/index.html +++ b/docs/gst/html/index.html @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GStreamer 1.0 Core Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for GStreamer Core 1.0 (0.11.89.1) + for GStreamer Core 1.0 (0.11.90.1) The latest version of this documentation can be found on-line at <a class="ulink" href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/" target="_top">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/</a>. </p></div> diff --git a/docs/gst/html/index.sgml b/docs/gst/html/index.sgml index 7799899..9aebeb6 100644 --- a/docs/gst/html/index.sgml +++ b/docs/gst/html/index.sgml @@ -465,6 +465,7 @@ <ANCHOR id="gst-control-binding-sync-values" href="gstreamer-1.0/GstControlBinding.html#gst-control-binding-sync-values"> <ANCHOR id="gst-control-binding-get-value" href="gstreamer-1.0/GstControlBinding.html#gst-control-binding-get-value"> <ANCHOR id="gst-control-binding-get-value-array" href="gstreamer-1.0/GstControlBinding.html#gst-control-binding-get-value-array"> +<ANCHOR id="gst-control-binding-get-g-value-array" href="gstreamer-1.0/GstControlBinding.html#gst-control-binding-get-g-value-array"> <ANCHOR id="gst-control-binding-set-disabled" href="gstreamer-1.0/GstControlBinding.html#gst-control-binding-set-disabled"> <ANCHOR id="gst-control-binding-is-disabled" href="gstreamer-1.0/GstControlBinding.html#gst-control-binding-is-disabled"> <ANCHOR id="GstControlBinding.property-details" href="gstreamer-1.0/GstControlBinding.html#GstControlBinding.property-details"> @@ -848,6 +849,9 @@ <ANCHOR id="GST-SEEK-FLAG-KEY-UNIT:CAPS" href="gstreamer-1.0/gstreamer-GstEvent.html#GST-SEEK-FLAG-KEY-UNIT:CAPS"> <ANCHOR id="GST-SEEK-FLAG-SEGMENT:CAPS" href="gstreamer-1.0/gstreamer-GstEvent.html#GST-SEEK-FLAG-SEGMENT:CAPS"> <ANCHOR id="GST-SEEK-FLAG-SKIP:CAPS" href="gstreamer-1.0/gstreamer-GstEvent.html#GST-SEEK-FLAG-SKIP:CAPS"> +<ANCHOR id="GST-SEEK-FLAG-SNAP-BEFORE:CAPS" href="gstreamer-1.0/gstreamer-GstEvent.html#GST-SEEK-FLAG-SNAP-BEFORE:CAPS"> +<ANCHOR id="GST-SEEK-FLAG-SNAP-AFTER:CAPS" href="gstreamer-1.0/gstreamer-GstEvent.html#GST-SEEK-FLAG-SNAP-AFTER:CAPS"> +<ANCHOR id="GST-SEEK-FLAG-SNAP-NEAREST:CAPS" href="gstreamer-1.0/gstreamer-GstEvent.html#GST-SEEK-FLAG-SNAP-NEAREST:CAPS"> <ANCHOR id="gst-event-new-seek" href="gstreamer-1.0/gstreamer-GstEvent.html#gst-event-new-seek"> <ANCHOR id="gst-event-parse-seek" href="gstreamer-1.0/gstreamer-GstEvent.html#gst-event-parse-seek"> <ANCHOR id="gst-event-new-navigation" href="gstreamer-1.0/gstreamer-GstEvent.html#gst-event-new-navigation"> @@ -1158,6 +1162,7 @@ <ANCHOR id="GST-META-FLAG-NONE:CAPS" href="gstreamer-1.0/gstreamer-GstMeta.html#GST-META-FLAG-NONE:CAPS"> <ANCHOR id="GST-META-FLAG-READONLY:CAPS" href="gstreamer-1.0/gstreamer-GstMeta.html#GST-META-FLAG-READONLY:CAPS"> <ANCHOR id="GST-META-FLAG-POOLED:CAPS" href="gstreamer-1.0/gstreamer-GstMeta.html#GST-META-FLAG-POOLED:CAPS"> +<ANCHOR id="GST-META-FLAG-LOCKED:CAPS" href="gstreamer-1.0/gstreamer-GstMeta.html#GST-META-FLAG-LOCKED:CAPS"> <ANCHOR id="GST-META-FLAG-LAST:CAPS" href="gstreamer-1.0/gstreamer-GstMeta.html#GST-META-FLAG-LAST:CAPS"> <ANCHOR id="GST-META-FLAGS:CAPS" href="gstreamer-1.0/gstreamer-GstMeta.html#GST-META-FLAGS:CAPS"> <ANCHOR id="GST-META-FLAG-IS-SET:CAPS" href="gstreamer-1.0/gstreamer-GstMeta.html#GST-META-FLAG-IS-SET:CAPS"> @@ -1252,6 +1257,7 @@ <ANCHOR id="gst-object-remove-control-binding" href="gstreamer-1.0/GstObject.html#gst-object-remove-control-binding"> <ANCHOR id="gst-object-get-value" href="gstreamer-1.0/GstObject.html#gst-object-get-value"> <ANCHOR id="gst-object-get-value-array" href="gstreamer-1.0/GstObject.html#gst-object-get-value-array"> +<ANCHOR id="gst-object-get-g-value-array" href="gstreamer-1.0/GstObject.html#gst-object-get-g-value-array"> <ANCHOR id="gst-object-get-control-rate" href="gstreamer-1.0/GstObject.html#gst-object-get-control-rate"> <ANCHOR id="gst-object-set-control-rate" href="gstreamer-1.0/GstObject.html#gst-object-set-control-rate"> <ANCHOR id="GstObject.property-details" href="gstreamer-1.0/GstObject.html#GstObject.property-details"> @@ -1586,11 +1592,10 @@ <ANCHOR id="gst-plugin-get-origin" href="gstreamer-1.0/GstPlugin.html#gst-plugin-get-origin"> <ANCHOR id="gst-plugin-get-source" href="gstreamer-1.0/GstPlugin.html#gst-plugin-get-source"> <ANCHOR id="gst-plugin-get-version" href="gstreamer-1.0/GstPlugin.html#gst-plugin-get-version"> -<ANCHOR id="gst-plugin-get-module" href="gstreamer-1.0/GstPlugin.html#gst-plugin-get-module"> +<ANCHOR id="gst-plugin-get-release-date-string" href="gstreamer-1.0/GstPlugin.html#gst-plugin-get-release-date-string"> <ANCHOR id="gst-plugin-is-loaded" href="gstreamer-1.0/GstPlugin.html#gst-plugin-is-loaded"> <ANCHOR id="gst-plugin-get-cache-data" href="gstreamer-1.0/GstPlugin.html#gst-plugin-get-cache-data"> <ANCHOR id="gst-plugin-set-cache-data" href="gstreamer-1.0/GstPlugin.html#gst-plugin-set-cache-data"> -<ANCHOR id="gst-plugin-name-filter" href="gstreamer-1.0/GstPlugin.html#gst-plugin-name-filter"> <ANCHOR id="gst-plugin-load-file" href="gstreamer-1.0/GstPlugin.html#gst-plugin-load-file"> <ANCHOR id="gst-plugin-load" href="gstreamer-1.0/GstPlugin.html#gst-plugin-load"> <ANCHOR id="gst-plugin-load-by-name" href="gstreamer-1.0/GstPlugin.html#gst-plugin-load-by-name"> diff --git a/docs/gst/running.xml b/docs/gst/running.xml index c84b0f6..ce64a24 100644 --- a/docs/gst/running.xml +++ b/docs/gst/running.xml @@ -95,7 +95,7 @@ to print out different types of debugging information to stderr. <para> The variable takes a comma-separated list of "category_name:level" pairs to set specific levels for the individual categories. -The level value ranges from 0 (nothing) to 5 (LOG). +The level value ranges from 0 (nothing) to 9 (MEMDUMP). <variablelist> <varlistentry> @@ -120,7 +120,19 @@ are expected to happen. </varlistentry> <varlistentry> - <term>3 - <option>INFO</option></term> + <term>3 - <option>FIXME</option></term> + <listitem> +<para> +Logs all fixme messages. Fixme messages are messages that indicate that something +in the executed code path is not fully implemented or handled yet. The purpose +of this message is to make it easier to spot incomplete/unfinished pieces of +code when reading the debug log. +</para> + </listitem> + </varlistentry> + + <varlistentry> + <term>4 - <option>INFO</option></term> <listitem> <para> Logs all informational messages. These are typically used for events in @@ -131,7 +143,7 @@ logged at this level. </varlistentry> <varlistentry> - <term>4 - <option>DEBUG</option></term> + <term>5 - <option>DEBUG</option></term> <listitem> <para> Logs all debug messages. These are general debug messages for events @@ -142,7 +154,7 @@ these include setup, teardown, change of parameters, ... </varlistentry> <varlistentry> - <term>5 - <option>LOG</option></term> + <term>6 - <option>LOG</option></term> <listitem> <para> Logs all log messages. These are messages for events @@ -151,6 +163,28 @@ these include streaming and steady-state conditions. </para> </listitem> </varlistentry> + + <varlistentry> + <term>7 - <option>TRACE</option></term> + <listitem> +<para> +Logs all trace messages. These messages for events +that happen repeatedly during an object's lifetime such as the +ref/unref cycles. +</para> + </listitem> + </varlistentry> + + <varlistentry> + <term>9 - <option>MEMDUMP</option></term> + <listitem> +<para> +Log all memory dump messages. Memory dump messages are used to log +(small) chunks of data as memory dumps in the log. They will be displayed +as hexdump with ASCII characters. +</para> + </listitem> + </varlistentry> </variablelist> The category_name can contain "<option>*"</option> as a wildcard. @@ -158,7 +192,7 @@ these include streaming and steady-state conditions. <para> For example, setting <envar>GST_DEBUG</envar> to -<option>GST_AUTOPLUG:5,GST_ELEMENT_*:3</option>, will cause the +<option>GST_AUTOPLUG:6,GST_ELEMENT_*:4</option>, will cause the <option>GST_AUTOPLUG</option> category to be logged at full <option>LOG</option> level, while all categories starting with <option>GST_ELEMENT_</option> will be logged at <option>INFO</option> level. @@ -167,7 +201,7 @@ For example, setting <envar>GST_DEBUG</envar> to <para> To get all possible debug output, set <envar>GST_DEBUG</envar> -to <option>*:5</option> +to <option>*:9</option> </para> </formalpara> @@ -236,6 +270,44 @@ plugins frequently, it will save time when doing gst_init(). </formalpara> +<formalpara id="GST_TRACE"> + <title><envar>GST_TRACE</envar></title> + + <para> + Enable memory allocation tracing. Most GStreamer objects have support for + tracing the number of unfreed objects and their memory pointers. + </para> + <para> +The variable takes a comma-separated list of tracing options to enable. + <variablelist> + + <varlistentry> + <term>live</term> + <listitem> +<para> + Counts all live objects and dumps an overview of the number of unfreed + objects at program exit. +</para> + </listitem> + </varlistentry> + + <varlistentry> + <term>mem-live</term> + <listitem> +<para> + Keep track of the unfreed memory pointers and dump an overview of all unfreed + memory at program exit. Together with a level 9 debug log this can be used to + follow the lifecycle of leaked objects in order to track down where they are + leaked. +</para> + </listitem> + </varlistentry> + </variablelist> + + Use <option>all</option> to enable all tracing flags. + </para> +</formalpara> + <formalpara id="ORC_CODE"> <title><envar>ORC_CODE</envar></title> diff --git a/docs/libs/Makefile.in b/docs/libs/Makefile.in index 86eaf68..980ba1a 100644 --- a/docs/libs/Makefile.in +++ b/docs/libs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/docs/libs/gstreamer-libs-docs.sgml b/docs/libs/gstreamer-libs-docs.sgml index 1d98145..6ca7e92 100644 --- a/docs/libs/gstreamer-libs-docs.sgml +++ b/docs/libs/gstreamer-libs-docs.sgml @@ -43,7 +43,7 @@ <xi:include href="xml/gstbitreader.xml" /> <xi:include href="xml/gstbytereader.xml" /> <xi:include href="xml/gstbytewriter.xml" /> - <xi:include href="xml/gstcollectpads2.xml" /> + <xi:include href="xml/gstcollectpads.xml" /> <xi:include href="xml/gsttypefindhelper.xml" /> </chapter> diff --git a/docs/libs/gstreamer-libs-sections.txt b/docs/libs/gstreamer-libs-sections.txt index ee74cc1..a5dbbda 100644 --- a/docs/libs/gstreamer-libs-sections.txt +++ b/docs/libs/gstreamer-libs-sections.txt @@ -615,68 +615,68 @@ GST_BYTE_WRITER </SECTION> <SECTION> -<FILE>gstcollectpads2</FILE> -<TITLE>GstCollectPads2</TITLE> -<INCLUDE>gst/base/gstcollectpads2.h</INCLUDE> -GstCollectPads2 -GstCollectData2 - -GstCollectData2DestroyNotify -GstCollectPads2BufferFunction -GstCollectPads2CompareFunction -GstCollectPads2EventFunction -GstCollectPads2ClipFunction -GstCollectPads2Function -GstCollectPads2StateFlags - -GST_COLLECT_PADS2_STATE -GST_COLLECT_PADS2_STATE_IS_SET -GST_COLLECT_PADS2_STATE_SET -GST_COLLECT_PADS2_STATE_UNSET - -GST_COLLECT_PADS2_GET_STREAM_LOCK -GST_COLLECT_PADS2_STREAM_LOCK -GST_COLLECT_PADS2_STREAM_UNLOCK - -gst_collect_pads2_new - -gst_collect_pads2_add_pad -gst_collect_pads2_add_pad_full -gst_collect_pads2_remove_pad - -gst_collect_pads2_start -gst_collect_pads2_stop - -gst_collect_pads2_available -gst_collect_pads2_is_active - -gst_collect_pads2_collect -gst_collect_pads2_collect_range - -gst_collect_pads2_flush -gst_collect_pads2_peek -gst_collect_pads2_pop - -gst_collect_pads2_read -gst_collect_pads2_read_buffer -gst_collect_pads2_take_buffer - -gst_collect_pads2_set_buffer_function -gst_collect_pads2_set_compare_function -gst_collect_pads2_set_event_function -gst_collect_pads2_set_clip_function -gst_collect_pads2_set_flushing -gst_collect_pads2_set_function -gst_collect_pads2_set_waiting +<FILE>gstcollectpads</FILE> +<TITLE>GstCollectPads</TITLE> +<INCLUDE>gst/base/gstcollectpads.h</INCLUDE> +GstCollectPads +GstCollectData + +GstCollectDataDestroyNotify +GstCollectPadsBufferFunction +GstCollectPadsCompareFunction +GstCollectPadsEventFunction +GstCollectPadsClipFunction +GstCollectPadsFunction +GstCollectPadsStateFlags + +GST_COLLECT_PADS_STATE +GST_COLLECT_PADS_STATE_IS_SET +GST_COLLECT_PADS_STATE_SET +GST_COLLECT_PADS_STATE_UNSET + +GST_COLLECT_PADS_GET_STREAM_LOCK +GST_COLLECT_PADS_STREAM_LOCK +GST_COLLECT_PADS_STREAM_UNLOCK + +gst_collect_pads_new + +gst_collect_pads_add_pad +gst_collect_pads_add_pad_full +gst_collect_pads_remove_pad + +gst_collect_pads_start +gst_collect_pads_stop + +gst_collect_pads_available +gst_collect_pads_is_active + +gst_collect_pads_collect +gst_collect_pads_collect_range + +gst_collect_pads_flush +gst_collect_pads_peek +gst_collect_pads_pop + +gst_collect_pads_read +gst_collect_pads_read_buffer +gst_collect_pads_take_buffer + +gst_collect_pads_set_buffer_function +gst_collect_pads_set_compare_function +gst_collect_pads_set_event_function +gst_collect_pads_set_clip_function +gst_collect_pads_set_flushing +gst_collect_pads_set_function +gst_collect_pads_set_waiting <SUBSECTION Standard> -GstCollectPads2Class -GST_COLLECT_PADS2 -GST_COLLECT_PADS2_CLASS -GST_TYPE_COLLECT_PADS2 -GST_IS_COLLECT_PADS2 -GST_IS_COLLECT_PADS2_CLASS -GST_COLLECT_PADS2_GET_CLASS -gst_collect_pads2_get_type +GstCollectPadsClass +GST_COLLECT_PADS +GST_COLLECT_PADS_CLASS +GST_TYPE_COLLECT_PADS +GST_IS_COLLECT_PADS +GST_IS_COLLECT_PADS_CLASS +GST_COLLECT_PADS_GET_CLASS +gst_collect_pads_get_type <SUBSECTION Private> </SECTION> diff --git a/docs/libs/gstreamer-libs.types b/docs/libs/gstreamer-libs.types index cfb552a..a75d55b 100644 --- a/docs/libs/gstreamer-libs.types +++ b/docs/libs/gstreamer-libs.types @@ -6,14 +6,14 @@ #include <gst/base/gstbasesrc.h> #include <gst/base/gstbasesink.h> #include <gst/base/gstbasetransform.h> -#include <gst/base/gstcollectpads2.h> +#include <gst/base/gstcollectpads.h> #include <gst/base/gstpushsrc.h> gst_adapter_get_type gst_base_src_get_type gst_base_sink_get_type gst_base_transform_get_type -gst_collect_pads2_get_type +gst_collect_pads_get_type gst_push_src_get_type % controller diff --git a/docs/libs/html/GstAdapter.html b/docs/libs/html/GstAdapter.html index e45d044..dcbe437 100644 --- a/docs/libs/html/GstAdapter.html +++ b/docs/libs/html/GstAdapter.html @@ -42,11 +42,11 @@ <pre class="synopsis"> #include <gst/base/gstadapter.h> -struct <a class="link" href="GstAdapter.html#GstAdapter-struct" title="struct GstAdapter">GstAdapter</a>; + <a class="link" href="GstAdapter.html#GstAdapter-struct" title="GstAdapter">GstAdapter</a>; <a class="link" href="GstAdapter.html" title="GstAdapter"><span class="returnvalue">GstAdapter</span></a> * <a class="link" href="GstAdapter.html#gst-adapter-new" title="gst_adapter_new ()">gst_adapter_new</a> (<em class="parameter"><code><span class="type">void</span></code></em>); <span class="returnvalue">void</span> <a class="link" href="GstAdapter.html#gst-adapter-clear" title="gst_adapter_clear ()">gst_adapter_clear</a> (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstAdapter.html#gst-adapter-push" title="gst_adapter_push ()">gst_adapter_push</a> (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buf</code></em>); + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buf</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="returnvalue">gconstpointer</span></a> <a class="link" href="GstAdapter.html#gst-adapter-map" title="gst_adapter_map ()">gst_adapter_map</a> (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, <em class="parameter"><code><span class="type">gsize</span> size</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstAdapter.html#gst-adapter-unmap" title="gst_adapter_unmap ()">gst_adapter_unmap</a> (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>); @@ -60,13 +60,13 @@ struct <a class="link" href="GstAdapter.html#GstAdapter-struct" tit <span class="returnvalue">gsize</span> <a class="link" href="GstAdapter.html#gst-adapter-available-fast" title="gst_adapter_available_fast ()">gst_adapter_available_fast</a> (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="returnvalue">gpointer</span></a> <a class="link" href="GstAdapter.html#gst-adapter-take" title="gst_adapter_take ()">gst_adapter_take</a> (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, <em class="parameter"><code><span class="type">gsize</span> nbytes</code></em>); -<a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="GstAdapter.html#gst-adapter-take-buffer" title="gst_adapter_take_buffer ()">gst_adapter_take_buffer</a> (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="GstAdapter.html#gst-adapter-take-buffer" title="gst_adapter_take_buffer ()">gst_adapter_take_buffer</a> (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, <em class="parameter"><code><span class="type">gsize</span> nbytes</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> * <a class="link" href="GstAdapter.html#gst-adapter-take-list" title="gst_adapter_take_list ()">gst_adapter_take_list</a> (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, <em class="parameter"><code><span class="type">gsize</span> nbytes</code></em>); -<a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> <a class="link" href="GstAdapter.html#gst-adapter-prev-pts" title="gst_adapter_prev_pts ()">gst_adapter_prev_pts</a> (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> <a class="link" href="GstAdapter.html#gst-adapter-prev-pts" title="gst_adapter_prev_pts ()">gst_adapter_prev_pts</a> (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, <em class="parameter"><code><span class="type">guint64</span> *distance</code></em>); -<a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> <a class="link" href="GstAdapter.html#gst-adapter-prev-dts" title="gst_adapter_prev_dts ()">gst_adapter_prev_dts</a> (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> <a class="link" href="GstAdapter.html#gst-adapter-prev-dts" title="gst_adapter_prev_dts ()">gst_adapter_prev_dts</a> (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, <em class="parameter"><code><span class="type">guint64</span> *distance</code></em>); <span class="returnvalue">gsize</span> <a class="link" href="GstAdapter.html#gst-adapter-masked-scan-uint32" title="gst_adapter_masked_scan_uint32 ()">gst_adapter_masked_scan_uint32</a> (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, <em class="parameter"><code><span class="type">guint32</span> mask</code></em>, @@ -154,21 +154,21 @@ in 512-byte chunks could be implemented like this: GstFlowReturn ret <span class="gtkdoc opt">=</span> GST_FLOW_OK<span class="gtkdoc opt">;</span> <span class="gtkdoc slc">// will give the element an extra ref; remember to drop it</span> - <span class="keyword">this</span> <span class="gtkdoc opt">=</span> <span class="function">MY_ELEMENT</span> <span class="gtkdoc opt">(</span><span class="function"><a href="../gstreamer-1.0/GstPad.html#gst-pad-get-parent">gst_pad_get_parent</a></span> <span class="gtkdoc opt">(</span>pad<span class="gtkdoc opt">));</span> + <span class="keyword">this</span> <span class="gtkdoc opt">=</span> <span class="function">MY_ELEMENT</span> <span class="gtkdoc opt">(</span><span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#gst-pad-get-parent">gst_pad_get_parent</a></span> <span class="gtkdoc opt">(</span>pad<span class="gtkdoc opt">));</span> adapter <span class="gtkdoc opt">=</span> <span class="keyword">this</span><span class="gtkdoc opt">-></span>adapter<span class="gtkdoc opt">;</span> <span class="gtkdoc slc">// put buffer into adapter</span> - <span class="function"><a href="../gstreamer-libs-1.0/GstAdapter.html#gst-adapter-push">gst_adapter_push</a></span> <span class="gtkdoc opt">(</span>adapter<span class="gtkdoc opt">,</span> buffer<span class="gtkdoc opt">);</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstAdapter.html#gst-adapter-push">gst_adapter_push</a></span> <span class="gtkdoc opt">(</span>adapter<span class="gtkdoc opt">,</span> buffer<span class="gtkdoc opt">);</span> <span class="gtkdoc slc">// while we can read out 512 bytes, process them</span> - <span class="keyword">while</span> <span class="gtkdoc opt">(</span><span class="function"><a href="../gstreamer-libs-1.0/GstAdapter.html#gst-adapter-available">gst_adapter_available</a></span> <span class="gtkdoc opt">(</span>adapter<span class="gtkdoc opt">) >=</span> <span class="number">512</span> <span class="gtkdoc opt">&&</span> ret <span class="gtkdoc opt">==</span> GST_FLOW_OK<span class="gtkdoc opt">) {</span> - <span class="gtkdoc kwb">const</span> guint8 <span class="gtkdoc opt">*</span>data <span class="gtkdoc opt">=</span> <span class="function"><a href="../gstreamer-libs-1.0/GstAdapter.html#gst-adapter-map">gst_adapter_map</a></span> <span class="gtkdoc opt">(</span>adapter<span class="gtkdoc opt">,</span> <span class="number">512</span><span class="gtkdoc opt">);</span> + <span class="keyword">while</span> <span class="gtkdoc opt">(</span><span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstAdapter.html#gst-adapter-available">gst_adapter_available</a></span> <span class="gtkdoc opt">(</span>adapter<span class="gtkdoc opt">) >=</span> <span class="number">512</span> <span class="gtkdoc opt">&&</span> ret <span class="gtkdoc opt">==</span> GST_FLOW_OK<span class="gtkdoc opt">) {</span> + <span class="gtkdoc kwb">const</span> guint8 <span class="gtkdoc opt">*</span>data <span class="gtkdoc opt">=</span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstAdapter.html#gst-adapter-map">gst_adapter_map</a></span> <span class="gtkdoc opt">(</span>adapter<span class="gtkdoc opt">,</span> <span class="number">512</span><span class="gtkdoc opt">);</span> <span class="gtkdoc slc">// use flowreturn as an error value</span> ret <span class="gtkdoc opt">=</span> <span class="function">my_library_foo</span> <span class="gtkdoc opt">(</span>data<span class="gtkdoc opt">);</span> - <span class="function"><a href="../gstreamer-libs-1.0/GstAdapter.html#gst-adapter-unmap">gst_adapter_unmap</a></span> <span class="gtkdoc opt">(</span>adapter<span class="gtkdoc opt">);</span> - <span class="function"><a href="../gstreamer-libs-1.0/GstAdapter.html#gst-adapter-flush">gst_adapter_flush</a></span> <span class="gtkdoc opt">(</span>adapter<span class="gtkdoc opt">,</span> <span class="number">512</span><span class="gtkdoc opt">);</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstAdapter.html#gst-adapter-unmap">gst_adapter_unmap</a></span> <span class="gtkdoc opt">(</span>adapter<span class="gtkdoc opt">);</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstAdapter.html#gst-adapter-flush">gst_adapter_flush</a></span> <span class="gtkdoc opt">(</span>adapter<span class="gtkdoc opt">,</span> <span class="number">512</span><span class="gtkdoc opt">);</span> <span class="gtkdoc opt">}</span> - <span class="function"><a href="../gstreamer-1.0/GstObject.html#gst-object-unref">gst_object_unref</a></span> <span class="gtkdoc opt">(</span><span class="keyword">this</span><span class="gtkdoc opt">);</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html#gst-object-unref">gst_object_unref</a></span> <span class="gtkdoc opt">(</span><span class="keyword">this</span><span class="gtkdoc opt">);</span> <span class="keyword">return</span> ret<span class="gtkdoc opt">;</span> <span class="gtkdoc opt">}</span></pre></td> </tr> @@ -186,7 +186,7 @@ is the libvisual element. An element using GstAdapter in its sink pad chain function should ensure that when the FLUSH_STOP event is received, that any queued data is cleared using <a class="link" href="GstAdapter.html#gst-adapter-clear" title="gst_adapter_clear ()"><code class="function">gst_adapter_clear()</code></a>. Data should also be cleared or processed on EOS and -when changing state from <a href="../gstreamer-1.0/GstElement.html#GST-STATE-PAUSED:CAPS"><span class="type">GST_STATE_PAUSED</span></a> to <a href="../gstreamer-1.0/GstElement.html#GST-STATE-READY:CAPS"><span class="type">GST_STATE_READY</span></a>. +when changing state from <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#GST-STATE-PAUSED:CAPS"><span class="type">GST_STATE_PAUSED</span></a> to <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#GST-STATE-READY:CAPS"><span class="type">GST_STATE_READY</span></a>. </p> <p> Also check the GST_BUFFER_FLAG_DISCONT flag on the buffer. Some elements might @@ -219,7 +219,7 @@ serialized via the pad's STREAM_LOCK. </p> <p> Note that <a class="link" href="GstAdapter.html#gst-adapter-push" title="gst_adapter_push ()"><code class="function">gst_adapter_push()</code></a> takes ownership of the buffer passed. Use -<a href="../gstreamer-1.0/gstreamer-GstBuffer.html#gst-buffer-ref"><code class="function">gst_buffer_ref()</code></a> before pushing it into the adapter if you still want to +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#gst-buffer-ref"><code class="function">gst_buffer_ref()</code></a> before pushing it into the adapter if you still want to access the buffer later. The adapter will never modify the data in the buffer pushed in it. </p> @@ -230,8 +230,8 @@ Last reviewed on 2009-05-13 (0.10.24). <div class="refsect1"> <a name="GstAdapter.details"></a><h2>Details</h2> <div class="refsect2"> -<a name="GstAdapter-struct"></a><h3>struct GstAdapter</h3> -<pre class="programlisting">struct GstAdapter;</pre> +<a name="GstAdapter-struct"></a><h3>GstAdapter</h3> +<pre class="programlisting">typedef struct _GstAdapter GstAdapter;</pre> <p> The opaque <a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> data structure. </p> @@ -272,7 +272,7 @@ Removes all buffers from <em class="parameter"><code>adapter</code></em>. <div class="refsect2"> <a name="gst-adapter-push"></a><h3>gst_adapter_push ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> gst_adapter_push (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buf</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buf</code></em>);</pre> <p> Adds the data from <em class="parameter"><code>buf</code></em> to the data stored inside <em class="parameter"><code>adapter</code></em> and takes ownership of the buffer. @@ -287,7 +287,7 @@ ownership of the buffer. </tr> <tr> <td><p><span class="term"><em class="parameter"><code>buf</code></em> :</span></p></td> -<td>a <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> to add to queue in the adapter. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> +<td>a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> to add to queue in the adapter. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> </td> </tr> </tbody> @@ -303,13 +303,13 @@ Gets the first <em class="parameter"><code>size</code></em> bytes stored in the valid until the next function is called on the adapter. </p> <p> -Note that setting the returned pointer as the data of a <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> is +Note that setting the returned pointer as the data of a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> is incorrect for general-purpose plugins. The reason is that if a downstream element stores the buffer so that it has access to it outside of the bounds of its chain function, the buffer will have an invalid data pointer after your element flushes the bytes. In that case you should use <a class="link" href="GstAdapter.html#gst-adapter-take" title="gst_adapter_take ()"><code class="function">gst_adapter_take()</code></a>, which returns a freshly-allocated buffer that you can set -as <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> malloc_data or the potentially more performant +as <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> malloc_data or the potentially more performant <a class="link" href="GstAdapter.html#gst-adapter-take-buffer" title="gst_adapter_take_buffer ()"><code class="function">gst_adapter_take_buffer()</code></a>. </p> <p> @@ -509,17 +509,17 @@ Free-function: g_free <hr> <div class="refsect2"> <a name="gst-adapter-take-buffer"></a><h3>gst_adapter_take_buffer ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_adapter_take_buffer (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_adapter_take_buffer (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, <em class="parameter"><code><span class="type">gsize</span> nbytes</code></em>);</pre> <p> -Returns a <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> containing the first <em class="parameter"><code>nbytes</code></em> bytes of the +Returns a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> containing the first <em class="parameter"><code>nbytes</code></em> bytes of the <em class="parameter"><code>adapter</code></em>. The returned bytes will be flushed from the adapter. This function is potentially more performant than <a class="link" href="GstAdapter.html#gst-adapter-take" title="gst_adapter_take ()"><code class="function">gst_adapter_take()</code></a> since it can reuse the memory in pushed buffers by subbuffering or merging. </p> <p> -Caller owns returned value. <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#gst-buffer-unref"><code class="function">gst_buffer_unref()</code></a> after usage. +Caller owns returned value. <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#gst-buffer-unref"><code class="function">gst_buffer_unref()</code></a> after usage. </p> <p> Free-function: gst_buffer_unref @@ -538,7 +538,7 @@ Free-function: gst_buffer_unref </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>a <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> containing the first <em class="parameter"><code>nbytes</code></em> of +<td>a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> containing the first <em class="parameter"><code>nbytes</code></em> of the adapter, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if <em class="parameter"><code>nbytes</code></em> bytes are not available. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> </td> </tr> @@ -558,7 +558,7 @@ When the caller can deal with individual buffers, this function is more performant because no memory should be copied. </p> <p> -Caller owns returned list and contained buffers. <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#gst-buffer-unref"><code class="function">gst_buffer_unref()</code></a> each +Caller owns returned list and contained buffers. <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#gst-buffer-unref"><code class="function">gst_buffer_unref()</code></a> each buffer in the list before freeing the list after usage. </p> <div class="variablelist"><table border="0"> @@ -587,7 +587,7 @@ are not available. <span class="annotation">[<acronym title="Generics and defini <hr> <div class="refsect2"> <a name="gst-adapter-prev-pts"></a><h3>gst_adapter_prev_pts ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> gst_adapter_prev_pts (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> gst_adapter_prev_pts (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, <em class="parameter"><code><span class="type">guint64</span> *distance</code></em>);</pre> <p> Get the pts that was before the current byte in the adapter. When @@ -623,7 +623,7 @@ and distance returned are GST_CLOCK_TIME_NONE and 0 respectively. <hr> <div class="refsect2"> <a name="gst-adapter-prev-dts"></a><h3>gst_adapter_prev_dts ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> gst_adapter_prev_dts (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> gst_adapter_prev_dts (<em class="parameter"><code><a class="link" href="GstAdapter.html" title="GstAdapter"><span class="type">GstAdapter</span></a> *adapter</code></em>, <em class="parameter"><code><span class="type">guint64</span> *distance</code></em>);</pre> <p> Get the dts that was before the current byte in the adapter. When diff --git a/docs/libs/html/GstBaseSink.html b/docs/libs/html/GstBaseSink.html index c4049c7..8aa1d9f 100644 --- a/docs/libs/html/GstBaseSink.html +++ b/docs/libs/html/GstBaseSink.html @@ -49,18 +49,18 @@ struct <a class="link" href="GstBaseSink.html#GstBaseSinkClass" tit <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-query-latency" title="gst_base_sink_query_latency ()">gst_base_sink_query_latency</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *live</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *upstream_live</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *min_latency</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *max_latency</code></em>); -<a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-get-latency" title="gst_base_sink_get_latency ()">gst_base_sink_get_latency</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>); -<a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-do-preroll" title="gst_base_sink_do_preroll ()">gst_base_sink_do_preroll</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstMiniObject.html#GstMiniObject"><span class="type">GstMiniObject</span></a> *obj</code></em>); -<a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-wait-preroll" title="gst_base_sink_wait_preroll ()">gst_base_sink_wait_preroll</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>); -<a href="../gstreamer-1.0/GstClock.html#GstClockReturn"><span class="returnvalue">GstClockReturn</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-wait-clock" title="gst_base_sink_wait_clock ()">gst_base_sink_wait_clock</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> time</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> *jitter</code></em>); -<a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-wait-eos" title="gst_base_sink_wait_eos ()">gst_base_sink_wait_eos</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> time</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> *jitter</code></em>); + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *min_latency</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *max_latency</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-get-latency" title="gst_base_sink_get_latency ()">gst_base_sink_get_latency</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-do-preroll" title="gst_base_sink_do_preroll ()">gst_base_sink_do_preroll</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMiniObject.html#GstMiniObject"><span class="type">GstMiniObject</span></a> *obj</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-wait-preroll" title="gst_base_sink_wait_preroll ()">gst_base_sink_wait_preroll</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockReturn"><span class="returnvalue">GstClockReturn</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-wait-clock" title="gst_base_sink_wait_clock ()">gst_base_sink_wait_clock</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> time</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> *jitter</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-wait-eos" title="gst_base_sink_wait_eos ()">gst_base_sink_wait_eos</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> time</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> *jitter</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstBaseSink.html#gst-base-sink-set-sync" title="gst_base_sink_set_sync ()">gst_base_sink_set_sync</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> sync</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-get-sync" title="gst_base_sink_get_sync ()">gst_base_sink_get_sync</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>); @@ -74,12 +74,12 @@ struct <a class="link" href="GstBaseSink.html#GstBaseSinkClass" tit <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enabled</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-is-async-enabled" title="gst_base_sink_is_async_enabled ()">gst_base_sink_is_async_enabled</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstBaseSink.html#gst-base-sink-set-ts-offset" title="gst_base_sink_set_ts_offset ()">gst_base_sink_set_ts_offset</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> offset</code></em>); -<a href="../gstreamer-1.0/GstClock.html#GstClockTimeDiff"><span class="returnvalue">GstClockTimeDiff</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-get-ts-offset" title="gst_base_sink_get_ts_offset ()">gst_base_sink_get_ts_offset</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>); + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> offset</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTimeDiff"><span class="returnvalue">GstClockTimeDiff</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-get-ts-offset" title="gst_base_sink_get_ts_offset ()">gst_base_sink_get_ts_offset</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstBaseSink.html#gst-base-sink-set-render-delay" title="gst_base_sink_set_render_delay ()">gst_base_sink_set_render_delay</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> delay</code></em>); -<a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-get-render-delay" title="gst_base_sink_get_render_delay ()">gst_base_sink_get_render_delay</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>); -<a href="../gstreamer-1.0/gstreamer-GstSample.html#GstSample"><span class="returnvalue">GstSample</span></a> * <a class="link" href="GstBaseSink.html#gst-base-sink-get-last-sample" title="gst_base_sink_get_last_sample ()">gst_base_sink_get_last_sample</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>); + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> delay</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-get-render-delay" title="gst_base_sink_get_render_delay ()">gst_base_sink_get_render_delay</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstSample.html#GstSample"><span class="returnvalue">GstSample</span></a> * <a class="link" href="GstBaseSink.html#gst-base-sink-get-last-sample" title="gst_base_sink_get_last_sample ()">gst_base_sink_get_last_sample</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstBaseSink.html#gst-base-sink-set-blocksize" title="gst_base_sink_set_blocksize ()">gst_base_sink_set_blocksize</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> blocksize</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> <a class="link" href="GstBaseSink.html#gst-base-sink-get-blocksize" title="gst_base_sink_get_blocksize ()">gst_base_sink_get_blocksize</a> (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>); @@ -102,8 +102,8 @@ struct <a class="link" href="GstBaseSink.html#GstBaseSinkClass" tit <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> +----GstBaseSink </pre> </div> @@ -113,7 +113,7 @@ struct <a class="link" href="GstBaseSink.html#GstBaseSinkClass" tit "<a class="link" href="GstBaseSink.html#GstBaseSink--async" title='The "async" property'>async</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write "<a class="link" href="GstBaseSink.html#GstBaseSink--blocksize" title='The "blocksize" property'>blocksize</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write "<a class="link" href="GstBaseSink.html#GstBaseSink--enable-last-sample" title='The "enable-last-sample" property'>enable-last-sample</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write - "<a class="link" href="GstBaseSink.html#GstBaseSink--last-sample" title='The "last-sample" property'>last-sample</a>" <a href="../gstreamer-1.0/gstreamer-GstSample.html#GstSample"><span class="type">GstSample</span></a>* : Read + "<a class="link" href="GstBaseSink.html#GstBaseSink--last-sample" title='The "last-sample" property'>last-sample</a>" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstSample.html#GstSample"><span class="type">GstSample</span></a>* : Read "<a class="link" href="GstBaseSink.html#GstBaseSink--max-lateness" title='The "max-lateness" property'>max-lateness</a>" <span class="type">gint64</span> : Read / Write "<a class="link" href="GstBaseSink.html#GstBaseSink--qos" title='The "qos" property'>qos</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write "<a class="link" href="GstBaseSink.html#GstBaseSink--render-delay" title='The "render-delay" property'>render-delay</a>" <span class="type">guint64</span> : Read / Write @@ -126,14 +126,14 @@ struct <a class="link" href="GstBaseSink.html#GstBaseSinkClass" tit <a name="GstBaseSink.description"></a><h2>Description</h2> <p> <a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> is the base class for sink elements in GStreamer, such as -xvimagesink or filesink. It is a layer on top of <a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> that provides a +xvimagesink or filesink. It is a layer on top of <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> that provides a simplified interface to plugin writers. <a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> handles many details for you, for example: preroll, clock synchronization, state changes, activation in push or pull mode, and queries. </p> <p> In most cases, when writing sink elements, there is no need to implement -class methods from <a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> or to set functions on pads, because the +class methods from <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> or to set functions on pads, because the <a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> infrastructure should be sufficient. </p> <p> @@ -162,10 +162,10 @@ install a pad template in its class_init function, like so: <span class="gtkdoc opt">{</span> GstElementClass <span class="gtkdoc opt">*</span>gstelement_class <span class="gtkdoc opt">=</span> <span class="function">GST_ELEMENT_CLASS</span> <span class="gtkdoc opt">(</span>klass<span class="gtkdoc opt">);</span> - <span class="gtkdoc slc">// sinktemplate should be a <a href="../gstreamer-1.0/GstPadTemplate.html#GstStaticPadTemplate">GstStaticPadTemplate</a> with direction</span> - <span class="gtkdoc slc">// <a href="../gstreamer-1.0/GstPad.html#GST-PAD-SINK:CAPS">GST_PAD_SINK</a> and name "sink"</span> - <span class="function"><a href="../gstreamer-1.0/GstElement.html#gst-element-class-add-pad-template">gst_element_class_add_pad_template</a></span> <span class="gtkdoc opt">(</span>gstelement_class<span class="gtkdoc opt">,</span> - <span class="function"><a href="../gstreamer-1.0/GstPadTemplate.html#gst-static-pad-template-get">gst_static_pad_template_get</a></span> <span class="gtkdoc opt">(&</span>sinktemplate<span class="gtkdoc opt">));</span> + <span class="gtkdoc slc">// sinktemplate should be a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPadTemplate.html#GstStaticPadTemplate">GstStaticPadTemplate</a> with direction</span> + <span class="gtkdoc slc">// <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GST-PAD-SINK:CAPS">GST_PAD_SINK</a> and name "sink"</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#gst-element-class-add-pad-template">gst_element_class_add_pad_template</a></span> <span class="gtkdoc opt">(</span>gstelement_class<span class="gtkdoc opt">,</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPadTemplate.html#gst-static-pad-template-get">gst_static_pad_template_get</a></span> <span class="gtkdoc opt">(&</span>sinktemplate<span class="gtkdoc opt">));</span> <span class="gtkdoc slc">// see <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElementFactory.html#GstElementDetails">GstElementDetails</a></span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#gst-element-class-set-details">gst_element_class_set_details</a></span> <span class="gtkdoc opt">(</span>gstelement_class<span class="gtkdoc opt">, &</span>details<span class="gtkdoc opt">);</span> <span class="gtkdoc opt">}</span></pre></td> @@ -178,7 +178,7 @@ install a pad template in its class_init function, like so: </p> <p> <a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> will handle the prerolling correctly. This means that it will -return <a href="../gstreamer-1.0/GstElement.html#GST-STATE-CHANGE-ASYNC:CAPS"><span class="type">GST_STATE_CHANGE_ASYNC</span></a> from a state change to PAUSED until the first +return <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#GST-STATE-CHANGE-ASYNC:CAPS"><span class="type">GST_STATE_CHANGE_ASYNC</span></a> from a state change to PAUSED until the first buffer arrives in this element. The base class will call the <a class="link" href="GstBaseSink.html#GstBaseSinkClass.preroll"><code class="function">GstBaseSinkClass.preroll()</code></a> vmethod with this preroll buffer and will then commit the state change to the next asynchronously pending state. @@ -186,7 +186,7 @@ commit the state change to the next asynchronously pending state. <p> When the element is set to PLAYING, <a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> will synchronise on the clock using the times returned from <a class="link" href="GstBaseSink.html#GstBaseSinkClass.get-times"><code class="function">GstBaseSinkClass.get_times()</code></a>. If this -function returns <a href="../gstreamer-1.0/GstClock.html#GST-CLOCK-TIME-NONE:CAPS"><span class="type">GST_CLOCK_TIME_NONE</span></a> for the start time, no synchronisation +function returns <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GST-CLOCK-TIME-NONE:CAPS"><span class="type">GST_CLOCK_TIME_NONE</span></a> for the start time, no synchronisation will be done. Synchronisation can be disabled entirely by setting the object <a class="link" href="GstBaseSink.html#GstBaseSink--sync" title='The "sync" property'><span class="type">"sync"</span></a> property to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a>. </p> @@ -218,7 +218,7 @@ clipping themselves when needed. </p> <p> <a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> will by default report the current playback position in -<a href="../gstreamer-1.0/gstreamer-GstFormat.html#GST-FORMAT-TIME:CAPS"><span class="type">GST_FORMAT_TIME</span></a> based on the current clock time and segment information. +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GST-FORMAT-TIME:CAPS"><span class="type">GST_FORMAT_TIME</span></a> based on the current clock time and segment information. If no clock has been set on the element, the query will be forwarded upstream. </p> @@ -345,7 +345,7 @@ output/present buffers. <col align="left" valign="top"> <tbody> <tr> -<td><p><span class="term"><a href="../gstreamer-1.0/GstElement.html#GstElementClass"><span class="type">GstElementClass</span></a> <em class="structfield"><code><a name="GstBaseSinkClass.parent-class"></a>parent_class</code></em>;</span></p></td> +<td><p><span class="term"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#GstElementClass"><span class="type">GstElementClass</span></a> <em class="structfield"><code><a name="GstBaseSinkClass.parent-class"></a>parent_class</code></em>;</span></p></td> <td>Element parent class</td> </tr> <tr> @@ -398,7 +398,7 @@ any state they set during <code class="function">unlock()</code>, such as cleari </tr> <tr> <td><p><span class="term"><em class="structfield"><code><a name="GstBaseSinkClass.query"></a>query</code></em> ()</span></p></td> -<td>perform a <a href="../gstreamer-1.0/gstreamer-GstQuery.html#GstQuery"><span class="type">GstQuery</span></a> on the element. Since: 0.10.36</td> +<td>perform a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstQuery.html#GstQuery"><span class="type">GstQuery</span></a> on the element. Since: 0.10.36</td> </tr> <tr> <td><p><span class="term"><em class="structfield"><code><a name="GstBaseSinkClass.event"></a>event</code></em> ()</span></p></td> @@ -432,8 +432,8 @@ buffers. Since: 0.10.24</td> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gst_base_sink_query_latency (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *live</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *upstream_live</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *min_latency</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *max_latency</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *min_latency</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *max_latency</code></em>);</pre> <p> Query the sink for the latency parameters. The latency will be queried from the upstream elements. <em class="parameter"><code>live</code></em> will be TRUE if <em class="parameter"><code>sink</code></em> is configured to @@ -486,7 +486,7 @@ This function is mostly used by subclasses. <hr> <div class="refsect2"> <a name="gst-base-sink-get-latency"></a><h3>gst_base_sink_get_latency ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> gst_base_sink_get_latency (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> gst_base_sink_get_latency (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>);</pre> <p> Get the currently configured latency. </p> @@ -508,8 +508,8 @@ Get the currently configured latency. <hr> <div class="refsect2"> <a name="gst-base-sink-do-preroll"></a><h3>gst_base_sink_do_preroll ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> gst_base_sink_do_preroll (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstMiniObject.html#GstMiniObject"><span class="type">GstMiniObject</span></a> *obj</code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> gst_base_sink_do_preroll (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMiniObject.html#GstMiniObject"><span class="type">GstMiniObject</span></a> *obj</code></em>);</pre> <p> If the <em class="parameter"><code>sink</code></em> spawns its own thread for pulling buffers from upstream it should call this method after it has pulled a buffer. If the element needed @@ -534,7 +534,7 @@ This function should be called with the PREROLL_LOCK held. <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> -<a href="../gstreamer-1.0/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a> if the preroll completed and processing can +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a> if the preroll completed and processing can continue. Any other return value should be returned from the render vmethod.</td> </tr> </tbody> @@ -544,7 +544,7 @@ continue. Any other return value should be returned from the render vmethod.</td <hr> <div class="refsect2"> <a name="gst-base-sink-wait-preroll"></a><h3>gst_base_sink_wait_preroll ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> gst_base_sink_wait_preroll (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> gst_base_sink_wait_preroll (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>);</pre> <p> If the <a class="link" href="GstBaseSink.html#GstBaseSinkClass.render"><code class="function">GstBaseSinkClass.render()</code></a> method performs its own synchronisation against the clock it must unblock when going from PLAYING to the PAUSED state @@ -552,9 +552,9 @@ and call this method before continuing to render the remaining data. </p> <p> This function will block until a state change to PLAYING happens (in which -case this function returns <a href="../gstreamer-1.0/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a>) or the processing must be stopped due +case this function returns <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a>) or the processing must be stopped due to a state change to READY or a FLUSH event (in which case this function -returns <a href="../gstreamer-1.0/GstPad.html#GST-FLOW-FLUSHING:CAPS"><span class="type">GST_FLOW_FLUSHING</span></a>). +returns <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GST-FLOW-FLUSHING:CAPS"><span class="type">GST_FLOW_FLUSHING</span></a>). </p> <p> This function should only be called with the PREROLL_LOCK held, like in the @@ -570,7 +570,7 @@ render function. <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> -<a href="../gstreamer-1.0/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a> if the preroll completed and processing can +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a> if the preroll completed and processing can continue. Any other return value should be returned from the render vmethod.</td> </tr> </tbody> @@ -580,17 +580,17 @@ continue. Any other return value should be returned from the render vmethod.</td <hr> <div class="refsect2"> <a name="gst-base-sink-wait-clock"></a><h3>gst_base_sink_wait_clock ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstClock.html#GstClockReturn"><span class="returnvalue">GstClockReturn</span></a> gst_base_sink_wait_clock (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> time</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> *jitter</code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockReturn"><span class="returnvalue">GstClockReturn</span></a> gst_base_sink_wait_clock (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> time</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> *jitter</code></em>);</pre> <p> This function will block until <em class="parameter"><code>time</code></em> is reached. It is usually called by subclasses that use their own internal synchronisation. </p> <p> -If <em class="parameter"><code>time</code></em> is not valid, no sycnhronisation is done and <a href="../gstreamer-1.0/GstClock.html#GST-CLOCK-BADTIME:CAPS"><span class="type">GST_CLOCK_BADTIME</span></a> is +If <em class="parameter"><code>time</code></em> is not valid, no sycnhronisation is done and <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GST-CLOCK-BADTIME:CAPS"><span class="type">GST_CLOCK_BADTIME</span></a> is returned. Likewise, if synchronisation is disabled in the element or there -is no clock, no synchronisation is done and <a href="../gstreamer-1.0/GstClock.html#GST-CLOCK-BADTIME:CAPS"><span class="type">GST_CLOCK_BADTIME</span></a> is returned. +is no clock, no synchronisation is done and <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GST-CLOCK-BADTIME:CAPS"><span class="type">GST_CLOCK_BADTIME</span></a> is returned. </p> <p> This function should only be called with the PREROLL_LOCK held, like when @@ -621,7 +621,7 @@ sink. </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td><a href="../gstreamer-1.0/GstClock.html#GstClockReturn"><span class="type">GstClockReturn</span></a></td> +<td><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockReturn"><span class="type">GstClockReturn</span></a></td> </tr> </tbody> </table></div> @@ -630,9 +630,9 @@ sink. <hr> <div class="refsect2"> <a name="gst-base-sink-wait-eos"></a><h3>gst_base_sink_wait_eos ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> gst_base_sink_wait_eos (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> time</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> *jitter</code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> gst_base_sink_wait_eos (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> time</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> *jitter</code></em>);</pre> <p> This function will block until <em class="parameter"><code>time</code></em> is reached. It is usually called by subclasses that use their own internal synchronisation but want to let the @@ -664,7 +664,7 @@ and will be adjusted with any latency and offset configured in the sink. </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td><a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a></td> +<td><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a></td> </tr> </tbody> </table></div> @@ -871,7 +871,7 @@ changes.</td> <div class="refsect2"> <a name="gst-base-sink-set-ts-offset"></a><h3>gst_base_sink_set_ts_offset ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> gst_base_sink_set_ts_offset (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> offset</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> offset</code></em>);</pre> <p> Adjust the synchronisation of <em class="parameter"><code>sink</code></em> with <em class="parameter"><code>offset</code></em>. A negative value will render buffers earlier than their timestamp. A positive value will delay @@ -896,7 +896,7 @@ buffers. <hr> <div class="refsect2"> <a name="gst-base-sink-get-ts-offset"></a><h3>gst_base_sink_get_ts_offset ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstClock.html#GstClockTimeDiff"><span class="returnvalue">GstClockTimeDiff</span></a> gst_base_sink_get_ts_offset (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTimeDiff"><span class="returnvalue">GstClockTimeDiff</span></a> gst_base_sink_get_ts_offset (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>);</pre> <p> Get the synchronisation offset of <em class="parameter"><code>sink</code></em>. </p> @@ -919,7 +919,7 @@ Get the synchronisation offset of <em class="parameter"><code>sink</code></em>. <div class="refsect2"> <a name="gst-base-sink-set-render-delay"></a><h3>gst_base_sink_set_render_delay ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> gst_base_sink_set_render_delay (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> delay</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> delay</code></em>);</pre> <p> Set the render delay in <em class="parameter"><code>sink</code></em> to <em class="parameter"><code>delay</code></em>. The render delay is the time between actual rendering of a buffer and its synchronisation time. Some @@ -952,7 +952,7 @@ This function is usually called by subclasses. <hr> <div class="refsect2"> <a name="gst-base-sink-get-render-delay"></a><h3>gst_base_sink_get_render_delay ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> gst_base_sink_get_render_delay (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="returnvalue">GstClockTime</span></a> gst_base_sink_get_render_delay (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>);</pre> <p> Get the render delay of <em class="parameter"><code>sink</code></em>. see <a class="link" href="GstBaseSink.html#gst-base-sink-set-render-delay" title="gst_base_sink_set_render_delay ()"><code class="function">gst_base_sink_set_render_delay()</code></a> for more information about the render delay. @@ -976,13 +976,13 @@ information about the render delay. <hr> <div class="refsect2"> <a name="gst-base-sink-get-last-sample"></a><h3>gst_base_sink_get_last_sample ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/gstreamer-GstSample.html#GstSample"><span class="returnvalue">GstSample</span></a> * gst_base_sink_get_last_sample (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstSample.html#GstSample"><span class="returnvalue">GstSample</span></a> * gst_base_sink_get_last_sample (<em class="parameter"><code><a class="link" href="GstBaseSink.html" title="GstBaseSink"><span class="type">GstBaseSink</span></a> *sink</code></em>);</pre> <p> Get the last sample that arrived in the sink and was used for preroll or for rendering. This property can be used to generate thumbnails. </p> <p> -The <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> on the sample can be used to determine the type of the buffer. +The <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> on the sample can be used to determine the type of the buffer. </p> <p> Free-function: gst_sample_unref @@ -996,7 +996,7 @@ Free-function: gst_sample_unref </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>a <a href="../gstreamer-1.0/gstreamer-GstSample.html#GstSample"><span class="type">GstSample</span></a>. <a href="../gstreamer-1.0/gstreamer-GstSample.html#gst-sample-unref"><code class="function">gst_sample_unref()</code></a> after usage. +<td>a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstSample.html#GstSample"><span class="type">GstSample</span></a>. <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstSample.html#gst-sample-unref"><code class="function">gst_sample_unref()</code></a> after usage. This function returns NULL when no buffer has arrived in the sink yet or when the sink is not in PAUSED or PLAYING. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> </td> @@ -1110,7 +1110,7 @@ will render. <pre class="programlisting">#define GST_BASE_SINK_PAD(obj) (GST_BASE_SINK_CAST (obj)->sinkpad) </pre> <p> -Gives the pointer to the <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> object of the element. +Gives the pointer to the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> object of the element. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -1208,7 +1208,7 @@ as possible, eg. if you're using a buffer pool. <hr> <div class="refsect2"> <a name="GstBaseSink--last-sample"></a><h3>The <code class="literal">"last-sample"</code> property</h3> -<pre class="programlisting"> "last-sample" <a href="../gstreamer-1.0/gstreamer-GstSample.html#GstSample"><span class="type">GstSample</span></a>* : Read</pre> +<pre class="programlisting"> "last-sample" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstSample.html#GstSample"><span class="type">GstSample</span></a>* : Read</pre> <p> The last buffer that arrived in the sink and was used for preroll or for rendering. This property can be used to generate thumbnails. This property diff --git a/docs/libs/html/GstBaseSrc.html b/docs/libs/html/GstBaseSrc.html index 1cabaf4..cedaec4 100644 --- a/docs/libs/html/GstBaseSrc.html +++ b/docs/libs/html/GstBaseSrc.html @@ -47,16 +47,16 @@ struct <a class="link" href="GstBaseSrc.html#GstBaseSrc-struct" title="struct GstBaseSrc">GstBaseSrc</a>; struct <a class="link" href="GstBaseSrc.html#GstBaseSrcClass" title="struct GstBaseSrcClass">GstBaseSrcClass</a>; enum <a class="link" href="GstBaseSrc.html#GstBaseSrcFlags" title="enum GstBaseSrcFlags">GstBaseSrcFlags</a>; -<a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> <a class="link" href="GstBaseSrc.html#gst-base-src-wait-playing" title="gst_base_src_wait_playing ()">gst_base_src_wait_playing</a> (<em class="parameter"><code><a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> *src</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> <a class="link" href="GstBaseSrc.html#gst-base-src-wait-playing" title="gst_base_src_wait_playing ()">gst_base_src_wait_playing</a> (<em class="parameter"><code><a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> *src</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstBaseSrc.html#gst-base-src-is-live" title="gst_base_src_is_live ()">gst_base_src_is_live</a> (<em class="parameter"><code><a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> *src</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstBaseSrc.html#gst-base-src-set-live" title="gst_base_src_set_live ()">gst_base_src_set_live</a> (<em class="parameter"><code><a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> *src</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> live</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstBaseSrc.html#gst-base-src-set-format" title="gst_base_src_set_format ()">gst_base_src_set_format</a> (<em class="parameter"><code><a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> *src</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> format</code></em>); + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> format</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstBaseSrc.html#gst-base-src-query-latency" title="gst_base_src_query_latency ()">gst_base_src_query_latency</a> (<em class="parameter"><code><a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> *src</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *live</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *min_latency</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *max_latency</code></em>); + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *min_latency</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *max_latency</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> <a class="link" href="GstBaseSrc.html#gst-base-src-get-blocksize" title="gst_base_src_get_blocksize ()">gst_base_src_get_blocksize</a> (<em class="parameter"><code><a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> *src</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstBaseSrc.html#gst-base-src-set-blocksize" title="gst_base_src_set_blocksize ()">gst_base_src_set_blocksize</a> (<em class="parameter"><code><a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> *src</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> blocksize</code></em>); @@ -70,7 +70,7 @@ enum <a class="link" href="GstBaseSrc.html#GstBaseSrcFlags" title <em class="parameter"><code><span class="type">gint64</span> stop</code></em>, <em class="parameter"><code><span class="type">gint64</span> position</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstBaseSrc.html#gst-base-src-set-caps" title="gst_base_src_set_caps ()">gst_base_src_set_caps</a> (<em class="parameter"><code><a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> *src</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps</code></em>); + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps</code></em>); #define <a class="link" href="GstBaseSrc.html#GST-BASE-SRC-PAD:CAPS" title="GST_BASE_SRC_PAD()">GST_BASE_SRC_PAD</a> (obj) </pre> </div> @@ -79,8 +79,8 @@ enum <a class="link" href="GstBaseSrc.html#GstBaseSrcFlags" title <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> +----GstBaseSrc +----<a class="link" href="GstPushSrc.html" title="GstPushSrc">GstPushSrc</a> </pre> @@ -108,17 +108,17 @@ types of sources are supported: <p> </p> <p> -The source can be configured to operate in any <a href="../gstreamer-1.0/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> with the +The source can be configured to operate in any <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> with the <a class="link" href="GstBaseSrc.html#gst-base-src-set-format" title="gst_base_src_set_format ()"><code class="function">gst_base_src_set_format()</code></a> method. The currently set format determines -the format of the internal <a href="../gstreamer-1.0/gstreamer-GstSegment.html#GstSegment"><span class="type">GstSegment</span></a> and any <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstEvent.html#GST-EVENT-NEWSEGMENT:CAPS"><span class="type">GST_EVENT_NEWSEGMENT</span></a> -events. The default format for <a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> is <a href="../gstreamer-1.0/gstreamer-GstFormat.html#GST-FORMAT-BYTES:CAPS"><span class="type">GST_FORMAT_BYTES</span></a>. +the format of the internal <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstSegment.html#GstSegment"><span class="type">GstSegment</span></a> and any <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstEvent.html#GST-EVENT-NEWSEGMENT:CAPS"><span class="type">GST_EVENT_NEWSEGMENT</span></a> +events. The default format for <a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> is <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GST-FORMAT-BYTES:CAPS"><span class="type">GST_FORMAT_BYTES</span></a>. </p> <p> <a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> always supports push mode scheduling. If the following conditions are met, it also supports pull mode scheduling: </p> <div class="itemizedlist"><ul class="itemizedlist" type="disc"> -<li class="listitem"><p>The format is set to <a href="../gstreamer-1.0/gstreamer-GstFormat.html#GST-FORMAT-BYTES:CAPS"><span class="type">GST_FORMAT_BYTES</span></a> (default).</p></li> +<li class="listitem"><p>The format is set to <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GST-FORMAT-BYTES:CAPS"><span class="type">GST_FORMAT_BYTES</span></a> (default).</p></li> <li class="listitem"><p><a class="link" href="GstBaseSrc.html#GstBaseSrcClass.is-seekable"><code class="function">GstBaseSrcClass.is_seekable()</code></a> returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>.</p></li> </ul></div> <p> @@ -127,7 +127,7 @@ conditions are met, it also supports pull mode scheduling: If all the conditions are met for operating in pull mode, <a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> is automatically seekable in push mode as well. The following conditions must be met to make the element seekable in push mode when the format is not -<a href="../gstreamer-1.0/gstreamer-GstFormat.html#GST-FORMAT-BYTES:CAPS"><span class="type">GST_FORMAT_BYTES</span></a>: +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GST-FORMAT-BYTES:CAPS"><span class="type">GST_FORMAT_BYTES</span></a>: </p> <div class="itemizedlist"><ul class="itemizedlist" type="disc"> <li class="listitem"><p> @@ -164,7 +164,7 @@ A live source does not produce data in the PAUSED state. This means that the <a class="link" href="GstBaseSrc.html#GstBaseSrcClass.create"><code class="function">GstBaseSrcClass.create()</code></a> method will not be called in PAUSED but only in PLAYING. To signal the pipeline that the element will not produce data, the return value from the READY to PAUSED state will be -<a href="../gstreamer-1.0/GstElement.html#GST-STATE-CHANGE-NO-PREROLL:CAPS"><span class="type">GST_STATE_CHANGE_NO_PREROLL</span></a>. +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#GST-STATE-CHANGE-NO-PREROLL:CAPS"><span class="type">GST_STATE_CHANGE_NO_PREROLL</span></a>. </p> <p> A typical live source will timestamp the buffers it creates with the @@ -219,10 +219,10 @@ should install a pad template in its class_init function, like so: <span class="function">my_element_class_init</span> <span class="gtkdoc opt">(</span>GstMyElementClass <span class="gtkdoc opt">*</span>klass<span class="gtkdoc opt">)</span> <span class="gtkdoc opt">{</span> GstElementClass <span class="gtkdoc opt">*</span>gstelement_class <span class="gtkdoc opt">=</span> <span class="function">GST_ELEMENT_CLASS</span> <span class="gtkdoc opt">(</span>klass<span class="gtkdoc opt">);</span> - <span class="gtkdoc slc">// srctemplate should be a <a href="../gstreamer-1.0/GstPadTemplate.html#GstStaticPadTemplate">GstStaticPadTemplate</a> with direction</span> - <span class="gtkdoc slc">// <a href="../gstreamer-1.0/GstPad.html#GST-PAD-SRC:CAPS">GST_PAD_SRC</a> and name "src"</span> - <span class="function"><a href="../gstreamer-1.0/GstElement.html#gst-element-class-add-pad-template">gst_element_class_add_pad_template</a></span> <span class="gtkdoc opt">(</span>gstelement_class<span class="gtkdoc opt">,</span> - <span class="function"><a href="../gstreamer-1.0/GstPadTemplate.html#gst-static-pad-template-get">gst_static_pad_template_get</a></span> <span class="gtkdoc opt">(&</span>srctemplate<span class="gtkdoc opt">));</span> + <span class="gtkdoc slc">// srctemplate should be a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPadTemplate.html#GstStaticPadTemplate">GstStaticPadTemplate</a> with direction</span> + <span class="gtkdoc slc">// <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GST-PAD-SRC:CAPS">GST_PAD_SRC</a> and name "src"</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#gst-element-class-add-pad-template">gst_element_class_add_pad_template</a></span> <span class="gtkdoc opt">(</span>gstelement_class<span class="gtkdoc opt">,</span> + <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPadTemplate.html#gst-static-pad-template-get">gst_static_pad_template_get</a></span> <span class="gtkdoc opt">(&</span>srctemplate<span class="gtkdoc opt">));</span> <span class="gtkdoc slc">// see <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElementFactory.html#GstElementDetails">GstElementDetails</a></span> <span class="function"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#gst-element-class-set-details">gst_element_class_set_details</a></span> <span class="gtkdoc opt">(</span>gstelement_class<span class="gtkdoc opt">, &</span>details<span class="gtkdoc opt">);</span> <span class="gtkdoc opt">}</span></pre></td> @@ -236,7 +236,7 @@ should install a pad template in its class_init function, like so: <p> </p> <div class="refsect2"> -<a name="idp9228272"></a><h3>Controlled shutdown of live sources in applications</h3> +<a name="idp9630832"></a><h3>Controlled shutdown of live sources in applications</h3> <p> Applications that record from a live source may want to stop recording in a controlled way, so that the recording is stopped, but the data @@ -250,8 +250,8 @@ been processed and the pipeline can safely be stopped. <p> Since GStreamer 0.10.16 an application may send an EOS event to a source element to make it perform the EOS logic (send EOS event downstream or post a -<a href="../gstreamer-1.0/gstreamer-GstMessage.html#GST-MESSAGE-SEGMENT-DONE:CAPS"><span class="type">GST_MESSAGE_SEGMENT_DONE</span></a> on the bus). This can typically be done -with the <a href="../gstreamer-1.0/GstElement.html#gst-element-send-event"><code class="function">gst_element_send_event()</code></a> function on the element or its parent bin. +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#GST-MESSAGE-SEGMENT-DONE:CAPS"><span class="type">GST_MESSAGE_SEGMENT_DONE</span></a> on the bus). This can typically be done +with the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#gst-element-send-event"><code class="function">gst_element_send_event()</code></a> function on the element or its parent bin. </p> <p> After the EOS has been sent to the element, the application should wait for @@ -350,7 +350,7 @@ buffers. <col align="left" valign="top"> <tbody> <tr> -<td><p><span class="term"><a href="../gstreamer-1.0/GstElement.html#GstElementClass"><span class="type">GstElementClass</span></a> <em class="structfield"><code><a name="GstBaseSrcClass.parent-class"></a>parent_class</code></em>;</span></p></td> +<td><p><span class="term"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#GstElementClass"><span class="type">GstElementClass</span></a> <em class="structfield"><code><a name="GstBaseSrcClass.parent-class"></a>parent_class</code></em>;</span></p></td> <td>Element parent class</td> </tr> <tr> @@ -467,7 +467,7 @@ passed buffer is guaranteed to hold the requested amount of bytes.</td> } GstBaseSrcFlags; </pre> <p> -The <a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> flags that a basesrc element may have. +The <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> flags that a basesrc element may have. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -493,7 +493,7 @@ The <a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</sp <hr> <div class="refsect2"> <a name="gst-base-src-wait-playing"></a><h3>gst_base_src_wait_playing ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> gst_base_src_wait_playing (<em class="parameter"><code><a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> *src</code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> gst_base_src_wait_playing (<em class="parameter"><code><a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> *src</code></em>);</pre> <p> If the <a class="link" href="GstBaseSrc.html#GstBaseSrcClass.create"><code class="function">GstBaseSrcClass.create()</code></a> method performs its own synchronisation against the clock it must unblock when going from PLAYING to the PAUSED state @@ -501,9 +501,9 @@ and call this method before continuing to produce the remaining data. </p> <p> This function will block until a state change to PLAYING happens (in which -case this function returns <a href="../gstreamer-1.0/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a>) or the processing must be stopped due +case this function returns <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a>) or the processing must be stopped due to a state change to READY or a FLUSH event (in which case this function -returns <a href="../gstreamer-1.0/GstPad.html#GST-FLOW-FLUSHING:CAPS"><span class="type">GST_FLOW_FLUSHING</span></a>). +returns <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GST-FLOW-FLUSHING:CAPS"><span class="type">GST_FLOW_FLUSHING</span></a>). </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -515,7 +515,7 @@ returns <a href="../gstreamer-1.0/GstPad.html#GST-FLOW-FLUSHING:CAPS"><span clas <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> -<a href="../gstreamer-1.0/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a> if <em class="parameter"><code>src</code></em> is PLAYING and processing can +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a> if <em class="parameter"><code>src</code></em> is PLAYING and processing can continue. Any other return value should be returned from the create vmethod.</td> </tr> </tbody> @@ -578,7 +578,7 @@ be GST_STATE_CHANGE_NO_PREROLL. <div class="refsect2"> <a name="gst-base-src-set-format"></a><h3>gst_base_src_set_format ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> gst_base_src_set_format (<em class="parameter"><code><a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> *src</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> format</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> format</code></em>);</pre> <p> Sets the default format of the source. This will be the format used for sending NEW_SEGMENT events and for performing seeks. @@ -588,7 +588,7 @@ If a format of GST_FORMAT_BYTES is set, the element will be able to operate in pull mode if the <a class="link" href="GstBaseSrc.html#GstBaseSrcClass.is-seekable"><code class="function">GstBaseSrcClass.is_seekable()</code></a> returns TRUE. </p> <p> -This function must only be called in states < <a href="../gstreamer-1.0/GstElement.html#GST-STATE-PAUSED:CAPS"><code class="literal">GST_STATE_PAUSED</code></a>. +This function must only be called in states < <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#GST-STATE-PAUSED:CAPS"><code class="literal">GST_STATE_PAUSED</code></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -610,8 +610,8 @@ This function must only be called in states < <a href="../gstreamer-1.0/GstEl <a name="gst-base-src-query-latency"></a><h3>gst_base_src_query_latency ()</h3> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gst_base_src_query_latency (<em class="parameter"><code><a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> *src</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> *live</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *min_latency</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *max_latency</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *min_latency</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> *max_latency</code></em>);</pre> <p> Query the source for the latency parameters. <em class="parameter"><code>live</code></em> will be TRUE when <em class="parameter"><code>src</code></em> is configured as a live source. <em class="parameter"><code>min_latency</code></em> will be set to the difference @@ -818,7 +818,7 @@ configured with <a class="link" href="GstBaseSrc.html#gst-base-src-set-format" t <div class="refsect2"> <a name="gst-base-src-set-caps"></a><h3>gst_base_src_set_caps ()</h3> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gst_base_src_set_caps (<em class="parameter"><code><a class="link" href="GstBaseSrc.html" title="GstBaseSrc"><span class="type">GstBaseSrc</span></a> *src</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps</code></em>);</pre> <p> Set new caps on the basesrc source pad. </p> @@ -832,7 +832,7 @@ Set new caps on the basesrc source pad. </tr> <tr> <td><p><span class="term"><em class="parameter"><code>caps</code></em> :</span></p></td> -<td>a <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> +<td>a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> </td> </tr> <tr> @@ -849,7 +849,7 @@ Set new caps on the basesrc source pad. <pre class="programlisting">#define GST_BASE_SRC_PAD(obj) (GST_BASE_SRC_CAST (obj)->srcpad) </pre> <p> -Gives the pointer to the <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> object of the element. +Gives the pointer to the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> object of the element. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> diff --git a/docs/libs/html/GstBaseTransform.html b/docs/libs/html/GstBaseTransform.html index 1634f86..743b1f7 100644 --- a/docs/libs/html/GstBaseTransform.html +++ b/docs/libs/html/GstBaseTransform.html @@ -57,8 +57,8 @@ struct <a class="link" href="GstBaseTransform.html#GstBaseTransform <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> enabled</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstBaseTransform.html#gst-base-transform-update-qos" title="gst_base_transform_update_qos ()">gst_base_transform_update_qos</a> (<em class="parameter"><code><a class="link" href="GstBaseTransform.html" title="GstBaseTransform"><span class="type">GstBaseTransform</span></a> *trans</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> proportion</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> diff</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>); + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> diff</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstBaseTransform.html#gst-base-transform-set-gap-aware" title="gst_base_transform_set_gap_aware ()">gst_base_transform_set_gap_aware</a> (<em class="parameter"><code><a class="link" href="GstBaseTransform.html" title="GstBaseTransform"><span class="type">GstBaseTransform</span></a> *trans</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> gap_aware</code></em>); #define <a class="link" href="GstBaseTransform.html#GST-BASE-TRANSFORM-SINK-NAME:CAPS" title="GST_BASE_TRANSFORM_SINK_NAME">GST_BASE_TRANSFORM_SINK_NAME</a> @@ -73,8 +73,8 @@ struct <a class="link" href="GstBaseTransform.html#GstBaseTransform <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> +----GstBaseTransform </pre> </div> @@ -111,7 +111,7 @@ It provides for: <p> </p> <div class="refsect2"> -<a name="idp8766032"></a><h3>Use Cases</h3> +<a name="idp8941488"></a><h3>Use Cases</h3> <p> </p> <div class="orderedlist"><ol class="orderedlist" type="1"> @@ -251,7 +251,7 @@ It provides for: </p> <hr> <div class="refsect2"> -<a name="idp10669744"></a><h3>Sub-class settable flags on GstBaseTransform</h3> +<a name="idp8166288"></a><h3>Sub-class settable flags on GstBaseTransform</h3> <p> </p> <div class="itemizedlist"><ul class="itemizedlist" type="disc"> @@ -387,7 +387,7 @@ same type and quantity) it should provide <em class="parameter"><code>transform_ <col align="left" valign="top"> <tbody> <tr> -<td><p><span class="term"><a href="../gstreamer-1.0/GstElement.html#GstElementClass"><span class="type">GstElementClass</span></a> <em class="structfield"><code><a name="GstBaseTransformClass.parent-class"></a>parent_class</code></em>;</span></p></td> +<td><p><span class="term"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#GstElementClass"><span class="type">GstElementClass</span></a> <em class="structfield"><code><a name="GstBaseTransformClass.parent-class"></a>parent_class</code></em>;</span></p></td> <td>Element parent class</td> </tr> <tr> @@ -711,8 +711,8 @@ MT safe. <a name="gst-base-transform-update-qos"></a><h3>gst_base_transform_update_qos ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> gst_base_transform_update_qos (<em class="parameter"><code><a class="link" href="GstBaseTransform.html" title="GstBaseTransform"><span class="type">GstBaseTransform</span></a> *trans</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> proportion</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> diff</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTimeDiff"><span class="type">GstClockTimeDiff</span></a> diff</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>);</pre> <p> Set the QoS parameters in the transform. This function is called internally when a QOS event is received but subclasses can provide custom information @@ -753,7 +753,7 @@ running_time.</td> <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> gap_aware</code></em>);</pre> <p> If <em class="parameter"><code>gap_aware</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> (the default), output buffers will have the -<a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GST-BUFFER-FLAG-GAP:CAPS"><code class="literal">GST_BUFFER_FLAG_GAP</code></a> flag unset. +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GST-BUFFER-FLAG-GAP:CAPS"><code class="literal">GST_BUFFER_FLAG_GAP</code></a> flag unset. </p> <p> If set to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, the element must handle output buffers with this flag set @@ -803,7 +803,7 @@ The name of the templates for the source pad. <pre class="programlisting">#define GST_BASE_TRANSFORM_SINK_PAD(obj) (GST_BASE_TRANSFORM_CAST (obj)->sinkpad) </pre> <p> -Gives the pointer to the sink <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> object of the element. +Gives the pointer to the sink <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> object of the element. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -820,7 +820,7 @@ Gives the pointer to the sink <a href="../gstreamer-1.0/GstPad.html"><span class <pre class="programlisting">#define GST_BASE_TRANSFORM_SRC_PAD(obj) (GST_BASE_TRANSFORM_CAST (obj)->srcpad) </pre> <p> -Gives the pointer to the source <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> object of the element. +Gives the pointer to the source <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> object of the element. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -837,7 +837,7 @@ Gives the pointer to the source <a href="../gstreamer-1.0/GstPad.html"><span cla <pre class="programlisting">#define GST_BASE_TRANSFORM_FLOW_DROPPED GST_FLOW_CUSTOM_SUCCESS </pre> <p> -A <a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a> that can be returned from transform and transform_ip to +A <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a> that can be returned from transform and transform_ip to indicate that no output buffer was generated. </p> <p class="since">Since 0.10.13</p> diff --git a/docs/libs/html/GstCollectPads2.html b/docs/libs/html/GstCollectPads.html index aa8960a..19c5e4f 100644 --- a/docs/libs/html/GstCollectPads2.html +++ b/docs/libs/html/GstCollectPads.html @@ -2,7 +2,7 @@ <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -<title>GstCollectPads2</title> +<title>GstCollectPads</title> <meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="GStreamer 1.0 Library Reference Manual"> <link rel="up" href="gstreamer-base.html" title="GStreamer Base and Utillity Classes"> @@ -21,143 +21,142 @@ <td><a accesskey="n" href="gstreamer-libs-GstTypeFindHelper.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> <tr><td colspan="5" class="shortcuts"> -<a href="#GstCollectPads2.synopsis" class="shortcut">Top</a> +<a href="#GstCollectPads.synopsis" class="shortcut">Top</a> | - <a href="#GstCollectPads2.description" class="shortcut">Description</a> + <a href="#GstCollectPads.description" class="shortcut">Description</a> | - <a href="#GstCollectPads2.object-hierarchy" class="shortcut">Object Hierarchy</a> + <a href="#GstCollectPads.object-hierarchy" class="shortcut">Object Hierarchy</a> </td></tr> </table> <div class="refentry"> -<a name="GstCollectPads2"></a><div class="titlepage"></div> +<a name="GstCollectPads"></a><div class="titlepage"></div> <div class="refnamediv"><table width="100%"><tr> <td valign="top"> -<h2><span class="refentrytitle"><a name="GstCollectPads2.top_of_page"></a>GstCollectPads2</span></h2> -<p>GstCollectPads2 — manages a set of pads that operate in collect mode</p> +<h2><span class="refentrytitle"><a name="GstCollectPads.top_of_page"></a>GstCollectPads</span></h2> +<p>GstCollectPads — manages a set of pads that operate in collect mode</p> </td> <td valign="top" align="right"></td> </tr></table></div> <div class="refsynopsisdiv"> -<a name="GstCollectPads2.synopsis"></a><h2>Synopsis</h2> +<a name="GstCollectPads.synopsis"></a><h2>Synopsis</h2> <pre class="synopsis"> -#include <gst/base/gstcollectpads2.h> +#include <gst/base/gstcollectpads.h> -struct <a class="link" href="GstCollectPads2.html#GstCollectPads2-struct" title="struct GstCollectPads2">GstCollectPads2</a>; -struct <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2">GstCollectData2</a>; -<span class="returnvalue">void</span> (<a class="link" href="GstCollectPads2.html#GstCollectData2DestroyNotify" title="GstCollectData2DestroyNotify ()">*GstCollectData2DestroyNotify</a>) (<em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>); -<a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (<a class="link" href="GstCollectPads2.html#GstCollectPads2BufferFunction" title="GstCollectPads2BufferFunction ()">*GstCollectPads2BufferFunction</a>) (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer</code></em>, +struct <a class="link" href="GstCollectPads.html#GstCollectPads-struct" title="struct GstCollectPads">GstCollectPads</a>; +struct <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData">GstCollectData</a>; +<span class="returnvalue">void</span> (<a class="link" href="GstCollectPads.html#GstCollectDataDestroyNotify" title="GstCollectDataDestroyNotify ()">*GstCollectDataDestroyNotify</a>) (<em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (<a class="link" href="GstCollectPads.html#GstCollectPadsBufferFunction" title="GstCollectPadsBufferFunction ()">*GstCollectPadsBufferFunction</a>) (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>); -<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a> (<a class="link" href="GstCollectPads2.html#GstCollectPads2CompareFunction" title="GstCollectPads2CompareFunction ()">*GstCollectPads2CompareFunction</a>) (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data1</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp1</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data2</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp2</code></em>, +<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a> (<a class="link" href="GstCollectPads.html#GstCollectPadsCompareFunction" title="GstCollectPadsCompareFunction ()">*GstCollectPadsCompareFunction</a>) (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data1</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp1</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data2</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp2</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>); -<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (<a class="link" href="GstCollectPads2.html#GstCollectPads2EventFunction" title="GstCollectPads2EventFunction ()">*GstCollectPads2EventFunction</a>) (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *pad</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstEvent.html#GstEvent"><span class="type">GstEvent</span></a> *event</code></em>, +<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (<a class="link" href="GstCollectPads.html#GstCollectPadsEventFunction" title="GstCollectPadsEventFunction ()">*GstCollectPadsEventFunction</a>) (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *pad</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstEvent.html#GstEvent"><span class="type">GstEvent</span></a> *event</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>); -<a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (<a class="link" href="GstCollectPads2.html#GstCollectPads2ClipFunction" title="GstCollectPads2ClipFunction ()">*GstCollectPads2ClipFunction</a>) (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *inbuffer</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> **outbuffer</code></em>, +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (<a class="link" href="GstCollectPads.html#GstCollectPadsClipFunction" title="GstCollectPadsClipFunction ()">*GstCollectPadsClipFunction</a>) (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *inbuffer</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> **outbuffer</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>); -<a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (<a class="link" href="GstCollectPads2.html#GstCollectPads2Function" title="GstCollectPads2Function ()">*GstCollectPads2Function</a>) (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (<a class="link" href="GstCollectPads.html#GstCollectPadsFunction" title="GstCollectPadsFunction ()">*GstCollectPadsFunction</a>) (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>); -enum <a class="link" href="GstCollectPads2.html#GstCollectPads2StateFlags" title="enum GstCollectPads2StateFlags">GstCollectPads2StateFlags</a>; -#define <a class="link" href="GstCollectPads2.html#GST-COLLECT-PADS2-STATE:CAPS" title="GST_COLLECT_PADS2_STATE()">GST_COLLECT_PADS2_STATE</a> (data) -#define <a class="link" href="GstCollectPads2.html#GST-COLLECT-PADS2-STATE-IS-SET:CAPS" title="GST_COLLECT_PADS2_STATE_IS_SET()">GST_COLLECT_PADS2_STATE_IS_SET</a> (data, +enum <a class="link" href="GstCollectPads.html#GstCollectPadsStateFlags" title="enum GstCollectPadsStateFlags">GstCollectPadsStateFlags</a>; +#define <a class="link" href="GstCollectPads.html#GST-COLLECT-PADS-STATE:CAPS" title="GST_COLLECT_PADS_STATE()">GST_COLLECT_PADS_STATE</a> (data) +#define <a class="link" href="GstCollectPads.html#GST-COLLECT-PADS-STATE-IS-SET:CAPS" title="GST_COLLECT_PADS_STATE_IS_SET()">GST_COLLECT_PADS_STATE_IS_SET</a> (data, flag) -#define <a class="link" href="GstCollectPads2.html#GST-COLLECT-PADS2-STATE-SET:CAPS" title="GST_COLLECT_PADS2_STATE_SET()">GST_COLLECT_PADS2_STATE_SET</a> (data, +#define <a class="link" href="GstCollectPads.html#GST-COLLECT-PADS-STATE-SET:CAPS" title="GST_COLLECT_PADS_STATE_SET()">GST_COLLECT_PADS_STATE_SET</a> (data, flag) -#define <a class="link" href="GstCollectPads2.html#GST-COLLECT-PADS2-STATE-UNSET:CAPS" title="GST_COLLECT_PADS2_STATE_UNSET()">GST_COLLECT_PADS2_STATE_UNSET</a> (data, +#define <a class="link" href="GstCollectPads.html#GST-COLLECT-PADS-STATE-UNSET:CAPS" title="GST_COLLECT_PADS_STATE_UNSET()">GST_COLLECT_PADS_STATE_UNSET</a> (data, flag) -#define <a class="link" href="GstCollectPads2.html#GST-COLLECT-PADS2-GET-STREAM-LOCK:CAPS" title="GST_COLLECT_PADS2_GET_STREAM_LOCK()">GST_COLLECT_PADS2_GET_STREAM_LOCK</a> (pads) -#define <a class="link" href="GstCollectPads2.html#GST-COLLECT-PADS2-STREAM-LOCK:CAPS" title="GST_COLLECT_PADS2_STREAM_LOCK()">GST_COLLECT_PADS2_STREAM_LOCK</a> (pads) -#define <a class="link" href="GstCollectPads2.html#GST-COLLECT-PADS2-STREAM-UNLOCK:CAPS" title="GST_COLLECT_PADS2_STREAM_UNLOCK()">GST_COLLECT_PADS2_STREAM_UNLOCK</a> (pads) -<a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="returnvalue">GstCollectPads2</span></a> * <a class="link" href="GstCollectPads2.html#gst-collect-pads2-new" title="gst_collect_pads2_new ()">gst_collect_pads2_new</a> (<em class="parameter"><code><span class="type">void</span></code></em>); -<a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="returnvalue">GstCollectData2</span></a> * <a class="link" href="GstCollectPads2.html#gst-collect-pads2-add-pad" title="gst_collect_pads2_add_pad ()">gst_collect_pads2_add_pad</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>, +#define <a class="link" href="GstCollectPads.html#GST-COLLECT-PADS-GET-STREAM-LOCK:CAPS" title="GST_COLLECT_PADS_GET_STREAM_LOCK()">GST_COLLECT_PADS_GET_STREAM_LOCK</a> (pads) +#define <a class="link" href="GstCollectPads.html#GST-COLLECT-PADS-STREAM-LOCK:CAPS" title="GST_COLLECT_PADS_STREAM_LOCK()">GST_COLLECT_PADS_STREAM_LOCK</a> (pads) +#define <a class="link" href="GstCollectPads.html#GST-COLLECT-PADS-STREAM-UNLOCK:CAPS" title="GST_COLLECT_PADS_STREAM_UNLOCK()">GST_COLLECT_PADS_STREAM_UNLOCK</a> (pads) +<a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="returnvalue">GstCollectPads</span></a> * <a class="link" href="GstCollectPads.html#gst-collect-pads-new" title="gst_collect_pads_new ()">gst_collect_pads_new</a> (<em class="parameter"><code><span class="type">void</span></code></em>); +<a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="returnvalue">GstCollectData</span></a> * <a class="link" href="GstCollectPads.html#gst-collect-pads-add-pad" title="gst_collect_pads_add_pad ()">gst_collect_pads_add_pad</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> size</code></em>); -<a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="returnvalue">GstCollectData2</span></a> * <a class="link" href="GstCollectPads2.html#gst-collect-pads2-add-pad-full" title="gst_collect_pads2_add_pad_full ()">gst_collect_pads2_add_pad_full</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>, +<a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="returnvalue">GstCollectData</span></a> * <a class="link" href="GstCollectPads.html#gst-collect-pads-add-pad-full" title="gst_collect_pads_add_pad_full ()">gst_collect_pads_add_pad_full</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> size</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2DestroyNotify" title="GstCollectData2DestroyNotify ()"><span class="type">GstCollectData2DestroyNotify</span></a> destroy_notify</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectDataDestroyNotify" title="GstCollectDataDestroyNotify ()"><span class="type">GstCollectDataDestroyNotify</span></a> destroy_notify</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> lock</code></em>); -<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstCollectPads2.html#gst-collect-pads2-remove-pad" title="gst_collect_pads2_remove_pad ()">gst_collect_pads2_remove_pad</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>); -<span class="returnvalue">void</span> <a class="link" href="GstCollectPads2.html#gst-collect-pads2-start" title="gst_collect_pads2_start ()">gst_collect_pads2_start</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>); -<span class="returnvalue">void</span> <a class="link" href="GstCollectPads2.html#gst-collect-pads2-stop" title="gst_collect_pads2_stop ()">gst_collect_pads2_stop</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>); -<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> <a class="link" href="GstCollectPads2.html#gst-collect-pads2-available" title="gst_collect_pads2_available ()">gst_collect_pads2_available</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>); -<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstCollectPads2.html#gst-collect-pads2-is-active" title="gst_collect_pads2_is_active ()">gst_collect_pads2_is_active</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>); -<a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> <a class="link" href="GstCollectPads2.html#gst-collect-pads2-collect" title="gst_collect_pads2_collect ()">gst_collect_pads2_collect</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>); -<a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> <a class="link" href="GstCollectPads2.html#gst-collect-pads2-collect-range" title="gst_collect_pads2_collect_range ()">gst_collect_pads2_collect_range</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, +<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstCollectPads.html#gst-collect-pads-remove-pad" title="gst_collect_pads_remove_pad ()">gst_collect_pads_remove_pad</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>); +<span class="returnvalue">void</span> <a class="link" href="GstCollectPads.html#gst-collect-pads-start" title="gst_collect_pads_start ()">gst_collect_pads_start</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>); +<span class="returnvalue">void</span> <a class="link" href="GstCollectPads.html#gst-collect-pads-stop" title="gst_collect_pads_stop ()">gst_collect_pads_stop</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>); +<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> <a class="link" href="GstCollectPads.html#gst-collect-pads-available" title="gst_collect_pads_available ()">gst_collect_pads_available</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>); +<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstCollectPads.html#gst-collect-pads-is-active" title="gst_collect_pads_is_active ()">gst_collect_pads_is_active</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> <a class="link" href="GstCollectPads.html#gst-collect-pads-collect" title="gst_collect_pads_collect ()">gst_collect_pads_collect</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> <a class="link" href="GstCollectPads.html#gst-collect-pads-collect-range" title="gst_collect_pads_collect_range ()">gst_collect_pads_collect_range</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, <em class="parameter"><code><span class="type">guint64</span> offset</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> length</code></em>); -<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> <a class="link" href="GstCollectPads2.html#gst-collect-pads2-flush" title="gst_collect_pads2_flush ()">gst_collect_pads2_flush</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>, +<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> <a class="link" href="GstCollectPads.html#gst-collect-pads-flush" title="gst_collect_pads_flush ()">gst_collect_pads_flush</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> size</code></em>); -<a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="GstCollectPads2.html#gst-collect-pads2-peek" title="gst_collect_pads2_peek ()">gst_collect_pads2_peek</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>); -<a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="GstCollectPads2.html#gst-collect-pads2-pop" title="gst_collect_pads2_pop ()">gst_collect_pads2_pop</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>); -<a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="GstCollectPads2.html#gst-collect-pads2-read-buffer" title="gst_collect_pads2_read_buffer ()">gst_collect_pads2_read_buffer</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>, +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="GstCollectPads.html#gst-collect-pads-peek" title="gst_collect_pads_peek ()">gst_collect_pads_peek</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="GstCollectPads.html#gst-collect-pads-pop" title="gst_collect_pads_pop ()">gst_collect_pads_pop</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="GstCollectPads.html#gst-collect-pads-read-buffer" title="gst_collect_pads_read_buffer ()">gst_collect_pads_read_buffer</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> size</code></em>); -<a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="GstCollectPads2.html#gst-collect-pads2-take-buffer" title="gst_collect_pads2_take_buffer ()">gst_collect_pads2_take_buffer</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>, +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="GstCollectPads.html#gst-collect-pads-take-buffer" title="gst_collect_pads_take_buffer ()">gst_collect_pads_take_buffer</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> size</code></em>); -<span class="returnvalue">void</span> <a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-buffer-function" title="gst_collect_pads2_set_buffer_function ()">gst_collect_pads2_set_buffer_function</a> - (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectPads2BufferFunction" title="GstCollectPads2BufferFunction ()"><span class="type">GstCollectPads2BufferFunction</span></a> func</code></em>, +<span class="returnvalue">void</span> <a class="link" href="GstCollectPads.html#gst-collect-pads-set-buffer-function" title="gst_collect_pads_set_buffer_function ()">gst_collect_pads_set_buffer_function</a> + (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectPadsBufferFunction" title="GstCollectPadsBufferFunction ()"><span class="type">GstCollectPadsBufferFunction</span></a> func</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>); -<span class="returnvalue">void</span> <a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-compare-function" title="gst_collect_pads2_set_compare_function ()">gst_collect_pads2_set_compare_function</a> - (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectPads2CompareFunction" title="GstCollectPads2CompareFunction ()"><span class="type">GstCollectPads2CompareFunction</span></a> func</code></em>, +<span class="returnvalue">void</span> <a class="link" href="GstCollectPads.html#gst-collect-pads-set-compare-function" title="gst_collect_pads_set_compare_function ()">gst_collect_pads_set_compare_function</a> + (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectPadsCompareFunction" title="GstCollectPadsCompareFunction ()"><span class="type">GstCollectPadsCompareFunction</span></a> func</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>); -<span class="returnvalue">void</span> <a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-event-function" title="gst_collect_pads2_set_event_function ()">gst_collect_pads2_set_event_function</a> - (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectPads2EventFunction" title="GstCollectPads2EventFunction ()"><span class="type">GstCollectPads2EventFunction</span></a> func</code></em>, +<span class="returnvalue">void</span> <a class="link" href="GstCollectPads.html#gst-collect-pads-set-event-function" title="gst_collect_pads_set_event_function ()">gst_collect_pads_set_event_function</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectPadsEventFunction" title="GstCollectPadsEventFunction ()"><span class="type">GstCollectPadsEventFunction</span></a> func</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>); -<span class="returnvalue">void</span> <a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-clip-function" title="gst_collect_pads2_set_clip_function ()">gst_collect_pads2_set_clip_function</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectPads2ClipFunction" title="GstCollectPads2ClipFunction ()"><span class="type">GstCollectPads2ClipFunction</span></a> clipfunc</code></em>, +<span class="returnvalue">void</span> <a class="link" href="GstCollectPads.html#gst-collect-pads-set-clip-function" title="gst_collect_pads_set_clip_function ()">gst_collect_pads_set_clip_function</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectPadsClipFunction" title="GstCollectPadsClipFunction ()"><span class="type">GstCollectPadsClipFunction</span></a> clipfunc</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>); -<span class="returnvalue">void</span> <a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-flushing" title="gst_collect_pads2_set_flushing ()">gst_collect_pads2_set_flushing</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, +<span class="returnvalue">void</span> <a class="link" href="GstCollectPads.html#gst-collect-pads-set-flushing" title="gst_collect_pads_set_flushing ()">gst_collect_pads_set_flushing</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> flushing</code></em>); -<span class="returnvalue">void</span> <a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-function" title="gst_collect_pads2_set_function ()">gst_collect_pads2_set_function</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectPads2Function" title="GstCollectPads2Function ()"><span class="type">GstCollectPads2Function</span></a> func</code></em>, +<span class="returnvalue">void</span> <a class="link" href="GstCollectPads.html#gst-collect-pads-set-function" title="gst_collect_pads_set_function ()">gst_collect_pads_set_function</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectPadsFunction" title="GstCollectPadsFunction ()"><span class="type">GstCollectPadsFunction</span></a> func</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>); -<span class="returnvalue">void</span> <a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-waiting" title="gst_collect_pads2_set_waiting ()">gst_collect_pads2_set_waiting</a> (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>, +<span class="returnvalue">void</span> <a class="link" href="GstCollectPads.html#gst-collect-pads-set-waiting" title="gst_collect_pads_set_waiting ()">gst_collect_pads_set_waiting</a> (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> waiting</code></em>); </pre> </div> <div class="refsect1"> -<a name="GstCollectPads2.object-hierarchy"></a><h2>Object Hierarchy</h2> +<a name="GstCollectPads.object-hierarchy"></a><h2>Object Hierarchy</h2> <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----GstCollectPads2 + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----GstCollectPads </pre> </div> <div class="refsect1"> -<a name="GstCollectPads2.description"></a><h2>Description</h2> +<a name="GstCollectPads.description"></a><h2>Description</h2> <p> Manages a set of pads that operate in collect mode. This means that control is given to the manager of this object when all pads have data. </p> <div class="itemizedlist"><ul class="itemizedlist" type="disc"> <li class="listitem"><p> - Collectpads are created with <a class="link" href="GstCollectPads2.html#gst-collect-pads2-new" title="gst_collect_pads2_new ()"><code class="function">gst_collect_pads2_new()</code></a>. A callback should then - be installed with <a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-function" title="gst_collect_pads2_set_function ()"><code class="function">gst_collect_pads2_set_function()</code></a>. + Collectpads are created with <a class="link" href="GstCollectPads.html#gst-collect-pads-new" title="gst_collect_pads_new ()"><code class="function">gst_collect_pads_new()</code></a>. A callback should then + be installed with <a class="link" href="GstCollectPads.html#gst-collect-pads-set-function" title="gst_collect_pads_set_function ()"><code class="function">gst_collect_pads_set_function()</code></a>. </p></li> <li class="listitem"><p> - Pads are added to the collection with <a class="link" href="GstCollectPads2.html#gst-collect-pads2-add-pad" title="gst_collect_pads2_add_pad ()"><code class="function">gst_collect_pads2_add_pad()</code></a>/ - <a class="link" href="GstCollectPads2.html#gst-collect-pads2-remove-pad" title="gst_collect_pads2_remove_pad ()"><code class="function">gst_collect_pads2_remove_pad()</code></a>. The pad + Pads are added to the collection with <a class="link" href="GstCollectPads.html#gst-collect-pads-add-pad" title="gst_collect_pads_add_pad ()"><code class="function">gst_collect_pads_add_pad()</code></a>/ + <a class="link" href="GstCollectPads.html#gst-collect-pads-remove-pad" title="gst_collect_pads_remove_pad ()"><code class="function">gst_collect_pads_remove_pad()</code></a>. The pad has to be a sinkpad. The chain and event functions of the pad are overridden. The element_private of the pad is used to store private information for the collectpads. @@ -170,30 +169,30 @@ is given to the manager of this object when all pads have data. When data is queued on all pads in waiting mode, the callback function is called. </p></li> <li class="listitem"><p> - Data can be dequeued from the pad with the <a class="link" href="GstCollectPads2.html#gst-collect-pads2-pop" title="gst_collect_pads2_pop ()"><code class="function">gst_collect_pads2_pop()</code></a> method. - One can peek at the data with the <a class="link" href="GstCollectPads2.html#gst-collect-pads2-peek" title="gst_collect_pads2_peek ()"><code class="function">gst_collect_pads2_peek()</code></a> function. + Data can be dequeued from the pad with the <a class="link" href="GstCollectPads.html#gst-collect-pads-pop" title="gst_collect_pads_pop ()"><code class="function">gst_collect_pads_pop()</code></a> method. + One can peek at the data with the <a class="link" href="GstCollectPads.html#gst-collect-pads-peek" title="gst_collect_pads_peek ()"><code class="function">gst_collect_pads_peek()</code></a> function. These functions will return NULL if the pad received an EOS event. When all - pads return NULL from a <a class="link" href="GstCollectPads2.html#gst-collect-pads2-peek" title="gst_collect_pads2_peek ()"><code class="function">gst_collect_pads2_peek()</code></a>, the element can emit an EOS + pads return NULL from a <a class="link" href="GstCollectPads.html#gst-collect-pads-peek" title="gst_collect_pads_peek ()"><code class="function">gst_collect_pads_peek()</code></a>, the element can emit an EOS event itself. </p></li> <li class="listitem"><p> - Data can also be dequeued in byte units using the <a class="link" href="GstCollectPads2.html#gst-collect-pads2-available" title="gst_collect_pads2_available ()"><code class="function">gst_collect_pads2_available()</code></a>, - <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/gstreamer-libs-GstCollectPads2.html#gst-collect-pads2-read"><code class="function">gst_collect_pads2_read()</code></a> and <a class="link" href="GstCollectPads2.html#gst-collect-pads2-flush" title="gst_collect_pads2_flush ()"><code class="function">gst_collect_pads2_flush()</code></a> calls. + Data can also be dequeued in byte units using the <a class="link" href="GstCollectPads.html#gst-collect-pads-available" title="gst_collect_pads_available ()"><code class="function">gst_collect_pads_available()</code></a>, + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstCollectPads.html#gst-collect-pads-read"><code class="function">gst_collect_pads_read()</code></a> and <a class="link" href="GstCollectPads.html#gst-collect-pads-flush" title="gst_collect_pads_flush ()"><code class="function">gst_collect_pads_flush()</code></a> calls. </p></li> <li class="listitem"><p> - Elements should call <a class="link" href="GstCollectPads2.html#gst-collect-pads2-start" title="gst_collect_pads2_start ()"><code class="function">gst_collect_pads2_start()</code></a> and <a class="link" href="GstCollectPads2.html#gst-collect-pads2-stop" title="gst_collect_pads2_stop ()"><code class="function">gst_collect_pads2_stop()</code></a> in + Elements should call <a class="link" href="GstCollectPads.html#gst-collect-pads-start" title="gst_collect_pads_start ()"><code class="function">gst_collect_pads_start()</code></a> and <a class="link" href="GstCollectPads.html#gst-collect-pads-stop" title="gst_collect_pads_stop ()"><code class="function">gst_collect_pads_stop()</code></a> in their state change functions to start and stop the processing of the collectpads. - The <a class="link" href="GstCollectPads2.html#gst-collect-pads2-stop" title="gst_collect_pads2_stop ()"><code class="function">gst_collect_pads2_stop()</code></a> call should be called before calling the parent + The <a class="link" href="GstCollectPads.html#gst-collect-pads-stop" title="gst_collect_pads_stop ()"><code class="function">gst_collect_pads_stop()</code></a> call should be called before calling the parent element state change function in the PAUSED_TO_READY state change to ensure no pad is blocked and the element can finish streaming. </p></li> <li class="listitem"><p> - <a class="link" href="GstCollectPads2.html#gst-collect-pads2-collect" title="gst_collect_pads2_collect ()"><code class="function">gst_collect_pads2_collect()</code></a> and <a class="link" href="GstCollectPads2.html#gst-collect-pads2-collect-range" title="gst_collect_pads2_collect_range ()"><code class="function">gst_collect_pads2_collect_range()</code></a> can be used by - elements that start a <a href="../gstreamer-1.0/GstTask.html"><span class="type">GstTask</span></a> to drive the collect_pads2. This feature is however + <a class="link" href="GstCollectPads.html#gst-collect-pads-collect" title="gst_collect_pads_collect ()"><code class="function">gst_collect_pads_collect()</code></a> and <a class="link" href="GstCollectPads.html#gst-collect-pads-collect-range" title="gst_collect_pads_collect_range ()"><code class="function">gst_collect_pads_collect_range()</code></a> can be used by + elements that start a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstTask.html"><span class="type">GstTask</span></a> to drive the collect_pads. This feature is however not yet implemented. </p></li> <li class="listitem"><p> - <a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-waiting" title="gst_collect_pads2_set_waiting ()"><code class="function">gst_collect_pads2_set_waiting()</code></a> sets a pad to waiting or non-waiting mode. + <a class="link" href="GstCollectPads.html#gst-collect-pads-set-waiting" title="gst_collect_pads_set_waiting ()"><code class="function">gst_collect_pads_set_waiting()</code></a> sets a pad to waiting or non-waiting mode. CollectPads element is not waiting for data to be collected on non-waiting pads. Thus these pads may but need not have data when the callback is called. All pads are in waiting mode by default. @@ -206,10 +205,10 @@ Last reviewed on 2011-10-28 (0.10.36) </p> </div> <div class="refsect1"> -<a name="GstCollectPads2.details"></a><h2>Details</h2> +<a name="GstCollectPads.details"></a><h2>Details</h2> <div class="refsect2"> -<a name="GstCollectPads2-struct"></a><h3>struct GstCollectPads2</h3> -<pre class="programlisting">struct GstCollectPads2 { +<a name="GstCollectPads-struct"></a><h3>struct GstCollectPads</h3> +<pre class="programlisting">struct GstCollectPads { GSList *data; /* list of CollectData items */ }; </pre> @@ -219,19 +218,19 @@ Collectpads object. <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *<em class="structfield"><code><a name="GstCollectPads2-struct.data"></a>data</code></em>;</span></p></td> +<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Singly-Linked-Lists.html#GSList"><span class="type">GSList</span></a> *<em class="structfield"><code><a name="GstCollectPads-struct.data"></a>data</code></em>;</span></p></td> <td> -<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> of <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> managed by this <a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a>.</td> +<a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> of <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> managed by this <a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a>.</td> </tr></tbody> </table></div> <p class="since">Since 0.10.36</p> </div> <hr> <div class="refsect2"> -<a name="GstCollectData2"></a><h3>struct GstCollectData2</h3> -<pre class="programlisting">struct GstCollectData2 { +<a name="GstCollectData"></a><h3>struct GstCollectData</h3> +<pre class="programlisting">struct GstCollectData { /* with STREAM_LOCK of @collect */ - GstCollectPads2 *collect; + GstCollectPads *collect; GstPad *pad; GstBuffer *buffer; guint pos; @@ -239,31 +238,31 @@ Collectpads object. }; </pre> <p> -Structure used by the collect_pads2. +Structure used by the collect_pads. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> <tr> -<td><p><span class="term"><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *<em class="structfield"><code><a name="GstCollectData2.collect"></a>collect</code></em>;</span></p></td> -<td>owner <a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> +<td><p><span class="term"><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *<em class="structfield"><code><a name="GstCollectData.collect"></a>collect</code></em>;</span></p></td> +<td>owner <a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> </td> </tr> <tr> -<td><p><span class="term"><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *<em class="structfield"><code><a name="GstCollectData2.pad"></a>pad</code></em>;</span></p></td> +<td><p><span class="term"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *<em class="structfield"><code><a name="GstCollectData.pad"></a>pad</code></em>;</span></p></td> <td> -<a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> managed by this data</td> +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> managed by this data</td> </tr> <tr> -<td><p><span class="term"><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *<em class="structfield"><code><a name="GstCollectData2.buffer"></a>buffer</code></em>;</span></p></td> +<td><p><span class="term"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *<em class="structfield"><code><a name="GstCollectData.buffer"></a>buffer</code></em>;</span></p></td> <td>currently queued buffer.</td> </tr> <tr> -<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="GstCollectData2.pos"></a>pos</code></em>;</span></p></td> +<td><p><span class="term"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> <em class="structfield"><code><a name="GstCollectData.pos"></a>pos</code></em>;</span></p></td> <td>position in the buffer</td> </tr> <tr> -<td><p><span class="term"><a href="../gstreamer-1.0/gstreamer-GstSegment.html#GstSegment"><span class="type">GstSegment</span></a> <em class="structfield"><code><a name="GstCollectData2.segment"></a>segment</code></em>;</span></p></td> +<td><p><span class="term"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstSegment.html#GstSegment"><span class="type">GstSegment</span></a> <em class="structfield"><code><a name="GstCollectData.segment"></a>segment</code></em>;</span></p></td> <td>last segment received.</td> </tr> </tbody> @@ -272,10 +271,10 @@ Structure used by the collect_pads2. </div> <hr> <div class="refsect2"> -<a name="GstCollectData2DestroyNotify"></a><h3>GstCollectData2DestroyNotify ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> (*GstCollectData2DestroyNotify) (<em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>);</pre> +<a name="GstCollectDataDestroyNotify"></a><h3>GstCollectDataDestroyNotify ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> (*GstCollectDataDestroyNotify) (<em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>);</pre> <p> -A function that will be called when the <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> will be freed. +A function that will be called when the <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> will be freed. It is passed the pointer to the structure and should free any custom memory and resources allocated for it. </p> @@ -283,17 +282,17 @@ memory and resources allocated for it. <col align="left" valign="top"> <tbody><tr> <td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td> -<td>the <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> that will be freed</td> +<td>the <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> that will be freed</td> </tr></tbody> </table></div> <p class="since">Since 0.10.36</p> </div> <hr> <div class="refsect2"> -<a name="GstCollectPads2BufferFunction"></a><h3>GstCollectPads2BufferFunction ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (*GstCollectPads2BufferFunction) (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer</code></em>, +<a name="GstCollectPadsBufferFunction"></a><h3>GstCollectPadsBufferFunction ()</h3> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (*GstCollectPadsBufferFunction) (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre> <p> A function that will be called when a (considered oldest) buffer can be muxed. @@ -305,26 +304,26 @@ and NULL <em class="parameter"><code>data</code></em>. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>pads</code></em> :</span></p></td> -<td>the <a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> that trigered the callback</td> +<td>the <a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> that trigered the callback</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td> -<td>the <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> of pad that has received the buffer</td> +<td>the <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> of pad that has received the buffer</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>buffer</code></em> :</span></p></td> -<td>the <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> +<td>the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td> -<td>user data passed to <a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-buffer-function" title="gst_collect_pads2_set_buffer_function ()"><code class="function">gst_collect_pads2_set_buffer_function()</code></a> +<td>user data passed to <a class="link" href="GstCollectPads.html#gst-collect-pads-set-buffer-function" title="gst_collect_pads_set_buffer_function ()"><code class="function">gst_collect_pads_set_buffer_function()</code></a> </td> </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> -<a href="../gstreamer-1.0/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a> for success</td> +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a> for success</td> </tr> </tbody> </table></div> @@ -332,12 +331,12 @@ and NULL <em class="parameter"><code>data</code></em>. </div> <hr> <div class="refsect2"> -<a name="GstCollectPads2CompareFunction"></a><h3>GstCollectPads2CompareFunction ()</h3> -<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a> (*GstCollectPads2CompareFunction) (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data1</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp1</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data2</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp2</code></em>, +<a name="GstCollectPadsCompareFunction"></a><h3>GstCollectPadsCompareFunction ()</h3> +<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a> (*GstCollectPadsCompareFunction) (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data1</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp1</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data2</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp2</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre> <p> A function for comparing two timestamps of buffers or newsegments collected on one pad. @@ -347,11 +346,11 @@ A function for comparing two timestamps of buffers or newsegments collected on o <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>pads</code></em> :</span></p></td> -<td>the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstCollectPads.html"><span class="type">GstCollectPads</span></a> that is comparing the timestamps</td> +<td>the <a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> that is comparing the timestamps</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>data1</code></em> :</span></p></td> -<td>the first <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> +<td>the first <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> </td> </tr> <tr> @@ -360,7 +359,7 @@ A function for comparing two timestamps of buffers or newsegments collected on o </tr> <tr> <td><p><span class="term"><em class="parameter"><code>data2</code></em> :</span></p></td> -<td>the second <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> +<td>the second <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> </td> </tr> <tr> @@ -369,7 +368,7 @@ A function for comparing two timestamps of buffers or newsegments collected on o </tr> <tr> <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td> -<td>user data passed to <a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-compare-function" title="gst_collect_pads2_set_compare_function ()"><code class="function">gst_collect_pads2_set_compare_function()</code></a> +<td>user data passed to <a class="link" href="GstCollectPads.html#gst-collect-pads-set-compare-function" title="gst_collect_pads_set_compare_function ()"><code class="function">gst_collect_pads_set_compare_function()</code></a> </td> </tr> <tr> @@ -384,38 +383,35 @@ Integer greate than zero when second timestamp is deemed older than the first on </div> <hr> <div class="refsect2"> -<a name="GstCollectPads2EventFunction"></a><h3>GstCollectPads2EventFunction ()</h3> -<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (*GstCollectPads2EventFunction) (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *pad</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstEvent.html#GstEvent"><span class="type">GstEvent</span></a> *event</code></em>, +<a name="GstCollectPadsEventFunction"></a><h3>GstCollectPadsEventFunction ()</h3> +<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> (*GstCollectPadsEventFunction) (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *pad</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstEvent.html#GstEvent"><span class="type">GstEvent</span></a> *event</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre> <p> A function that will be called while processing an event. It takes -ownership of the event and is responsible for forwarding -events downstream (with <a href="../gstreamer-1.0/GstPad.html#gst-pad-event-default"><code class="function">gst_pad_event_default()</code></a>) or dropping events. -</p> -<p> -The STREAM_START, CAPS, STREAM_CONFIG, SEGMENT and EOS events should -usually be dropped by this function. +ownership of the event and is responsible for chaining up (to +<code class="function">gst_collect_pads_event_default()</code>) or dropping events (such typical cases +being handled by the default handler). </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>pads</code></em> :</span></p></td> -<td>the <a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> that trigered the callback</td> +<td>the <a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> that trigered the callback</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>pad</code></em> :</span></p></td> -<td>the <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> that received an event</td> +<td>the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> that received an event</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>event</code></em> :</span></p></td> -<td>the <a href="../gstreamer-1.0/gstreamer-GstEvent.html#GstEvent"><span class="type">GstEvent</span></a> received</td> +<td>the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstEvent.html#GstEvent"><span class="type">GstEvent</span></a> received</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td> -<td>user data passed to <a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-event-function" title="gst_collect_pads2_set_event_function ()"><code class="function">gst_collect_pads2_set_event_function()</code></a> +<td>user data passed to <a class="link" href="GstCollectPads.html#gst-collect-pads-set-event-function" title="gst_collect_pads_set_event_function ()"><code class="function">gst_collect_pads_set_event_function()</code></a> </td> </tr> <tr> @@ -429,11 +425,11 @@ usually be dropped by this function. </div> <hr> <div class="refsect2"> -<a name="GstCollectPads2ClipFunction"></a><h3>GstCollectPads2ClipFunction ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (*GstCollectPads2ClipFunction) (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *inbuffer</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> **outbuffer</code></em>, +<a name="GstCollectPadsClipFunction"></a><h3>GstCollectPadsClipFunction ()</h3> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (*GstCollectPadsClipFunction) (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *inbuffer</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> **outbuffer</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre> <p> A function that will be called when <em class="parameter"><code>inbuffer</code></em> is received on the pad managed @@ -452,22 +448,22 @@ This function takes ownership of <em class="parameter"><code>inbuffer</code></em <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>pads</code></em> :</span></p></td> -<td>a <a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> +<td>a <a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td> -<td>a <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> +<td>a <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>inbuffer</code></em> :</span></p></td> -<td>the input <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> +<td>the input <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> </td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>outbuffer</code></em> :</span></p></td> -<td>the output <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> +<td>the output <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> </td> </tr> <tr> @@ -476,7 +472,7 @@ This function takes ownership of <em class="parameter"><code>inbuffer</code></em </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>a <a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a> that corresponds to the result of clipping.</td> +<td>a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a> that corresponds to the result of clipping.</td> </tr> </tbody> </table></div> @@ -484,8 +480,8 @@ This function takes ownership of <em class="parameter"><code>inbuffer</code></em </div> <hr> <div class="refsect2"> -<a name="GstCollectPads2Function"></a><h3>GstCollectPads2Function ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (*GstCollectPads2Function) (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, +<a name="GstCollectPadsFunction"></a><h3>GstCollectPadsFunction ()</h3> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (*GstCollectPadsFunction) (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre> <p> A function that will be called when all pads have received data. @@ -495,17 +491,17 @@ A function that will be called when all pads have received data. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>pads</code></em> :</span></p></td> -<td>the <a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> that trigered the callback</td> +<td>the <a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> that trigered the callback</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td> -<td>user data passed to <a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-function" title="gst_collect_pads2_set_function ()"><code class="function">gst_collect_pads2_set_function()</code></a> +<td>user data passed to <a class="link" href="GstCollectPads.html#gst-collect-pads-set-function" title="gst_collect_pads_set_function ()"><code class="function">gst_collect_pads_set_function()</code></a> </td> </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> -<a href="../gstreamer-1.0/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a> for success</td> +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a> for success</td> </tr> </tbody> </table></div> @@ -513,45 +509,45 @@ A function that will be called when all pads have received data. </div> <hr> <div class="refsect2"> -<a name="GstCollectPads2StateFlags"></a><h3>enum GstCollectPads2StateFlags</h3> +<a name="GstCollectPadsStateFlags"></a><h3>enum GstCollectPadsStateFlags</h3> <pre class="programlisting">typedef enum { - GST_COLLECT_PADS2_STATE_EOS = 1 << 0, - GST_COLLECT_PADS2_STATE_FLUSHING = 1 << 1, - GST_COLLECT_PADS2_STATE_NEW_SEGMENT = 1 << 2, - GST_COLLECT_PADS2_STATE_WAITING = 1 << 3, - GST_COLLECT_PADS2_STATE_LOCKED = 1 << 4 -} GstCollectPads2StateFlags; + GST_COLLECT_PADS_STATE_EOS = 1 << 0, + GST_COLLECT_PADS_STATE_FLUSHING = 1 << 1, + GST_COLLECT_PADS_STATE_NEW_SEGMENT = 1 << 2, + GST_COLLECT_PADS_STATE_WAITING = 1 << 3, + GST_COLLECT_PADS_STATE_LOCKED = 1 << 4 +} GstCollectPadsStateFlags; </pre> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> <tr> -<td><p><a name="GST-COLLECT-PADS2-STATE-EOS:CAPS"></a><span class="term"><code class="literal">GST_COLLECT_PADS2_STATE_EOS</code></span></p></td> +<td><p><a name="GST-COLLECT-PADS-STATE-EOS:CAPS"></a><span class="term"><code class="literal">GST_COLLECT_PADS_STATE_EOS</code></span></p></td> <td>Set if collectdata's pad is EOS. </td> </tr> <tr> -<td><p><a name="GST-COLLECT-PADS2-STATE-FLUSHING:CAPS"></a><span class="term"><code class="literal">GST_COLLECT_PADS2_STATE_FLUSHING</code></span></p></td> +<td><p><a name="GST-COLLECT-PADS-STATE-FLUSHING:CAPS"></a><span class="term"><code class="literal">GST_COLLECT_PADS_STATE_FLUSHING</code></span></p></td> <td>Set if collectdata's pad is flushing. </td> </tr> <tr> -<td><p><a name="GST-COLLECT-PADS2-STATE-NEW-SEGMENT:CAPS"></a><span class="term"><code class="literal">GST_COLLECT_PADS2_STATE_NEW_SEGMENT</code></span></p></td> +<td><p><a name="GST-COLLECT-PADS-STATE-NEW-SEGMENT:CAPS"></a><span class="term"><code class="literal">GST_COLLECT_PADS_STATE_NEW_SEGMENT</code></span></p></td> <td>Set if collectdata's pad received a new_segment event. </td> </tr> <tr> -<td><p><a name="GST-COLLECT-PADS2-STATE-WAITING:CAPS"></a><span class="term"><code class="literal">GST_COLLECT_PADS2_STATE_WAITING</code></span></p></td> +<td><p><a name="GST-COLLECT-PADS-STATE-WAITING:CAPS"></a><span class="term"><code class="literal">GST_COLLECT_PADS_STATE_WAITING</code></span></p></td> <td>Set if collectdata's pad must be waited for when collecting. </td> </tr> <tr> -<td><p><a name="GST-COLLECT-PADS2-STATE-LOCKED:CAPS"></a><span class="term"><code class="literal">GST_COLLECT_PADS2_STATE_LOCKED</code></span></p></td> +<td><p><a name="GST-COLLECT-PADS-STATE-LOCKED:CAPS"></a><span class="term"><code class="literal">GST_COLLECT_PADS_STATE_LOCKED</code></span></p></td> <td>Set collectdata's pad WAITING state must not be changed. -<a class="link" href="GstCollectPads2.html#GstCollectPads2StateFlags" title="enum GstCollectPads2StateFlags"><span class="type">GstCollectPads2StateFlags</span></a> indicate private state of a collectdata('s pad). +<a class="link" href="GstCollectPads.html#GstCollectPadsStateFlags" title="enum GstCollectPadsStateFlags"><span class="type">GstCollectPadsStateFlags</span></a> indicate private state of a collectdata('s pad). </td> </tr> </tbody> @@ -560,26 +556,26 @@ A function that will be called when all pads have received data. </div> <hr> <div class="refsect2"> -<a name="GST-COLLECT-PADS2-STATE:CAPS"></a><h3>GST_COLLECT_PADS2_STATE()</h3> -<pre class="programlisting">#define GST_COLLECT_PADS2_STATE(data) (((GstCollectData2 *) data)->state) +<a name="GST-COLLECT-PADS-STATE:CAPS"></a><h3>GST_COLLECT_PADS_STATE()</h3> +<pre class="programlisting">#define GST_COLLECT_PADS_STATE(data) (((GstCollectData *) data)->state) </pre> <p> -A flags word containing <a class="link" href="GstCollectPads2.html#GstCollectPads2StateFlags" title="enum GstCollectPads2StateFlags"><span class="type">GstCollectPads2StateFlags</span></a> flags set +A flags word containing <a class="link" href="GstCollectPads.html#GstCollectPadsStateFlags" title="enum GstCollectPadsStateFlags"><span class="type">GstCollectPadsStateFlags</span></a> flags set on this collected pad. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> <td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td> -<td>a <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a>.</td> +<td>a <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a>.</td> </tr></tbody> </table></div> <p class="since">Since 0.10.36</p> </div> <hr> <div class="refsect2"> -<a name="GST-COLLECT-PADS2-STATE-IS-SET:CAPS"></a><h3>GST_COLLECT_PADS2_STATE_IS_SET()</h3> -<pre class="programlisting">#define GST_COLLECT_PADS2_STATE_IS_SET(data,flag) !!(GST_COLLECT_PADS2_STATE (data) & flag) +<a name="GST-COLLECT-PADS-STATE-IS-SET:CAPS"></a><h3>GST_COLLECT_PADS_STATE_IS_SET()</h3> +<pre class="programlisting">#define GST_COLLECT_PADS_STATE_IS_SET(data,flag) !!(GST_COLLECT_PADS_STATE (data) & flag) </pre> <p> Gives the status of a specific flag on a collected pad. @@ -589,11 +585,11 @@ Gives the status of a specific flag on a collected pad. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td> -<td>a <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a>.</td> +<td>a <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a>.</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>flag</code></em> :</span></p></td> -<td>the <a class="link" href="GstCollectPads2.html#GstCollectPads2StateFlags" title="enum GstCollectPads2StateFlags"><span class="type">GstCollectPads2StateFlags</span></a> to check.</td> +<td>the <a class="link" href="GstCollectPads.html#GstCollectPadsStateFlags" title="enum GstCollectPadsStateFlags"><span class="type">GstCollectPadsStateFlags</span></a> to check.</td> </tr> </tbody> </table></div> @@ -601,8 +597,8 @@ Gives the status of a specific flag on a collected pad. </div> <hr> <div class="refsect2"> -<a name="GST-COLLECT-PADS2-STATE-SET:CAPS"></a><h3>GST_COLLECT_PADS2_STATE_SET()</h3> -<pre class="programlisting">#define GST_COLLECT_PADS2_STATE_SET(data,flag) (GST_COLLECT_PADS2_STATE (data) |= flag) +<a name="GST-COLLECT-PADS-STATE-SET:CAPS"></a><h3>GST_COLLECT_PADS_STATE_SET()</h3> +<pre class="programlisting">#define GST_COLLECT_PADS_STATE_SET(data,flag) (GST_COLLECT_PADS_STATE (data) |= flag) </pre> <p> Sets a state flag on a collected pad. @@ -612,11 +608,11 @@ Sets a state flag on a collected pad. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td> -<td>a <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a>.</td> +<td>a <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a>.</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>flag</code></em> :</span></p></td> -<td>the <a class="link" href="GstCollectPads2.html#GstCollectPads2StateFlags" title="enum GstCollectPads2StateFlags"><span class="type">GstCollectPads2StateFlags</span></a> to set.</td> +<td>the <a class="link" href="GstCollectPads.html#GstCollectPadsStateFlags" title="enum GstCollectPadsStateFlags"><span class="type">GstCollectPadsStateFlags</span></a> to set.</td> </tr> </tbody> </table></div> @@ -624,8 +620,8 @@ Sets a state flag on a collected pad. </div> <hr> <div class="refsect2"> -<a name="GST-COLLECT-PADS2-STATE-UNSET:CAPS"></a><h3>GST_COLLECT_PADS2_STATE_UNSET()</h3> -<pre class="programlisting">#define GST_COLLECT_PADS2_STATE_UNSET(data,flag) (GST_COLLECT_PADS2_STATE (data) &= ~(flag)) +<a name="GST-COLLECT-PADS-STATE-UNSET:CAPS"></a><h3>GST_COLLECT_PADS_STATE_UNSET()</h3> +<pre class="programlisting">#define GST_COLLECT_PADS_STATE_UNSET(data,flag) (GST_COLLECT_PADS_STATE (data) &= ~(flag)) </pre> <p> Clears a state flag on a collected pad. @@ -635,11 +631,11 @@ Clears a state flag on a collected pad. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>data</code></em> :</span></p></td> -<td>a <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a>.</td> +<td>a <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a>.</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>flag</code></em> :</span></p></td> -<td>the <a class="link" href="GstCollectPads2.html#GstCollectPads2StateFlags" title="enum GstCollectPads2StateFlags"><span class="type">GstCollectPads2StateFlags</span></a> to clear.</td> +<td>the <a class="link" href="GstCollectPads.html#GstCollectPadsStateFlags" title="enum GstCollectPadsStateFlags"><span class="type">GstCollectPadsStateFlags</span></a> to clear.</td> </tr> </tbody> </table></div> @@ -647,8 +643,8 @@ Clears a state flag on a collected pad. </div> <hr> <div class="refsect2"> -<a name="GST-COLLECT-PADS2-GET-STREAM-LOCK:CAPS"></a><h3>GST_COLLECT_PADS2_GET_STREAM_LOCK()</h3> -<pre class="programlisting">#define GST_COLLECT_PADS2_GET_STREAM_LOCK(pads) (&((GstCollectPads2 *)pads)->stream_lock) +<a name="GST-COLLECT-PADS-GET-STREAM-LOCK:CAPS"></a><h3>GST_COLLECT_PADS_GET_STREAM_LOCK()</h3> +<pre class="programlisting">#define GST_COLLECT_PADS_GET_STREAM_LOCK(pads) (&((GstCollectPads *)pads)->stream_lock) </pre> <p> Get the stream lock of <em class="parameter"><code>pads</code></em>. The stream lock is used to coordinate and @@ -659,7 +655,7 @@ protecting the resources used to accomplish this. <col align="left" valign="top"> <tbody><tr> <td><p><span class="term"><em class="parameter"><code>pads</code></em> :</span></p></td> -<td>a <a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> +<td>a <a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> </td> </tr></tbody> </table></div> @@ -667,8 +663,8 @@ protecting the resources used to accomplish this. </div> <hr> <div class="refsect2"> -<a name="GST-COLLECT-PADS2-STREAM-LOCK:CAPS"></a><h3>GST_COLLECT_PADS2_STREAM_LOCK()</h3> -<pre class="programlisting">#define GST_COLLECT_PADS2_STREAM_LOCK(pads) g_rec_mutex_lock(GST_COLLECT_PADS2_GET_STREAM_LOCK (pads)) +<a name="GST-COLLECT-PADS-STREAM-LOCK:CAPS"></a><h3>GST_COLLECT_PADS_STREAM_LOCK()</h3> +<pre class="programlisting">#define GST_COLLECT_PADS_STREAM_LOCK(pads) g_rec_mutex_lock(GST_COLLECT_PADS_GET_STREAM_LOCK (pads)) </pre> <p> Lock the stream lock of <em class="parameter"><code>pads</code></em>. @@ -677,7 +673,7 @@ Lock the stream lock of <em class="parameter"><code>pads</code></em>. <col align="left" valign="top"> <tbody><tr> <td><p><span class="term"><em class="parameter"><code>pads</code></em> :</span></p></td> -<td>a <a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> +<td>a <a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> </td> </tr></tbody> </table></div> @@ -685,8 +681,8 @@ Lock the stream lock of <em class="parameter"><code>pads</code></em>. </div> <hr> <div class="refsect2"> -<a name="GST-COLLECT-PADS2-STREAM-UNLOCK:CAPS"></a><h3>GST_COLLECT_PADS2_STREAM_UNLOCK()</h3> -<pre class="programlisting">#define GST_COLLECT_PADS2_STREAM_UNLOCK(pads) g_rec_mutex_unlock(GST_COLLECT_PADS2_GET_STREAM_LOCK (pads)) +<a name="GST-COLLECT-PADS-STREAM-UNLOCK:CAPS"></a><h3>GST_COLLECT_PADS_STREAM_UNLOCK()</h3> +<pre class="programlisting">#define GST_COLLECT_PADS_STREAM_UNLOCK(pads) g_rec_mutex_unlock(GST_COLLECT_PADS_GET_STREAM_LOCK (pads)) </pre> <p> Unlock the stream lock of <em class="parameter"><code>pads</code></em>. @@ -695,7 +691,7 @@ Unlock the stream lock of <em class="parameter"><code>pads</code></em>. <col align="left" valign="top"> <tbody><tr> <td><p><span class="term"><em class="parameter"><code>pads</code></em> :</span></p></td> -<td>a <a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> +<td>a <a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> </td> </tr></tbody> </table></div> @@ -703,8 +699,8 @@ Unlock the stream lock of <em class="parameter"><code>pads</code></em>. </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-new"></a><h3>gst_collect_pads2_new ()</h3> -<pre class="programlisting"><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="returnvalue">GstCollectPads2</span></a> * gst_collect_pads2_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> +<a name="gst-collect-pads-new"></a><h3>gst_collect_pads_new ()</h3> +<pre class="programlisting"><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="returnvalue">GstCollectPads</span></a> * gst_collect_pads_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> <p> Create a new instance of <span class="type">GstCollectsPads</span>. </p> @@ -715,7 +711,7 @@ MT safe. <col align="left" valign="top"> <tbody><tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>a new <a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a>, or NULL in case of an error. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> +<td>a new <a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a>, or NULL in case of an error. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> </td> </tr></tbody> </table></div> @@ -723,18 +719,18 @@ MT safe. </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-add-pad"></a><h3>gst_collect_pads2_add_pad ()</h3> -<pre class="programlisting"><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="returnvalue">GstCollectData2</span></a> * gst_collect_pads2_add_pad (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>, +<a name="gst-collect-pads-add-pad"></a><h3>gst_collect_pads_add_pad ()</h3> +<pre class="programlisting"><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="returnvalue">GstCollectData</span></a> * gst_collect_pads_add_pad (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> size</code></em>);</pre> <p> Add a pad to the collection of collect pads. The pad has to be a sinkpad. The refcount of the pad is incremented. Use -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-remove-pad" title="gst_collect_pads2_remove_pad ()"><code class="function">gst_collect_pads2_remove_pad()</code></a> to remove the pad from the collection +<a class="link" href="GstCollectPads.html#gst-collect-pads-remove-pad" title="gst_collect_pads_remove_pad ()"><code class="function">gst_collect_pads_remove_pad()</code></a> to remove the pad from the collection again. </p> <p> -You specify a size for the returned <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> structure +You specify a size for the returned <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> structure so that you can use it to store additional information. </p> <p> @@ -742,7 +738,7 @@ The pad will be automatically activated in push mode when <em class="parameter"> started. </p> <p> -This function calls <a class="link" href="GstCollectPads2.html#gst-collect-pads2-add-pad-full" title="gst_collect_pads2_add_pad_full ()"><code class="function">gst_collect_pads2_add_pad_full()</code></a> passing a value of NULL +This function calls <a class="link" href="GstCollectPads.html#gst-collect-pads-add-pad-full" title="gst_collect_pads_add_pad_full ()"><code class="function">gst_collect_pads_add_pad_full()</code></a> passing a value of NULL for destroy_notify and TRUE for locked. </p> <p> @@ -762,11 +758,11 @@ MT safe. </tr> <tr> <td><p><span class="term"><em class="parameter"><code>size</code></em> :</span></p></td> -<td>the size of the returned <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> structure</td> +<td>the size of the returned <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> structure</td> </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>a new <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> to identify the new pad. Or NULL +<td>a new <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> to identify the new pad. Or NULL if wrong parameters are supplied.</td> </tr> </tbody> @@ -775,25 +771,25 @@ if wrong parameters are supplied.</td> </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-add-pad-full"></a><h3>gst_collect_pads2_add_pad_full ()</h3> -<pre class="programlisting"><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="returnvalue">GstCollectData2</span></a> * gst_collect_pads2_add_pad_full (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>, +<a name="gst-collect-pads-add-pad-full"></a><h3>gst_collect_pads_add_pad_full ()</h3> +<pre class="programlisting"><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="returnvalue">GstCollectData</span></a> * gst_collect_pads_add_pad_full (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> size</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2DestroyNotify" title="GstCollectData2DestroyNotify ()"><span class="type">GstCollectData2DestroyNotify</span></a> destroy_notify</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectDataDestroyNotify" title="GstCollectDataDestroyNotify ()"><span class="type">GstCollectDataDestroyNotify</span></a> destroy_notify</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> lock</code></em>);</pre> <p> Add a pad to the collection of collect pads. The pad has to be a sinkpad. The refcount of the pad is incremented. Use -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-remove-pad" title="gst_collect_pads2_remove_pad ()"><code class="function">gst_collect_pads2_remove_pad()</code></a> to remove the pad from the collection +<a class="link" href="GstCollectPads.html#gst-collect-pads-remove-pad" title="gst_collect_pads_remove_pad ()"><code class="function">gst_collect_pads_remove_pad()</code></a> to remove the pad from the collection again. </p> <p> -You specify a size for the returned <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> structure +You specify a size for the returned <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> structure so that you can use it to store additional information. </p> <p> -You can also specify a <a class="link" href="GstCollectPads2.html#GstCollectData2DestroyNotify" title="GstCollectData2DestroyNotify ()"><span class="type">GstCollectData2DestroyNotify</span></a> that will be called -just before the <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> structure is freed. It is passed the +You can also specify a <a class="link" href="GstCollectPads.html#GstCollectDataDestroyNotify" title="GstCollectDataDestroyNotify ()"><span class="type">GstCollectDataDestroyNotify</span></a> that will be called +just before the <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> structure is freed. It is passed the pointer to the structure and should free any custom memory and resources allocated for it. </p> @@ -827,11 +823,11 @@ MT safe. </tr> <tr> <td><p><span class="term"><em class="parameter"><code>size</code></em> :</span></p></td> -<td>the size of the returned <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> structure</td> +<td>the size of the returned <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> structure</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>destroy_notify</code></em> :</span></p></td> -<td>function to be called before the returned <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> +<td>function to be called before the returned <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> structure is freed</td> </tr> <tr> @@ -840,7 +836,7 @@ structure is freed</td> </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>a new <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> to identify the new pad. Or NULL +<td>a new <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> to identify the new pad. Or NULL if wrong parameters are supplied.</td> </tr> </tbody> @@ -849,13 +845,13 @@ if wrong parameters are supplied.</td> </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-remove-pad"></a><h3>gst_collect_pads2_remove_pad ()</h3> -<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gst_collect_pads2_remove_pad (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>);</pre> +<a name="gst-collect-pads-remove-pad"></a><h3>gst_collect_pads_remove_pad ()</h3> +<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gst_collect_pads_remove_pad (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>);</pre> <p> Remove a pad from the collection of collect pads. This function will also -free the <a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> and all the resources that were allocated with -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-add-pad" title="gst_collect_pads2_add_pad ()"><code class="function">gst_collect_pads2_add_pad()</code></a>. +free the <a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> and all the resources that were allocated with +<a class="link" href="GstCollectPads.html#gst-collect-pads-add-pad" title="gst_collect_pads_add_pad ()"><code class="function">gst_collect_pads_add_pad()</code></a>. </p> <p> The pad will be deactivated automatically when <em class="parameter"><code>pads</code></em> is stopped. @@ -886,10 +882,10 @@ MT safe. </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-start"></a><h3>gst_collect_pads2_start ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads2_start (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>);</pre> +<a name="gst-collect-pads-start"></a><h3>gst_collect_pads_start ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads_start (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>);</pre> <p> -Starts the processing of data in the collect_pads2. +Starts the processing of data in the collect_pads. </p> <p> MT safe. @@ -905,10 +901,10 @@ MT safe. </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-stop"></a><h3>gst_collect_pads2_stop ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads2_stop (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>);</pre> +<a name="gst-collect-pads-stop"></a><h3>gst_collect_pads_stop ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads_stop (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>);</pre> <p> -Stops the processing of data in the collect_pads2. this function +Stops the processing of data in the collect_pads. this function will also unblock any blocking operations. </p> <p> @@ -925,8 +921,8 @@ MT safe. </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-available"></a><h3>gst_collect_pads2_available ()</h3> -<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> gst_collect_pads2_available (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>);</pre> +<a name="gst-collect-pads-available"></a><h3>gst_collect_pads_available ()</h3> +<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> gst_collect_pads_available (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>);</pre> <p> Query how much bytes can be read from each queued buffer. This means that the result of this call is the maximum number of bytes that can @@ -957,9 +953,9 @@ returns 0 if a pad has no queued buffer.</td> </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-is-active"></a><h3>gst_collect_pads2_is_active ()</h3> -<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gst_collect_pads2_is_active (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>);</pre> +<a name="gst-collect-pads-is-active"></a><h3>gst_collect_pads_is_active ()</h3> +<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gst_collect_pads_is_active (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>);</pre> <p> Check if a pad is active. </p> @@ -991,11 +987,11 @@ MT safe. </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-collect"></a><h3>gst_collect_pads2_collect ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> gst_collect_pads2_collect (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>);</pre> +<a name="gst-collect-pads-collect"></a><h3>gst_collect_pads_collect ()</h3> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> gst_collect_pads_collect (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>);</pre> <p> Collect data on all pads. This function is usually called -from a <a href="../gstreamer-1.0/GstTask.html"><span class="type">GstTask</span></a> function in an element. +from a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstTask.html"><span class="type">GstTask</span></a> function in an element. </p> <p> This function is currently not implemented. @@ -1013,7 +1009,7 @@ MT safe. <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> -<a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a> of the operation.</td> +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a> of the operation.</td> </tr> </tbody> </table></div> @@ -1021,8 +1017,8 @@ MT safe. </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-collect-range"></a><h3>gst_collect_pads2_collect_range ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> gst_collect_pads2_collect_range (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, +<a name="gst-collect-pads-collect-range"></a><h3>gst_collect_pads_collect_range ()</h3> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> gst_collect_pads_collect_range (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, <em class="parameter"><code><span class="type">guint64</span> offset</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> length</code></em>);</pre> <p> @@ -1053,7 +1049,7 @@ MT safe. <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> <td> -<a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a> of the operation.</td> +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a> of the operation.</td> </tr> </tbody> </table></div> @@ -1061,9 +1057,9 @@ MT safe. </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-flush"></a><h3>gst_collect_pads2_flush ()</h3> -<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> gst_collect_pads2_flush (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>, +<a name="gst-collect-pads-flush"></a><h3>gst_collect_pads_flush ()</h3> +<pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> gst_collect_pads_flush (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> size</code></em>);</pre> <p> Flush <em class="parameter"><code>size</code></em> bytes from the pad <em class="parameter"><code>data</code></em>. @@ -1101,9 +1097,9 @@ is 0 if the pad was end-of-stream.</td> </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-peek"></a><h3>gst_collect_pads2_peek ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_collect_pads2_peek (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>);</pre> +<a name="gst-collect-pads-peek"></a><h3>gst_collect_pads_peek ()</h3> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_collect_pads_peek (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>);</pre> <p> Peek at the buffer currently queued in <em class="parameter"><code>data</code></em>. This function should be called with the <em class="parameter"><code>pads</code></em> STREAM_LOCK held, such as in the callback @@ -1134,9 +1130,9 @@ should unref the buffer after usage.</td> </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-pop"></a><h3>gst_collect_pads2_pop ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_collect_pads2_pop (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>);</pre> +<a name="gst-collect-pads-pop"></a><h3>gst_collect_pads_pop ()</h3> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_collect_pads_pop (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>);</pre> <p> Pop the buffer currently queued in <em class="parameter"><code>data</code></em>. This function should be called with the <em class="parameter"><code>pads</code></em> STREAM_LOCK held, such as in the callback @@ -1168,9 +1164,9 @@ queued. You should unref the buffer after usage. <span class="annotation">[<acro </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-read-buffer"></a><h3>gst_collect_pads2_read_buffer ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_collect_pads2_read_buffer (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>, +<a name="gst-collect-pads-read-buffer"></a><h3>gst_collect_pads_read_buffer ()</h3> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_collect_pads_read_buffer (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> size</code></em>);</pre> <p> Get a subbuffer of <em class="parameter"><code>size</code></em> bytes from the given pad <em class="parameter"><code>data</code></em>. @@ -1210,9 +1206,9 @@ Unref the buffer after use. <span class="annotation">[<acronym title="Free data </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-take-buffer"></a><h3>gst_collect_pads2_take_buffer ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_collect_pads2_take_buffer (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>, +<a name="gst-collect-pads-take-buffer"></a><h3>gst_collect_pads_take_buffer ()</h3> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_collect_pads_take_buffer (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> size</code></em>);</pre> <p> Get a subbuffer of <em class="parameter"><code>size</code></em> bytes from the given pad <em class="parameter"><code>data</code></em>. Flushes the amount @@ -1252,10 +1248,10 @@ Unref the buffer after use.</td> </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-set-buffer-function"></a><h3>gst_collect_pads2_set_buffer_function ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads2_set_buffer_function - (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectPads2BufferFunction" title="GstCollectPads2BufferFunction ()"><span class="type">GstCollectPads2BufferFunction</span></a> func</code></em>, +<a name="gst-collect-pads-set-buffer-function"></a><h3>gst_collect_pads_set_buffer_function ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads_set_buffer_function + (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectPadsBufferFunction" title="GstCollectPadsBufferFunction ()"><span class="type">GstCollectPadsBufferFunction</span></a> func</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre> <p> Set the callback function and user data that will be called with @@ -1286,10 +1282,10 @@ MT safe. </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-set-compare-function"></a><h3>gst_collect_pads2_set_compare_function ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads2_set_compare_function - (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectPads2CompareFunction" title="GstCollectPads2CompareFunction ()"><span class="type">GstCollectPads2CompareFunction</span></a> func</code></em>, +<a name="gst-collect-pads-set-compare-function"></a><h3>gst_collect_pads_set_compare_function ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads_set_compare_function + (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectPadsCompareFunction" title="GstCollectPadsCompareFunction ()"><span class="type">GstCollectPadsCompareFunction</span></a> func</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre> <p> Set the timestamp comparison function. @@ -1319,14 +1315,13 @@ MT safe. </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-set-event-function"></a><h3>gst_collect_pads2_set_event_function ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads2_set_event_function - (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectPads2EventFunction" title="GstCollectPads2EventFunction ()"><span class="type">GstCollectPads2EventFunction</span></a> func</code></em>, +<a name="gst-collect-pads-set-event-function"></a><h3>gst_collect_pads_set_event_function ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads_set_event_function (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectPadsEventFunction" title="GstCollectPadsEventFunction ()"><span class="type">GstCollectPadsEventFunction</span></a> func</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre> <p> -Set the event callback function and user data that will be called after -collectpads has processed and event originating from one of the collected +Set the event callback function and user data that will be called when +collectpads has received an event originating from one of the collected pads. If the event being processed is a serialized one, this callback is called with <em class="parameter"><code>pads</code></em> STREAM_LOCK held, otherwise not. As this lock should be held when calling a number of CollectPads functions, it should be acquired @@ -1356,9 +1351,9 @@ MT safe. </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-set-clip-function"></a><h3>gst_collect_pads2_set_clip_function ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads2_set_clip_function (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectPads2ClipFunction" title="GstCollectPads2ClipFunction ()"><span class="type">GstCollectPads2ClipFunction</span></a> clipfunc</code></em>, +<a name="gst-collect-pads-set-clip-function"></a><h3>gst_collect_pads_set_clip_function ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads_set_clip_function (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectPadsClipFunction" title="GstCollectPadsClipFunction ()"><span class="type">GstCollectPadsClipFunction</span></a> clipfunc</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre> <p> Install a clipping function that is called right after a buffer is received @@ -1386,8 +1381,8 @@ on a pad managed by <em class="parameter"><code>pads</code></em>. See <span clas </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-set-flushing"></a><h3>gst_collect_pads2_set_flushing ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads2_set_flushing (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, +<a name="gst-collect-pads-set-flushing"></a><h3>gst_collect_pads_set_flushing ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads_set_flushing (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> flushing</code></em>);</pre> <p> Change the flushing state of all the pads in the collection. No pad @@ -1416,9 +1411,9 @@ MT safe. </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-set-function"></a><h3>gst_collect_pads2_set_function ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads2_set_function (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectPads2Function" title="GstCollectPads2Function ()"><span class="type">GstCollectPads2Function</span></a> func</code></em>, +<a name="gst-collect-pads-set-function"></a><h3>gst_collect_pads_set_function ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads_set_function (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectPadsFunction" title="GstCollectPadsFunction ()"><span class="type">GstCollectPadsFunction</span></a> func</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data</code></em>);</pre> <p> CollectPads provides a default collection algorithm that will determine @@ -1428,7 +1423,7 @@ However, if circumstances are more complicated and/or more control is desired, this sets a callback that will be invoked instead when all the pads added to the collection have buffers queued. Evidently, this callback is not compatible with -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-buffer-function" title="gst_collect_pads2_set_buffer_function ()"><code class="function">gst_collect_pads2_set_buffer_function()</code></a> callback. +<a class="link" href="GstCollectPads.html#gst-collect-pads-set-buffer-function" title="gst_collect_pads_set_buffer_function ()"><code class="function">gst_collect_pads_set_buffer_function()</code></a> callback. If this callback is set, the former will be unset. </p> <p> @@ -1455,9 +1450,9 @@ MT safe. </div> <hr> <div class="refsect2"> -<a name="gst-collect-pads2-set-waiting"></a><h3>gst_collect_pads2_set_waiting ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads2_set_waiting (<em class="parameter"><code><a class="link" href="GstCollectPads2.html" title="GstCollectPads2"><span class="type">GstCollectPads2</span></a> *pads</code></em>, - <em class="parameter"><code><a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2"><span class="type">GstCollectData2</span></a> *data</code></em>, +<a name="gst-collect-pads-set-waiting"></a><h3>gst_collect_pads_set_waiting ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> gst_collect_pads_set_waiting (<em class="parameter"><code><a class="link" href="GstCollectPads.html" title="GstCollectPads"><span class="type">GstCollectPads</span></a> *pads</code></em>, + <em class="parameter"><code><a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData"><span class="type">GstCollectData</span></a> *data</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> waiting</code></em>);</pre> <p> Sets a pad to waiting or non-waiting mode, if at least this pad diff --git a/docs/libs/html/GstInterpolationControlSource.html b/docs/libs/html/GstInterpolationControlSource.html index b8244c9..2b865b6 100644 --- a/docs/libs/html/GstInterpolationControlSource.html +++ b/docs/libs/html/GstInterpolationControlSource.html @@ -46,7 +46,7 @@ struct <a class="link" href="GstInterpolationControlSource.html#GstInterpolationControlSource-struct" title="struct GstInterpolationControlSource">GstInterpolationControlSource</a>; enum <a class="link" href="GstInterpolationControlSource.html#GstInterpolationMode" title="enum GstInterpolationMode">GstInterpolationMode</a>; -<a href="../gstreamer-1.0/GstControlSource.html"><span class="returnvalue">GstControlSource</span></a> * <a class="link" href="GstInterpolationControlSource.html#gst-interpolation-control-source-new" title="gst_interpolation_control_source_new ()">gst_interpolation_control_source_new</a> +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html"><span class="returnvalue">GstControlSource</span></a> * <a class="link" href="GstInterpolationControlSource.html#gst-interpolation-control-source-new" title="gst_interpolation_control_source_new ()">gst_interpolation_control_source_new</a> (<em class="parameter"><code><span class="type">void</span></code></em>); </pre> </div> @@ -55,8 +55,8 @@ enum <a class="link" href="GstInterpolationControlSource.html#Gst <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstControlSource.html">GstControlSource</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html">GstControlSource</a> +----<a class="link" href="GstTimedValueControlSource.html" title="GstTimedValueControlSource">GstTimedValueControlSource</a> +----GstInterpolationControlSource </pre> @@ -70,7 +70,7 @@ enum <a class="link" href="GstInterpolationControlSource.html#Gst <div class="refsect1"> <a name="GstInterpolationControlSource.description"></a><h2>Description</h2> <p> -<a class="link" href="GstInterpolationControlSource.html" title="GstInterpolationControlSource"><span class="type">GstInterpolationControlSource</span></a> is a <a href="../gstreamer-1.0/GstControlSource.html"><span class="type">GstControlSource</span></a>, that interpolates values between user-given +<a class="link" href="GstInterpolationControlSource.html" title="GstInterpolationControlSource"><span class="type">GstInterpolationControlSource</span></a> is a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html"><span class="type">GstControlSource</span></a>, that interpolates values between user-given control points. It supports several interpolation modes and property types. </p> <p> @@ -88,7 +88,7 @@ All functions are MT-safe. <a name="GstInterpolationControlSource-struct"></a><h3>struct GstInterpolationControlSource</h3> <pre class="programlisting">struct GstInterpolationControlSource;</pre> <p> -The instance structure of <a href="../gstreamer-1.0/GstControlSource.html"><span class="type">GstControlSource</span></a>. +The instance structure of <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html"><span class="type">GstControlSource</span></a>. </p> </div> <hr> @@ -127,7 +127,7 @@ The various interpolation modes available. <hr> <div class="refsect2"> <a name="gst-interpolation-control-source-new"></a><h3>gst_interpolation_control_source_new ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstControlSource.html"><span class="returnvalue">GstControlSource</span></a> * gst_interpolation_control_source_new +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html"><span class="returnvalue">GstControlSource</span></a> * gst_interpolation_control_source_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> <p> This returns a new, unbound <a class="link" href="GstInterpolationControlSource.html" title="GstInterpolationControlSource"><span class="type">GstInterpolationControlSource</span></a>. diff --git a/docs/libs/html/GstLFOControlSource.html b/docs/libs/html/GstLFOControlSource.html index bf44a2d..143e430 100644 --- a/docs/libs/html/GstLFOControlSource.html +++ b/docs/libs/html/GstLFOControlSource.html @@ -46,7 +46,7 @@ struct <a class="link" href="GstLFOControlSource.html#GstLFOControlSource-struct" title="struct GstLFOControlSource">GstLFOControlSource</a>; enum <a class="link" href="GstLFOControlSource.html#GstLFOWaveform" title="enum GstLFOWaveform">GstLFOWaveform</a>; -<a href="../gstreamer-1.0/GstControlSource.html"><span class="returnvalue">GstControlSource</span></a> * <a class="link" href="GstLFOControlSource.html#gst-lfo-control-source-new" title="gst_lfo_control_source_new ()">gst_lfo_control_source_new</a> (<em class="parameter"><code><span class="type">void</span></code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html"><span class="returnvalue">GstControlSource</span></a> * <a class="link" href="GstLFOControlSource.html#gst-lfo-control-source-new" title="gst_lfo_control_source_new ()">gst_lfo_control_source_new</a> (<em class="parameter"><code><span class="type">void</span></code></em>); </pre> </div> <div class="refsect1"> @@ -54,8 +54,8 @@ enum <a class="link" href="GstLFOControlSource.html#GstLFOWavefor <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstControlSource.html">GstControlSource</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html">GstControlSource</a> +----GstLFOControlSource </pre> </div> @@ -72,7 +72,7 @@ enum <a class="link" href="GstLFOControlSource.html#GstLFOWavefor <div class="refsect1"> <a name="GstLFOControlSource.description"></a><h2>Description</h2> <p> -<a class="link" href="GstLFOControlSource.html" title="GstLFOControlSource"><span class="type">GstLFOControlSource</span></a> is a <a href="../gstreamer-1.0/GstControlSource.html"><span class="type">GstControlSource</span></a>, that provides several periodic waveforms +<a class="link" href="GstLFOControlSource.html" title="GstLFOControlSource"><span class="type">GstLFOControlSource</span></a> is a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html"><span class="type">GstControlSource</span></a>, that provides several periodic waveforms as control values. It supports all fundamental, numeric GValue types as property. </p> <p> @@ -90,7 +90,7 @@ All functions are MT-safe. <a name="GstLFOControlSource-struct"></a><h3>struct GstLFOControlSource</h3> <pre class="programlisting">struct GstLFOControlSource;</pre> <p> -The instance structure of <a href="../gstreamer-1.0/GstControlSource.html"><span class="type">GstControlSource</span></a>. +The instance structure of <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html"><span class="type">GstControlSource</span></a>. </p> </div> <hr> @@ -141,7 +141,7 @@ The various waveform modes available. <hr> <div class="refsect2"> <a name="gst-lfo-control-source-new"></a><h3>gst_lfo_control_source_new ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstControlSource.html"><span class="returnvalue">GstControlSource</span></a> * gst_lfo_control_source_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html"><span class="returnvalue">GstControlSource</span></a> * gst_lfo_control_source_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> <p> This returns a new, unbound <a class="link" href="GstLFOControlSource.html" title="GstLFOControlSource"><span class="type">GstLFOControlSource</span></a>. </p> diff --git a/docs/libs/html/GstNetClientClock.html b/docs/libs/html/GstNetClientClock.html index 0055651..e4f308f 100644 --- a/docs/libs/html/GstNetClientClock.html +++ b/docs/libs/html/GstNetClientClock.html @@ -46,10 +46,10 @@ #include <gst/net/gstnet.h> struct <a class="link" href="GstNetClientClock.html#GstNetClientClock-struct" title="struct GstNetClientClock">GstNetClientClock</a>; -<a href="../gstreamer-1.0/GstClock.html"><span class="returnvalue">GstClock</span></a> * <a class="link" href="GstNetClientClock.html#gst-net-client-clock-new" title="gst_net_client_clock_new ()">gst_net_client_clock_new</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>, +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html"><span class="returnvalue">GstClock</span></a> * <a class="link" href="GstNetClientClock.html#gst-net-client-clock-new" title="gst_net_client_clock_new ()">gst_net_client_clock_new</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *remote_address</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> remote_port</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> base_time</code></em>); + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> base_time</code></em>); </pre> </div> <div class="refsect1"> @@ -57,9 +57,9 @@ struct <a class="link" href="GstNetClientClock.html#GstNetClientClo <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstClock.html">GstClock</a> - +----<a href="../gstreamer-1.0/GstSystemClock.html">GstSystemClock</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html">GstClock</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstSystemClock.html">GstSystemClock</a> +----GstNetClientClock </pre> </div> @@ -73,7 +73,7 @@ struct <a class="link" href="GstNetClientClock.html#GstNetClientClo <div class="refsect1"> <a name="GstNetClientClock.description"></a><h2>Description</h2> <p> -This object implements a custom <a href="../gstreamer-1.0/GstClock.html"><span class="type">GstClock</span></a> that synchronizes its time +This object implements a custom <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html"><span class="type">GstClock</span></a> that synchronizes its time to a remote time provider such as <a class="link" href="GstNetTimeProvider.html" title="GstNetTimeProvider"><span class="type">GstNetTimeProvider</span></a>. </p> <p> @@ -86,12 +86,12 @@ This clock will poll the time provider and will update its calibration parameters based on the local and remote observations. </p> <p> -Various parameters of the clock can be configured with the parent <a href="../gstreamer-1.0/GstClock.html"><span class="type">GstClock</span></a> +Various parameters of the clock can be configured with the parent <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html"><span class="type">GstClock</span></a> "timeout", "window-size" and "window-threshold" object properties. </p> <p> -A <a class="link" href="GstNetClientClock.html" title="GstNetClientClock"><span class="type">GstNetClientClock</span></a> is typically set on a <a href="../gstreamer-1.0/GstPipeline.html"><span class="type">GstPipeline</span></a> with -<a href="../gstreamer-1.0/GstPipeline.html#gst-pipeline-use-clock"><code class="function">gst_pipeline_use_clock()</code></a>. +A <a class="link" href="GstNetClientClock.html" title="GstNetClientClock"><span class="type">GstNetClientClock</span></a> is typically set on a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPipeline.html"><span class="type">GstPipeline</span></a> with +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPipeline.html#gst-pipeline-use-clock"><code class="function">gst_pipeline_use_clock()</code></a>. </p> <p> Last reviewed on 2005-11-23 (0.9.5) @@ -109,10 +109,10 @@ Opaque <a class="link" href="GstNetClientClock.html" title="GstNetClientClock">< <hr> <div class="refsect2"> <a name="gst-net-client-clock-new"></a><h3>gst_net_client_clock_new ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstClock.html"><span class="returnvalue">GstClock</span></a> * gst_net_client_clock_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>, +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html"><span class="returnvalue">GstClock</span></a> * gst_net_client_clock_new (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *remote_address</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> remote_port</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> base_time</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> base_time</code></em>);</pre> <p> Create a new <a class="link" href="GstNetClientClock.html" title="GstNetClientClock"><span class="type">GstNetClientClock</span></a> that will report the time provided by the <a class="link" href="GstNetTimeProvider.html" title="GstNetTimeProvider"><span class="type">GstNetTimeProvider</span></a> on <em class="parameter"><code>remote_address</code></em> and @@ -139,7 +139,7 @@ provided by the <a class="link" href="GstNetTimeProvider.html" title="GstNetTime </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>a new <a href="../gstreamer-1.0/GstClock.html"><span class="type">GstClock</span></a> that receives a time from the remote +<td>a new <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html"><span class="type">GstClock</span></a> that receives a time from the remote clock.</td> </tr> </tbody> @@ -165,7 +165,7 @@ clock.</td> </div> <div class="refsect1"> <a name="GstNetClientClock.see-also"></a><h2>See Also</h2> -<a href="../gstreamer-1.0/GstClock.html"><span class="type">GstClock</span></a>, <a class="link" href="GstNetTimeProvider.html" title="GstNetTimeProvider"><span class="type">GstNetTimeProvider</span></a>, <a href="../gstreamer-1.0/GstPipeline.html"><span class="type">GstPipeline</span></a> +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html"><span class="type">GstClock</span></a>, <a class="link" href="GstNetTimeProvider.html" title="GstNetTimeProvider"><span class="type">GstNetTimeProvider</span></a>, <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPipeline.html"><span class="type">GstPipeline</span></a> </div> </div> <div class="footer"> diff --git a/docs/libs/html/GstNetTimeProvider.html b/docs/libs/html/GstNetTimeProvider.html index 9c11fbc..33f4f99 100644 --- a/docs/libs/html/GstNetTimeProvider.html +++ b/docs/libs/html/GstNetTimeProvider.html @@ -46,7 +46,7 @@ #include <gst/net/gstnet.h> struct <a class="link" href="GstNetTimeProvider.html#GstNetTimeProvider-struct" title="struct GstNetTimeProvider">GstNetTimeProvider</a>; -<a class="link" href="GstNetTimeProvider.html" title="GstNetTimeProvider"><span class="returnvalue">GstNetTimeProvider</span></a> * <a class="link" href="GstNetTimeProvider.html#gst-net-time-provider-new" title="gst_net_time_provider_new ()">gst_net_time_provider_new</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html"><span class="type">GstClock</span></a> *clock</code></em>, +<a class="link" href="GstNetTimeProvider.html" title="GstNetTimeProvider"><span class="returnvalue">GstNetTimeProvider</span></a> * <a class="link" href="GstNetTimeProvider.html#gst-net-time-provider-new" title="gst_net_time_provider_new ()">gst_net_time_provider_new</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html"><span class="type">GstClock</span></a> *clock</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *address</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> port</code></em>); </pre> @@ -56,7 +56,7 @@ struct <a class="link" href="GstNetTimeProvider.html#GstNetTimeProv <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> +----GstNetTimeProvider </pre> </div> @@ -65,25 +65,25 @@ struct <a class="link" href="GstNetTimeProvider.html#GstNetTimeProv <pre class="synopsis"> "<a class="link" href="GstNetTimeProvider.html#GstNetTimeProvider--active" title='The "active" property'>active</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write "<a class="link" href="GstNetTimeProvider.html#GstNetTimeProvider--address" title='The "address" property'>address</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a>* : Read / Write - "<a class="link" href="GstNetTimeProvider.html#GstNetTimeProvider--clock" title='The "clock" property'>clock</a>" <a href="../gstreamer-1.0/GstClock.html"><span class="type">GstClock</span></a>* : Read / Write + "<a class="link" href="GstNetTimeProvider.html#GstNetTimeProvider--clock" title='The "clock" property'>clock</a>" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html"><span class="type">GstClock</span></a>* : Read / Write "<a class="link" href="GstNetTimeProvider.html#GstNetTimeProvider--port" title='The "port" property'>port</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> : Read / Write </pre> </div> <div class="refsect1"> <a name="GstNetTimeProvider.description"></a><h2>Description</h2> <p> -This object exposes the time of a <a href="../gstreamer-1.0/GstClock.html"><span class="type">GstClock</span></a> on the network. +This object exposes the time of a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html"><span class="type">GstClock</span></a> on the network. </p> <p> A <a class="link" href="GstNetTimeProvider.html" title="GstNetTimeProvider"><span class="type">GstNetTimeProvider</span></a> is created with <a class="link" href="GstNetTimeProvider.html#gst-net-time-provider-new" title="gst_net_time_provider_new ()"><code class="function">gst_net_time_provider_new()</code></a> which -takes a <a href="../gstreamer-1.0/GstClock.html"><span class="type">GstClock</span></a>, an address and a port number as arguments. +takes a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html"><span class="type">GstClock</span></a>, an address and a port number as arguments. </p> <p> After creating the object, a client clock such as <a class="link" href="GstNetClientClock.html" title="GstNetClientClock"><span class="type">GstNetClientClock</span></a> can query the exposed clock over the network for its values. </p> <p> -The <a class="link" href="GstNetTimeProvider.html" title="GstNetTimeProvider"><span class="type">GstNetTimeProvider</span></a> typically wraps the clock used by a <a href="../gstreamer-1.0/GstPipeline.html"><span class="type">GstPipeline</span></a>. +The <a class="link" href="GstNetTimeProvider.html" title="GstNetTimeProvider"><span class="type">GstNetTimeProvider</span></a> typically wraps the clock used by a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPipeline.html"><span class="type">GstPipeline</span></a>. </p> <p> Last reviewed on 2005-11-23 (0.9.5) @@ -101,7 +101,7 @@ Opaque <a class="link" href="GstNetTimeProvider.html" title="GstNetTimeProvider" <hr> <div class="refsect2"> <a name="gst-net-time-provider-new"></a><h3>gst_net_time_provider_new ()</h3> -<pre class="programlisting"><a class="link" href="GstNetTimeProvider.html" title="GstNetTimeProvider"><span class="returnvalue">GstNetTimeProvider</span></a> * gst_net_time_provider_new (<em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html"><span class="type">GstClock</span></a> *clock</code></em>, +<pre class="programlisting"><a class="link" href="GstNetTimeProvider.html" title="GstNetTimeProvider"><span class="returnvalue">GstNetTimeProvider</span></a> * gst_net_time_provider_new (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html"><span class="type">GstClock</span></a> *clock</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *address</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> port</code></em>);</pre> <p> @@ -112,7 +112,7 @@ Allows network clients to get the current time of <em class="parameter"><code>cl <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>clock</code></em> :</span></p></td> -<td>a <a href="../gstreamer-1.0/GstClock.html"><span class="type">GstClock</span></a> to export over the network</td> +<td>a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html"><span class="type">GstClock</span></a> to export over the network</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td> @@ -149,7 +149,7 @@ to bind to all addresses</td> <hr> <div class="refsect2"> <a name="GstNetTimeProvider--clock"></a><h3>The <code class="literal">"clock"</code> property</h3> -<pre class="programlisting"> "clock" <a href="../gstreamer-1.0/GstClock.html"><span class="type">GstClock</span></a>* : Read / Write</pre> +<pre class="programlisting"> "clock" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html"><span class="type">GstClock</span></a>* : Read / Write</pre> <p>The clock to export over the network.</p> </div> <hr> @@ -163,7 +163,7 @@ to bind to all addresses</td> </div> <div class="refsect1"> <a name="GstNetTimeProvider.see-also"></a><h2>See Also</h2> -<a href="../gstreamer-1.0/GstClock.html"><span class="type">GstClock</span></a>, <a class="link" href="GstNetClientClock.html" title="GstNetClientClock"><span class="type">GstNetClientClock</span></a>, <a href="../gstreamer-1.0/GstPipeline.html"><span class="type">GstPipeline</span></a> +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html"><span class="type">GstClock</span></a>, <a class="link" href="GstNetClientClock.html" title="GstNetClientClock"><span class="type">GstNetClientClock</span></a>, <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPipeline.html"><span class="type">GstPipeline</span></a> </div> </div> <div class="footer"> diff --git a/docs/libs/html/GstPushSrc.html b/docs/libs/html/GstPushSrc.html index 05c2c43..d6b1e3d 100644 --- a/docs/libs/html/GstPushSrc.html +++ b/docs/libs/html/GstPushSrc.html @@ -50,8 +50,8 @@ struct <a class="link" href="GstPushSrc.html#GstPushSrc-struct" tit <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> +----<a class="link" href="GstBaseSrc.html" title="GstBaseSrc">GstBaseSrc</a> +----GstPushSrc </pre> diff --git a/docs/libs/html/GstTimedValueControlSource.html b/docs/libs/html/GstTimedValueControlSource.html index b81d608..832f03f 100644 --- a/docs/libs/html/GstTimedValueControlSource.html +++ b/docs/libs/html/GstTimedValueControlSource.html @@ -45,9 +45,9 @@ struct <a class="link" href="GstTimedValueControlSource.html#GstTimedValueControlSource-struct" title="struct GstTimedValueControlSource">GstTimedValueControlSource</a>; <a href="http://library.gnome.org/devel/glib/unstable/glib-Sequences.html#GSequenceIter"><span class="returnvalue">GSequenceIter</span></a> * <a class="link" href="GstTimedValueControlSource.html#gst-timed-value-control-source-find-control-point-iter" title="gst_timed_value_control_source_find_control_point_iter ()">gst_timed_value_control_source_find_control_point_iter</a> (<em class="parameter"><code><a class="link" href="GstTimedValueControlSource.html" title="GstTimedValueControlSource"><span class="type">GstTimedValueControlSource</span></a> *self</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>); + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstTimedValueControlSource.html#gst-timed-value-control-source-set" title="gst_timed_value_control_source_set ()">gst_timed_value_control_source_set</a> (<em class="parameter"><code><a class="link" href="GstTimedValueControlSource.html" title="GstTimedValueControlSource"><span class="type">GstTimedValueControlSource</span></a> *self</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> value</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstTimedValueControlSource.html#gst-timed-value-control-source-set-from-list" title="gst_timed_value_control_source_set_from_list ()">gst_timed_value_control_source_set_from_list</a> (<em class="parameter"><code><a class="link" href="GstTimedValueControlSource.html" title="GstTimedValueControlSource"><span class="type">GstTimedValueControlSource</span></a> *self</code></em>, @@ -56,7 +56,7 @@ struct <a class="link" href="GstTimedValueControlSource.html#GstTim (<em class="parameter"><code><a class="link" href="GstTimedValueControlSource.html" title="GstTimedValueControlSource"><span class="type">GstTimedValueControlSource</span></a> *self</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="GstTimedValueControlSource.html#gst-timed-value-control-source-unset" title="gst_timed_value_control_source_unset ()">gst_timed_value_control_source_unset</a> (<em class="parameter"><code><a class="link" href="GstTimedValueControlSource.html" title="GstTimedValueControlSource"><span class="type">GstTimedValueControlSource</span></a> *self</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>); + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>); <span class="returnvalue">void</span> <a class="link" href="GstTimedValueControlSource.html#gst-timed-value-control-source-unset-all" title="gst_timed_value_control_source_unset_all ()">gst_timed_value_control_source_unset_all</a> (<em class="parameter"><code><a class="link" href="GstTimedValueControlSource.html" title="GstTimedValueControlSource"><span class="type">GstTimedValueControlSource</span></a> *self</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a> <a class="link" href="GstTimedValueControlSource.html#gst-timed-value-control-source-get-count" title="gst_timed_value_control_source_get_count ()">gst_timed_value_control_source_get_count</a> @@ -70,8 +70,8 @@ struct <a class="link" href="GstTimedValueControlSource.html#GstTim <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstControlSource.html">GstControlSource</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html">GstControlSource</a> +----GstTimedValueControlSource +----<a class="link" href="GstInterpolationControlSource.html" title="GstInterpolationControlSource">GstInterpolationControlSource</a> +----<a class="link" href="GstTriggerControlSource.html" title="GstTriggerControlSource">GstTriggerControlSource</a> @@ -96,7 +96,7 @@ All functions are MT-safe. <a name="GstTimedValueControlSource-struct"></a><h3>struct GstTimedValueControlSource</h3> <pre class="programlisting">struct GstTimedValueControlSource;</pre> <p> -The instance structure of <a href="../gstreamer-1.0/GstControlSource.html"><span class="type">GstControlSource</span></a>. +The instance structure of <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html"><span class="type">GstControlSource</span></a>. </p> </div> <hr> @@ -104,7 +104,7 @@ The instance structure of <a href="../gstreamer-1.0/GstControlSource.html"><span <a name="gst-timed-value-control-source-find-control-point-iter"></a><h3>gst_timed_value_control_source_find_control_point_iter ()</h3> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Sequences.html#GSequenceIter"><span class="returnvalue">GSequenceIter</span></a> * gst_timed_value_control_source_find_control_point_iter (<em class="parameter"><code><a class="link" href="GstTimedValueControlSource.html" title="GstTimedValueControlSource"><span class="type">GstTimedValueControlSource</span></a> *self</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>);</pre> <p> Find last value before given timestamp in control point list. If all values in the control point list come after the given @@ -136,7 +136,7 @@ For use in control source implementations. <div class="refsect2"> <a name="gst-timed-value-control-source-set"></a><h3>gst_timed_value_control_source_set ()</h3> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gst_timed_value_control_source_set (<em class="parameter"><code><a class="link" href="GstTimedValueControlSource.html" title="GstTimedValueControlSource"><span class="type">GstTimedValueControlSource</span></a> *self</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gdouble"><span class="type">gdouble</span></a> value</code></em>);</pre> <p> Set the value of given controller-handled property at a certain time. @@ -182,7 +182,7 @@ Sets multiple timed values at once. <tr> <td><p><span class="term"><em class="parameter"><code>timedvalues</code></em> :</span></p></td> <td>a list -with <a href="../gstreamer-1.0/GstControlSource.html#GstTimedValue"><span class="type">GstTimedValue</span></a> items. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> GstController.TimedValue]</span> +with <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html#GstTimedValue"><span class="type">GstTimedValue</span></a> items. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>][<acronym title="Generics and defining elements of containers and arrays."><span class="acronym">element-type</span></acronym> GstController.TimedValue]</span> </td> </tr> <tr> @@ -198,7 +198,7 @@ with <a href="../gstreamer-1.0/GstControlSource.html#GstTimedValue"><span class= <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="returnvalue">GList</span></a> * gst_timed_value_control_source_get_all (<em class="parameter"><code><a class="link" href="GstTimedValueControlSource.html" title="GstTimedValueControlSource"><span class="type">GstTimedValueControlSource</span></a> *self</code></em>);</pre> <p> -Returns a read-only copy of the list of <a href="../gstreamer-1.0/GstControlSource.html#GstTimedValue"><span class="type">GstTimedValue</span></a> for the given property. +Returns a read-only copy of the list of <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html#GstTimedValue"><span class="type">GstTimedValue</span></a> for the given property. Free the list after done with it. </p> <div class="variablelist"><table border="0"> @@ -222,7 +222,7 @@ of the list, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Stand <a name="gst-timed-value-control-source-unset"></a><h3>gst_timed_value_control_source_unset ()</h3> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gst_timed_value_control_source_unset (<em class="parameter"><code><a class="link" href="GstTimedValueControlSource.html" title="GstTimedValueControlSource"><span class="type">GstTimedValueControlSource</span></a> *self</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> timestamp</code></em>);</pre> <p> Used to remove the value of given controller-handled property at a certain time. diff --git a/docs/libs/html/GstTriggerControlSource.html b/docs/libs/html/GstTriggerControlSource.html index b4a91d0..86e4975 100644 --- a/docs/libs/html/GstTriggerControlSource.html +++ b/docs/libs/html/GstTriggerControlSource.html @@ -45,7 +45,7 @@ #include <libs/controller/gsttriggercontrolsource.h> struct <a class="link" href="GstTriggerControlSource.html#GstTriggerControlSource-struct" title="struct GstTriggerControlSource">GstTriggerControlSource</a>; -<a href="../gstreamer-1.0/GstControlSource.html"><span class="returnvalue">GstControlSource</span></a> * <a class="link" href="GstTriggerControlSource.html#gst-trigger-control-source-new" title="gst_trigger_control_source_new ()">gst_trigger_control_source_new</a> (<em class="parameter"><code><span class="type">void</span></code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html"><span class="returnvalue">GstControlSource</span></a> * <a class="link" href="GstTriggerControlSource.html#gst-trigger-control-source-new" title="gst_trigger_control_source_new ()">gst_trigger_control_source_new</a> (<em class="parameter"><code><span class="type">void</span></code></em>); </pre> </div> <div class="refsect1"> @@ -53,8 +53,8 @@ struct <a class="link" href="GstTriggerControlSource.html#GstTrigge <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstControlSource.html">GstControlSource</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html">GstControlSource</a> +----<a class="link" href="GstTimedValueControlSource.html" title="GstTimedValueControlSource">GstTimedValueControlSource</a> +----GstTriggerControlSource </pre> @@ -68,7 +68,7 @@ struct <a class="link" href="GstTriggerControlSource.html#GstTrigge <div class="refsect1"> <a name="GstTriggerControlSource.description"></a><h2>Description</h2> <p> -<a class="link" href="GstTriggerControlSource.html" title="GstTriggerControlSource"><span class="type">GstTriggerControlSource</span></a> is a <a href="../gstreamer-1.0/GstControlSource.html"><span class="type">GstControlSource</span></a>, that returns values from user-given +<a class="link" href="GstTriggerControlSource.html" title="GstTriggerControlSource"><span class="type">GstTriggerControlSource</span></a> is a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html"><span class="type">GstControlSource</span></a>, that returns values from user-given control points. It allows for a tolerance on the time-stamps. </p> <p> @@ -86,13 +86,13 @@ All functions are MT-safe. <a name="GstTriggerControlSource-struct"></a><h3>struct GstTriggerControlSource</h3> <pre class="programlisting">struct GstTriggerControlSource;</pre> <p> -The instance structure of <a href="../gstreamer-1.0/GstControlSource.html"><span class="type">GstControlSource</span></a>. +The instance structure of <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html"><span class="type">GstControlSource</span></a>. </p> </div> <hr> <div class="refsect2"> <a name="gst-trigger-control-source-new"></a><h3>gst_trigger_control_source_new ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstControlSource.html"><span class="returnvalue">GstControlSource</span></a> * gst_trigger_control_source_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html"><span class="returnvalue">GstControlSource</span></a> * gst_trigger_control_source_new (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> <p> This returns a new, unbound <a class="link" href="GstTriggerControlSource.html" title="GstTriggerControlSource"><span class="type">GstTriggerControlSource</span></a>. </p> diff --git a/docs/libs/html/api-index-full.html b/docs/libs/html/api-index-full.html index d1add83..32dc764 100644 --- a/docs/libs/html/api-index-full.html +++ b/docs/libs/html/api-index-full.html @@ -49,7 +49,7 @@ <a name="api-index-full"></a>API Index</h2></div></div></div> <a name="idx"></a><a name="idxA"></a><h3 class="title">A</h3> <dt> -<a class="link" href="GstAdapter.html#GstAdapter-struct" title="struct GstAdapter">GstAdapter</a>, struct in <a class="link" href="GstAdapter.html" title="GstAdapter">GstAdapter</a> +<a class="link" href="GstAdapter.html#GstAdapter-struct" title="GstAdapter">GstAdapter</a>, struct in <a class="link" href="GstAdapter.html" title="GstAdapter">GstAdapter</a> </dt> <dd></dd> <dt> @@ -1543,155 +1543,155 @@ </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GstCollectData2" title="struct GstCollectData2">GstCollectData2</a>, struct in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GstCollectData" title="struct GstCollectData">GstCollectData</a>, struct in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GstCollectData2DestroyNotify" title="GstCollectData2DestroyNotify ()">GstCollectData2DestroyNotify</a>, user_function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GstCollectDataDestroyNotify" title="GstCollectDataDestroyNotify ()">GstCollectDataDestroyNotify</a>, user_function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GstCollectPads2-struct" title="struct GstCollectPads2">GstCollectPads2</a>, struct in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GstCollectPads-struct" title="struct GstCollectPads">GstCollectPads</a>, struct in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GstCollectPads2BufferFunction" title="GstCollectPads2BufferFunction ()">GstCollectPads2BufferFunction</a>, user_function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GstCollectPadsBufferFunction" title="GstCollectPadsBufferFunction ()">GstCollectPadsBufferFunction</a>, user_function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GstCollectPads2ClipFunction" title="GstCollectPads2ClipFunction ()">GstCollectPads2ClipFunction</a>, user_function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GstCollectPadsClipFunction" title="GstCollectPadsClipFunction ()">GstCollectPadsClipFunction</a>, user_function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GstCollectPads2CompareFunction" title="GstCollectPads2CompareFunction ()">GstCollectPads2CompareFunction</a>, user_function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GstCollectPadsCompareFunction" title="GstCollectPadsCompareFunction ()">GstCollectPadsCompareFunction</a>, user_function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GstCollectPads2EventFunction" title="GstCollectPads2EventFunction ()">GstCollectPads2EventFunction</a>, user_function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GstCollectPadsEventFunction" title="GstCollectPadsEventFunction ()">GstCollectPadsEventFunction</a>, user_function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GstCollectPads2Function" title="GstCollectPads2Function ()">GstCollectPads2Function</a>, user_function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GstCollectPadsFunction" title="GstCollectPadsFunction ()">GstCollectPadsFunction</a>, user_function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GstCollectPads2StateFlags" title="enum GstCollectPads2StateFlags">GstCollectPads2StateFlags</a>, enum in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GstCollectPadsStateFlags" title="enum GstCollectPadsStateFlags">GstCollectPadsStateFlags</a>, enum in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-add-pad" title="gst_collect_pads2_add_pad ()">gst_collect_pads2_add_pad</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-add-pad" title="gst_collect_pads_add_pad ()">gst_collect_pads_add_pad</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-add-pad-full" title="gst_collect_pads2_add_pad_full ()">gst_collect_pads2_add_pad_full</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-add-pad-full" title="gst_collect_pads_add_pad_full ()">gst_collect_pads_add_pad_full</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-available" title="gst_collect_pads2_available ()">gst_collect_pads2_available</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-available" title="gst_collect_pads_available ()">gst_collect_pads_available</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-collect" title="gst_collect_pads2_collect ()">gst_collect_pads2_collect</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-collect" title="gst_collect_pads_collect ()">gst_collect_pads_collect</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-collect-range" title="gst_collect_pads2_collect_range ()">gst_collect_pads2_collect_range</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-collect-range" title="gst_collect_pads_collect_range ()">gst_collect_pads_collect_range</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-flush" title="gst_collect_pads2_flush ()">gst_collect_pads2_flush</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-flush" title="gst_collect_pads_flush ()">gst_collect_pads_flush</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GST-COLLECT-PADS2-GET-STREAM-LOCK:CAPS" title="GST_COLLECT_PADS2_GET_STREAM_LOCK()">GST_COLLECT_PADS2_GET_STREAM_LOCK</a>, macro in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GST-COLLECT-PADS-GET-STREAM-LOCK:CAPS" title="GST_COLLECT_PADS_GET_STREAM_LOCK()">GST_COLLECT_PADS_GET_STREAM_LOCK</a>, macro in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-is-active" title="gst_collect_pads2_is_active ()">gst_collect_pads2_is_active</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-is-active" title="gst_collect_pads_is_active ()">gst_collect_pads_is_active</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-new" title="gst_collect_pads2_new ()">gst_collect_pads2_new</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-new" title="gst_collect_pads_new ()">gst_collect_pads_new</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-peek" title="gst_collect_pads2_peek ()">gst_collect_pads2_peek</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-peek" title="gst_collect_pads_peek ()">gst_collect_pads_peek</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-pop" title="gst_collect_pads2_pop ()">gst_collect_pads2_pop</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-pop" title="gst_collect_pads_pop ()">gst_collect_pads_pop</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-read-buffer" title="gst_collect_pads2_read_buffer ()">gst_collect_pads2_read_buffer</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-read-buffer" title="gst_collect_pads_read_buffer ()">gst_collect_pads_read_buffer</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-remove-pad" title="gst_collect_pads2_remove_pad ()">gst_collect_pads2_remove_pad</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-remove-pad" title="gst_collect_pads_remove_pad ()">gst_collect_pads_remove_pad</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-buffer-function" title="gst_collect_pads2_set_buffer_function ()">gst_collect_pads2_set_buffer_function</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-set-buffer-function" title="gst_collect_pads_set_buffer_function ()">gst_collect_pads_set_buffer_function</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-clip-function" title="gst_collect_pads2_set_clip_function ()">gst_collect_pads2_set_clip_function</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-set-clip-function" title="gst_collect_pads_set_clip_function ()">gst_collect_pads_set_clip_function</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-compare-function" title="gst_collect_pads2_set_compare_function ()">gst_collect_pads2_set_compare_function</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-set-compare-function" title="gst_collect_pads_set_compare_function ()">gst_collect_pads_set_compare_function</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-event-function" title="gst_collect_pads2_set_event_function ()">gst_collect_pads2_set_event_function</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-set-event-function" title="gst_collect_pads_set_event_function ()">gst_collect_pads_set_event_function</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-flushing" title="gst_collect_pads2_set_flushing ()">gst_collect_pads2_set_flushing</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-set-flushing" title="gst_collect_pads_set_flushing ()">gst_collect_pads_set_flushing</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-function" title="gst_collect_pads2_set_function ()">gst_collect_pads2_set_function</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-set-function" title="gst_collect_pads_set_function ()">gst_collect_pads_set_function</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-set-waiting" title="gst_collect_pads2_set_waiting ()">gst_collect_pads2_set_waiting</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-set-waiting" title="gst_collect_pads_set_waiting ()">gst_collect_pads_set_waiting</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-start" title="gst_collect_pads2_start ()">gst_collect_pads2_start</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-start" title="gst_collect_pads_start ()">gst_collect_pads_start</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GST-COLLECT-PADS2-STATE:CAPS" title="GST_COLLECT_PADS2_STATE()">GST_COLLECT_PADS2_STATE</a>, macro in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GST-COLLECT-PADS-STATE:CAPS" title="GST_COLLECT_PADS_STATE()">GST_COLLECT_PADS_STATE</a>, macro in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GST-COLLECT-PADS2-STATE-IS-SET:CAPS" title="GST_COLLECT_PADS2_STATE_IS_SET()">GST_COLLECT_PADS2_STATE_IS_SET</a>, macro in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GST-COLLECT-PADS-STATE-IS-SET:CAPS" title="GST_COLLECT_PADS_STATE_IS_SET()">GST_COLLECT_PADS_STATE_IS_SET</a>, macro in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GST-COLLECT-PADS2-STATE-SET:CAPS" title="GST_COLLECT_PADS2_STATE_SET()">GST_COLLECT_PADS2_STATE_SET</a>, macro in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GST-COLLECT-PADS-STATE-SET:CAPS" title="GST_COLLECT_PADS_STATE_SET()">GST_COLLECT_PADS_STATE_SET</a>, macro in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GST-COLLECT-PADS2-STATE-UNSET:CAPS" title="GST_COLLECT_PADS2_STATE_UNSET()">GST_COLLECT_PADS2_STATE_UNSET</a>, macro in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GST-COLLECT-PADS-STATE-UNSET:CAPS" title="GST_COLLECT_PADS_STATE_UNSET()">GST_COLLECT_PADS_STATE_UNSET</a>, macro in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-stop" title="gst_collect_pads2_stop ()">gst_collect_pads2_stop</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-stop" title="gst_collect_pads_stop ()">gst_collect_pads_stop</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GST-COLLECT-PADS2-STREAM-LOCK:CAPS" title="GST_COLLECT_PADS2_STREAM_LOCK()">GST_COLLECT_PADS2_STREAM_LOCK</a>, macro in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GST-COLLECT-PADS-STREAM-LOCK:CAPS" title="GST_COLLECT_PADS_STREAM_LOCK()">GST_COLLECT_PADS_STREAM_LOCK</a>, macro in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#GST-COLLECT-PADS2-STREAM-UNLOCK:CAPS" title="GST_COLLECT_PADS2_STREAM_UNLOCK()">GST_COLLECT_PADS2_STREAM_UNLOCK</a>, macro in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#GST-COLLECT-PADS-STREAM-UNLOCK:CAPS" title="GST_COLLECT_PADS_STREAM_UNLOCK()">GST_COLLECT_PADS_STREAM_UNLOCK</a>, macro in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> -<a class="link" href="GstCollectPads2.html#gst-collect-pads2-take-buffer" title="gst_collect_pads2_take_buffer ()">gst_collect_pads2_take_buffer</a>, function in <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> +<a class="link" href="GstCollectPads.html#gst-collect-pads-take-buffer" title="gst_collect_pads_take_buffer ()">gst_collect_pads_take_buffer</a>, function in <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> </dt> <dd></dd> <dt> diff --git a/docs/libs/html/gstreamer-base.html b/docs/libs/html/gstreamer-base.html index bb86f2a..0738a4c 100644 --- a/docs/libs/html/gstreamer-base.html +++ b/docs/libs/html/gstreamer-base.html @@ -53,7 +53,7 @@ types to a memory buffer and allows reading</span> </dt> <dt> -<span class="refentrytitle"><a href="GstCollectPads2.html">GstCollectPads2</a></span><span class="refpurpose"> — manages a set of pads that operate in collect mode</span> +<span class="refentrytitle"><a href="GstCollectPads.html">GstCollectPads</a></span><span class="refpurpose"> — manages a set of pads that operate in collect mode</span> </dt> <dt> <span class="refentrytitle"><a href="gstreamer-libs-GstTypeFindHelper.html">GstTypeFindHelper</a></span><span class="refpurpose"> — Utility functions for typefinding</span> diff --git a/docs/libs/html/gstreamer-hierarchy.html b/docs/libs/html/gstreamer-hierarchy.html index 0304992..144cbbe 100644 --- a/docs/libs/html/gstreamer-hierarchy.html +++ b/docs/libs/html/gstreamer-hierarchy.html @@ -25,21 +25,21 @@ <pre class="screen"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - <a href="../gstreamer-1.0/GstObject.html">GstObject</a> - <a href="../gstreamer-1.0/GstElement.html">GstElement</a> + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> <a class="link" href="GstBaseSrc.html" title="GstBaseSrc">GstBaseSrc</a> <a class="link" href="GstPushSrc.html" title="GstPushSrc">GstPushSrc</a> <a class="link" href="GstBaseSink.html" title="GstBaseSink">GstBaseSink</a> <a class="link" href="GstBaseTransform.html" title="GstBaseTransform">GstBaseTransform</a> - <a href="../gstreamer-1.0/GstClock.html">GstClock</a> - <a href="../gstreamer-1.0/GstSystemClock.html">GstSystemClock</a> + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html">GstClock</a> + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstSystemClock.html">GstSystemClock</a> <a class="link" href="GstNetClientClock.html" title="GstNetClientClock">GstNetClientClock</a> - <a href="../gstreamer-1.0/GstControlSource.html">GstControlSource</a> + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstControlSource.html">GstControlSource</a> <a class="link" href="GstTimedValueControlSource.html" title="GstTimedValueControlSource">GstTimedValueControlSource</a> <a class="link" href="GstInterpolationControlSource.html" title="GstInterpolationControlSource">GstInterpolationControlSource</a> <a class="link" href="GstTriggerControlSource.html" title="GstTriggerControlSource">GstTriggerControlSource</a> <a class="link" href="GstLFOControlSource.html" title="GstLFOControlSource">GstLFOControlSource</a> - <a class="link" href="GstCollectPads2.html" title="GstCollectPads2">GstCollectPads2</a> + <a class="link" href="GstCollectPads.html" title="GstCollectPads">GstCollectPads</a> <a class="link" href="GstNetTimeProvider.html" title="GstNetTimeProvider">GstNetTimeProvider</a> <a class="link" href="GstAdapter.html" title="GstAdapter">GstAdapter</a> </pre> diff --git a/docs/libs/html/gstreamer-libs-GstBaseParse.html b/docs/libs/html/gstreamer-libs-GstBaseParse.html index 606e661..c7c3d93 100644 --- a/docs/libs/html/gstreamer-libs-GstBaseParse.html +++ b/docs/libs/html/gstreamer-libs-GstBaseParse.html @@ -43,7 +43,7 @@ struct <a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" title="struct GstBaseParse">GstBaseParse</a>; struct <a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParseClass" title="struct GstBaseParseClass">GstBaseParseClass</a>; <span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstBaseParse.html#gst-base-parse-set-duration" title="gst_base_parse_set_duration ()">gst_base_parse_set_duration</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" title="struct GstBaseParse"><span class="type">GstBaseParse</span></a> *parse</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> fmt</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> fmt</code></em>, <em class="parameter"><code><span class="type">gint64</span> duration</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> interval</code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstBaseParse.html#gst-base-parse-set-average-bitrate" title="gst_base_parse_set_average_bitrate ()">gst_base_parse_set_average_bitrate</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" title="struct GstBaseParse"><span class="type">GstBaseParse</span></a> *parse</code></em>, @@ -62,26 +62,26 @@ struct <a class="link" href="gstreamer-libs-GstBaseParse.html#GstBa <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> lead_in</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> lead_out</code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstBaseParse.html#gst-base-parse-set-latency" title="gst_base_parse_set_latency ()">gst_base_parse_set_latency</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" title="struct GstBaseParse"><span class="type">GstBaseParse</span></a> *parse</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> min_latency</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> max_latency</code></em>); + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> min_latency</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> max_latency</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="gstreamer-libs-GstBaseParse.html#gst-base-parse-convert-default" title="gst_base_parse_convert_default ()">gst_base_parse_convert_default</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" title="struct GstBaseParse"><span class="type">GstBaseParse</span></a> *parse</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> src_format</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> src_format</code></em>, <em class="parameter"><code><span class="type">gint64</span> src_value</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> dest_format</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> dest_format</code></em>, <em class="parameter"><code><span class="type">gint64</span> *dest_value</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="gstreamer-libs-GstBaseParse.html#gst-base-parse-add-index-entry" title="gst_base_parse_add_index_entry ()">gst_base_parse_add_index_entry</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" title="struct GstBaseParse"><span class="type">GstBaseParse</span></a> *parse</code></em>, <em class="parameter"><code><span class="type">guint64</span> offset</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> ts</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> ts</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> key</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> force</code></em>); <a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParseFrame" title="GstBaseParseFrame">GstBaseParseFrame</a>; enum <a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParseFrameFlags" title="enum GstBaseParseFrameFlags">GstBaseParseFrameFlags</a>; -<a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParseFrame" title="GstBaseParseFrame"><span class="returnvalue">GstBaseParseFrame</span></a> * <a class="link" href="gstreamer-libs-GstBaseParse.html#gst-base-parse-frame-new" title="gst_base_parse_frame_new ()">gst_base_parse_frame_new</a> (<em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer</code></em>, +<a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParseFrame" title="GstBaseParseFrame"><span class="returnvalue">GstBaseParseFrame</span></a> * <a class="link" href="gstreamer-libs-GstBaseParse.html#gst-base-parse-frame-new" title="gst_base_parse_frame_new ()">gst_base_parse_frame_new</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer</code></em>, <em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParseFrameFlags" title="enum GstBaseParseFrameFlags"><span class="type">GstBaseParseFrameFlags</span></a> flags</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> overhead</code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstBaseParse.html#gst-base-parse-frame-init" title="gst_base_parse_frame_init ()">gst_base_parse_frame_init</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParseFrame" title="GstBaseParseFrame"><span class="type">GstBaseParseFrame</span></a> *frame</code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstBaseParse.html#gst-base-parse-frame-free" title="gst_base_parse_frame_free ()">gst_base_parse_frame_free</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParseFrame" title="GstBaseParseFrame"><span class="type">GstBaseParseFrame</span></a> *frame</code></em>); -<a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> <a class="link" href="gstreamer-libs-GstBaseParse.html#gst-base-parse-push-frame" title="gst_base_parse_push_frame ()">gst_base_parse_push_frame</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" title="struct GstBaseParse"><span class="type">GstBaseParse</span></a> *parse</code></em>, +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> <a class="link" href="gstreamer-libs-GstBaseParse.html#gst-base-parse-push-frame" title="gst_base_parse_push_frame ()">gst_base_parse_push_frame</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" title="struct GstBaseParse"><span class="type">GstBaseParse</span></a> *parse</code></em>, <em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParseFrame" title="GstBaseParseFrame"><span class="type">GstBaseParseFrame</span></a> *frame</code></em>); #define <a class="link" href="gstreamer-libs-GstBaseParse.html#GST-BASE-PARSE-DRAINING:CAPS" title="GST_BASE_PARSE_DRAINING()">GST_BASE_PARSE_DRAINING</a> (parse) #define <a class="link" href="gstreamer-libs-GstBaseParse.html#GST-BASE-PARSE-FLAG-DRAINING:CAPS" title="GST_BASE_PARSE_FLAG_DRAINING">GST_BASE_PARSE_FLAG_DRAINING</a> @@ -221,9 +221,9 @@ needs to set the fixed caps on srcpad, when the format is ensured (e.g. when base class calls subclass' <em class="parameter"><code>set_sink_caps</code></em> function). </p> <p> -This base class uses <a href="../gstreamer-1.0/gstreamer-GstFormat.html#GST-FORMAT-DEFAULT:CAPS"><span class="type">GST_FORMAT_DEFAULT</span></a> as a meaning of frames. So, +This base class uses <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GST-FORMAT-DEFAULT:CAPS"><span class="type">GST_FORMAT_DEFAULT</span></a> as a meaning of frames. So, subclass conversion routine needs to know that conversion from -<a href="../gstreamer-1.0/gstreamer-GstFormat.html#GST-FORMAT-TIME:CAPS"><span class="type">GST_FORMAT_TIME</span></a> to <a href="../gstreamer-1.0/gstreamer-GstFormat.html#GST-FORMAT-DEFAULT:CAPS"><span class="type">GST_FORMAT_DEFAULT</span></a> must return the +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GST-FORMAT-TIME:CAPS"><span class="type">GST_FORMAT_TIME</span></a> to <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GST-FORMAT-DEFAULT:CAPS"><span class="type">GST_FORMAT_DEFAULT</span></a> must return the frame number that can be found from the given byte position. </p> <p> @@ -292,7 +292,7 @@ The opaque <a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody><tr> -<td><p><span class="term"><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> <em class="structfield"><code><a name="GstBaseParse.element"></a>element</code></em>;</span></p></td> +<td><p><span class="term"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> <em class="structfield"><code><a name="GstBaseParse.element"></a>element</code></em>;</span></p></td> <td>the parent element.</td> </tr></tbody> </table></div> @@ -347,7 +347,7 @@ overridden. <col align="left" valign="top"> <tbody> <tr> -<td><p><span class="term"><a href="../gstreamer-1.0/GstElement.html#GstElementClass"><span class="type">GstElementClass</span></a> <em class="structfield"><code><a name="GstBaseParseClass.parent-class"></a>parent_class</code></em>;</span></p></td> +<td><p><span class="term"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#GstElementClass"><span class="type">GstElementClass</span></a> <em class="structfield"><code><a name="GstBaseParseClass.parent-class"></a>parent_class</code></em>;</span></p></td> <td>the parent class</td> </tr> <tr> @@ -424,7 +424,7 @@ the stream format. Since: 0.10.36</td> <div class="refsect2"> <a name="gst-base-parse-set-duration"></a><h3>gst_base_parse_set_duration ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> gst_base_parse_set_duration (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" title="struct GstBaseParse"><span class="type">GstBaseParse</span></a> *parse</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> fmt</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> fmt</code></em>, <em class="parameter"><code><span class="type">gint64</span> duration</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> interval</code></em>);</pre> <p> @@ -445,7 +445,7 @@ frames. <tr> <td><p><span class="term"><em class="parameter"><code>fmt</code></em> :</span></p></td> <td> -<a href="../gstreamer-1.0/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a>.</td> +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a>.</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>duration</code></em> :</span></p></td> @@ -645,8 +645,8 @@ entirely filled upon decoding. <div class="refsect2"> <a name="gst-base-parse-set-latency"></a><h3>gst_base_parse_set_latency ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> gst_base_parse_set_latency (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" title="struct GstBaseParse"><span class="type">GstBaseParse</span></a> *parse</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> min_latency</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> max_latency</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> min_latency</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> max_latency</code></em>);</pre> <p> Sets the minimum and maximum (which may likely be equal) latency introduced by the parsing process. If there is such a latency, which depends on the @@ -676,9 +676,9 @@ particular parsing of the format, it typically corresponds to 1 frame duration. <div class="refsect2"> <a name="gst-base-parse-convert-default"></a><h3>gst_base_parse_convert_default ()</h3> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gst_base_parse_convert_default (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" title="struct GstBaseParse"><span class="type">GstBaseParse</span></a> *parse</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> src_format</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> src_format</code></em>, <em class="parameter"><code><span class="type">gint64</span> src_value</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> dest_format</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> dest_format</code></em>, <em class="parameter"><code><span class="type">gint64</span> *dest_value</code></em>);</pre> <p> Default implementation of "convert" vmethod in <a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" title="struct GstBaseParse"><span class="type">GstBaseParse</span></a> class. @@ -694,7 +694,7 @@ Default implementation of "convert" vmethod in <a class="link" href="gstreamer-l <tr> <td><p><span class="term"><em class="parameter"><code>src_format</code></em> :</span></p></td> <td> -<a href="../gstreamer-1.0/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> describing the source format.</td> +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> describing the source format.</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>src_value</code></em> :</span></p></td> @@ -703,7 +703,7 @@ Default implementation of "convert" vmethod in <a class="link" href="gstreamer-l <tr> <td><p><span class="term"><em class="parameter"><code>dest_format</code></em> :</span></p></td> <td> -<a href="../gstreamer-1.0/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> defining the converted format.</td> +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> defining the converted format.</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>dest_value</code></em> :</span></p></td> @@ -722,7 +722,7 @@ Default implementation of "convert" vmethod in <a class="link" href="gstreamer-l <a name="gst-base-parse-add-index-entry"></a><h3>gst_base_parse_add_index_entry ()</h3> <pre class="programlisting"><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> gst_base_parse_add_index_entry (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" title="struct GstBaseParse"><span class="type">GstBaseParse</span></a> *parse</code></em>, <em class="parameter"><code><span class="type">guint64</span> offset</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> ts</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> ts</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> key</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> force</code></em>);</pre> <p> @@ -788,11 +788,11 @@ of each frame's processing, i.e. parsing virtual method invocation sequence. <col align="left" valign="top"> <tbody> <tr> -<td><p><span class="term"><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *<em class="structfield"><code><a name="GstBaseParseFrame.buffer"></a>buffer</code></em>;</span></p></td> +<td><p><span class="term"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *<em class="structfield"><code><a name="GstBaseParseFrame.buffer"></a>buffer</code></em>;</span></p></td> <td>input data to be parsed for frames.</td> </tr> <tr> -<td><p><span class="term"><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *<em class="structfield"><code><a name="GstBaseParseFrame.out-buffer"></a>out_buffer</code></em>;</span></p></td> +<td><p><span class="term"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *<em class="structfield"><code><a name="GstBaseParseFrame.out-buffer"></a>out_buffer</code></em>;</span></p></td> <td>(optional) (replacement) output data.</td> </tr> <tr> @@ -883,7 +883,7 @@ Flags to be used in a <a class="link" href="gstreamer-libs-GstBaseParse.html#Gst <hr> <div class="refsect2"> <a name="gst-base-parse-frame-new"></a><h3>gst_base_parse_frame_new ()</h3> -<pre class="programlisting"><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParseFrame" title="GstBaseParseFrame"><span class="returnvalue">GstBaseParseFrame</span></a> * gst_base_parse_frame_new (<em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer</code></em>, +<pre class="programlisting"><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParseFrame" title="GstBaseParseFrame"><span class="returnvalue">GstBaseParseFrame</span></a> * gst_base_parse_frame_new (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer</code></em>, <em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParseFrameFlags" title="enum GstBaseParseFrameFlags"><span class="type">GstBaseParseFrameFlags</span></a> flags</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> overhead</code></em>);</pre> <p> @@ -896,7 +896,7 @@ then use <a class="link" href="gstreamer-libs-GstBaseParse.html#gst-base-parse-f <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>buffer</code></em> :</span></p></td> -<td>a <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span> +<td>a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a>. <span class="annotation">[<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span> </td> </tr> <tr> @@ -947,7 +947,7 @@ allocated on the stack. <hr> <div class="refsect2"> <a name="gst-base-parse-push-frame"></a><h3>gst_base_parse_push_frame ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> gst_base_parse_push_frame (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" title="struct GstBaseParse"><span class="type">GstBaseParse</span></a> *parse</code></em>, +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> gst_base_parse_push_frame (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParse" title="struct GstBaseParse"><span class="type">GstBaseParse</span></a> *parse</code></em>, <em class="parameter"><code><a class="link" href="gstreamer-libs-GstBaseParse.html#GstBaseParseFrame" title="GstBaseParseFrame"><span class="type">GstBaseParseFrame</span></a> *frame</code></em>);</pre> <p> Pushes the frame's buffer downstream, sends any pending events and @@ -972,7 +972,7 @@ This must be called with sinkpad STREAM_LOCK held. </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td><a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a></td> +<td><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a></td> </tr> </tbody> </table></div> @@ -1014,7 +1014,7 @@ the parser is now processing the frames at the end of the stream) <pre class="programlisting">#define GST_BASE_PARSE_FLOW_DROPPED GST_FLOW_CUSTOM_SUCCESS </pre> <p> -A <a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a> that can be returned from parse_frame to +A <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a> that can be returned from parse_frame to indicate that no output buffer was generated, or from pre_push_frame to to forego pushing buffer. </p> @@ -1043,7 +1043,7 @@ Obtains current sync status. <pre class="programlisting">#define GST_BASE_PARSE_SINK_PAD(obj) (GST_BASE_PARSE_CAST (obj)->sinkpad) </pre> <p> -Gives the pointer to the sink <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> object of the element. +Gives the pointer to the sink <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> object of the element. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> @@ -1060,7 +1060,7 @@ Gives the pointer to the sink <a href="../gstreamer-1.0/GstPad.html"><span class <pre class="programlisting">#define GST_BASE_PARSE_SRC_PAD(obj) (GST_BASE_PARSE_CAST (obj)->srcpad) </pre> <p> -Gives the pointer to the source <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> object of the element. +Gives the pointer to the source <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> object of the element. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> diff --git a/docs/libs/html/gstreamer-libs-GstBufferStraw.html b/docs/libs/html/gstreamer-libs-GstBufferStraw.html index b1a2ff0..ae88b32 100644 --- a/docs/libs/html/gstreamer-libs-GstBufferStraw.html +++ b/docs/libs/html/gstreamer-libs-GstBufferStraw.html @@ -40,12 +40,12 @@ <pre class="synopsis"> #include <gst/check/gstbufferstraw.h> -<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstBufferStraw.html#gst-buffer-straw-start-pipeline" title="gst_buffer_straw_start_pipeline ()">gst_buffer_straw_start_pipeline</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *bin</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>); -<a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="gstreamer-libs-GstBufferStraw.html#gst-buffer-straw-get-buffer" title="gst_buffer_straw_get_buffer ()">gst_buffer_straw_get_buffer</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *bin</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>); -<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstBufferStraw.html#gst-buffer-straw-stop-pipeline" title="gst_buffer_straw_stop_pipeline ()">gst_buffer_straw_stop_pipeline</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *bin</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>); +<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstBufferStraw.html#gst-buffer-straw-start-pipeline" title="gst_buffer_straw_start_pipeline ()">gst_buffer_straw_start_pipeline</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *bin</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="gstreamer-libs-GstBufferStraw.html#gst-buffer-straw-get-buffer" title="gst_buffer_straw_get_buffer ()">gst_buffer_straw_get_buffer</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *bin</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>); +<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstBufferStraw.html#gst-buffer-straw-stop-pipeline" title="gst_buffer_straw_stop_pipeline ()">gst_buffer_straw_stop_pipeline</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *bin</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>); </pre> </div> <div class="refsect1"> @@ -59,8 +59,8 @@ inside the 'check' directories of various GStreamer packages. <a name="gstreamer-libs-GstBufferStraw.details"></a><h2>Details</h2> <div class="refsect2"> <a name="gst-buffer-straw-start-pipeline"></a><h3>gst_buffer_straw_start_pipeline ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_buffer_straw_start_pipeline (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *bin</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>);</pre> +<pre class="programlisting"><span class="returnvalue">void</span> gst_buffer_straw_start_pipeline (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *bin</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>);</pre> <p> Sets up a pipeline for buffer sucking. This will allow you to call <a class="link" href="gstreamer-libs-GstBufferStraw.html#gst-buffer-straw-get-buffer" title="gst_buffer_straw_get_buffer ()"><code class="function">gst_buffer_straw_get_buffer()</code></a> to access buffers as they pass over <em class="parameter"><code>pad</code></em>. @@ -68,7 +68,7 @@ Sets up a pipeline for buffer sucking. This will allow you to call <p> This function is normally used in unit tests that want to verify that a particular element is outputting correct buffers. For example, you would make -a pipeline via <a href="../gstreamer-1.0/gstreamer-GstParse.html#gst-parse-launch"><code class="function">gst_parse_launch()</code></a>, pull out the pad you want to monitor, then +a pipeline via <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstParse.html#gst-parse-launch"><code class="function">gst_parse_launch()</code></a>, pull out the pad you want to monitor, then call <a class="link" href="gstreamer-libs-GstBufferStraw.html#gst-buffer-straw-get-buffer" title="gst_buffer_straw_get_buffer ()"><code class="function">gst_buffer_straw_get_buffer()</code></a> to get the buffers that pass through <em class="parameter"><code>pad</code></em>. The pipeline will block until you have sucked off the buffers. </p> @@ -99,8 +99,8 @@ from libcheck, so you cannot use it outside unit tests. <hr> <div class="refsect2"> <a name="gst-buffer-straw-get-buffer"></a><h3>gst_buffer_straw_get_buffer ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_buffer_straw_get_buffer (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *bin</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_buffer_straw_get_buffer (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *bin</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>);</pre> <p> Get one buffer from <em class="parameter"><code>pad</code></em>. Implemented via buffer probes. This function will block until the pipeline passes a buffer over <em class="parameter"><code>pad</code></em>, so for robust behavior @@ -126,7 +126,7 @@ You must have previously called <a class="link" href="gstreamer-libs-GstBufferSt </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>the captured <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a>.</td> +<td>the captured <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a>.</td> </tr> </tbody> </table></div> @@ -134,10 +134,10 @@ You must have previously called <a class="link" href="gstreamer-libs-GstBufferSt <hr> <div class="refsect2"> <a name="gst-buffer-straw-stop-pipeline"></a><h3>gst_buffer_straw_stop_pipeline ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_buffer_straw_stop_pipeline (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *bin</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>);</pre> +<pre class="programlisting"><span class="returnvalue">void</span> gst_buffer_straw_stop_pipeline (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *bin</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>);</pre> <p> -Set <em class="parameter"><code>bin</code></em> to <a href="../gstreamer-1.0/GstElement.html#GST-STATE-NULL:CAPS"><span class="type">GST_STATE_NULL</span></a> and release resource allocated in +Set <em class="parameter"><code>bin</code></em> to <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#GST-STATE-NULL:CAPS"><span class="type">GST_STATE_NULL</span></a> and release resource allocated in <a class="link" href="gstreamer-libs-GstBufferStraw.html#gst-buffer-straw-start-pipeline" title="gst_buffer_straw_start_pipeline ()"><code class="function">gst_buffer_straw_start_pipeline()</code></a>. </p> <p> diff --git a/docs/libs/html/gstreamer-libs-GstByteWriter.html b/docs/libs/html/gstreamer-libs-GstByteWriter.html index 961e487..cf2422c 100644 --- a/docs/libs/html/gstreamer-libs-GstByteWriter.html +++ b/docs/libs/html/gstreamer-libs-GstByteWriter.html @@ -7,7 +7,7 @@ <link rel="home" href="index.html" title="GStreamer 1.0 Library Reference Manual"> <link rel="up" href="gstreamer-base.html" title="GStreamer Base and Utillity Classes"> <link rel="prev" href="gstreamer-libs-GstByteReader.html" title="GstByteReader"> -<link rel="next" href="GstCollectPads2.html" title="GstCollectPads2"> +<link rel="next" href="GstCollectPads.html" title="GstCollectPads"> <meta name="generator" content="GTK-Doc V1.18 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> @@ -18,7 +18,7 @@ <td><a accesskey="u" href="gstreamer-base.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td> <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> <th width="100%" align="center">GStreamer 1.0 Library Reference Manual</th> -<td><a accesskey="n" href="GstCollectPads2.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> +<td><a accesskey="n" href="GstCollectPads.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td> </tr> <tr><td colspan="5" class="shortcuts"> <a href="#gstreamer-libs-GstByteWriter.synopsis" class="shortcut">Top</a> @@ -57,11 +57,11 @@ <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> size</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> fixed</code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstByteWriter.html#gst-byte-writer-free" title="gst_byte_writer_free ()">gst_byte_writer_free</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstByteWriter.html#GstByteWriter" title="GstByteWriter"><span class="type">GstByteWriter</span></a> *writer</code></em>); -<a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="gstreamer-libs-GstByteWriter.html#gst-byte-writer-free-and-get-buffer" title="gst_byte_writer_free_and_get_buffer ()">gst_byte_writer_free_and_get_buffer</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstByteWriter.html#GstByteWriter" title="GstByteWriter"><span class="type">GstByteWriter</span></a> *writer</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="gstreamer-libs-GstByteWriter.html#gst-byte-writer-free-and-get-buffer" title="gst_byte_writer_free_and_get_buffer ()">gst_byte_writer_free_and_get_buffer</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstByteWriter.html#GstByteWriter" title="GstByteWriter"><span class="type">GstByteWriter</span></a> *writer</code></em>); <span class="returnvalue">guint8</span> * <a class="link" href="gstreamer-libs-GstByteWriter.html#gst-byte-writer-free-and-get-data" title="gst_byte_writer_free_and_get_data ()">gst_byte_writer_free_and_get_data</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstByteWriter.html#GstByteWriter" title="GstByteWriter"><span class="type">GstByteWriter</span></a> *writer</code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstByteWriter.html#gst-byte-writer-reset" title="gst_byte_writer_reset ()">gst_byte_writer_reset</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstByteWriter.html#GstByteWriter" title="GstByteWriter"><span class="type">GstByteWriter</span></a> *writer</code></em>); <span class="returnvalue">guint8</span> * <a class="link" href="gstreamer-libs-GstByteWriter.html#gst-byte-writer-reset-and-get-data" title="gst_byte_writer_reset_and_get_data ()">gst_byte_writer_reset_and_get_data</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstByteWriter.html#GstByteWriter" title="GstByteWriter"><span class="type">GstByteWriter</span></a> *writer</code></em>); -<a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="gstreamer-libs-GstByteWriter.html#gst-byte-writer-reset-and-get-buffer" title="gst_byte_writer_reset_and_get_buffer ()">gst_byte_writer_reset_and_get_buffer</a> +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * <a class="link" href="gstreamer-libs-GstByteWriter.html#gst-byte-writer-reset-and-get-buffer" title="gst_byte_writer_reset_and_get_buffer ()">gst_byte_writer_reset_and_get_buffer</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstByteWriter.html#GstByteWriter" title="GstByteWriter"><span class="type">GstByteWriter</span></a> *writer</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="returnvalue">guint</span></a> <a class="link" href="gstreamer-libs-GstByteWriter.html#gst-byte-writer-get-pos" title="gst_byte_writer_get_pos ()">gst_byte_writer_get_pos</a> (<em class="parameter"><code>const <a class="link" href="gstreamer-libs-GstByteWriter.html#GstByteWriter" title="GstByteWriter"><span class="type">GstByteWriter</span></a> *writer</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="returnvalue">gboolean</span></a> <a class="link" href="gstreamer-libs-GstByteWriter.html#gst-byte-writer-set-pos" title="gst_byte_writer_set_pos ()">gst_byte_writer_set_pos</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstByteWriter.html#GstByteWriter" title="GstByteWriter"><span class="type">GstByteWriter</span></a> *writer</code></em>, @@ -445,10 +445,10 @@ Frees <em class="parameter"><code>writer</code></em> and all memory allocated by <hr> <div class="refsect2"> <a name="gst-byte-writer-free-and-get-buffer"></a><h3>gst_byte_writer_free_and_get_buffer ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_byte_writer_free_and_get_buffer (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstByteWriter.html#GstByteWriter" title="GstByteWriter"><span class="type">GstByteWriter</span></a> *writer</code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_byte_writer_free_and_get_buffer (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstByteWriter.html#GstByteWriter" title="GstByteWriter"><span class="type">GstByteWriter</span></a> *writer</code></em>);</pre> <p> Frees <em class="parameter"><code>writer</code></em> and all memory allocated by it except -the current data, which is returned as <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a>. +the current data, which is returned as <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a>. </p> <p> Free-function: gst_buffer_unref @@ -464,7 +464,7 @@ Free-function: gst_buffer_unref </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>the current data as buffer. <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#gst-buffer-unref"><code class="function">gst_buffer_unref()</code></a> +<td>the current data as buffer. <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#gst-buffer-unref"><code class="function">gst_buffer_unref()</code></a> after usage. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> </td> </tr> @@ -549,7 +549,7 @@ Free-function: g_free <hr> <div class="refsect2"> <a name="gst-byte-writer-reset-and-get-buffer"></a><h3>gst_byte_writer_reset_and_get_buffer ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_byte_writer_reset_and_get_buffer +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="returnvalue">GstBuffer</span></a> * gst_byte_writer_reset_and_get_buffer (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstByteWriter.html#GstByteWriter" title="GstByteWriter"><span class="type">GstByteWriter</span></a> *writer</code></em>);</pre> <p> Resets <em class="parameter"><code>writer</code></em> and returns the current data as buffer. @@ -567,7 +567,7 @@ Free-function: gst_buffer_unref </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>the current data as buffer. <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#gst-buffer-unref"><code class="function">gst_buffer_unref()</code></a> +<td>the current data as buffer. <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#gst-buffer-unref"><code class="function">gst_buffer_unref()</code></a> after usage. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> </td> </tr> diff --git a/docs/libs/html/gstreamer-libs-GstCheck.html b/docs/libs/html/gstreamer-libs-GstCheck.html index 4a1b6cd..0bd2a72 100644 --- a/docs/libs/html/gstreamer-libs-GstCheck.html +++ b/docs/libs/html/gstreamer-libs-GstCheck.html @@ -91,43 +91,43 @@ c) <span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-init" title="gst_check_init ()">gst_check_init</a> (<em class="parameter"><code><span class="type">int</span> *argc</code></em>, <em class="parameter"><code><span class="type">char</span> **argv[]</code></em>); -<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-message-error" title="gst_check_message_error ()">gst_check_message_error</a> (<em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstMessage.html#GstMessage"><span class="type">GstMessage</span></a> *message</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstMessage.html#GstMessageType"><span class="type">GstMessageType</span></a> type</code></em>, +<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-message-error" title="gst_check_message_error ()">gst_check_message_error</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#GstMessage"><span class="type">GstMessage</span></a> *message</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#GstMessageType"><span class="type">GstMessageType</span></a> type</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> domain</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> code</code></em>); -<a href="../gstreamer-1.0/GstElement.html"><span class="returnvalue">GstElement</span></a> * <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-setup-element" title="gst_check_setup_element ()">gst_check_setup_element</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *factory</code></em>); -<a href="../gstreamer-1.0/GstPad.html"><span class="returnvalue">GstPad</span></a> * <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-setup-sink-pad" title="gst_check_setup_sink_pad ()">gst_check_setup_sink_pad</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>); -<a href="../gstreamer-1.0/GstPad.html"><span class="returnvalue">GstPad</span></a> * <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-setup-src-pad" title="gst_check_setup_src_pad ()">gst_check_setup_src_pad</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>); -<a href="../gstreamer-1.0/GstPad.html"><span class="returnvalue">GstPad</span></a> * <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-setup-sink-pad-by-name" title="gst_check_setup_sink_pad_by_name ()">gst_check_setup_sink_pad_by_name</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>, +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="returnvalue">GstElement</span></a> * <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-setup-element" title="gst_check_setup_element ()">gst_check_setup_element</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *factory</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="returnvalue">GstPad</span></a> * <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-setup-sink-pad" title="gst_check_setup_sink_pad ()">gst_check_setup_sink_pad</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="returnvalue">GstPad</span></a> * <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-setup-src-pad" title="gst_check_setup_src_pad ()">gst_check_setup_src_pad</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="returnvalue">GstPad</span></a> * <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-setup-sink-pad-by-name" title="gst_check_setup_sink_pad_by_name ()">gst_check_setup_sink_pad_by_name</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>); -<a href="../gstreamer-1.0/GstPad.html"><span class="returnvalue">GstPad</span></a> * <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-setup-src-pad-by-name" title="gst_check_setup_src_pad_by_name ()">gst_check_setup_src_pad_by_name</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>, +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="returnvalue">GstPad</span></a> * <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-setup-src-pad-by-name" title="gst_check_setup_src_pad_by_name ()">gst_check_setup_src_pad_by_name</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>); -<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-teardown-pad-by-name" title="gst_check_teardown_pad_by_name ()">gst_check_teardown_pad_by_name</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, +<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-teardown-pad-by-name" title="gst_check_teardown_pad_by_name ()">gst_check_teardown_pad_by_name</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>); -<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-teardown-element" title="gst_check_teardown_element ()">gst_check_teardown_element</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>); -<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-teardown-sink-pad" title="gst_check_teardown_sink_pad ()">gst_check_teardown_sink_pad</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>); -<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-teardown-src-pad" title="gst_check_teardown_src_pad ()">gst_check_teardown_src_pad</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>); +<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-teardown-element" title="gst_check_teardown_element ()">gst_check_teardown_element</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>); +<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-teardown-sink-pad" title="gst_check_teardown_sink_pad ()">gst_check_teardown_sink_pad</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>); +<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-teardown-src-pad" title="gst_check_teardown_src_pad ()">gst_check_teardown_src_pad</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-drop-buffers" title="gst_check_drop_buffers ()">gst_check_drop_buffers</a> (<em class="parameter"><code><span class="type">void</span></code></em>); -<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-buffer-data" title="gst_check_buffer_data ()">gst_check_buffer_data</a> (<em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer</code></em>, +<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-buffer-data" title="gst_check_buffer_data ()">gst_check_buffer_data</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> data</code></em>, <em class="parameter"><code><span class="type">gsize</span> size</code></em>); -<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-caps-equal" title="gst_check_caps_equal ()">gst_check_caps_equal</a> (<em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps1</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps2</code></em>); +<span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-caps-equal" title="gst_check_caps_equal ()">gst_check_caps_equal</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps1</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps2</code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-element-push-buffer-list" title="gst_check_element_push_buffer_list ()">gst_check_element_push_buffer_list</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *element_name</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *buffer_in</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_in</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_in</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *buffer_out</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_out</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a> last_flow_return</code></em>); + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_out</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a> last_flow_return</code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-element-push-buffer" title="gst_check_element_push_buffer ()">gst_check_element_push_buffer</a> (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *element_name</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer_in</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_in</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer_out</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_out</code></em>); + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer_in</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_in</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer_out</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_out</code></em>); <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="returnvalue">gint</span></a> <a class="link" href="gstreamer-libs-GstCheck.html#gst-check-run-suite" title="gst_check_run_suite ()">gst_check_run_suite</a> (<em class="parameter"><code><span class="type">Suite</span> *suite</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *fname</code></em>); @@ -461,62 +461,62 @@ macro is for use in unit tests. <hr> <div class="refsect2"> <a name="gst-check-message-error"></a><h3>gst_check_message_error ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_check_message_error (<em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstMessage.html#GstMessage"><span class="type">GstMessage</span></a> *message</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstMessage.html#GstMessageType"><span class="type">GstMessageType</span></a> type</code></em>, +<pre class="programlisting"><span class="returnvalue">void</span> gst_check_message_error (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#GstMessage"><span class="type">GstMessage</span></a> *message</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstMessage.html#GstMessageType"><span class="type">GstMessageType</span></a> type</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Quarks.html#GQuark"><span class="type">GQuark</span></a> domain</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> code</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="gst-check-setup-element"></a><h3>gst_check_setup_element ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstElement.html"><span class="returnvalue">GstElement</span></a> * gst_check_setup_element (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *factory</code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="returnvalue">GstElement</span></a> * gst_check_setup_element (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *factory</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="gst-check-setup-sink-pad"></a><h3>gst_check_setup_sink_pad ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstPad.html"><span class="returnvalue">GstPad</span></a> * gst_check_setup_sink_pad (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="returnvalue">GstPad</span></a> * gst_check_setup_sink_pad (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="gst-check-setup-src-pad"></a><h3>gst_check_setup_src_pad ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstPad.html"><span class="returnvalue">GstPad</span></a> * gst_check_setup_src_pad (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="returnvalue">GstPad</span></a> * gst_check_setup_src_pad (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="gst-check-setup-sink-pad-by-name"></a><h3>gst_check_setup_sink_pad_by_name ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstPad.html"><span class="returnvalue">GstPad</span></a> * gst_check_setup_sink_pad_by_name (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>, +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="returnvalue">GstPad</span></a> * gst_check_setup_sink_pad_by_name (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="gst-check-setup-src-pad-by-name"></a><h3>gst_check_setup_src_pad_by_name ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstPad.html"><span class="returnvalue">GstPad</span></a> * gst_check_setup_src_pad_by_name (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>, +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="returnvalue">GstPad</span></a> * gst_check_setup_src_pad_by_name (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPadTemplate.html#GstStaticPadTemplate"><span class="type">GstStaticPadTemplate</span></a> *tmpl</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="gst-check-teardown-pad-by-name"></a><h3>gst_check_teardown_pad_by_name ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_check_teardown_pad_by_name (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, +<pre class="programlisting"><span class="returnvalue">void</span> gst_check_teardown_pad_by_name (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *name</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="gst-check-teardown-element"></a><h3>gst_check_teardown_element ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_check_teardown_element (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>);</pre> +<pre class="programlisting"><span class="returnvalue">void</span> gst_check_teardown_element (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="gst-check-teardown-sink-pad"></a><h3>gst_check_teardown_sink_pad ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_check_teardown_sink_pad (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>);</pre> +<pre class="programlisting"><span class="returnvalue">void</span> gst_check_teardown_sink_pad (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>);</pre> </div> <hr> <div class="refsect2"> <a name="gst-check-teardown-src-pad"></a><h3>gst_check_teardown_src_pad ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_check_teardown_src_pad (<em class="parameter"><code><a href="../gstreamer-1.0/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>);</pre> +<pre class="programlisting"><span class="returnvalue">void</span> gst_check_teardown_src_pad (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html"><span class="type">GstElement</span></a> *element</code></em>);</pre> </div> <hr> <div class="refsect2"> @@ -531,7 +531,7 @@ emptying the list. <hr> <div class="refsect2"> <a name="gst-check-buffer-data"></a><h3>gst_check_buffer_data ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_check_buffer_data (<em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer</code></em>, +<pre class="programlisting"><span class="returnvalue">void</span> gst_check_buffer_data (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gconstpointer"><span class="type">gconstpointer</span></a> data</code></em>, <em class="parameter"><code><span class="type">gsize</span> size</code></em>);</pre> <p> @@ -558,8 +558,8 @@ Compare the buffer contents with <em class="parameter"><code>data</code></em> an <hr> <div class="refsect2"> <a name="gst-check-caps-equal"></a><h3>gst_check_caps_equal ()</h3> -<pre class="programlisting"><span class="returnvalue">void</span> gst_check_caps_equal (<em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps1</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps2</code></em>);</pre> +<pre class="programlisting"><span class="returnvalue">void</span> gst_check_caps_equal (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps1</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps2</code></em>);</pre> <p> Compare two caps with gst_caps_is_equal and fail unless they are equal. @@ -584,10 +584,10 @@ equal. <a name="gst-check-element-push-buffer-list"></a><h3>gst_check_element_push_buffer_list ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> gst_check_element_push_buffer_list (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *element_name</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *buffer_in</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_in</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_in</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html#GList"><span class="type">GList</span></a> *buffer_out</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_out</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a> last_flow_return</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_out</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="type">GstFlowReturn</span></a> last_flow_return</code></em>);</pre> <p> Create an <em class="parameter"><code>element</code></em> with the factory with the name and push the buffers in <em class="parameter"><code>buffer_in</code></em> to this element. The element should create the buffers equal to @@ -629,10 +629,10 @@ the element. <span class="annotation">[<acronym title="Generics and defining ele <div class="refsect2"> <a name="gst-check-element-push-buffer"></a><h3>gst_check_element_push_buffer ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> gst_check_element_push_buffer (<em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *element_name</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer_in</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_in</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer_out</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_out</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer_in</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_in</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer_out</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps_out</code></em>);</pre> <p> Create an <em class="parameter"><code>element</code></em> with the factory with the name and push the <em class="parameter"><code>buffer_in</code></em> to this element. The element should create one buffer diff --git a/docs/libs/html/gstreamer-libs-GstNetTimePacket.html b/docs/libs/html/gstreamer-libs-GstNetTimePacket.html index 53f1ee6..2635574 100644 --- a/docs/libs/html/gstreamer-libs-GstNetTimePacket.html +++ b/docs/libs/html/gstreamer-libs-GstNetTimePacket.html @@ -80,11 +80,11 @@ Content of a <a class="link" href="gstreamer-libs-GstNetTimePacket.html#GstNetTi <col align="left" valign="top"> <tbody> <tr> -<td><p><span class="term"><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> <em class="structfield"><code><a name="GstNetTimePacket.local-time"></a>local_time</code></em>;</span></p></td> +<td><p><span class="term"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> <em class="structfield"><code><a name="GstNetTimePacket.local-time"></a>local_time</code></em>;</span></p></td> <td>the local time when this packet was sent</td> </tr> <tr> -<td><p><span class="term"><a href="../gstreamer-1.0/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> <em class="structfield"><code><a name="GstNetTimePacket.remote-time"></a>remote_time</code></em>;</span></p></td> +<td><p><span class="term"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GstClockTime"><span class="type">GstClockTime</span></a> <em class="structfield"><code><a name="GstNetTimePacket.remote-time"></a>remote_time</code></em>;</span></p></td> <td>the remote time observation</td> </tr> </tbody> @@ -110,7 +110,7 @@ caller is responsible for ensuring that <em class="parameter"><code>buffer</code </p> <p> If <em class="parameter"><code>buffer</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a>, the local and remote times will be set to -<a href="../gstreamer-1.0/GstClock.html#GST-CLOCK-TIME-NONE:CAPS"><span class="type">GST_CLOCK_TIME_NONE</span></a>. +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html#GST-CLOCK-TIME-NONE:CAPS"><span class="type">GST_CLOCK_TIME_NONE</span></a>. </p> <p> MT safe. Caller owns return value (g_free to free). @@ -234,7 +234,7 @@ MT safe. Caller owns return value (g_free to free). </div> <div class="refsect1"> <a name="gstreamer-libs-GstNetTimePacket.see-also"></a><h2>See Also</h2> -<a href="../gstreamer-1.0/GstClock.html"><span class="type">GstClock</span></a>, <a class="link" href="GstNetClientClock.html" title="GstNetClientClock"><span class="type">GstNetClientClock</span></a>, <a class="link" href="GstNetTimeProvider.html" title="GstNetTimeProvider"><span class="type">GstNetTimeProvider</span></a> +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstClock.html"><span class="type">GstClock</span></a>, <a class="link" href="GstNetClientClock.html" title="GstNetClientClock"><span class="type">GstNetClientClock</span></a>, <a class="link" href="GstNetTimeProvider.html" title="GstNetTimeProvider"><span class="type">GstNetTimeProvider</span></a> </div> </div> <div class="footer"> diff --git a/docs/libs/html/gstreamer-libs-GstStreamConsistency.html b/docs/libs/html/gstreamer-libs-GstStreamConsistency.html index 8943a5f..cc950b9 100644 --- a/docs/libs/html/gstreamer-libs-GstStreamConsistency.html +++ b/docs/libs/html/gstreamer-libs-GstStreamConsistency.html @@ -41,7 +41,7 @@ #include <gst/check/gstconsistencychecker.h> <a class="link" href="gstreamer-libs-GstStreamConsistency.html#GstStreamConsistency" title="GstStreamConsistency">GstStreamConsistency</a>; -<a class="link" href="gstreamer-libs-GstStreamConsistency.html#GstStreamConsistency" title="GstStreamConsistency"><span class="returnvalue">GstStreamConsistency</span></a> * <a class="link" href="gstreamer-libs-GstStreamConsistency.html#gst-consistency-checker-new" title="gst_consistency_checker_new ()">gst_consistency_checker_new</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>); +<a class="link" href="gstreamer-libs-GstStreamConsistency.html#GstStreamConsistency" title="GstStreamConsistency"><span class="returnvalue">GstStreamConsistency</span></a> * <a class="link" href="gstreamer-libs-GstStreamConsistency.html#gst-consistency-checker-new" title="gst_consistency_checker_new ()">gst_consistency_checker_new</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstStreamConsistency.html#gst-consistency-checker-reset" title="gst_consistency_checker_reset ()">gst_consistency_checker_reset</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstStreamConsistency.html#GstStreamConsistency" title="GstStreamConsistency"><span class="type">GstStreamConsistency</span></a> *consist</code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-libs-GstStreamConsistency.html#gst-consistency-checker-free" title="gst_consistency_checker_free ()">gst_consistency_checker_free</a> (<em class="parameter"><code><a class="link" href="gstreamer-libs-GstStreamConsistency.html#GstStreamConsistency" title="GstStreamConsistency"><span class="type">GstStreamConsistency</span></a> *consist</code></em>); </pre> @@ -66,7 +66,7 @@ Opaque consistency checker handle. <hr> <div class="refsect2"> <a name="gst-consistency-checker-new"></a><h3>gst_consistency_checker_new ()</h3> -<pre class="programlisting"><a class="link" href="gstreamer-libs-GstStreamConsistency.html#GstStreamConsistency" title="GstStreamConsistency"><span class="returnvalue">GstStreamConsistency</span></a> * gst_consistency_checker_new (<em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>);</pre> +<pre class="programlisting"><a class="link" href="gstreamer-libs-GstStreamConsistency.html#GstStreamConsistency" title="GstStreamConsistency"><span class="returnvalue">GstStreamConsistency</span></a> * gst_consistency_checker_new (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad</code></em>);</pre> <p> Sets up a data probe on the given pad which will raise assertions if the data flow is inconsistent. @@ -76,7 +76,7 @@ data flow is inconsistent. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>pad</code></em> :</span></p></td> -<td>The <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> on which the dataflow will be checked.</td> +<td>The <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> on which the dataflow will be checked.</td> </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> diff --git a/docs/libs/html/gstreamer-libs-GstTypeFindHelper.html b/docs/libs/html/gstreamer-libs-GstTypeFindHelper.html index 1afd585..6587c24 100644 --- a/docs/libs/html/gstreamer-libs-GstTypeFindHelper.html +++ b/docs/libs/html/gstreamer-libs-GstTypeFindHelper.html @@ -6,7 +6,7 @@ <meta name="generator" content="DocBook XSL Stylesheets V1.76.1"> <link rel="home" href="index.html" title="GStreamer 1.0 Library Reference Manual"> <link rel="up" href="gstreamer-base.html" title="GStreamer Base and Utillity Classes"> -<link rel="prev" href="GstCollectPads2.html" title="GstCollectPads2"> +<link rel="prev" href="GstCollectPads.html" title="GstCollectPads"> <link rel="next" href="gstreamer-control.html" title="GStreamer Dynamic Parameter Control"> <meta name="generator" content="GTK-Doc V1.18 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> @@ -14,7 +14,7 @@ <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> <table class="navigation" id="top" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"> <tr valign="middle"> -<td><a accesskey="p" href="GstCollectPads2.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> +<td><a accesskey="p" href="GstCollectPads.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td> <td><a accesskey="u" href="gstreamer-base.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td> <td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td> <th width="100%" align="center">GStreamer 1.0 Library Reference Manual</th> @@ -40,29 +40,29 @@ <pre class="synopsis"> #include <gst/base/gsttypefindhelper.h> -<a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * <a class="link" href="gstreamer-libs-GstTypeFindHelper.html#gst-type-find-helper" title="gst_type_find_helper ()">gst_type_find_helper</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *src</code></em>, +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * <a class="link" href="gstreamer-libs-GstTypeFindHelper.html#gst-type-find-helper" title="gst_type_find_helper ()">gst_type_find_helper</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *src</code></em>, <em class="parameter"><code><span class="type">guint64</span> size</code></em>); -<a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * <a class="link" href="gstreamer-libs-GstTypeFindHelper.html#gst-type-find-helper-for-buffer" title="gst_type_find_helper_for_buffer ()">gst_type_find_helper_for_buffer</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buf</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstTypeFind.html#GstTypeFindProbability"><span class="type">GstTypeFindProbability</span></a> *prob</code></em>); -<a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * <a class="link" href="gstreamer-libs-GstTypeFindHelper.html#gst-type-find-helper-for-extension" title="gst_type_find_helper_for_extension ()">gst_type_find_helper_for_extension</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * <a class="link" href="gstreamer-libs-GstTypeFindHelper.html#gst-type-find-helper-for-buffer" title="gst_type_find_helper_for_buffer ()">gst_type_find_helper_for_buffer</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buf</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstTypeFind.html#GstTypeFindProbability"><span class="type">GstTypeFindProbability</span></a> *prob</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * <a class="link" href="gstreamer-libs-GstTypeFindHelper.html#gst-type-find-helper-for-extension" title="gst_type_find_helper_for_extension ()">gst_type_find_helper_for_extension</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *extension</code></em>); -<a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * <a class="link" href="gstreamer-libs-GstTypeFindHelper.html#gst-type-find-helper-for-data" title="gst_type_find_helper_for_data ()">gst_type_find_helper_for_data</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * <a class="link" href="gstreamer-libs-GstTypeFindHelper.html#gst-type-find-helper-for-data" title="gst_type_find_helper_for_data ()">gst_type_find_helper_for_data</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, <em class="parameter"><code>const <span class="type">guint8</span> *data</code></em>, <em class="parameter"><code><span class="type">gsize</span> size</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstTypeFind.html#GstTypeFindProbability"><span class="type">GstTypeFindProbability</span></a> *prob</code></em>); -<a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (<a class="link" href="gstreamer-libs-GstTypeFindHelper.html#GstTypeFindHelperGetRangeFunction" title="GstTypeFindHelperGetRangeFunction ()">*GstTypeFindHelperGetRangeFunction</a>) - (<em class="parameter"><code><a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> *parent</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstTypeFind.html#GstTypeFindProbability"><span class="type">GstTypeFindProbability</span></a> *prob</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (<a class="link" href="gstreamer-libs-GstTypeFindHelper.html#GstTypeFindHelperGetRangeFunction" title="GstTypeFindHelperGetRangeFunction ()">*GstTypeFindHelperGetRangeFunction</a>) + (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> *parent</code></em>, <em class="parameter"><code><span class="type">guint64</span> offset</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> length</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> **buffer</code></em>); -<a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * <a class="link" href="gstreamer-libs-GstTypeFindHelper.html#gst-type-find-helper-get-range" title="gst_type_find_helper_get_range ()">gst_type_find_helper_get_range</a> (<em class="parameter"><code><a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> *parent</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> **buffer</code></em>); +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * <a class="link" href="gstreamer-libs-GstTypeFindHelper.html#gst-type-find-helper-get-range" title="gst_type_find_helper_get_range ()">gst_type_find_helper_get_range</a> (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> *parent</code></em>, <em class="parameter"><code><a class="link" href="gstreamer-libs-GstTypeFindHelper.html#GstTypeFindHelperGetRangeFunction" title="GstTypeFindHelperGetRangeFunction ()"><span class="type">GstTypeFindHelperGetRangeFunction</span></a> func</code></em>, <em class="parameter"><code><span class="type">guint64</span> size</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *extension</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstTypeFind.html#GstTypeFindProbability"><span class="type">GstTypeFindProbability</span></a> *prob</code></em>); + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstTypeFind.html#GstTypeFindProbability"><span class="type">GstTypeFindProbability</span></a> *prob</code></em>); </pre> </div> <div class="refsect1"> @@ -78,10 +78,10 @@ typefinding in push mode from a chain function. <a name="gstreamer-libs-GstTypeFindHelper.details"></a><h2>Details</h2> <div class="refsect2"> <a name="gst-type-find-helper"></a><h3>gst_type_find_helper ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * gst_type_find_helper (<em class="parameter"><code><a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *src</code></em>, +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * gst_type_find_helper (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *src</code></em>, <em class="parameter"><code><span class="type">guint64</span> size</code></em>);</pre> <p> -Tries to find what type of data is flowing from the given source <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a>. +Tries to find what type of data is flowing from the given source <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a>. </p> <p> Free-function: gst_caps_unref @@ -91,7 +91,7 @@ Free-function: gst_caps_unref <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>src</code></em> :</span></p></td> -<td>A source <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> +<td>A source <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> </td> </tr> <tr> @@ -100,8 +100,8 @@ Free-function: gst_caps_unref </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>the <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> corresponding to the data stream. -Returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if no <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> matches the data stream. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> +<td>the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> corresponding to the data stream. +Returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if no <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> matches the data stream. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> </td> </tr> </tbody> @@ -110,17 +110,17 @@ Returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macr <hr> <div class="refsect2"> <a name="gst-type-find-helper-for-buffer"></a><h3>gst_type_find_helper_for_buffer ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * gst_type_find_helper_for_buffer (<em class="parameter"><code><a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buf</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstTypeFind.html#GstTypeFindProbability"><span class="type">GstTypeFindProbability</span></a> *prob</code></em>);</pre> +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * gst_type_find_helper_for_buffer (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buf</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstTypeFind.html#GstTypeFindProbability"><span class="type">GstTypeFindProbability</span></a> *prob</code></em>);</pre> <p> -Tries to find what type of data is contained in the given <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a>, the +Tries to find what type of data is contained in the given <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a>, the assumption being that the buffer represents the beginning of the stream or file. </p> <p> All available typefinders will be called on the data in order of rank. If -a typefinding function returns a probability of <a href="../gstreamer-1.0/gstreamer-GstTypeFind.html#GST-TYPE-FIND-MAXIMUM:CAPS"><span class="type">GST_TYPE_FIND_MAXIMUM</span></a>, +a typefinding function returns a probability of <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstTypeFind.html#GST-TYPE-FIND-MAXIMUM:CAPS"><span class="type">GST_TYPE_FIND_MAXIMUM</span></a>, typefinding is stopped immediately and the found caps will be returned right away. Otherwise, all available typefind functions will the tried, and the caps with the highest probability will be returned, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if @@ -138,7 +138,7 @@ Free-function: gst_caps_unref </tr> <tr> <td><p><span class="term"><em class="parameter"><code>buf</code></em> :</span></p></td> -<td>a <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> with data to typefind. <span class="annotation">[<acronym title="Parameter for input. Default is transfer none."><span class="acronym">in</span></acronym>][<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span> +<td>a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> with data to typefind. <span class="annotation">[<acronym title="Parameter for input. Default is transfer none."><span class="acronym">in</span></acronym>][<acronym title="Don't free data after the code is done."><span class="acronym">transfer none</span></acronym>]</span> </td> </tr> <tr> @@ -149,9 +149,9 @@ caps, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Mac </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>the <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> corresponding to the data, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> +<td>the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> corresponding to the data, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if no type could be found. The caller should free the caps returned -with <a href="../gstreamer-1.0/gstreamer-GstCaps.html#gst-caps-unref"><code class="function">gst_caps_unref()</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> +with <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#gst-caps-unref"><code class="function">gst_caps_unref()</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> </td> </tr> </tbody> @@ -160,10 +160,10 @@ with <a href="../gstreamer-1.0/gstreamer-GstCaps.html#gst-caps-unref"><code clas <hr> <div class="refsect2"> <a name="gst-type-find-helper-for-extension"></a><h3>gst_type_find_helper_for_extension ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * gst_type_find_helper_for_extension (<em class="parameter"><code><a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * gst_type_find_helper_for_extension (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *extension</code></em>);</pre> <p> -Tries to find the best <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> associated with <em class="parameter"><code>extension</code></em>. +Tries to find the best <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> associated with <em class="parameter"><code>extension</code></em>. </p> <p> All available typefinders will be checked against the extension in order @@ -187,9 +187,9 @@ Free-function: gst_caps_unref </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>the <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> corresponding to <em class="parameter"><code>extension</code></em>, or +<td>the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> corresponding to <em class="parameter"><code>extension</code></em>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if no type could be found. The caller should free the caps -returned with <a href="../gstreamer-1.0/gstreamer-GstCaps.html#gst-caps-unref"><code class="function">gst_caps_unref()</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> +returned with <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#gst-caps-unref"><code class="function">gst_caps_unref()</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> </td> </tr> </tbody> @@ -199,10 +199,10 @@ returned with <a href="../gstreamer-1.0/gstreamer-GstCaps.html#gst-caps-unref">< <hr> <div class="refsect2"> <a name="gst-type-find-helper-for-data"></a><h3>gst_type_find_helper_for_data ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * gst_type_find_helper_for_data (<em class="parameter"><code><a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * gst_type_find_helper_for_data (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, <em class="parameter"><code>const <span class="type">guint8</span> *data</code></em>, <em class="parameter"><code><span class="type">gsize</span> size</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstTypeFind.html#GstTypeFindProbability"><span class="type">GstTypeFindProbability</span></a> *prob</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstTypeFind.html#GstTypeFindProbability"><span class="type">GstTypeFindProbability</span></a> *prob</code></em>);</pre> <p> Tries to find what type of data is contained in the given <em class="parameter"><code>data</code></em>, the assumption being that the data represents the beginning of the stream or @@ -210,7 +210,7 @@ file. </p> <p> All available typefinders will be called on the data in order of rank. If -a typefinding function returns a probability of <a href="../gstreamer-1.0/gstreamer-GstTypeFind.html#GST-TYPE-FIND-MAXIMUM:CAPS"><span class="type">GST_TYPE_FIND_MAXIMUM</span></a>, +a typefinding function returns a probability of <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstTypeFind.html#GST-TYPE-FIND-MAXIMUM:CAPS"><span class="type">GST_TYPE_FIND_MAXIMUM</span></a>, typefinding is stopped immediately and the found caps will be returned right away. Otherwise, all available typefind functions will the tried, and the caps with the highest probability will be returned, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if @@ -244,9 +244,9 @@ caps, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Mac </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>the <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> corresponding to the data, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> +<td>the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> corresponding to the data, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if no type could be found. The caller should free the caps returned -with <a href="../gstreamer-1.0/gstreamer-GstCaps.html#gst-caps-unref"><code class="function">gst_caps_unref()</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> +with <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#gst-caps-unref"><code class="function">gst_caps_unref()</code></a>. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> </td> </tr> </tbody> @@ -255,12 +255,12 @@ with <a href="../gstreamer-1.0/gstreamer-GstCaps.html#gst-caps-unref"><code clas <hr> <div class="refsect2"> <a name="GstTypeFindHelperGetRangeFunction"></a><h3>GstTypeFindHelperGetRangeFunction ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (*GstTypeFindHelperGetRangeFunction) - (<em class="parameter"><code><a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> *parent</code></em>, +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstFlowReturn"><span class="returnvalue">GstFlowReturn</span></a> (*GstTypeFindHelperGetRangeFunction) + (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> *parent</code></em>, <em class="parameter"><code><span class="type">guint64</span> offset</code></em>, <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> length</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> **buffer</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> **buffer</code></em>);</pre> <p> This function will be called by <a class="link" href="gstreamer-libs-GstTypeFindHelper.html#gst-type-find-helper-get-range" title="gst_type_find_helper_get_range ()"><code class="function">gst_type_find_helper_get_range()</code></a> when typefinding functions request to peek at the data of a stream at certain @@ -269,14 +269,14 @@ stored in <em class="parameter"><code>buffer</code></em>. The contents of <em c return value. </p> <p> -This function is supposed to behave exactly like a <a href="../gstreamer-1.0/GstPad.html#GstPadGetRangeFunction"><span class="type">GstPadGetRangeFunction</span></a>. +This function is supposed to behave exactly like a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GstPadGetRangeFunction"><span class="type">GstPadGetRangeFunction</span></a>. </p> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>obj</code></em> :</span></p></td> -<td>a <a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> that will handle the getrange request</td> +<td>a <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> that will handle the getrange request</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>parent</code></em> :</span></p></td> @@ -304,12 +304,12 @@ This function is supposed to behave exactly like a <a href="../gstreamer-1.0/Gst <hr> <div class="refsect2"> <a name="gst-type-find-helper-get-range"></a><h3>gst_type_find_helper_get_range ()</h3> -<pre class="programlisting"><a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * gst_type_find_helper_get_range (<em class="parameter"><code><a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> *parent</code></em>, +<pre class="programlisting"><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="returnvalue">GstCaps</span></a> * gst_type_find_helper_get_range (<em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> *obj</code></em>, + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> *parent</code></em>, <em class="parameter"><code><a class="link" href="gstreamer-libs-GstTypeFindHelper.html#GstTypeFindHelperGetRangeFunction" title="GstTypeFindHelperGetRangeFunction ()"><span class="type">GstTypeFindHelperGetRangeFunction</span></a> func</code></em>, <em class="parameter"><code><span class="type">guint64</span> size</code></em>, <em class="parameter"><code>const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar"><span class="type">gchar</span></a> *extension</code></em>, - <em class="parameter"><code><a href="../gstreamer-1.0/gstreamer-GstTypeFind.html#GstTypeFindProbability"><span class="type">GstTypeFindProbability</span></a> *prob</code></em>);</pre> + <em class="parameter"><code><a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstTypeFind.html#GstTypeFindProbability"><span class="type">GstTypeFindProbability</span></a> *prob</code></em>);</pre> <p> Utility function to do pull-based typefinding. Unlike <a class="link" href="gstreamer-libs-GstTypeFindHelper.html#gst-type-find-helper" title="gst_type_find_helper ()"><code class="function">gst_type_find_helper()</code></a> however, this function will use the specified function <em class="parameter"><code>func</code></em> to obtain the @@ -333,7 +333,7 @@ Free-function: gst_caps_unref <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>obj</code></em> :</span></p></td> -<td>A <a href="../gstreamer-1.0/GstObject.html"><span class="type">GstObject</span></a> that will be passed as first argument to <em class="parameter"><code>func</code></em> +<td>A <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html"><span class="type">GstObject</span></a> that will be passed as first argument to <em class="parameter"><code>func</code></em> </td> </tr> <tr> @@ -362,8 +362,8 @@ caps, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Mac </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> -<td>the <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> corresponding to the data stream. -Returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if no <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> matches the data stream. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> +<td>the <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> corresponding to the data stream. +Returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><span class="type">NULL</span></a> if no <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> matches the data stream. <span class="annotation">[<acronym title="Free data after the code is done."><span class="acronym">transfer full</span></acronym>]</span> </td> </tr> </tbody> diff --git a/docs/libs/html/gstreamer-libs.devhelp2 b/docs/libs/html/gstreamer-libs.devhelp2 index fc20d81..f1f78d5 100644 --- a/docs/libs/html/gstreamer-libs.devhelp2 +++ b/docs/libs/html/gstreamer-libs.devhelp2 @@ -13,7 +13,7 @@ <sub name="GstBitReader" link="gstreamer-libs-GstBitReader.html"/> <sub name="GstByteReader" link="gstreamer-libs-GstByteReader.html"/> <sub name="GstByteWriter" link="gstreamer-libs-GstByteWriter.html"/> - <sub name="GstCollectPads2" link="GstCollectPads2.html"/> + <sub name="GstCollectPads" link="GstCollectPads.html"/> <sub name="GstTypeFindHelper" link="gstreamer-libs-GstTypeFindHelper.html"/> </sub> <sub name="GStreamer Dynamic Parameter Control" link="gstreamer-control.html"> @@ -64,7 +64,7 @@ <keyword type="macro" name="GST_BASE_PARSE_LOST_SYNC()" link="gstreamer-libs-GstBaseParse.html#GST-BASE-PARSE-LOST-SYNC:CAPS" since="0.10.33"/> <keyword type="macro" name="GST_BASE_PARSE_SINK_PAD()" link="gstreamer-libs-GstBaseParse.html#GST-BASE-PARSE-SINK-PAD:CAPS" since="0.10.33"/> <keyword type="macro" name="GST_BASE_PARSE_SRC_PAD()" link="gstreamer-libs-GstBaseParse.html#GST-BASE-PARSE-SRC-PAD:CAPS" since="0.10.33"/> - <keyword type="" name="Controlled shutdown of live sources in applications" link="GstBaseSrc.html#idp9228272"/> + <keyword type="" name="Controlled shutdown of live sources in applications" link="GstBaseSrc.html#idp9630832"/> <keyword type="struct" name="struct GstBaseSrc" link="GstBaseSrc.html#GstBaseSrc-struct"/> <keyword type="struct" name="struct GstBaseSrcClass" link="GstBaseSrc.html#GstBaseSrcClass"/> <keyword type="enum" name="enum GstBaseSrcFlags" link="GstBaseSrc.html#GstBaseSrcFlags"/> @@ -129,8 +129,8 @@ <keyword type="property" name="The "sync" property" link="GstBaseSink.html#GstBaseSink--sync"/> <keyword type="property" name="The "throttle-time" property" link="GstBaseSink.html#GstBaseSink--throttle-time"/> <keyword type="property" name="The "ts-offset" property" link="GstBaseSink.html#GstBaseSink--ts-offset"/> - <keyword type="" name="Use Cases" link="GstBaseTransform.html#idp8766032"/> - <keyword type="" name="Sub-class settable flags on GstBaseTransform" link="GstBaseTransform.html#idp10669744"/> + <keyword type="" name="Use Cases" link="GstBaseTransform.html#idp8941488"/> + <keyword type="" name="Sub-class settable flags on GstBaseTransform" link="GstBaseTransform.html#idp8166288"/> <keyword type="struct" name="struct GstBaseTransform" link="GstBaseTransform.html#GstBaseTransform-struct"/> <keyword type="struct" name="struct GstBaseTransformClass" link="GstBaseTransform.html#GstBaseTransformClass"/> <keyword type="function" name="gst_base_transform_is_passthrough ()" link="GstBaseTransform.html#gst-base-transform-is-passthrough"/> @@ -148,7 +148,7 @@ <keyword type="macro" name="GST_BASE_TRANSFORM_FLOW_DROPPED" link="GstBaseTransform.html#GST-BASE-TRANSFORM-FLOW-DROPPED:CAPS" since="0.10.13"/> <keyword type="property" name="The "qos" property" link="GstBaseTransform.html#GstBaseTransform--qos"/> <keyword type="struct" name="struct GstPushSrc" link="GstPushSrc.html#GstPushSrc-struct"/> - <keyword type="struct" name="struct GstAdapter" link="GstAdapter.html#GstAdapter-struct"/> + <keyword type="struct" name="GstAdapter" link="GstAdapter.html#GstAdapter-struct"/> <keyword type="function" name="gst_adapter_new ()" link="GstAdapter.html#gst-adapter-new"/> <keyword type="function" name="gst_adapter_clear ()" link="GstAdapter.html#gst-adapter-clear"/> <keyword type="function" name="gst_adapter_push ()" link="GstAdapter.html#gst-adapter-push"/> @@ -382,44 +382,44 @@ <keyword type="function" name="gst_byte_writer_put_float64_le_unchecked ()" link="gstreamer-libs-GstByteWriter.html#gst-byte-writer-put-float64-le-unchecked" since="0.10.31"/> <keyword type="function" name="gst_byte_writer_put_data_unchecked ()" link="gstreamer-libs-GstByteWriter.html#gst-byte-writer-put-data-unchecked" since="0.10.31"/> <keyword type="function" name="gst_byte_writer_fill_unchecked ()" link="gstreamer-libs-GstByteWriter.html#gst-byte-writer-fill-unchecked" since="0.10.31"/> - <keyword type="struct" name="struct GstCollectPads2" link="GstCollectPads2.html#GstCollectPads2-struct"/> - <keyword type="struct" name="struct GstCollectData2" link="GstCollectPads2.html#GstCollectData2" since="0.10.36"/> - <keyword type="function" name="GstCollectData2DestroyNotify ()" link="GstCollectPads2.html#GstCollectData2DestroyNotify" since="0.10.36"/> - <keyword type="function" name="GstCollectPads2BufferFunction ()" link="GstCollectPads2.html#GstCollectPads2BufferFunction" since="0.10.36"/> - <keyword type="function" name="GstCollectPads2CompareFunction ()" link="GstCollectPads2.html#GstCollectPads2CompareFunction" since="0.10.36"/> - <keyword type="function" name="GstCollectPads2EventFunction ()" link="GstCollectPads2.html#GstCollectPads2EventFunction" since="0.10.36"/> - <keyword type="function" name="GstCollectPads2ClipFunction ()" link="GstCollectPads2.html#GstCollectPads2ClipFunction" since="0.10.36"/> - <keyword type="function" name="GstCollectPads2Function ()" link="GstCollectPads2.html#GstCollectPads2Function" since="0.10.36"/> - <keyword type="enum" name="enum GstCollectPads2StateFlags" link="GstCollectPads2.html#GstCollectPads2StateFlags" since="0.10.36"/> - <keyword type="macro" name="GST_COLLECT_PADS2_STATE()" link="GstCollectPads2.html#GST-COLLECT-PADS2-STATE:CAPS" since="0.10.36"/> - <keyword type="macro" name="GST_COLLECT_PADS2_STATE_IS_SET()" link="GstCollectPads2.html#GST-COLLECT-PADS2-STATE-IS-SET:CAPS" since="0.10.36"/> - <keyword type="macro" name="GST_COLLECT_PADS2_STATE_SET()" link="GstCollectPads2.html#GST-COLLECT-PADS2-STATE-SET:CAPS" since="0.10.36"/> - <keyword type="macro" name="GST_COLLECT_PADS2_STATE_UNSET()" link="GstCollectPads2.html#GST-COLLECT-PADS2-STATE-UNSET:CAPS" since="0.10.36"/> - <keyword type="macro" name="GST_COLLECT_PADS2_GET_STREAM_LOCK()" link="GstCollectPads2.html#GST-COLLECT-PADS2-GET-STREAM-LOCK:CAPS" since="0.10.36"/> - <keyword type="macro" name="GST_COLLECT_PADS2_STREAM_LOCK()" link="GstCollectPads2.html#GST-COLLECT-PADS2-STREAM-LOCK:CAPS" since="0.10.36"/> - <keyword type="macro" name="GST_COLLECT_PADS2_STREAM_UNLOCK()" link="GstCollectPads2.html#GST-COLLECT-PADS2-STREAM-UNLOCK:CAPS" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_new ()" link="GstCollectPads2.html#gst-collect-pads2-new" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_add_pad ()" link="GstCollectPads2.html#gst-collect-pads2-add-pad" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_add_pad_full ()" link="GstCollectPads2.html#gst-collect-pads2-add-pad-full" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_remove_pad ()" link="GstCollectPads2.html#gst-collect-pads2-remove-pad" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_start ()" link="GstCollectPads2.html#gst-collect-pads2-start" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_stop ()" link="GstCollectPads2.html#gst-collect-pads2-stop" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_available ()" link="GstCollectPads2.html#gst-collect-pads2-available" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_is_active ()" link="GstCollectPads2.html#gst-collect-pads2-is-active" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_collect ()" link="GstCollectPads2.html#gst-collect-pads2-collect" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_collect_range ()" link="GstCollectPads2.html#gst-collect-pads2-collect-range" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_flush ()" link="GstCollectPads2.html#gst-collect-pads2-flush" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_peek ()" link="GstCollectPads2.html#gst-collect-pads2-peek" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_pop ()" link="GstCollectPads2.html#gst-collect-pads2-pop" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_read_buffer ()" link="GstCollectPads2.html#gst-collect-pads2-read-buffer" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_take_buffer ()" link="GstCollectPads2.html#gst-collect-pads2-take-buffer" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_set_buffer_function ()" link="GstCollectPads2.html#gst-collect-pads2-set-buffer-function" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_set_compare_function ()" link="GstCollectPads2.html#gst-collect-pads2-set-compare-function" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_set_event_function ()" link="GstCollectPads2.html#gst-collect-pads2-set-event-function" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_set_clip_function ()" link="GstCollectPads2.html#gst-collect-pads2-set-clip-function" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_set_flushing ()" link="GstCollectPads2.html#gst-collect-pads2-set-flushing" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_set_function ()" link="GstCollectPads2.html#gst-collect-pads2-set-function" since="0.10.36"/> - <keyword type="function" name="gst_collect_pads2_set_waiting ()" link="GstCollectPads2.html#gst-collect-pads2-set-waiting" since="0.10.36"/> + <keyword type="struct" name="struct GstCollectPads" link="GstCollectPads.html#GstCollectPads-struct"/> + <keyword type="struct" name="struct GstCollectData" link="GstCollectPads.html#GstCollectData" since="0.10.36"/> + <keyword type="function" name="GstCollectDataDestroyNotify ()" link="GstCollectPads.html#GstCollectDataDestroyNotify" since="0.10.36"/> + <keyword type="function" name="GstCollectPadsBufferFunction ()" link="GstCollectPads.html#GstCollectPadsBufferFunction" since="0.10.36"/> + <keyword type="function" name="GstCollectPadsCompareFunction ()" link="GstCollectPads.html#GstCollectPadsCompareFunction" since="0.10.36"/> + <keyword type="function" name="GstCollectPadsEventFunction ()" link="GstCollectPads.html#GstCollectPadsEventFunction" since="0.10.36"/> + <keyword type="function" name="GstCollectPadsClipFunction ()" link="GstCollectPads.html#GstCollectPadsClipFunction" since="0.10.36"/> + <keyword type="function" name="GstCollectPadsFunction ()" link="GstCollectPads.html#GstCollectPadsFunction" since="0.10.36"/> + <keyword type="enum" name="enum GstCollectPadsStateFlags" link="GstCollectPads.html#GstCollectPadsStateFlags" since="0.10.36"/> + <keyword type="macro" name="GST_COLLECT_PADS_STATE()" link="GstCollectPads.html#GST-COLLECT-PADS-STATE:CAPS" since="0.10.36"/> + <keyword type="macro" name="GST_COLLECT_PADS_STATE_IS_SET()" link="GstCollectPads.html#GST-COLLECT-PADS-STATE-IS-SET:CAPS" since="0.10.36"/> + <keyword type="macro" name="GST_COLLECT_PADS_STATE_SET()" link="GstCollectPads.html#GST-COLLECT-PADS-STATE-SET:CAPS" since="0.10.36"/> + <keyword type="macro" name="GST_COLLECT_PADS_STATE_UNSET()" link="GstCollectPads.html#GST-COLLECT-PADS-STATE-UNSET:CAPS" since="0.10.36"/> + <keyword type="macro" name="GST_COLLECT_PADS_GET_STREAM_LOCK()" link="GstCollectPads.html#GST-COLLECT-PADS-GET-STREAM-LOCK:CAPS" since="0.10.36"/> + <keyword type="macro" name="GST_COLLECT_PADS_STREAM_LOCK()" link="GstCollectPads.html#GST-COLLECT-PADS-STREAM-LOCK:CAPS" since="0.10.36"/> + <keyword type="macro" name="GST_COLLECT_PADS_STREAM_UNLOCK()" link="GstCollectPads.html#GST-COLLECT-PADS-STREAM-UNLOCK:CAPS" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_new ()" link="GstCollectPads.html#gst-collect-pads-new" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_add_pad ()" link="GstCollectPads.html#gst-collect-pads-add-pad" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_add_pad_full ()" link="GstCollectPads.html#gst-collect-pads-add-pad-full" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_remove_pad ()" link="GstCollectPads.html#gst-collect-pads-remove-pad" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_start ()" link="GstCollectPads.html#gst-collect-pads-start" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_stop ()" link="GstCollectPads.html#gst-collect-pads-stop" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_available ()" link="GstCollectPads.html#gst-collect-pads-available" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_is_active ()" link="GstCollectPads.html#gst-collect-pads-is-active" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_collect ()" link="GstCollectPads.html#gst-collect-pads-collect" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_collect_range ()" link="GstCollectPads.html#gst-collect-pads-collect-range" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_flush ()" link="GstCollectPads.html#gst-collect-pads-flush" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_peek ()" link="GstCollectPads.html#gst-collect-pads-peek" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_pop ()" link="GstCollectPads.html#gst-collect-pads-pop" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_read_buffer ()" link="GstCollectPads.html#gst-collect-pads-read-buffer" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_take_buffer ()" link="GstCollectPads.html#gst-collect-pads-take-buffer" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_set_buffer_function ()" link="GstCollectPads.html#gst-collect-pads-set-buffer-function" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_set_compare_function ()" link="GstCollectPads.html#gst-collect-pads-set-compare-function" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_set_event_function ()" link="GstCollectPads.html#gst-collect-pads-set-event-function" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_set_clip_function ()" link="GstCollectPads.html#gst-collect-pads-set-clip-function" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_set_flushing ()" link="GstCollectPads.html#gst-collect-pads-set-flushing" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_set_function ()" link="GstCollectPads.html#gst-collect-pads-set-function" since="0.10.36"/> + <keyword type="function" name="gst_collect_pads_set_waiting ()" link="GstCollectPads.html#gst-collect-pads-set-waiting" since="0.10.36"/> <keyword type="function" name="gst_type_find_helper ()" link="gstreamer-libs-GstTypeFindHelper.html#gst-type-find-helper"/> <keyword type="function" name="gst_type_find_helper_for_buffer ()" link="gstreamer-libs-GstTypeFindHelper.html#gst-type-find-helper-for-buffer"/> <keyword type="function" name="gst_type_find_helper_for_extension ()" link="gstreamer-libs-GstTypeFindHelper.html#gst-type-find-helper-for-extension" since="0.10.23"/> @@ -521,11 +521,11 @@ <keyword type="constant" name="GST_BASE_SRC_FLAG_STARTING" link="GstBaseSrc.html#GST-BASE-SRC-FLAG-STARTING:CAPS"/> <keyword type="constant" name="GST_BASE_SRC_FLAG_STARTED" link="GstBaseSrc.html#GST-BASE-SRC-FLAG-STARTED:CAPS"/> <keyword type="constant" name="GST_BASE_SRC_FLAG_LAST" link="GstBaseSrc.html#GST-BASE-SRC-FLAG-LAST:CAPS"/> - <keyword type="constant" name="GST_COLLECT_PADS2_STATE_EOS" link="GstCollectPads2.html#GST-COLLECT-PADS2-STATE-EOS:CAPS"/> - <keyword type="constant" name="GST_COLLECT_PADS2_STATE_FLUSHING" link="GstCollectPads2.html#GST-COLLECT-PADS2-STATE-FLUSHING:CAPS"/> - <keyword type="constant" name="GST_COLLECT_PADS2_STATE_NEW_SEGMENT" link="GstCollectPads2.html#GST-COLLECT-PADS2-STATE-NEW-SEGMENT:CAPS"/> - <keyword type="constant" name="GST_COLLECT_PADS2_STATE_WAITING" link="GstCollectPads2.html#GST-COLLECT-PADS2-STATE-WAITING:CAPS"/> - <keyword type="constant" name="GST_COLLECT_PADS2_STATE_LOCKED" link="GstCollectPads2.html#GST-COLLECT-PADS2-STATE-LOCKED:CAPS"/> + <keyword type="constant" name="GST_COLLECT_PADS_STATE_EOS" link="GstCollectPads.html#GST-COLLECT-PADS-STATE-EOS:CAPS"/> + <keyword type="constant" name="GST_COLLECT_PADS_STATE_FLUSHING" link="GstCollectPads.html#GST-COLLECT-PADS-STATE-FLUSHING:CAPS"/> + <keyword type="constant" name="GST_COLLECT_PADS_STATE_NEW_SEGMENT" link="GstCollectPads.html#GST-COLLECT-PADS-STATE-NEW-SEGMENT:CAPS"/> + <keyword type="constant" name="GST_COLLECT_PADS_STATE_WAITING" link="GstCollectPads.html#GST-COLLECT-PADS-STATE-WAITING:CAPS"/> + <keyword type="constant" name="GST_COLLECT_PADS_STATE_LOCKED" link="GstCollectPads.html#GST-COLLECT-PADS-STATE-LOCKED:CAPS"/> <keyword type="constant" name="GST_INTERPOLATION_MODE_NONE" link="GstInterpolationControlSource.html#GST-INTERPOLATION-MODE-NONE:CAPS"/> <keyword type="constant" name="GST_INTERPOLATION_MODE_LINEAR" link="GstInterpolationControlSource.html#GST-INTERPOLATION-MODE-LINEAR:CAPS"/> <keyword type="constant" name="GST_INTERPOLATION_MODE_CUBIC" link="GstInterpolationControlSource.html#GST-INTERPOLATION-MODE-CUBIC:CAPS"/> diff --git a/docs/libs/html/gstreamer-libs.html b/docs/libs/html/gstreamer-libs.html index c78c045..0f61876 100644 --- a/docs/libs/html/gstreamer-libs.html +++ b/docs/libs/html/gstreamer-libs.html @@ -57,7 +57,7 @@ types to a memory buffer and allows reading</span> </dt> <dt> -<span class="refentrytitle"><a href="GstCollectPads2.html">GstCollectPads2</a></span><span class="refpurpose"> — manages a set of pads that operate in collect mode</span> +<span class="refentrytitle"><a href="GstCollectPads.html">GstCollectPads</a></span><span class="refpurpose"> — manages a set of pads that operate in collect mode</span> </dt> <dt> <span class="refentrytitle"><a href="gstreamer-libs-GstTypeFindHelper.html">GstTypeFindHelper</a></span><span class="refpurpose"> — Utility functions for typefinding</span> diff --git a/docs/libs/html/index.html b/docs/libs/html/index.html index 77ca5d3..b3cb126 100644 --- a/docs/libs/html/index.html +++ b/docs/libs/html/index.html @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GStreamer 1.0 Library Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for GStreamer Library 1.0 (0.11.89.1) + for GStreamer Library 1.0 (0.11.90.1) The latest version of this documentation can be found on-line at <a class="ulink" href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/" target="_top">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/</a>. </p></div> @@ -57,7 +57,7 @@ types to a memory buffer and allows reading</span> </dt> <dt> -<span class="refentrytitle"><a href="GstCollectPads2.html">GstCollectPads2</a></span><span class="refpurpose"> — manages a set of pads that operate in collect mode</span> +<span class="refentrytitle"><a href="GstCollectPads.html">GstCollectPads</a></span><span class="refpurpose"> — manages a set of pads that operate in collect mode</span> </dt> <dt> <span class="refentrytitle"><a href="gstreamer-libs-GstTypeFindHelper.html">GstTypeFindHelper</a></span><span class="refpurpose"> — Utility functions for typefinding</span> diff --git a/docs/libs/html/index.sgml b/docs/libs/html/index.sgml index f0c3cb6..13940c0 100644 --- a/docs/libs/html/index.sgml +++ b/docs/libs/html/index.sgml @@ -400,54 +400,54 @@ <ANCHOR id="gst-byte-writer-put-float64-le-unchecked" href="gstreamer-libs-1.0/gstreamer-libs-GstByteWriter.html#gst-byte-writer-put-float64-le-unchecked"> <ANCHOR id="gst-byte-writer-put-data-unchecked" href="gstreamer-libs-1.0/gstreamer-libs-GstByteWriter.html#gst-byte-writer-put-data-unchecked"> <ANCHOR id="gst-byte-writer-fill-unchecked" href="gstreamer-libs-1.0/gstreamer-libs-GstByteWriter.html#gst-byte-writer-fill-unchecked"> -<ANCHOR id="GstCollectPads2" href="gstreamer-libs-1.0/GstCollectPads2.html"> -<ANCHOR id="GstCollectPads2.synopsis" href="gstreamer-libs-1.0/GstCollectPads2.html#GstCollectPads2.synopsis"> -<ANCHOR id="GstCollectPads2.object-hierarchy" href="gstreamer-libs-1.0/GstCollectPads2.html#GstCollectPads2.object-hierarchy"> -<ANCHOR id="GstCollectPads2.description" href="gstreamer-libs-1.0/GstCollectPads2.html#GstCollectPads2.description"> -<ANCHOR id="GstCollectPads2.details" href="gstreamer-libs-1.0/GstCollectPads2.html#GstCollectPads2.details"> -<ANCHOR id="GstCollectPads2-struct" href="gstreamer-libs-1.0/GstCollectPads2.html#GstCollectPads2-struct"> -<ANCHOR id="GstCollectData2" href="gstreamer-libs-1.0/GstCollectPads2.html#GstCollectData2"> -<ANCHOR id="GstCollectData2DestroyNotify" href="gstreamer-libs-1.0/GstCollectPads2.html#GstCollectData2DestroyNotify"> -<ANCHOR id="GstCollectPads2BufferFunction" href="gstreamer-libs-1.0/GstCollectPads2.html#GstCollectPads2BufferFunction"> -<ANCHOR id="GstCollectPads2CompareFunction" href="gstreamer-libs-1.0/GstCollectPads2.html#GstCollectPads2CompareFunction"> -<ANCHOR id="GstCollectPads2EventFunction" href="gstreamer-libs-1.0/GstCollectPads2.html#GstCollectPads2EventFunction"> -<ANCHOR id="GstCollectPads2ClipFunction" href="gstreamer-libs-1.0/GstCollectPads2.html#GstCollectPads2ClipFunction"> -<ANCHOR id="GstCollectPads2Function" href="gstreamer-libs-1.0/GstCollectPads2.html#GstCollectPads2Function"> -<ANCHOR id="GstCollectPads2StateFlags" href="gstreamer-libs-1.0/GstCollectPads2.html#GstCollectPads2StateFlags"> -<ANCHOR id="GST-COLLECT-PADS2-STATE-EOS:CAPS" href="gstreamer-libs-1.0/GstCollectPads2.html#GST-COLLECT-PADS2-STATE-EOS:CAPS"> -<ANCHOR id="GST-COLLECT-PADS2-STATE-FLUSHING:CAPS" href="gstreamer-libs-1.0/GstCollectPads2.html#GST-COLLECT-PADS2-STATE-FLUSHING:CAPS"> -<ANCHOR id="GST-COLLECT-PADS2-STATE-NEW-SEGMENT:CAPS" href="gstreamer-libs-1.0/GstCollectPads2.html#GST-COLLECT-PADS2-STATE-NEW-SEGMENT:CAPS"> -<ANCHOR id="GST-COLLECT-PADS2-STATE-WAITING:CAPS" href="gstreamer-libs-1.0/GstCollectPads2.html#GST-COLLECT-PADS2-STATE-WAITING:CAPS"> -<ANCHOR id="GST-COLLECT-PADS2-STATE-LOCKED:CAPS" href="gstreamer-libs-1.0/GstCollectPads2.html#GST-COLLECT-PADS2-STATE-LOCKED:CAPS"> -<ANCHOR id="GST-COLLECT-PADS2-STATE:CAPS" href="gstreamer-libs-1.0/GstCollectPads2.html#GST-COLLECT-PADS2-STATE:CAPS"> -<ANCHOR id="GST-COLLECT-PADS2-STATE-IS-SET:CAPS" href="gstreamer-libs-1.0/GstCollectPads2.html#GST-COLLECT-PADS2-STATE-IS-SET:CAPS"> -<ANCHOR id="GST-COLLECT-PADS2-STATE-SET:CAPS" href="gstreamer-libs-1.0/GstCollectPads2.html#GST-COLLECT-PADS2-STATE-SET:CAPS"> -<ANCHOR id="GST-COLLECT-PADS2-STATE-UNSET:CAPS" href="gstreamer-libs-1.0/GstCollectPads2.html#GST-COLLECT-PADS2-STATE-UNSET:CAPS"> -<ANCHOR id="GST-COLLECT-PADS2-GET-STREAM-LOCK:CAPS" href="gstreamer-libs-1.0/GstCollectPads2.html#GST-COLLECT-PADS2-GET-STREAM-LOCK:CAPS"> -<ANCHOR id="GST-COLLECT-PADS2-STREAM-LOCK:CAPS" href="gstreamer-libs-1.0/GstCollectPads2.html#GST-COLLECT-PADS2-STREAM-LOCK:CAPS"> -<ANCHOR id="GST-COLLECT-PADS2-STREAM-UNLOCK:CAPS" href="gstreamer-libs-1.0/GstCollectPads2.html#GST-COLLECT-PADS2-STREAM-UNLOCK:CAPS"> -<ANCHOR id="gst-collect-pads2-new" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-new"> -<ANCHOR id="gst-collect-pads2-add-pad" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-add-pad"> -<ANCHOR id="gst-collect-pads2-add-pad-full" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-add-pad-full"> -<ANCHOR id="gst-collect-pads2-remove-pad" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-remove-pad"> -<ANCHOR id="gst-collect-pads2-start" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-start"> -<ANCHOR id="gst-collect-pads2-stop" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-stop"> -<ANCHOR id="gst-collect-pads2-available" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-available"> -<ANCHOR id="gst-collect-pads2-is-active" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-is-active"> -<ANCHOR id="gst-collect-pads2-collect" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-collect"> -<ANCHOR id="gst-collect-pads2-collect-range" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-collect-range"> -<ANCHOR id="gst-collect-pads2-flush" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-flush"> -<ANCHOR id="gst-collect-pads2-peek" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-peek"> -<ANCHOR id="gst-collect-pads2-pop" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-pop"> -<ANCHOR id="gst-collect-pads2-read-buffer" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-read-buffer"> -<ANCHOR id="gst-collect-pads2-take-buffer" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-take-buffer"> -<ANCHOR id="gst-collect-pads2-set-buffer-function" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-set-buffer-function"> -<ANCHOR id="gst-collect-pads2-set-compare-function" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-set-compare-function"> -<ANCHOR id="gst-collect-pads2-set-event-function" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-set-event-function"> -<ANCHOR id="gst-collect-pads2-set-clip-function" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-set-clip-function"> -<ANCHOR id="gst-collect-pads2-set-flushing" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-set-flushing"> -<ANCHOR id="gst-collect-pads2-set-function" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-set-function"> -<ANCHOR id="gst-collect-pads2-set-waiting" href="gstreamer-libs-1.0/GstCollectPads2.html#gst-collect-pads2-set-waiting"> +<ANCHOR id="GstCollectPads" href="gstreamer-libs-1.0/GstCollectPads.html"> +<ANCHOR id="GstCollectPads.synopsis" href="gstreamer-libs-1.0/GstCollectPads.html#GstCollectPads.synopsis"> +<ANCHOR id="GstCollectPads.object-hierarchy" href="gstreamer-libs-1.0/GstCollectPads.html#GstCollectPads.object-hierarchy"> +<ANCHOR id="GstCollectPads.description" href="gstreamer-libs-1.0/GstCollectPads.html#GstCollectPads.description"> +<ANCHOR id="GstCollectPads.details" href="gstreamer-libs-1.0/GstCollectPads.html#GstCollectPads.details"> +<ANCHOR id="GstCollectPads-struct" href="gstreamer-libs-1.0/GstCollectPads.html#GstCollectPads-struct"> +<ANCHOR id="GstCollectData" href="gstreamer-libs-1.0/GstCollectPads.html#GstCollectData"> +<ANCHOR id="GstCollectDataDestroyNotify" href="gstreamer-libs-1.0/GstCollectPads.html#GstCollectDataDestroyNotify"> +<ANCHOR id="GstCollectPadsBufferFunction" href="gstreamer-libs-1.0/GstCollectPads.html#GstCollectPadsBufferFunction"> +<ANCHOR id="GstCollectPadsCompareFunction" href="gstreamer-libs-1.0/GstCollectPads.html#GstCollectPadsCompareFunction"> +<ANCHOR id="GstCollectPadsEventFunction" href="gstreamer-libs-1.0/GstCollectPads.html#GstCollectPadsEventFunction"> +<ANCHOR id="GstCollectPadsClipFunction" href="gstreamer-libs-1.0/GstCollectPads.html#GstCollectPadsClipFunction"> +<ANCHOR id="GstCollectPadsFunction" href="gstreamer-libs-1.0/GstCollectPads.html#GstCollectPadsFunction"> +<ANCHOR id="GstCollectPadsStateFlags" href="gstreamer-libs-1.0/GstCollectPads.html#GstCollectPadsStateFlags"> +<ANCHOR id="GST-COLLECT-PADS-STATE-EOS:CAPS" href="gstreamer-libs-1.0/GstCollectPads.html#GST-COLLECT-PADS-STATE-EOS:CAPS"> +<ANCHOR id="GST-COLLECT-PADS-STATE-FLUSHING:CAPS" href="gstreamer-libs-1.0/GstCollectPads.html#GST-COLLECT-PADS-STATE-FLUSHING:CAPS"> +<ANCHOR id="GST-COLLECT-PADS-STATE-NEW-SEGMENT:CAPS" href="gstreamer-libs-1.0/GstCollectPads.html#GST-COLLECT-PADS-STATE-NEW-SEGMENT:CAPS"> +<ANCHOR id="GST-COLLECT-PADS-STATE-WAITING:CAPS" href="gstreamer-libs-1.0/GstCollectPads.html#GST-COLLECT-PADS-STATE-WAITING:CAPS"> +<ANCHOR id="GST-COLLECT-PADS-STATE-LOCKED:CAPS" href="gstreamer-libs-1.0/GstCollectPads.html#GST-COLLECT-PADS-STATE-LOCKED:CAPS"> +<ANCHOR id="GST-COLLECT-PADS-STATE:CAPS" href="gstreamer-libs-1.0/GstCollectPads.html#GST-COLLECT-PADS-STATE:CAPS"> +<ANCHOR id="GST-COLLECT-PADS-STATE-IS-SET:CAPS" href="gstreamer-libs-1.0/GstCollectPads.html#GST-COLLECT-PADS-STATE-IS-SET:CAPS"> +<ANCHOR id="GST-COLLECT-PADS-STATE-SET:CAPS" href="gstreamer-libs-1.0/GstCollectPads.html#GST-COLLECT-PADS-STATE-SET:CAPS"> +<ANCHOR id="GST-COLLECT-PADS-STATE-UNSET:CAPS" href="gstreamer-libs-1.0/GstCollectPads.html#GST-COLLECT-PADS-STATE-UNSET:CAPS"> +<ANCHOR id="GST-COLLECT-PADS-GET-STREAM-LOCK:CAPS" href="gstreamer-libs-1.0/GstCollectPads.html#GST-COLLECT-PADS-GET-STREAM-LOCK:CAPS"> +<ANCHOR id="GST-COLLECT-PADS-STREAM-LOCK:CAPS" href="gstreamer-libs-1.0/GstCollectPads.html#GST-COLLECT-PADS-STREAM-LOCK:CAPS"> +<ANCHOR id="GST-COLLECT-PADS-STREAM-UNLOCK:CAPS" href="gstreamer-libs-1.0/GstCollectPads.html#GST-COLLECT-PADS-STREAM-UNLOCK:CAPS"> +<ANCHOR id="gst-collect-pads-new" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-new"> +<ANCHOR id="gst-collect-pads-add-pad" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-add-pad"> +<ANCHOR id="gst-collect-pads-add-pad-full" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-add-pad-full"> +<ANCHOR id="gst-collect-pads-remove-pad" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-remove-pad"> +<ANCHOR id="gst-collect-pads-start" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-start"> +<ANCHOR id="gst-collect-pads-stop" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-stop"> +<ANCHOR id="gst-collect-pads-available" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-available"> +<ANCHOR id="gst-collect-pads-is-active" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-is-active"> +<ANCHOR id="gst-collect-pads-collect" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-collect"> +<ANCHOR id="gst-collect-pads-collect-range" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-collect-range"> +<ANCHOR id="gst-collect-pads-flush" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-flush"> +<ANCHOR id="gst-collect-pads-peek" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-peek"> +<ANCHOR id="gst-collect-pads-pop" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-pop"> +<ANCHOR id="gst-collect-pads-read-buffer" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-read-buffer"> +<ANCHOR id="gst-collect-pads-take-buffer" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-take-buffer"> +<ANCHOR id="gst-collect-pads-set-buffer-function" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-set-buffer-function"> +<ANCHOR id="gst-collect-pads-set-compare-function" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-set-compare-function"> +<ANCHOR id="gst-collect-pads-set-event-function" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-set-event-function"> +<ANCHOR id="gst-collect-pads-set-clip-function" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-set-clip-function"> +<ANCHOR id="gst-collect-pads-set-flushing" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-set-flushing"> +<ANCHOR id="gst-collect-pads-set-function" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-set-function"> +<ANCHOR id="gst-collect-pads-set-waiting" href="gstreamer-libs-1.0/GstCollectPads.html#gst-collect-pads-set-waiting"> <ANCHOR id="gstreamer-libs-GstTypeFindHelper" href="gstreamer-libs-1.0/gstreamer-libs-GstTypeFindHelper.html"> <ANCHOR id="gstreamer-libs-GstTypeFindHelper.synopsis" href="gstreamer-libs-1.0/gstreamer-libs-GstTypeFindHelper.html#gstreamer-libs-GstTypeFindHelper.synopsis"> <ANCHOR id="gstreamer-libs-GstTypeFindHelper.description" href="gstreamer-libs-1.0/gstreamer-libs-GstTypeFindHelper.html#gstreamer-libs-GstTypeFindHelper.description"> diff --git a/docs/manual/Makefile.in b/docs/manual/Makefile.in index 9931237..5546c4f 100644 --- a/docs/manual/Makefile.in +++ b/docs/manual/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -553,7 +553,7 @@ install-manualDATA: $(manual_DATA) @list='$(manual_DATA)'; test -n "$(manualdir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(manualdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(manualdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(manualdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ diff --git a/docs/plugins/Makefile.in b/docs/plugins/Makefile.in index 47acc8f..34b0949 100644 --- a/docs/plugins/Makefile.in +++ b/docs/plugins/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/docs/plugins/html/ch01.html b/docs/plugins/html/ch01.html index 4b3daf0..4ce3974 100644 --- a/docs/plugins/html/ch01.html +++ b/docs/plugins/html/ch01.html @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="idp179200"></a>gstreamer Elements</h2></div></div></div> +<a name="idp4169280"></a>gstreamer Elements</h2></div></div></div> <div class="toc"><dl> <dt> <span class="refentrytitle"><a href="gstreamer-plugins-capsfilter.html">capsfilter</a></span><span class="refpurpose"> — Pass data without modification, limiting formats</span> diff --git a/docs/plugins/html/ch02.html b/docs/plugins/html/ch02.html index b8df4f6..64c6e46 100644 --- a/docs/plugins/html/ch02.html +++ b/docs/plugins/html/ch02.html @@ -21,7 +21,7 @@ </tr></table> <div class="chapter"> <div class="titlepage"><div><div><h2 class="title"> -<a name="idp276336"></a>gstreamer Plugins</h2></div></div></div> +<a name="idp275968"></a>gstreamer Plugins</h2></div></div></div> <div class="toc"><dl><dt> <span class="refentrytitle"><a href="gstreamer-plugins-plugin-coreelements.html">coreelements</a></span><span class="refpurpose"> — <a name="plugin-coreelements"></a>standard GStreamer elements</span> </dt></dl></div> diff --git a/docs/plugins/html/gstreamer-plugins-capsfilter.html b/docs/plugins/html/gstreamer-plugins-capsfilter.html index 5b7e3a6..8571db3 100644 --- a/docs/plugins/html/gstreamer-plugins-capsfilter.html +++ b/docs/plugins/html/gstreamer-plugins-capsfilter.html @@ -49,16 +49,16 @@ <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> - +----<a href="../gstreamer-libs-1.0/GstBaseTransform.html">GstBaseTransform</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseTransform.html">GstBaseTransform</a> +----GstCapsFilter </pre> </div> <div class="refsect1"> <a name="gstreamer-plugins-capsfilter.properties"></a><h2>Properties</h2> <pre class="synopsis"> - "<a class="link" href="gstreamer-plugins-capsfilter.html#GstCapsFilter--caps" title='The "caps" property'>caps</a>" <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a>* : Read / Write + "<a class="link" href="gstreamer-plugins-capsfilter.html#GstCapsFilter--caps" title='The "caps" property'>caps</a>" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a>* : Read / Write </pre> </div> <div class="refsect1"> @@ -70,7 +70,7 @@ data format. <p> </p> <div class="refsect2"> -<a name="idp7856352"></a><h3>Example launch line</h3> +<a name="idp7244064"></a><h3>Example launch line</h3> <div class="informalexample"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -88,7 +88,7 @@ data format. <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp7769296"></a><h3>Element Information</h3> +<a name="idp8108768"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -173,7 +173,7 @@ The opaque <a class="link" href="gstreamer-plugins-capsfilter.html#GstCapsFilter <a name="gstreamer-plugins-capsfilter.property-details"></a><h2>Property Details</h2> <div class="refsect2"> <a name="GstCapsFilter--caps"></a><h3>The <code class="literal">"caps"</code> property</h3> -<pre class="programlisting"> "caps" <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a>* : Read / Write</pre> +<pre class="programlisting"> "caps" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a>* : Read / Write</pre> <p>Restrict the possible allowed capabilities (NULL means ANY). Setting this property takes a reference to the supplied GstCaps object.</p> </div> </div> diff --git a/docs/plugins/html/gstreamer-plugins-fakesink.html b/docs/plugins/html/gstreamer-plugins-fakesink.html index b0f063e..f579a81 100644 --- a/docs/plugins/html/gstreamer-plugins-fakesink.html +++ b/docs/plugins/html/gstreamer-plugins-fakesink.html @@ -52,9 +52,9 @@ enum <a class="link" href="gstreamer-plugins-fakesink.html#GstFak <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> - +----<a href="../gstreamer-libs-1.0/GstBaseSink.html">GstBaseSink</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseSink.html">GstBaseSink</a> +----GstFakeSink </pre> </div> @@ -86,7 +86,7 @@ Dummy sink that swallows everything. <p> </p> <div class="refsect2"> -<a name="idp8740176"></a><h3>Example launch line</h3> +<a name="idp9286240"></a><h3>Example launch line</h3> <div class="informalexample"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -104,7 +104,7 @@ Dummy sink that swallows everything. <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp8742784"></a><h3>Element Information</h3> +<a name="idp10003392"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -127,7 +127,7 @@ Dummy sink that swallows everything. </div> <hr> <div class="refsect2"> -<a name="idp9609776"></a><h3>Element Pads</h3> +<a name="idp10010928"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -285,8 +285,8 @@ Possible state change errors for the state-error property. <div class="refsect2"> <a name="GstFakeSink-handoff"></a><h3>The <code class="literal">"handoff"</code> signal</h3> <pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="gstreamer-plugins-fakesink.html#GstFakeSink"><span class="type">GstFakeSink</span></a> *fakesink, - <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer, - <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad, + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer, + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad, <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS"><code class="literal">Run Last</code></a></pre> <p> This signal gets emitted before unreffing the buffer. @@ -317,8 +317,8 @@ This signal gets emitted before unreffing the buffer. <div class="refsect2"> <a name="GstFakeSink-preroll-handoff"></a><h3>The <code class="literal">"preroll-handoff"</code> signal</h3> <pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="gstreamer-plugins-fakesink.html#GstFakeSink"><span class="type">GstFakeSink</span></a> *fakesink, - <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer, - <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad, + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer, + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad, <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS"><code class="literal">Run Last</code></a></pre> <p> This signal gets emitted before unreffing the buffer. diff --git a/docs/plugins/html/gstreamer-plugins-fakesrc.html b/docs/plugins/html/gstreamer-plugins-fakesrc.html index 56e3682..fd7ebbb 100644 --- a/docs/plugins/html/gstreamer-plugins-fakesrc.html +++ b/docs/plugins/html/gstreamer-plugins-fakesrc.html @@ -55,9 +55,9 @@ enum <a class="link" href="gstreamer-plugins-fakesrc.html#GstFake <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> - +----<a href="../gstreamer-libs-1.0/GstBaseSrc.html">GstBaseSrc</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseSrc.html">GstBaseSrc</a> +----GstFakeSrc </pre> </div> @@ -80,7 +80,7 @@ enum <a class="link" href="gstreamer-plugins-fakesrc.html#GstFake "<a class="link" href="gstreamer-plugins-fakesrc.html#GstFakeSrc--sizemin" title='The "sizemin" property'>sizemin</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> : Read / Write "<a class="link" href="gstreamer-plugins-fakesrc.html#GstFakeSrc--sizetype" title='The "sizetype" property'>sizetype</a>" <a class="link" href="gstreamer-plugins-fakesrc.html#GstFakeSrcSizeType" title="enum GstFakeSrcSizeType"><span class="type">GstFakeSrcSizeType</span></a> : Read / Write "<a class="link" href="gstreamer-plugins-fakesrc.html#GstFakeSrc--sync" title='The "sync" property'>sync</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write - "<a class="link" href="gstreamer-plugins-fakesrc.html#GstFakeSrc--format" title='The "format" property'>format</a>" <a href="../gstreamer-1.0/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> : Read / Write + "<a class="link" href="gstreamer-plugins-fakesrc.html#GstFakeSrc--format" title='The "format" property'>format</a>" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> : Read / Write </pre> </div> <div class="refsect1"> @@ -102,7 +102,7 @@ basic <span class="application">GStreamer</span> core functionality is: <p> </p> <div class="refsect2"> -<a name="idp6947072"></a><h3>Example launch line</h3> +<a name="idp7348848"></a><h3>Example launch line</h3> <div class="informalexample"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -124,7 +124,7 @@ Last reviewed on 2008-06-20 (0.10.21) <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp6950256"></a><h3>Element Information</h3> +<a name="idp7352032"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -147,7 +147,7 @@ Last reviewed on 2008-06-20 (0.10.21) </div> <hr> <div class="refsect2"> -<a name="idp6957664"></a><h3>Element Pads</h3> +<a name="idp7359440"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -472,7 +472,7 @@ The different size of the allocated buffers. <hr> <div class="refsect2"> <a name="GstFakeSrc--format"></a><h3>The <code class="literal">"format"</code> property</h3> -<pre class="programlisting"> "format" <a href="../gstreamer-1.0/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> : Read / Write</pre> +<pre class="programlisting"> "format" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GstFormat"><span class="type">GstFormat</span></a> : Read / Write</pre> <p> Set the format of the newsegment events to produce. </p> @@ -485,8 +485,8 @@ Set the format of the newsegment events to produce. <div class="refsect2"> <a name="GstFakeSrc-handoff"></a><h3>The <code class="literal">"handoff"</code> signal</h3> <pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="gstreamer-plugins-fakesrc.html#GstFakeSrc"><span class="type">GstFakeSrc</span></a> *fakesrc, - <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer, - <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *pad, + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer, + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *pad, <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS"><code class="literal">Run Last</code></a></pre> <p> This signal gets emitted before sending the buffer. diff --git a/docs/plugins/html/gstreamer-plugins-fdsink.html b/docs/plugins/html/gstreamer-plugins-fdsink.html index adf6091..1feab11 100644 --- a/docs/plugins/html/gstreamer-plugins-fdsink.html +++ b/docs/plugins/html/gstreamer-plugins-fdsink.html @@ -51,9 +51,9 @@ <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> - +----<a href="../gstreamer-libs-1.0/GstBaseSink.html">GstBaseSink</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseSink.html">GstBaseSink</a> +----GstFdSink </pre> </div> @@ -61,7 +61,7 @@ <a name="gstreamer-plugins-fdsink.implemented-interfaces"></a><h2>Implemented Interfaces</h2> <p> GstFdSink implements - <a href="../gstreamer-1.0/gstreamer-GstUriHandler.html#GstURIHandler">GstURIHandler</a>.</p> + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstUriHandler.html#GstURIHandler">GstURIHandler</a>.</p> </div> <div class="refsect1"> <a name="gstreamer-plugins-fdsink.properties"></a><h2>Properties</h2> @@ -77,7 +77,7 @@ Write data to a unix file descriptor. <p> This element will synchronize on the clock before writing the data on the socket. For file descriptors where this does not make sense (files, ...) the -<a href="../gstreamer-libs-1.0/GstBaseSink.html#GstBaseSink--sync"><span class="type">"sync"</span></a> property can be used to disable synchronisation. +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseSink.html#GstBaseSink--sync"><span class="type">"sync"</span></a> property can be used to disable synchronisation. </p> <p> Last reviewed on 2006-04-28 (0.10.6) @@ -85,7 +85,7 @@ Last reviewed on 2006-04-28 (0.10.6) <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp6711088"></a><h3>Element Information</h3> +<a name="idp9210352"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -108,7 +108,7 @@ Last reviewed on 2006-04-28 (0.10.6) </div> <hr> <div class="refsect2"> -<a name="idp7582032"></a><h3>Element Pads</h3> +<a name="idp9133200"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> diff --git a/docs/plugins/html/gstreamer-plugins-fdsrc.html b/docs/plugins/html/gstreamer-plugins-fdsrc.html index d6012cf..6326bb7 100644 --- a/docs/plugins/html/gstreamer-plugins-fdsrc.html +++ b/docs/plugins/html/gstreamer-plugins-fdsrc.html @@ -51,10 +51,10 @@ <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> - +----<a href="../gstreamer-libs-1.0/GstBaseSrc.html">GstBaseSrc</a> - +----<a href="../gstreamer-libs-1.0/GstPushSrc.html">GstPushSrc</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseSrc.html">GstBaseSrc</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstPushSrc.html">GstPushSrc</a> +----GstFdSrc </pre> </div> @@ -62,7 +62,7 @@ <a name="gstreamer-plugins-fdsrc.implemented-interfaces"></a><h2>Implemented Interfaces</h2> <p> GstFdSrc implements - <a href="../gstreamer-1.0/gstreamer-GstUriHandler.html#GstURIHandler">GstURIHandler</a>.</p> + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstUriHandler.html#GstURIHandler">GstURIHandler</a>.</p> </div> <div class="refsect1"> <a name="gstreamer-plugins-fdsrc.properties"></a><h2>Properties</h2> @@ -97,7 +97,7 @@ The message's structure contains one field: <p> </p> <div class="refsect2"> -<a name="idp6807520"></a><h3>Example launch line</h3> +<a name="idp6457056"></a><h3>Example launch line</h3> <div class="informalexample"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -119,7 +119,7 @@ Last reviewed on 2008-06-20 (0.10.21) <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp6810672"></a><h3>Element Information</h3> +<a name="idp6460208"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -142,7 +142,7 @@ Last reviewed on 2008-06-20 (0.10.21) </div> <hr> <div class="refsect2"> -<a name="idp9734752"></a><h3>Element Pads</h3> +<a name="idp10135952"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> diff --git a/docs/plugins/html/gstreamer-plugins-filesink.html b/docs/plugins/html/gstreamer-plugins-filesink.html index 46af2c0..3409245 100644 --- a/docs/plugins/html/gstreamer-plugins-filesink.html +++ b/docs/plugins/html/gstreamer-plugins-filesink.html @@ -51,9 +51,9 @@ <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> - +----<a href="../gstreamer-libs-1.0/GstBaseSink.html">GstBaseSink</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseSink.html">GstBaseSink</a> +----GstFileSink </pre> </div> @@ -61,7 +61,7 @@ <a name="gstreamer-plugins-filesink.implemented-interfaces"></a><h2>Implemented Interfaces</h2> <p> GstFileSink implements - <a href="../gstreamer-1.0/gstreamer-GstUriHandler.html#GstURIHandler">GstURIHandler</a>.</p> + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstUriHandler.html#GstURIHandler">GstURIHandler</a>.</p> </div> <div class="refsect1"> <a name="gstreamer-plugins-filesink.properties"></a><h2>Properties</h2> @@ -80,7 +80,7 @@ Write incoming data to a file in the local file system. <p> </p> <div class="refsect2"> -<a name="idp5144848"></a><h3>Example launch line</h3> +<a name="idp9711680"></a><h3>Example launch line</h3> <div class="informalexample"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -98,7 +98,7 @@ Write incoming data to a file in the local file system. <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp5147408"></a><h3>Element Information</h3> +<a name="idp9714240"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -121,7 +121,7 @@ Write incoming data to a file in the local file system. </div> <hr> <div class="refsect2"> -<a name="idp5154816"></a><h3>Element Pads</h3> +<a name="idp9721648"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> diff --git a/docs/plugins/html/gstreamer-plugins-filesrc.html b/docs/plugins/html/gstreamer-plugins-filesrc.html index 6876e43..d0bf096 100644 --- a/docs/plugins/html/gstreamer-plugins-filesrc.html +++ b/docs/plugins/html/gstreamer-plugins-filesrc.html @@ -51,9 +51,9 @@ <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> - +----<a href="../gstreamer-libs-1.0/GstBaseSrc.html">GstBaseSrc</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseSrc.html">GstBaseSrc</a> +----GstFileSrc </pre> </div> @@ -61,7 +61,7 @@ <a name="gstreamer-plugins-filesrc.implemented-interfaces"></a><h2>Implemented Interfaces</h2> <p> GstFileSrc implements - <a href="../gstreamer-1.0/gstreamer-GstUriHandler.html#GstURIHandler">GstURIHandler</a>.</p> + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstUriHandler.html#GstURIHandler">GstURIHandler</a>.</p> </div> <div class="refsect1"> <a name="gstreamer-plugins-filesrc.properties"></a><h2>Properties</h2> @@ -82,7 +82,7 @@ Read data from a file in the local file system. <p> </p> <div class="refsect2"> -<a name="idp7280672"></a><h3>Example launch line</h3> +<a name="idp9089696"></a><h3>Example launch line</h3> <div class="informalexample"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -100,7 +100,7 @@ Read data from a file in the local file system. <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp7283280"></a><h3>Element Information</h3> +<a name="idp9092304"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -123,7 +123,7 @@ Read data from a file in the local file system. </div> <hr> <div class="refsect2"> -<a name="idp9769648"></a><h3>Element Pads</h3> +<a name="idp10170896"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> diff --git a/docs/plugins/html/gstreamer-plugins-funnel.html b/docs/plugins/html/gstreamer-plugins-funnel.html index ddf9c88..d1bca75 100644 --- a/docs/plugins/html/gstreamer-plugins-funnel.html +++ b/docs/plugins/html/gstreamer-plugins-funnel.html @@ -47,8 +47,8 @@ <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> +----GstFunnel </pre> </div> @@ -59,7 +59,7 @@ Takes packets from various input sinks into one output source. </p> <p> funnel always outputs a single, open ended segment from -0 with in <a href="../gstreamer-1.0/gstreamer-GstFormat.html#GST-FORMAT-TIME:CAPS"><code class="literal">GST_FORMAT_TIME</code></a> and outputs the buffers of the +0 with in <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstFormat.html#GST-FORMAT-TIME:CAPS"><code class="literal">GST_FORMAT_TIME</code></a> and outputs the buffers of the different sinkpads with timestamps that are set to the running time for that stream. funnel does not synchronize the different input streams but simply forwards all buffers @@ -68,7 +68,7 @@ immediately when they arrive. <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp5262320"></a><h3>Element Information</h3> +<a name="idp6849904"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -91,7 +91,7 @@ immediately when they arrive. </div> <hr> <div class="refsect2"> -<a name="idp5786160"></a><h3>Element Pads</h3> +<a name="idp6604704"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> diff --git a/docs/plugins/html/gstreamer-plugins-identity.html b/docs/plugins/html/gstreamer-plugins-identity.html index 3b148c4..32b5e31 100644 --- a/docs/plugins/html/gstreamer-plugins-identity.html +++ b/docs/plugins/html/gstreamer-plugins-identity.html @@ -51,9 +51,9 @@ <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> - +----<a href="../gstreamer-libs-1.0/GstBaseTransform.html">GstBaseTransform</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-libs/html/GstBaseTransform.html">GstBaseTransform</a> +----GstIdentity </pre> </div> @@ -90,7 +90,7 @@ useful diagnostic functions, such as offset and timestamp checking. <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp10069920"></a><h3>Element Information</h3> +<a name="idp10472176"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -113,7 +113,7 @@ useful diagnostic functions, such as offset and timestamp checking. </div> <hr> <div class="refsect2"> -<a name="idp10077376"></a><h3>Element Pads</h3> +<a name="idp10479632"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -275,7 +275,7 @@ When set to <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard- <div class="refsect2"> <a name="GstIdentity-handoff"></a><h3>The <code class="literal">"handoff"</code> signal</h3> <pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="gstreamer-plugins-identity.html#GstIdentity"><span class="type">GstIdentity</span></a> *identity, - <a href="../gstreamer-1.0/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer, + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstBuffer.html#GstBuffer"><span class="type">GstBuffer</span></a> *buffer, <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS"><code class="literal">Run Last</code></a></pre> <p> This signal gets emitted before passing the buffer downstream. diff --git a/docs/plugins/html/gstreamer-plugins-input-selector.html b/docs/plugins/html/gstreamer-plugins-input-selector.html index f9341db..17029ce 100644 --- a/docs/plugins/html/gstreamer-plugins-input-selector.html +++ b/docs/plugins/html/gstreamer-plugins-input-selector.html @@ -51,15 +51,15 @@ <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> +----GstInputSelector </pre> </div> <div class="refsect1"> <a name="gstreamer-plugins-input-selector.properties"></a><h2>Properties</h2> <pre class="synopsis"> - "<a class="link" href="gstreamer-plugins-input-selector.html#GstInputSelector--active-pad" title='The "active-pad" property'>active-pad</a>" <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a>* : Read / Write + "<a class="link" href="gstreamer-plugins-input-selector.html#GstInputSelector--active-pad" title='The "active-pad" property'>active-pad</a>" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a>* : Read / Write "<a class="link" href="gstreamer-plugins-input-selector.html#GstInputSelector--n-pads" title='The "n-pads" property'>n-pads</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read "<a class="link" href="gstreamer-plugins-input-selector.html#GstInputSelector--select-all" title='The "select-all" property'>select-all</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write "<a class="link" href="gstreamer-plugins-input-selector.html#GstInputSelector--sync-streams" title='The "sync-streams" property'>sync-streams</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write @@ -88,14 +88,14 @@ properties, which users may find useful, namely: "running-time": Running time of stream on pad (<span class="type">gint64</span>) </li> <li class="listitem"> -"tags": The currently active tags on the pad (<a href="../gstreamer-1.0/gstreamer-GstTagList.html#GstTagList"><span class="type">GstTagList</span></a>, boxed type) +"tags": The currently active tags on the pad (<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstTagList.html#GstTagList"><span class="type">GstTagList</span></a>, boxed type) </li> <li class="listitem"> "active": If the pad is currently active (<a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a>) </li> <li class="listitem"> -"always-ok" : Make an inactive pads return <a href="../gstreamer-1.0/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a> instead of -<a href="../gstreamer-1.0/GstPad.html#GST-FLOW-NOT-LINKED:CAPS"><span class="type">GST_FLOW_NOT_LINKED</span></a> +"always-ok" : Make an inactive pads return <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GST-FLOW-OK:CAPS"><span class="type">GST_FLOW_OK</span></a> instead of +<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html#GST-FLOW-NOT-LINKED:CAPS"><span class="type">GST_FLOW_NOT_LINKED</span></a> </li> </ul></div> <p> @@ -103,7 +103,7 @@ properties, which users may find useful, namely: <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp4834976"></a><h3>Element Information</h3> +<a name="idp9842896"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -126,7 +126,7 @@ properties, which users may find useful, namely: </div> <hr> <div class="refsect2"> -<a name="idp10210464"></a><h3>Element Pads</h3> +<a name="idp10612512"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -187,7 +187,7 @@ properties, which users may find useful, namely: <a name="gstreamer-plugins-input-selector.property-details"></a><h2>Property Details</h2> <div class="refsect2"> <a name="GstInputSelector--active-pad"></a><h3>The <code class="literal">"active-pad"</code> property</h3> -<pre class="programlisting"> "active-pad" <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a>* : Read / Write</pre> +<pre class="programlisting"> "active-pad" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a>* : Read / Write</pre> <p>The currently active sink pad.</p> </div> <hr> @@ -248,7 +248,7 @@ active pad or the current active pad never received data. <div class="refsect2"> <a name="GstInputSelector-switch"></a><h3>The <code class="literal">"switch"</code> signal</h3> <pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="gstreamer-plugins-input-selector.html#GstInputSelector"><span class="type">GstInputSelector</span></a> *gstinputselector, - <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a> *arg1, + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a> *arg1, <span class="type">gint64</span> arg2, <span class="type">gint64</span> arg3, <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS"><code class="literal">Run Last</code></a></pre> diff --git a/docs/plugins/html/gstreamer-plugins-multiqueue.html b/docs/plugins/html/gstreamer-plugins-multiqueue.html index 19bf440..8b6f452 100644 --- a/docs/plugins/html/gstreamer-plugins-multiqueue.html +++ b/docs/plugins/html/gstreamer-plugins-multiqueue.html @@ -51,8 +51,8 @@ <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> +----GstMultiQueue </pre> </div> @@ -83,7 +83,7 @@ <p> </p> <div class="refsect2"> -<a name="idp10431328"></a><p> +<a name="idp10414640"></a><p> Multiqueue is similar to a normal <a class="link" href="gstreamer-plugins-queue.html#GstQueue"><span class="type">GstQueue</span></a> with the following additional features: </p> @@ -97,7 +97,7 @@ features: 'sometimes' src pads (src%d). </p> <p> - When requesting a given sinkpad with <a href="../gstreamer-1.0/GstElement.html#gst-element-get-request-pad"><code class="function">gst_element_get_request_pad()</code></a>, + When requesting a given sinkpad with <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#gst-element-get-request-pad"><code class="function">gst_element_get_request_pad()</code></a>, the associated srcpad for that stream will be created. Example: requesting sink1 will generate src1. </p> @@ -173,7 +173,7 @@ Last reviewed on 2008-01-25 (0.10.17) <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp10453120"></a><h3>Element Information</h3> +<a name="idp10854272"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -196,7 +196,7 @@ Last reviewed on 2008-01-25 (0.10.17) </div> <hr> <div class="refsect2"> -<a name="idp10460576"></a><h3>Element Pads</h3> +<a name="idp10861728"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> diff --git a/docs/plugins/html/gstreamer-plugins-output-selector.html b/docs/plugins/html/gstreamer-plugins-output-selector.html index 0dde3af..9740086 100644 --- a/docs/plugins/html/gstreamer-plugins-output-selector.html +++ b/docs/plugins/html/gstreamer-plugins-output-selector.html @@ -49,15 +49,15 @@ <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> +----GstOutputSelector </pre> </div> <div class="refsect1"> <a name="gstreamer-plugins-output-selector.properties"></a><h2>Properties</h2> <pre class="synopsis"> - "<a class="link" href="gstreamer-plugins-output-selector.html#GstOutputSelector--active-pad" title='The "active-pad" property'>active-pad</a>" <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a>* : Read / Write + "<a class="link" href="gstreamer-plugins-output-selector.html#GstOutputSelector--active-pad" title='The "active-pad" property'>active-pad</a>" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a>* : Read / Write "<a class="link" href="gstreamer-plugins-output-selector.html#GstOutputSelector--resend-latest" title='The "resend-latest" property'>resend-latest</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write "<a class="link" href="gstreamer-plugins-output-selector.html#GstOutputSelector--pad-negotiation-mode" title='The "pad-negotiation-mode" property'>pad-negotiation-mode</a>" <span class="type">GstOutputSelectorPadNegotiationMode</span> : Read / Write </pre> @@ -70,7 +70,7 @@ Direct input stream to one out of N output pads. <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp7263568"></a><h3>Element Information</h3> +<a name="idp10445936"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -93,7 +93,7 @@ Direct input stream to one out of N output pads. </div> <hr> <div class="refsect2"> -<a name="idp10296384"></a><h3>Element Pads</h3> +<a name="idp10698096"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -154,7 +154,7 @@ Direct input stream to one out of N output pads. <a name="gstreamer-plugins-output-selector.property-details"></a><h2>Property Details</h2> <div class="refsect2"> <a name="GstOutputSelector--active-pad"></a><h3>The <code class="literal">"active-pad"</code> property</h3> -<pre class="programlisting"> "active-pad" <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a>* : Read / Write</pre> +<pre class="programlisting"> "active-pad" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a>* : Read / Write</pre> <p>Currently active src pad.</p> </div> <hr> diff --git a/docs/plugins/html/gstreamer-plugins-plugin-coreelements.html b/docs/plugins/html/gstreamer-plugins-plugin-coreelements.html index 5cfa8fc..b6d073a 100644 --- a/docs/plugins/html/gstreamer-plugins-plugin-coreelements.html +++ b/docs/plugins/html/gstreamer-plugins-plugin-coreelements.html @@ -28,7 +28,7 @@ <td valign="top" align="right"></td> </tr></table></div> <div class="refsect1"> -<a name="idp6118432"></a><h2>Plugin Information</h2> +<a name="idp7693648"></a><h2>Plugin Information</h2> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -38,7 +38,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>0.11.90</td> +<td>0.11.91</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> @@ -56,7 +56,7 @@ </table></div> </div> <div class="refsect1"> -<a name="idp5409776"></a><h2>Elements</h2> +<a name="idp7977664"></a><h2>Elements</h2> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> diff --git a/docs/plugins/html/gstreamer-plugins-queue.html b/docs/plugins/html/gstreamer-plugins-queue.html index 7ba787d..f3e00b7 100644 --- a/docs/plugins/html/gstreamer-plugins-queue.html +++ b/docs/plugins/html/gstreamer-plugins-queue.html @@ -52,8 +52,8 @@ enum <a class="link" href="gstreamer-plugins-queue.html#GstQueueL <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> +----GstQueue </pre> </div> @@ -122,7 +122,7 @@ up. Both signals are emitted from the context of the streaming thread. <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp10656704"></a><h3>Element Information</h3> +<a name="idp11058880"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -145,7 +145,7 @@ up. Both signals are emitted from the context of the streaming thread. </div> <hr> <div class="refsect2"> -<a name="idp10664160"></a><h3>Element Pads</h3> +<a name="idp11066336"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> diff --git a/docs/plugins/html/gstreamer-plugins-queue2.html b/docs/plugins/html/gstreamer-plugins-queue2.html index 04daa5d..f8ddc46 100644 --- a/docs/plugins/html/gstreamer-plugins-queue2.html +++ b/docs/plugins/html/gstreamer-plugins-queue2.html @@ -49,8 +49,8 @@ <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> +----GstQueue2 </pre> </div> @@ -112,7 +112,7 @@ Last reviewed on 2009-07-10 (0.10.24) <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp10827264"></a><h3>Element Information</h3> +<a name="idp11373072"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -135,7 +135,7 @@ Last reviewed on 2009-07-10 (0.10.24) </div> <hr> <div class="refsect2"> -<a name="idp10834672"></a><h3>Element Pads</h3> +<a name="idp11380480"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> diff --git a/docs/plugins/html/gstreamer-plugins-tee.html b/docs/plugins/html/gstreamer-plugins-tee.html index 3970009..fca4137 100644 --- a/docs/plugins/html/gstreamer-plugins-tee.html +++ b/docs/plugins/html/gstreamer-plugins-tee.html @@ -50,8 +50,8 @@ enum <a class="link" href="gstreamer-plugins-tee.html#GstTeePullM <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> +----GstTee </pre> </div> @@ -64,7 +64,7 @@ enum <a class="link" href="gstreamer-plugins-tee.html#GstTeePullM "<a class="link" href="gstreamer-plugins-tee.html#GstTee--num-src-pads" title='The "num-src-pads" property'>num-src-pads</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint"><span class="type">gint</span></a> : Read "<a class="link" href="gstreamer-plugins-tee.html#GstTee--silent" title='The "silent" property'>silent</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> : Read / Write / Construct "<a class="link" href="gstreamer-plugins-tee.html#GstTee--pull-mode" title='The "pull-mode" property'>pull-mode</a>" <a class="link" href="gstreamer-plugins-tee.html#GstTeePullMode" title="enum GstTeePullMode"><span class="type">GstTeePullMode</span></a> : Read / Write / Construct - "<a class="link" href="gstreamer-plugins-tee.html#GstTee--alloc-pad" title='The "alloc-pad" property'>alloc-pad</a>" <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a>* : Read / Write + "<a class="link" href="gstreamer-plugins-tee.html#GstTee--alloc-pad" title='The "alloc-pad" property'>alloc-pad</a>" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a>* : Read / Write </pre> </div> <div class="refsect1"> @@ -83,7 +83,7 @@ branch would stall the other branches. <p> </p> <div class="refsect2"> -<a name="idp5386448"></a><h3>Example launch line</h3> +<a name="idp11219408"></a><h3>Example launch line</h3> <div class="informalexample"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -102,7 +102,7 @@ element. <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp5389168"></a><h3>Element Information</h3> +<a name="idp11222128"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -125,7 +125,7 @@ element. </div> <hr> <div class="refsect2"> -<a name="idp11082272"></a><h3>Element Pads</h3> +<a name="idp11485952"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -258,7 +258,7 @@ disables pull mode. <hr> <div class="refsect2"> <a name="GstTee--alloc-pad"></a><h3>The <code class="literal">"alloc-pad"</code> property</h3> -<pre class="programlisting"> "alloc-pad" <a href="../gstreamer-1.0/GstPad.html"><span class="type">GstPad</span></a>* : Read / Write</pre> +<pre class="programlisting"> "alloc-pad" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstPad.html"><span class="type">GstPad</span></a>* : Read / Write</pre> <p>The pad used for gst_pad_alloc_buffer.</p> </div> </div> diff --git a/docs/plugins/html/gstreamer-plugins-typefind.html b/docs/plugins/html/gstreamer-plugins-typefind.html index d09597c..1989c0e 100644 --- a/docs/plugins/html/gstreamer-plugins-typefind.html +++ b/docs/plugins/html/gstreamer-plugins-typefind.html @@ -51,18 +51,18 @@ <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> +----GstTypeFindElement </pre> </div> <div class="refsect1"> <a name="gstreamer-plugins-typefind.properties"></a><h2>Properties</h2> <pre class="synopsis"> - "<a class="link" href="gstreamer-plugins-typefind.html#GstTypeFindElement--caps" title='The "caps" property'>caps</a>" <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a>* : Read + "<a class="link" href="gstreamer-plugins-typefind.html#GstTypeFindElement--caps" title='The "caps" property'>caps</a>" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a>* : Read "<a class="link" href="gstreamer-plugins-typefind.html#GstTypeFindElement--maximum" title='The "maximum" property'>maximum</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write "<a class="link" href="gstreamer-plugins-typefind.html#GstTypeFindElement--minimum" title='The "minimum" property'>minimum</a>" <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> : Read / Write - "<a class="link" href="gstreamer-plugins-typefind.html#GstTypeFindElement--force-caps" title='The "force-caps" property'>force-caps</a>" <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a>* : Read / Write + "<a class="link" href="gstreamer-plugins-typefind.html#GstTypeFindElement--force-caps" title='The "force-caps" property'>force-caps</a>" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a>* : Read / Write </pre> </div> <div class="refsect1"> @@ -85,12 +85,12 @@ emitted, either from the streaming thread or the application thread state change function). </p> <p> -Plugins can register custom typefinders by using <a href="../gstreamer-1.0/GstTypeFindFactory.html"><span class="type">GstTypeFindFactory</span></a>. +Plugins can register custom typefinders by using <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstTypeFindFactory.html"><span class="type">GstTypeFindFactory</span></a>. </p> <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp5535104"></a><h3>Element Information</h3> +<a name="idp11281248"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -113,7 +113,7 @@ Plugins can register custom typefinders by using <a href="../gstreamer-1.0/GstTy </div> <hr> <div class="refsect2"> -<a name="idp5542512"></a><h3>Element Pads</h3> +<a name="idp11288656"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -175,7 +175,7 @@ Opaque <a class="link" href="gstreamer-plugins-typefind.html#GstTypeFindElement" <a name="gstreamer-plugins-typefind.property-details"></a><h2>Property Details</h2> <div class="refsect2"> <a name="GstTypeFindElement--caps"></a><h3>The <code class="literal">"caps"</code> property</h3> -<pre class="programlisting"> "caps" <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a>* : Read</pre> +<pre class="programlisting"> "caps" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a>* : Read</pre> <p>detected capabilities in stream.</p> </div> <hr> @@ -197,7 +197,7 @@ Opaque <a class="link" href="gstreamer-plugins-typefind.html#GstTypeFindElement" <hr> <div class="refsect2"> <a name="GstTypeFindElement--force-caps"></a><h3>The <code class="literal">"force-caps"</code> property</h3> -<pre class="programlisting"> "force-caps" <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a>* : Read / Write</pre> +<pre class="programlisting"> "force-caps" <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a>* : Read / Write</pre> <p>force caps without doing a typefind.</p> </div> </div> @@ -207,7 +207,7 @@ Opaque <a class="link" href="gstreamer-plugins-typefind.html#GstTypeFindElement" <a name="GstTypeFindElement-have-type"></a><h3>The <code class="literal">"have-type"</code> signal</h3> <pre class="programlisting"><span class="returnvalue">void</span> user_function (<a class="link" href="gstreamer-plugins-typefind.html#GstTypeFindElement"><span class="type">GstTypeFindElement</span></a> *typefind, <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> probability, - <a href="../gstreamer-1.0/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps, + <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-GstCaps.html#GstCaps"><span class="type">GstCaps</span></a> *caps, <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a> user_data) : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-FIRST:CAPS"><code class="literal">Run First</code></a></pre> <p> This signal gets emitted when the type and its probability has diff --git a/docs/plugins/html/gstreamer-plugins-valve.html b/docs/plugins/html/gstreamer-plugins-valve.html index 4a3d761..6b72efd 100644 --- a/docs/plugins/html/gstreamer-plugins-valve.html +++ b/docs/plugins/html/gstreamer-plugins-valve.html @@ -49,8 +49,8 @@ <pre class="synopsis"> <a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject">GObject</a> +----<a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GInitiallyUnowned">GInitiallyUnowned</a> - +----<a href="../gstreamer-1.0/GstObject.html">GstObject</a> - +----<a href="../gstreamer-1.0/GstElement.html">GstElement</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstObject.html">GstObject</a> + +----<a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html">GstElement</a> +----GstValve </pre> </div> @@ -68,7 +68,7 @@ property is set to <a href="http://library.gnome.org/devel/glib/unstable/glib-St </p> <p> Any downstream error received while the <a class="link" href="gstreamer-plugins-valve.html#GstValve--drop" title='The "drop" property'><span class="type">"drop"</span></a> property is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> -is ignored. So downstream element can be set to <a href="../gstreamer-1.0/GstElement.html#GST-STATE-NULL:CAPS"><code class="literal">GST_STATE_NULL</code></a> and removed, +is ignored. So downstream element can be set to <a href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/GstElement.html#GST-STATE-NULL:CAPS"><code class="literal">GST_STATE_NULL</code></a> and removed, without using pad blocking. </p> <p> @@ -81,7 +81,7 @@ Documentation last reviewed on 2010-12-30 (0.10.31) <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp7786464"></a><h3>Element Information</h3> +<a name="idp8009792"></a><h3>Element Information</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> @@ -104,7 +104,7 @@ Documentation last reviewed on 2010-12-30 (0.10.31) </div> <hr> <div class="refsect2"> -<a name="idp10980608"></a><h3>Element Pads</h3> +<a name="idp11315344"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0"> <col align="left" valign="top"> <tbody> diff --git a/docs/plugins/html/gstreamer-plugins.devhelp2 b/docs/plugins/html/gstreamer-plugins.devhelp2 index 37a88ca..878a7e8 100644 --- a/docs/plugins/html/gstreamer-plugins.devhelp2 +++ b/docs/plugins/html/gstreamer-plugins.devhelp2 @@ -26,14 +26,14 @@ </sub> </chapters> <functions> - <keyword type="" name="Example launch line" link="gstreamer-plugins-capsfilter.html#idp7856352"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-capsfilter.html#idp7769296"/> + <keyword type="" name="Example launch line" link="gstreamer-plugins-capsfilter.html#idp7244064"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-capsfilter.html#idp8108768"/> <keyword type="" name="Element Pads" link="gstreamer-plugins-capsfilter.html#idp81344"/> <keyword type="struct" name="struct GstCapsFilter" link="gstreamer-plugins-capsfilter.html#GstCapsFilter-struct"/> <keyword type="property" name="The "caps" property" link="gstreamer-plugins-capsfilter.html#GstCapsFilter--caps"/> - <keyword type="" name="Example launch line" link="gstreamer-plugins-fakesrc.html#idp6947072"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-fakesrc.html#idp6950256"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-fakesrc.html#idp6957664"/> + <keyword type="" name="Example launch line" link="gstreamer-plugins-fakesrc.html#idp7348848"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-fakesrc.html#idp7352032"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-fakesrc.html#idp7359440"/> <keyword type="struct" name="struct GstFakeSrc" link="gstreamer-plugins-fakesrc.html#GstFakeSrc-struct"/> <keyword type="enum" name="enum GstFakeSrcDataType" link="gstreamer-plugins-fakesrc.html#GstFakeSrcDataType"/> <keyword type="enum" name="enum GstFakeSrcFillType" link="gstreamer-plugins-fakesrc.html#GstFakeSrcFillType"/> @@ -57,9 +57,9 @@ <keyword type="property" name="The "sync" property" link="gstreamer-plugins-fakesrc.html#GstFakeSrc--sync"/> <keyword type="property" name="The "format" property" link="gstreamer-plugins-fakesrc.html#GstFakeSrc--format"/> <keyword type="signal" name="The "handoff" signal" link="gstreamer-plugins-fakesrc.html#GstFakeSrc-handoff"/> - <keyword type="" name="Example launch line" link="gstreamer-plugins-fakesink.html#idp8740176"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-fakesink.html#idp8742784"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-fakesink.html#idp9609776"/> + <keyword type="" name="Example launch line" link="gstreamer-plugins-fakesink.html#idp9286240"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-fakesink.html#idp10003392"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-fakesink.html#idp10010928"/> <keyword type="struct" name="struct GstFakeSink" link="gstreamer-plugins-fakesink.html#GstFakeSink-struct"/> <keyword type="enum" name="enum GstFakeSinkStateError" link="gstreamer-plugins-fakesink.html#GstFakeSinkStateError"/> <keyword type="property" name="The "can-activate-pull" property" link="gstreamer-plugins-fakesink.html#GstFakeSink--can-activate-pull"/> @@ -72,19 +72,19 @@ <keyword type="property" name="The "num-buffers" property" link="gstreamer-plugins-fakesink.html#GstFakeSink--num-buffers"/> <keyword type="signal" name="The "handoff" signal" link="gstreamer-plugins-fakesink.html#GstFakeSink-handoff"/> <keyword type="signal" name="The "preroll-handoff" signal" link="gstreamer-plugins-fakesink.html#GstFakeSink-preroll-handoff"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-fdsink.html#idp6711088"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-fdsink.html#idp7582032"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-fdsink.html#idp9210352"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-fdsink.html#idp9133200"/> <keyword type="struct" name="struct GstFdSink" link="gstreamer-plugins-fdsink.html#GstFdSink-struct"/> <keyword type="property" name="The "fd" property" link="gstreamer-plugins-fdsink.html#GstFdSink--fd"/> - <keyword type="" name="Example launch line" link="gstreamer-plugins-fdsrc.html#idp6807520"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-fdsrc.html#idp6810672"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-fdsrc.html#idp9734752"/> + <keyword type="" name="Example launch line" link="gstreamer-plugins-fdsrc.html#idp6457056"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-fdsrc.html#idp6460208"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-fdsrc.html#idp10135952"/> <keyword type="struct" name="struct GstFdSrc" link="gstreamer-plugins-fdsrc.html#GstFdSrc-struct"/> <keyword type="property" name="The "fd" property" link="gstreamer-plugins-fdsrc.html#GstFdSrc--fd"/> <keyword type="property" name="The "timeout" property" link="gstreamer-plugins-fdsrc.html#GstFdSrc--timeout"/> - <keyword type="" name="Example launch line" link="gstreamer-plugins-filesrc.html#idp7280672"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-filesrc.html#idp7283280"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-filesrc.html#idp9769648"/> + <keyword type="" name="Example launch line" link="gstreamer-plugins-filesrc.html#idp9089696"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-filesrc.html#idp9092304"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-filesrc.html#idp10170896"/> <keyword type="struct" name="struct GstFileSrc" link="gstreamer-plugins-filesrc.html#GstFileSrc-struct"/> <keyword type="property" name="The "fd" property" link="gstreamer-plugins-filesrc.html#GstFileSrc--fd"/> <keyword type="property" name="The "location" property" link="gstreamer-plugins-filesrc.html#GstFileSrc--location"/> @@ -92,19 +92,19 @@ <keyword type="property" name="The "touch" property" link="gstreamer-plugins-filesrc.html#GstFileSrc--touch"/> <keyword type="property" name="The "use-mmap" property" link="gstreamer-plugins-filesrc.html#GstFileSrc--use-mmap"/> <keyword type="property" name="The "sequential" property" link="gstreamer-plugins-filesrc.html#GstFileSrc--sequential"/> - <keyword type="" name="Example launch line" link="gstreamer-plugins-filesink.html#idp5144848"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-filesink.html#idp5147408"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-filesink.html#idp5154816"/> + <keyword type="" name="Example launch line" link="gstreamer-plugins-filesink.html#idp9711680"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-filesink.html#idp9714240"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-filesink.html#idp9721648"/> <keyword type="struct" name="struct GstFileSink" link="gstreamer-plugins-filesink.html#GstFileSink-struct"/> <keyword type="property" name="The "location" property" link="gstreamer-plugins-filesink.html#GstFileSink--location"/> <keyword type="property" name="The "buffer-mode" property" link="gstreamer-plugins-filesink.html#GstFileSink--buffer-mode"/> <keyword type="property" name="The "buffer-size" property" link="gstreamer-plugins-filesink.html#GstFileSink--buffer-size"/> <keyword type="property" name="The "append" property" link="gstreamer-plugins-filesink.html#GstFileSink--append"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-funnel.html#idp5262320"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-funnel.html#idp5786160"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-funnel.html#idp6849904"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-funnel.html#idp6604704"/> <keyword type="struct" name="struct GstFunnel" link="gstreamer-plugins-funnel.html#GstFunnel-struct"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-identity.html#idp10069920"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-identity.html#idp10077376"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-identity.html#idp10472176"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-identity.html#idp10479632"/> <keyword type="struct" name="struct GstIdentity" link="gstreamer-plugins-identity.html#GstIdentity-struct"/> <keyword type="property" name="The "check-perfect" property" link="gstreamer-plugins-identity.html#GstIdentity--check-perfect"/> <keyword type="property" name="The "datarate" property" link="gstreamer-plugins-identity.html#GstIdentity--datarate"/> @@ -120,8 +120,8 @@ <keyword type="property" name="The "check-imperfect-timestamp" property" link="gstreamer-plugins-identity.html#GstIdentity--check-imperfect-timestamp"/> <keyword type="property" name="The "signal-handoffs" property" link="gstreamer-plugins-identity.html#GstIdentity--signal-handoffs"/> <keyword type="signal" name="The "handoff" signal" link="gstreamer-plugins-identity.html#GstIdentity-handoff"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-input-selector.html#idp4834976"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-input-selector.html#idp10210464"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-input-selector.html#idp9842896"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-input-selector.html#idp10612512"/> <keyword type="struct" name="struct GstInputSelector" link="gstreamer-plugins-input-selector.html#GstInputSelector-struct"/> <keyword type="property" name="The "active-pad" property" link="gstreamer-plugins-input-selector.html#GstInputSelector--active-pad"/> <keyword type="property" name="The "n-pads" property" link="gstreamer-plugins-input-selector.html#GstInputSelector--n-pads"/> @@ -129,9 +129,9 @@ <keyword type="property" name="The "sync-streams" property" link="gstreamer-plugins-input-selector.html#GstInputSelector--sync-streams"/> <keyword type="signal" name="The "block" signal" link="gstreamer-plugins-input-selector.html#GstInputSelector-block"/> <keyword type="signal" name="The "switch" signal" link="gstreamer-plugins-input-selector.html#GstInputSelector-switch"/> - <keyword type="" name="" link="gstreamer-plugins-multiqueue.html#idp10431328"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-multiqueue.html#idp10453120"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-multiqueue.html#idp10460576"/> + <keyword type="" name="" link="gstreamer-plugins-multiqueue.html#idp10414640"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-multiqueue.html#idp10854272"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-multiqueue.html#idp10861728"/> <keyword type="struct" name="struct GstMultiQueue" link="gstreamer-plugins-multiqueue.html#GstMultiQueue-struct"/> <keyword type="property" name="The "extra-size-buffers" property" link="gstreamer-plugins-multiqueue.html#GstMultiQueue--extra-size-buffers"/> <keyword type="property" name="The "extra-size-bytes" property" link="gstreamer-plugins-multiqueue.html#GstMultiQueue--extra-size-bytes"/> @@ -145,14 +145,14 @@ <keyword type="property" name="The "sync-by-running-time" property" link="gstreamer-plugins-multiqueue.html#GstMultiQueue--sync-by-running-time"/> <keyword type="signal" name="The "overrun" signal" link="gstreamer-plugins-multiqueue.html#GstMultiQueue-overrun"/> <keyword type="signal" name="The "underrun" signal" link="gstreamer-plugins-multiqueue.html#GstMultiQueue-underrun"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-output-selector.html#idp7263568"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-output-selector.html#idp10296384"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-output-selector.html#idp10445936"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-output-selector.html#idp10698096"/> <keyword type="struct" name="struct GstOutputSelector" link="gstreamer-plugins-output-selector.html#GstOutputSelector-struct"/> <keyword type="property" name="The "active-pad" property" link="gstreamer-plugins-output-selector.html#GstOutputSelector--active-pad"/> <keyword type="property" name="The "resend-latest" property" link="gstreamer-plugins-output-selector.html#GstOutputSelector--resend-latest"/> <keyword type="property" name="The "pad-negotiation-mode" property" link="gstreamer-plugins-output-selector.html#GstOutputSelector--pad-negotiation-mode"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-queue.html#idp10656704"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-queue.html#idp10664160"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-queue.html#idp11058880"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-queue.html#idp11066336"/> <keyword type="struct" name="struct GstQueue" link="gstreamer-plugins-queue.html#GstQueue-struct"/> <keyword type="enum" name="enum GstQueueLeaky" link="gstreamer-plugins-queue.html#GstQueueLeaky"/> <keyword type="property" name="The "current-level-buffers" property" link="gstreamer-plugins-queue.html#GstQueue--current-level-buffers"/> @@ -170,8 +170,8 @@ <keyword type="signal" name="The "running" signal" link="gstreamer-plugins-queue.html#GstQueue-running"/> <keyword type="signal" name="The "underrun" signal" link="gstreamer-plugins-queue.html#GstQueue-underrun"/> <keyword type="signal" name="The "pushing" signal" link="gstreamer-plugins-queue.html#GstQueue-pushing"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-queue2.html#idp10827264"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-queue2.html#idp10834672"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-queue2.html#idp11373072"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-queue2.html#idp11380480"/> <keyword type="struct" name="struct GstQueue2" link="gstreamer-plugins-queue2.html#GstQueue2-struct"/> <keyword type="property" name="The "current-level-buffers" property" link="gstreamer-plugins-queue2.html#GstQueue2--current-level-buffers"/> <keyword type="property" name="The "current-level-bytes" property" link="gstreamer-plugins-queue2.html#GstQueue2--current-level-bytes"/> @@ -187,9 +187,9 @@ <keyword type="property" name="The "use-rate-estimate" property" link="gstreamer-plugins-queue2.html#GstQueue2--use-rate-estimate"/> <keyword type="property" name="The "temp-remove" property" link="gstreamer-plugins-queue2.html#GstQueue2--temp-remove"/> <keyword type="property" name="The "ring-buffer-max-size" property" link="gstreamer-plugins-queue2.html#GstQueue2--ring-buffer-max-size"/> - <keyword type="" name="Example launch line" link="gstreamer-plugins-tee.html#idp5386448"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-tee.html#idp5389168"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-tee.html#idp11082272"/> + <keyword type="" name="Example launch line" link="gstreamer-plugins-tee.html#idp11219408"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-tee.html#idp11222128"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-tee.html#idp11485952"/> <keyword type="struct" name="struct GstTee" link="gstreamer-plugins-tee.html#GstTee-struct"/> <keyword type="enum" name="enum GstTeePullMode" link="gstreamer-plugins-tee.html#GstTeePullMode"/> <keyword type="property" name="The "has-chain" property" link="gstreamer-plugins-tee.html#GstTee--has-chain"/> @@ -199,16 +199,16 @@ <keyword type="property" name="The "silent" property" link="gstreamer-plugins-tee.html#GstTee--silent"/> <keyword type="property" name="The "pull-mode" property" link="gstreamer-plugins-tee.html#GstTee--pull-mode"/> <keyword type="property" name="The "alloc-pad" property" link="gstreamer-plugins-tee.html#GstTee--alloc-pad"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-typefind.html#idp5535104"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-typefind.html#idp5542512"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-typefind.html#idp11281248"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-typefind.html#idp11288656"/> <keyword type="struct" name="struct GstTypeFindElement" link="gstreamer-plugins-typefind.html#GstTypeFindElement-struct"/> <keyword type="property" name="The "caps" property" link="gstreamer-plugins-typefind.html#GstTypeFindElement--caps"/> <keyword type="property" name="The "maximum" property" link="gstreamer-plugins-typefind.html#GstTypeFindElement--maximum"/> <keyword type="property" name="The "minimum" property" link="gstreamer-plugins-typefind.html#GstTypeFindElement--minimum"/> <keyword type="property" name="The "force-caps" property" link="gstreamer-plugins-typefind.html#GstTypeFindElement--force-caps"/> <keyword type="signal" name="The "have-type" signal" link="gstreamer-plugins-typefind.html#GstTypeFindElement-have-type"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-valve.html#idp7786464"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-valve.html#idp10980608"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-valve.html#idp8009792"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-valve.html#idp11315344"/> <keyword type="struct" name="struct GstValve" link="gstreamer-plugins-valve.html#GstValve-struct"/> <keyword type="property" name="The "drop" property" link="gstreamer-plugins-valve.html#GstValve--drop"/> <keyword type="constant" name="FAKE_SRC_DATA_ALLOCATE" link="gstreamer-plugins-fakesrc.html#FAKE-SRC-DATA-ALLOCATE:CAPS"/> diff --git a/docs/plugins/html/index.html b/docs/plugins/html/index.html index 87dd257..68cd2ef 100644 --- a/docs/plugins/html/index.html +++ b/docs/plugins/html/index.html @@ -15,7 +15,7 @@ <div> <div><table class="navigation" id="top" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">GStreamer Core Plugins 1.0 Plugins Reference Manual</p></th></tr></table></div> <div><p class="releaseinfo"> - for GStreamer Core Plugins 1.0 (0.11.90) + for GStreamer Core Plugins 1.0 (0.11.91) The latest version of this documentation can be found on-line at <a class="ulink" href="http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-plugins/html/" target="_top">http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer-plugins/html/</a>. </p></div> diff --git a/docs/plugins/inspect/plugin-coreelements.xml b/docs/plugins/inspect/plugin-coreelements.xml index 93c52d9..74a4211 100644 --- a/docs/plugins/inspect/plugin-coreelements.xml +++ b/docs/plugins/inspect/plugin-coreelements.xml @@ -3,7 +3,7 @@ <description>standard GStreamer elements</description> <filename>../../plugins/elements/.libs/libgstcoreelements.so</filename> <basename>libgstcoreelements.so</basename> - <version>0.11.90</version> + <version>0.11.91</version> <license>LGPL</license> <source>gstreamer</source> <package>GStreamer source release</package> diff --git a/docs/pwg/Makefile.in b/docs/pwg/Makefile.in index c70fafe..6f684d8 100644 --- a/docs/pwg/Makefile.in +++ b/docs/pwg/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -550,7 +550,7 @@ install-pwgDATA: $(pwg_DATA) @list='$(pwg_DATA)'; test -n "$(pwgdir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(pwgdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(pwgdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(pwgdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ diff --git a/docs/pwg/advanced-events.xml b/docs/pwg/advanced-events.xml index 88cda4a..b755452 100644 --- a/docs/pwg/advanced-events.xml +++ b/docs/pwg/advanced-events.xml @@ -241,7 +241,7 @@ gst_my_filter_sink_event (GstPad *pad, GstEvent * event) As a side-effect of flushing all data from the pipeline, this event unblocks the streaming thread by making all pads reject data until they receive a <xref linkend="section-events-flush-stop"/> signal - (elements trying to push data will get a WRONG_STATE flow return + (elements trying to push data will get a FLUSHING flow return and stop processing data). </para> <para> diff --git a/docs/slides/Makefile.in b/docs/slides/Makefile.in index 8dbbecd..064b8fc 100644 --- a/docs/slides/Makefile.in +++ b/docs/slides/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/docs/xsl/Makefile.in b/docs/xsl/Makefile.in index 6bc5fab..0325dfb 100644 --- a/docs/xsl/Makefile.in +++ b/docs/xsl/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/gst/Makefile.in b/gst/Makefile.in index 5553d5b..008347b 100644 --- a/gst/Makefile.in +++ b/gst/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -824,7 +824,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) done; \ test -z "$$list2" || { \ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(libdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -1359,7 +1359,7 @@ install-girDATA: $(gir_DATA) @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(girdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -1380,7 +1380,7 @@ install-typelibsDATA: $(typelibs_DATA) @list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(typelibsdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(typelibsdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(typelibsdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -1401,7 +1401,7 @@ install-libgstreamer_@GST_API_VERSION@includeHEADERS: $(libgstreamer_@GST_API_VE @list='$(libgstreamer_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstreamer_@GST_API_VERSION@includedir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(libgstreamer_@GST_API_VERSION@includedir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(libgstreamer_@GST_API_VERSION@includedir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(libgstreamer_@GST_API_VERSION@includedir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -1422,7 +1422,7 @@ install-nodist_libgstreamer_@GST_API_VERSION@includeHEADERS: $(nodist_libgstream @list='$(nodist_libgstreamer_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstreamer_@GST_API_VERSION@includedir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(libgstreamer_@GST_API_VERSION@includedir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(libgstreamer_@GST_API_VERSION@includedir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(libgstreamer_@GST_API_VERSION@includedir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -635,7 +635,9 @@ init_post (GOptionContext * context, GOptionGroup * group, gpointer data, llf = G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_ERROR | G_LOG_FLAG_FATAL; g_log_set_handler (g_log_domain_gstreamer, llf, debug_log_handler, NULL); +#ifndef GST_DISABLE_TRACE _priv_gst_alloc_trace_initialize (); +#endif _priv_gst_mini_object_initialize (); _priv_gst_quarks_initialize (); @@ -1011,7 +1013,9 @@ gst_deinit (void) _priv_gst_registry_cleanup (); +#ifndef GST_DISABLE_TRACE _priv_gst_alloc_trace_deinit (); +#endif g_type_class_unref (g_type_class_peek (gst_object_get_type ())); g_type_class_unref (g_type_class_peek (gst_pad_get_type ())); diff --git a/gst/gst_private.h b/gst/gst_private.h index 19f02d3..f44c6f3 100644 --- a/gst/gst_private.h +++ b/gst/gst_private.h @@ -257,5 +257,68 @@ extern GstDebugCategory *_priv_GST_CAT_POLL; #endif +/**** objects made opaque until the private bits have been made private ****/ + +#include <gmodule.h> +#include <time.h> /* time_t */ +#include <sys/types.h> /* off_t */ +#include <sys/stat.h> /* off_t */ + +typedef struct _GstPluginPrivate GstPluginPrivate; + +struct _GstPlugin { + GstObject object; + + /*< private >*/ + GstPluginDesc desc; + + GstPluginDesc *orig_desc; + + gchar * filename; + gchar * basename; /* base name (non-dir part) of plugin path */ + + GModule * module; /* contains the module if plugin is loaded */ + + off_t file_size; + time_t file_mtime; + gboolean registered; /* TRUE when the registry has seen a filename + * that matches the plugin's basename */ + + GstPluginPrivate *priv; + + gpointer _gst_reserved[GST_PADDING]; +}; + +struct _GstPluginClass { + GstObjectClass object_class; + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; +}; + +#include "gsttypefind.h" + +struct _GstTypeFindFactory { + GstPluginFeature feature; + /* <private> */ + + GstTypeFindFunction function; + gchar ** extensions; + GstCaps * caps; /* FIXME: not yet saved in registry */ + + gpointer user_data; + GDestroyNotify user_data_notify; + + gpointer _gst_reserved[GST_PADDING]; +}; + +struct _GstTypeFindFactoryClass { + GstPluginFeatureClass parent; + /* <private> */ + + gpointer _gst_reserved[GST_PADDING]; +}; + + G_END_DECLS #endif /* __GST_PRIVATE_H__ */ diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c index 54bb950..b9783c5 100644 --- a/gst/gstbuffer.c +++ b/gst/gstbuffer.c @@ -235,7 +235,8 @@ _get_merged_memory (GstBuffer * buffer, guint idx, guint length) gst_memory_map (mem[i], &sinfo, GST_MAP_READ); tocopy = MIN (sinfo.size, left); GST_CAT_DEBUG (GST_CAT_PERFORMANCE, - "memcpy for merge %p from memory %p", result, mem[i]); + "memcpy %" G_GSIZE_FORMAT " bytes for merge %p from memory %p", + tocopy, result, mem[i]); memcpy (ptr, (guint8 *) sinfo.data, tocopy); left -= tocopy; ptr += tocopy; @@ -827,8 +828,8 @@ gst_buffer_get_memory_range (GstBuffer * buffer, guint idx, gint length) g_return_val_if_fail (GST_IS_BUFFER (buffer), NULL); len = GST_BUFFER_MEM_LEN (buffer); - g_return_val_if_fail ((length == -1 && idx < len) || - (length > 0 && length + idx <= len), NULL); + g_return_val_if_fail ((len == 0 && idx == 0 && length == -1) || + (length == -1 && idx < len) || (length > 0 && length + idx <= len), NULL); if (length == -1) length = len - idx; @@ -859,8 +860,8 @@ gst_buffer_replace_memory_range (GstBuffer * buffer, guint idx, gint length, g_return_if_fail (GST_IS_BUFFER (buffer)); g_return_if_fail (gst_buffer_is_writable (buffer)); len = GST_BUFFER_MEM_LEN (buffer); - g_return_if_fail ((length == -1 && idx < len) || (length > 0 - && length + idx <= len)); + g_return_if_fail ((len == 0 && idx == 0 && length == -1) || + (length == -1 && idx < len) || (length > 0 && length + idx <= len)); if (length == -1) length = len - idx; @@ -887,7 +888,8 @@ gst_buffer_remove_memory_range (GstBuffer * buffer, guint idx, gint length) g_return_if_fail (gst_buffer_is_writable (buffer)); len = GST_BUFFER_MEM_LEN (buffer); - g_return_if_fail ((length == -1 && idx < len) || length + idx <= len); + g_return_if_fail ((len == 0 && idx == 0 && length == -1) || + (length == -1 && idx < len) || length + idx <= len); if (length == -1) length = len - idx; @@ -997,8 +999,8 @@ gst_buffer_get_sizes_range (GstBuffer * buffer, guint idx, gint length, g_return_val_if_fail (GST_IS_BUFFER (buffer), 0); len = GST_BUFFER_MEM_LEN (buffer); - g_return_val_if_fail (len == 0 || (length == -1 && idx < len) - || (length + idx <= len), 0); + g_return_val_if_fail ((len == 0 && idx == 0 && length == -1) || + (length == -1 && idx < len) || (length + idx <= len), 0); if (length == -1) length = len - idx; @@ -1062,7 +1064,8 @@ gst_buffer_resize_range (GstBuffer * buffer, guint idx, gint length, g_return_if_fail (gst_buffer_is_writable (buffer)); g_return_if_fail (size >= -1); len = GST_BUFFER_MEM_LEN (buffer); - g_return_if_fail ((length == -1 && idx < len) || (length + idx <= len)); + g_return_if_fail ((len == 0 && idx == 0 && length == -1) || + (length == -1 && idx < len) || (length + idx <= len)); if (length == -1) length = len - idx; @@ -1166,9 +1169,8 @@ gst_buffer_map_range (GstBuffer * buffer, guint idx, gint length, g_return_val_if_fail (GST_IS_BUFFER (buffer), FALSE); g_return_val_if_fail (info != NULL, FALSE); len = GST_BUFFER_MEM_LEN (buffer); - if (len == 0) - goto no_memory; - g_return_val_if_fail ((length == -1 && idx < len) || (length > 0 + g_return_val_if_fail ((len == 0 && idx == 0 && length == -1) || + (length == -1 && idx < len) || (length > 0 && length + idx <= len), FALSE); write = (flags & GST_MAP_WRITE) != 0; @@ -1623,6 +1625,8 @@ gst_buffer_remove_meta (GstBuffer * buffer, GstMeta * meta) g_return_val_if_fail (buffer != NULL, FALSE); g_return_val_if_fail (meta != NULL, FALSE); g_return_val_if_fail (gst_buffer_is_writable (buffer), FALSE); + g_return_val_if_fail (!GST_META_FLAG_IS_SET (meta, GST_META_FLAG_LOCKED), + FALSE); /* find the metadata and delete */ prev = GST_BUFFER_META (buffer); @@ -1722,6 +1726,7 @@ gst_buffer_foreach_meta (GstBuffer * buffer, GstBufferForeachMetaFunc func, g_type_name (info->type)); g_return_if_fail (gst_buffer_is_writable (buffer)); + g_return_if_fail (!GST_META_FLAG_IS_SET (m, GST_META_FLAG_LOCKED)); /* remove from list */ if (GST_BUFFER_META (buffer) == walk) diff --git a/gst/gstbuffer.h b/gst/gstbuffer.h index 0b3a7f8..5b0a854 100644 --- a/gst/gstbuffer.h +++ b/gst/gstbuffer.h @@ -184,7 +184,7 @@ typedef struct _GstBufferPool GstBufferPool; * @GST_BUFFER_FLAG_CORRUPTED: the buffer data is corrupted. * @GST_BUFFER_FLAG_MARKER: the buffer contains a media specific marker. for * video this is typically the end of a frame boundary, for audio - * this is usually the end of a talkspurt. + * this is usually the start of a talkspurt. * @GST_BUFFER_FLAG_HEADER: the buffer contains header information that is * needed to decode the following data. The buffer * is also part of the headers of the STREAM_CONFIG event. diff --git a/gst/gstbufferpool.c b/gst/gstbufferpool.c index 7020345..d7a09d1 100644 --- a/gst/gstbufferpool.c +++ b/gst/gstbufferpool.c @@ -130,8 +130,7 @@ static GstFlowReturn default_alloc_buffer (GstBufferPool * pool, GstBuffer ** buffer, GstBufferPoolAcquireParams * params); static GstFlowReturn default_acquire_buffer (GstBufferPool * pool, GstBuffer ** buffer, GstBufferPoolAcquireParams * params); -static void default_reset_buffer (GstBufferPool * pool, GstBuffer * buffer, - GstBufferPoolAcquireParams * params); +static void default_reset_buffer (GstBufferPool * pool, GstBuffer * buffer); static void default_free_buffer (GstBufferPool * pool, GstBuffer * buffer); static void default_release_buffer (GstBufferPool * pool, GstBuffer * buffer); @@ -243,6 +242,7 @@ mark_meta_pooled (GstBuffer * buffer, GstMeta ** meta, gpointer user_data) GST_DEBUG_OBJECT (pool, "marking meta %p as POOLED in buffer %p", *meta, buffer); GST_META_FLAG_SET (*meta, GST_META_FLAG_POOLED); + GST_META_FLAG_SET (*meta, GST_META_FLAG_LOCKED); return TRUE; } @@ -988,14 +988,15 @@ dec_outstanding (GstBufferPool * pool) static gboolean remove_meta_unpooled (GstBuffer * buffer, GstMeta ** meta, gpointer user_data) { - if (!GST_META_FLAG_IS_SET (*meta, GST_META_FLAG_POOLED)) + if (!GST_META_FLAG_IS_SET (*meta, GST_META_FLAG_POOLED)) { + GST_META_FLAG_UNSET (*meta, GST_META_FLAG_LOCKED); *meta = NULL; + } return TRUE; } static void -default_reset_buffer (GstBufferPool * pool, GstBuffer * buffer, - GstBufferPoolAcquireParams * params) +default_reset_buffer (GstBufferPool * pool, GstBuffer * buffer) { GST_BUFFER_FLAGS (buffer) = 0; @@ -1048,9 +1049,6 @@ gst_buffer_pool_acquire_buffer (GstBufferPool * pool, GstBuffer ** buffer, /* all buffers from the pool point to the pool and have the refcount of the * pool incremented */ (*buffer)->pool = gst_object_ref (pool); - /* now reset the buffer when needed */ - if (G_LIKELY (pclass->reset_buffer)) - pclass->reset_buffer (pool, *buffer, params); } else { dec_outstanding (pool); } @@ -1093,6 +1091,10 @@ gst_buffer_pool_release_buffer (GstBufferPool * pool, GstBuffer * buffer) pclass = GST_BUFFER_POOL_GET_CLASS (pool); + /* reset the buffer when needed */ + if (G_LIKELY (pclass->reset_buffer)) + pclass->reset_buffer (pool, buffer); + if (G_LIKELY (pclass->release_buffer)) pclass->release_buffer (pool, buffer); diff --git a/gst/gstbufferpool.h b/gst/gstbufferpool.h index aad3b22..ed26bb5 100644 --- a/gst/gstbufferpool.h +++ b/gst/gstbufferpool.h @@ -129,11 +129,12 @@ struct _GstBufferPool { * @alloc_buffer: allocate a buffer. the default implementation allocates * buffers from the configured memory allocator and with the configured * parameters. All metadata that is present on the allocated buffer will - * be marked as #GST_META_FLAG_POOLED and will not be removed from the - * buffer in @reset_buffer. + * be marked as #GST_META_FLAG_POOLED and #GST_META_FLAG_LOCKED and will + * not be removed from the buffer in @reset_buffer. * @reset_buffer: reset the buffer to its state when it was freshly allocated. * The default implementation will clear the flags, timestamps and - * will remove the metadata without the #GST_META_FLAG_POOLED flag. + * will remove the metadata without the #GST_META_FLAG_POOLED flag (even + * the metadata with #GST_META_FLAG_LOCKED). * @release_buffer: release a buffer back in the pool. The default * implementation will put the buffer back in the queue and notify any * blocking acquire_buffer calls. @@ -155,8 +156,7 @@ struct _GstBufferPoolClass { GstBufferPoolAcquireParams *params); GstFlowReturn (*alloc_buffer) (GstBufferPool *pool, GstBuffer **buffer, GstBufferPoolAcquireParams *params); - void (*reset_buffer) (GstBufferPool *pool, GstBuffer *buffer, - GstBufferPoolAcquireParams *params); + void (*reset_buffer) (GstBufferPool *pool, GstBuffer *buffer); void (*release_buffer) (GstBufferPool *pool, GstBuffer *buffer); void (*free_buffer) (GstBufferPool *pool, GstBuffer *buffer); diff --git a/gst/gstcaps.c b/gst/gstcaps.c index 57f8ae6..2f4a341 100644 --- a/gst/gstcaps.c +++ b/gst/gstcaps.c @@ -1037,8 +1037,6 @@ gst_caps_is_subset_structure (const GstCaps * caps, * <note>This function does not work reliably if optional properties for caps * are included on one caps and omitted on the other.</note> * - * This function deals correctly with passing NULL for any of the caps. - * * Returns: TRUE if both caps are equal. */ gboolean diff --git a/gst/gstcontrolbinding.c b/gst/gstcontrolbinding.c index 74d078e..b7cc8d5 100644 --- a/gst/gstcontrolbinding.c +++ b/gst/gstcontrolbinding.c @@ -25,6 +25,20 @@ * * A value mapping object that attaches control sources to gobject properties. */ +/* FIXME(ensonic): should we make gst_object_add_control_binding() internal + * - we create the control_binding for a certain object anyway + * - we could call gst_object_add_control_binding() at the end of + * gst_control_binding_constructor() + * - the weak-ref on object is not nice, as is the same as gst_object_parent() + * once the object is added to the parent + * + * - another option would be do defer what I am doing in _constructor to when + * the parent is set (need to listen to the signal then) + * then basically I could + * a) remove the obj arg and wait the binding to be added or + * b) add the binding from constructor, unref object there and make obj + * writeonly + */ #include "gst_private.h" @@ -130,8 +144,10 @@ gst_control_binding_dispose (GObject * object) { GstControlBinding *self = GST_CONTROL_BINDING (object); - if (self->object) - gst_object_replace (&self->object, NULL); + /* we did not took a reference */ + g_object_remove_weak_pointer ((GObject *) self->object, + (gpointer *) & self->object); + self->object = NULL; ((GObjectClass *) gst_control_binding_parent_class)->dispose (object); } @@ -154,7 +170,10 @@ gst_control_binding_set_property (GObject * object, guint prop_id, switch (prop_id) { case PROP_OBJECT: - self->object = g_value_dup_object (value); + /* do not ref to avoid a ref cycle */ + self->object = g_value_get_object (value); + g_object_add_weak_pointer ((GObject *) self->object, + (gpointer *) & self->object); break; case PROP_NAME: self->name = g_value_dup_string (value); @@ -261,19 +280,23 @@ gst_control_binding_get_value (GstControlBinding * self, GstClockTime timestamp) * @n_values: the number of values * @values: array to put control-values in * - * Gets a number of values for the given controllered property starting at the + * Gets a number of values for the given controlled property starting at the * requested time. The array @values need to hold enough space for @n_values of * the same type as the objects property's type. * * This function is useful if one wants to e.g. draw a graph of the control * curve or apply a control curve sample by sample. * + * The values are unboxed and ready to be used. The similar function + * gst_control_binding_get_g_value_array() returns the array as #GValues and is + * better suites for bindings. + * * Returns: %TRUE if the given array could be filled, %FALSE otherwise */ gboolean gst_control_binding_get_value_array (GstControlBinding * self, GstClockTime timestamp, GstClockTime interval, guint n_values, - GValue * values) + gpointer values) { GstControlBindingClass *klass; gboolean ret = FALSE; @@ -293,6 +316,117 @@ gst_control_binding_get_value_array (GstControlBinding * self, return ret; } +#define CONVERT_ARRAY(type,TYPE) \ +{ \ + g##type *v = g_new (g##type,n_values); \ + ret = gst_control_binding_get_value_array (self, timestamp, interval, \ + n_values, v); \ + if (ret) { \ + for (i = 0; i < n_values; i++) { \ + g_value_init (&values[i], G_TYPE_##TYPE); \ + g_value_set_##type (&values[i], v[i]); \ + } \ + } \ + g_free (v); \ +} + +/** + * gst_control_binding_get_g_value_array: + * @self: the control binding + * @timestamp: the time that should be processed + * @interval: the time spacing between subsequent values + * @n_values: the number of values + * @values: array to put control-values in + * + * Gets a number of #GValues for the given controlled property starting at the + * requested time. The array @values need to hold enough space for @n_values of + * #GValue. + * + * This function is useful if one wants to e.g. draw a graph of the control + * curve or apply a control curve sample by sample. + * + * Returns: %TRUE if the given array could be filled, %FALSE otherwise + */ +gboolean +gst_control_binding_get_g_value_array (GstControlBinding * self, + GstClockTime timestamp, GstClockTime interval, guint n_values, + GValue * values) +{ + GstControlBindingClass *klass; + gboolean ret = FALSE; + + g_return_val_if_fail (GST_IS_CONTROL_BINDING (self), FALSE); + g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (timestamp), FALSE); + g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (interval), FALSE); + g_return_val_if_fail (values, FALSE); + + klass = GST_CONTROL_BINDING_GET_CLASS (self); + + if (G_LIKELY (klass->get_g_value_array != NULL)) { + ret = + klass->get_g_value_array (self, timestamp, interval, n_values, values); + } else { + guint i; + GType type, base; + + base = type = G_PARAM_SPEC_VALUE_TYPE (GST_CONTROL_BINDING_PSPEC (self)); + while ((type = g_type_parent (type))) + base = type; + + GST_INFO_OBJECT (self, "missing get_g_value_array implementation, we're " + "emulating it"); + switch (base) { + case G_TYPE_INT: + CONVERT_ARRAY (int, INT); + break; + case G_TYPE_UINT: + CONVERT_ARRAY (uint, UINT); + break; + case G_TYPE_LONG: + CONVERT_ARRAY (long, LONG); + break; + case G_TYPE_ULONG: + CONVERT_ARRAY (ulong, ULONG); + break; + case G_TYPE_INT64: + CONVERT_ARRAY (int64, INT64); + break; + case G_TYPE_UINT64: + CONVERT_ARRAY (uint64, UINT64); + break; + case G_TYPE_FLOAT: + CONVERT_ARRAY (float, FLOAT); + break; + case G_TYPE_DOUBLE: + CONVERT_ARRAY (double, DOUBLE); + break; + case G_TYPE_BOOLEAN: + CONVERT_ARRAY (boolean, BOOLEAN); + break; + case G_TYPE_ENUM: + { + gint *v = g_new (gint, n_values); + ret = gst_control_binding_get_value_array (self, timestamp, interval, + n_values, v); + if (ret) { + for (i = 0; i < n_values; i++) { + g_value_init (&values[i], type); + g_value_set_enum (&values[i], v[i]); + } + } + g_free (v); + } + break; + default: + GST_WARNING ("incomplete implementation for paramspec type '%s'", + G_PARAM_SPEC_TYPE_NAME (GST_CONTROL_BINDING_PSPEC (self))); + GST_CONTROL_BINDING_PSPEC (self) = NULL; + break; + } + } + return ret; +} + /** * gst_control_binding_set_disabled: * @self: the control binding diff --git a/gst/gstcontrolbinding.h b/gst/gstcontrolbinding.h index 96652fa..7f83d3d 100644 --- a/gst/gstcontrolbinding.h +++ b/gst/gstcontrolbinding.h @@ -93,7 +93,8 @@ struct _GstControlBindingClass /* virtual methods */ gboolean (* sync_values) (GstControlBinding *self, GstObject *object, GstClockTime timestamp, GstClockTime last_sync); GValue * (* get_value) (GstControlBinding *self, GstClockTime timestamp); - gboolean (* get_value_array) (GstControlBinding *self, GstClockTime timestamp,GstClockTime interval, guint n_values, GValue *values); + gboolean (* get_value_array) (GstControlBinding *self, GstClockTime timestamp,GstClockTime interval, guint n_values, gpointer values); + gboolean (* get_g_value_array) (GstControlBinding *self, GstClockTime timestamp,GstClockTime interval, guint n_values, GValue *values); /*< private >*/ gpointer _gst_reserved[GST_PADDING]; @@ -110,6 +111,8 @@ gboolean gst_control_binding_sync_values (GstControlBinding * GValue * gst_control_binding_get_value (GstControlBinding *binding, GstClockTime timestamp); gboolean gst_control_binding_get_value_array (GstControlBinding *binding, GstClockTime timestamp, + GstClockTime interval, guint n_values, gpointer values); +gboolean gst_control_binding_get_g_value_array (GstControlBinding *binding, GstClockTime timestamp, GstClockTime interval, guint n_values, GValue *values); void gst_control_binding_set_disabled (GstControlBinding * self, gboolean disabled); diff --git a/gst/gstcontrolsource.c b/gst/gstcontrolsource.c index b75c2ee..611784f 100644 --- a/gst/gstcontrolsource.c +++ b/gst/gstcontrolsource.c @@ -122,7 +122,8 @@ gst_control_source_get_value (GstControlSource * self, GstClockTime timestamp, * @n_values: the number of values to fetch * @value_array: array to put control-values in * - * Gets an array of values for for this #GstControlSource. + * Gets an array of values for for this #GstControlSource. Values that are + * undefined contain NANs. * * Returns: %TRUE if the given array could be filled, %FALSE otherwise */ diff --git a/gst/gstghostpad.c b/gst/gstghostpad.c index 7a8947d..f9b8368 100644 --- a/gst/gstghostpad.c +++ b/gst/gstghostpad.c @@ -207,6 +207,7 @@ gst_proxy_pad_query_default (GstPad * pad, GstObject * parent, GstQuery * query) GST_DEBUG_OBJECT (pad, "no target"); /* We don't have a target, we return TRUE and we assume that any future * target will be able to deal with any configured caps. */ + gst_query_set_accept_caps_result (query, TRUE); res = TRUE; } break; diff --git a/gst/gstmemory.c b/gst/gstmemory.c index 5a7f289..8eb112e 100644 --- a/gst/gstmemory.c +++ b/gst/gstmemory.c @@ -222,7 +222,7 @@ _default_alloc_alloc (GstAllocator * allocator, gsize size, } static gpointer -_default_mem_map (GstMemoryDefault * mem, GstMapFlags flags) +_default_mem_map (GstMemoryDefault * mem, gsize maxsize, GstMapFlags flags) { return mem->data; } @@ -258,8 +258,10 @@ _default_mem_copy (GstMemoryDefault * mem, gssize offset, gsize size) copy = _default_mem_new_block (0, mem->mem.maxsize, 0, mem->mem.offset + offset, size); + GST_CAT_DEBUG (GST_CAT_PERFORMANCE, + "memcpy %" G_GSIZE_FORMAT " memory %p -> %p", mem->mem.maxsize, mem, + copy); memcpy (copy->data, mem->data, mem->mem.maxsize); - GST_CAT_DEBUG (GST_CAT_PERFORMANCE, "copy memory %p -> %p", mem, copy); return copy; } @@ -324,8 +326,9 @@ _fallback_mem_copy (GstMemory * mem, gssize offset, gssize size) return NULL; } + GST_CAT_DEBUG (GST_CAT_PERFORMANCE, + "memcpy %" G_GSSIZE_FORMAT " memory %p -> %p", size, mem, copy); memcpy (dinfo.data, sinfo.data + offset, size); - GST_CAT_DEBUG (GST_CAT_PERFORMANCE, "copy memory %p -> %p", mem, copy); gst_memory_unmap (copy, &dinfo); gst_memory_unmap (mem, &sinfo); diff --git a/gst/gstmessage.h b/gst/gstmessage.h index aadb646..b7046e1 100644 --- a/gst/gstmessage.h +++ b/gst/gstmessage.h @@ -264,7 +264,7 @@ typedef enum { GST_PROGRESS_TYPE_CONTINUE = 1, GST_PROGRESS_TYPE_COMPLETE = 2, GST_PROGRESS_TYPE_CANCELED = 3, - GST_PROGRESS_TYPE_ERROR = 4, + GST_PROGRESS_TYPE_ERROR = 4 } GstProgressType; /** diff --git a/gst/gstmeta.h b/gst/gstmeta.h index bd7b2e2..e6d4f00 100644 --- a/gst/gstmeta.h +++ b/gst/gstmeta.h @@ -34,8 +34,8 @@ typedef struct _GstMetaInfo GstMetaInfo; * GstMetaFlags: * @GST_META_FLAG_NONE: no flags * @GST_META_FLAG_READONLY: metadata should not be modified - * @GST_META_FLAG_POOLED: metadata is managed by a bufferpool and should not - * be removed + * @GST_META_FLAG_POOLED: metadata is managed by a bufferpool + * @GST_META_FLAG_LOCKED: metadata should not be removed * @GST_META_FLAG_LAST: additional flags can be added starting from this flag. * * Extra metadata flags. @@ -44,6 +44,7 @@ typedef enum { GST_META_FLAG_NONE = 0, GST_META_FLAG_READONLY = (1 << 0), GST_META_FLAG_POOLED = (1 << 1), + GST_META_FLAG_LOCKED = (1 << 2), GST_META_FLAG_LAST = (1 << 16) } GstMetaFlags; diff --git a/gst/gstobject.c b/gst/gstobject.c index f830402..e8d4880 100644 --- a/gst/gstobject.c +++ b/gst/gstobject.c @@ -340,7 +340,7 @@ gst_object_replace (GstObject ** oldobj, GstObject * newobj) return FALSE; if (newobj) - g_object_ref (newobj); + gst_object_ref (newobj); while (G_UNLIKELY (!g_atomic_pointer_compare_and_exchange ((gpointer *) oldobj, oldptr, newobj))) { @@ -350,7 +350,7 @@ gst_object_replace (GstObject ** oldobj, GstObject * newobj) } if (oldptr) - g_object_unref (oldptr); + gst_object_unref (oldptr); return oldptr != newobj; } @@ -559,7 +559,14 @@ gst_object_set_name_default (GstObject * object) type_name = g_quark_to_string (q); if (strncmp (type_name, "Gst", 3) == 0) type_name += 3; - name = g_strdup_printf ("%s%d", type_name, count); + /* give the 20th "queue" element and the first "queue2" different names */ + l = strlen (type_name); + if (l > 0 && g_ascii_isdigit (type_name[l - 1])) { + name = g_strdup_printf ("%s-%d", type_name, count); + } else { + name = g_strdup_printf ("%s%d", type_name, count); + } + l = strlen (name); for (i = 0; i < l; i++) name[i] = g_ascii_tolower (name[i]); @@ -1220,7 +1227,7 @@ gst_object_get_control_binding (GstObject * object, const gchar * property_name) GST_OBJECT_LOCK (object); if ((binding = gst_object_find_control_binding (object, property_name))) { - g_object_ref (binding); + gst_object_ref (binding); } GST_OBJECT_UNLOCK (object); @@ -1300,19 +1307,23 @@ gst_object_get_value (GstObject * object, const gchar * property_name, * @n_values: the number of values * @values: array to put control-values in * - * Gets a number of values for the given controllered property starting at the + * Gets a number of values for the given controlled property starting at the * requested time. The array @values need to hold enough space for @n_values of * the same type as the objects property's type. * * This function is useful if one wants to e.g. draw a graph of the control * curve or apply a control curve sample by sample. * + * The values are unboxed and ready to be used. The similar function + * gst_object_get_g_value_array() returns the array as #GValues and is + * better suites for bindings. + * * Returns: %TRUE if the given array could be filled, %FALSE otherwise */ gboolean gst_object_get_value_array (GstObject * object, const gchar * property_name, GstClockTime timestamp, GstClockTime interval, guint n_values, - GValue * values) + gpointer values) { gboolean res = FALSE; GstControlBinding *binding; @@ -1332,6 +1343,47 @@ gst_object_get_value_array (GstObject * object, const gchar * property_name, return res; } +/** + * gst_object_get_g_value_array: + * @object: the object that has controlled properties + * @property_name: the name of the property to get + * @timestamp: the time that should be processed + * @interval: the time spacing between subsequent values + * @n_values: the number of values + * @values: array to put control-values in + * + * Gets a number of #GValues for the given controlled property starting at the + * requested time. The array @values need to hold enough space for @n_values of + * #GValue. + * + * This function is useful if one wants to e.g. draw a graph of the control + * curve or apply a control curve sample by sample. + * + * Returns: %TRUE if the given array could be filled, %FALSE otherwise + */ +gboolean +gst_object_get_g_value_array (GstObject * object, const gchar * property_name, + GstClockTime timestamp, GstClockTime interval, guint n_values, + GValue * values) +{ + gboolean res = FALSE; + GstControlBinding *binding; + + g_return_val_if_fail (GST_IS_OBJECT (object), FALSE); + g_return_val_if_fail (property_name, FALSE); + g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (timestamp), FALSE); + g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (interval), FALSE); + g_return_val_if_fail (values, FALSE); + + GST_OBJECT_LOCK (object); + if ((binding = gst_object_find_control_binding (object, property_name))) { + res = gst_control_binding_get_g_value_array (binding, timestamp, interval, + n_values, values); + } + GST_OBJECT_UNLOCK (object); + return res; +} + /** * gst_object_get_control_rate: diff --git a/gst/gstobject.h b/gst/gstobject.h index e753516..6c9f9f5 100644 --- a/gst/gstobject.h +++ b/gst/gstobject.h @@ -253,6 +253,9 @@ GValue * gst_object_get_value (GstObject * object, const gch GstClockTime timestamp); gboolean gst_object_get_value_array (GstObject * object, const gchar * property_name, GstClockTime timestamp, GstClockTime interval, + guint n_values, gpointer values); +gboolean gst_object_get_g_value_array (GstObject * object, const gchar * property_name, + GstClockTime timestamp, GstClockTime interval, guint n_values, GValue *values); GstClockTime gst_object_get_control_rate (GstObject * object); diff --git a/gst/gstplugin.c b/gst/gstplugin.c index 413ffd7..a7542fc 100644 --- a/gst/gstplugin.c +++ b/gst/gstplugin.c @@ -90,18 +90,17 @@ static char *_gst_plugin_fault_handler_filename = NULL; * MIT/X11: http://www.opensource.org/licenses/mit-license.php * 3-clause BSD: http://www.opensource.org/licenses/bsd-license.php */ -static const gchar *const valid_licenses[] = { - "LGPL", /* GNU Lesser General Public License */ - "GPL", /* GNU General Public License */ - "QPL", /* Trolltech Qt Public License */ - "GPL/QPL", /* Combi-license of GPL + QPL */ - "MPL", /* MPL 1.1 license */ - "BSD", /* 3-clause BSD license */ - "MIT/X11", /* MIT/X11 license */ - "Proprietary", /* Proprietary license */ - GST_LICENSE_UNKNOWN, /* some other license */ - NULL -}; +static const gchar valid_licenses[] = "LGPL\000" /* GNU Lesser General Public License */ + "GPL\000" /* GNU General Public License */ + "QPL\000" /* Trolltech Qt Public License */ + "GPL/QPL\000" /* Combi-license of GPL + QPL */ + "MPL\000" /* MPL 1.1 license */ + "BSD\000" /* 3-clause BSD license */ + "MIT/X11\000" /* MIT/X11 license */ + "Proprietary\000" /* Proprietary license */ + GST_LICENSE_UNKNOWN; /* some other license */ + +static const guint8 valid_licenses_idx[] = { 0, 5, 9, 13, 21, 25, 29, 37, 49 }; static GstPlugin *gst_plugin_register_func (GstPlugin * plugin, const GstPluginDesc * desc, gpointer user_data); @@ -460,14 +459,11 @@ priv_gst_plugin_loading_get_whitelist_hash (void) static gboolean gst_plugin_check_license (const gchar * license) { - const gchar *const *check_license = valid_licenses; + gint i; - g_assert (check_license); - - while (*check_license) { - if (strcmp (license, *check_license) == 0) + for (i = 0; i < G_N_ELEMENTS (valid_licenses_idx); ++i) { + if (strcmp (license, valid_licenses + valid_licenses_idx[i]) == 0) return TRUE; - check_license++; } return FALSE; } @@ -993,21 +989,26 @@ gst_plugin_get_origin (GstPlugin * plugin) } /** - * gst_plugin_get_module: - * @plugin: plugin to query + * gst_plugin_get_release_date_string: + * @plugin: plugin to get the release date of + * + * Get the release date (and possibly time) in form of a string, if available. + * + * For normal GStreamer plugin releases this will usually just be a date in + * the form of "YYYY-MM-DD", while pre-releases and builds from git may contain + * a time component after the date as well, in which case the string will be + * formatted like "YYYY-MM-DDTHH:MMZ" (e.g. "2012-04-30T09:30Z"). * - * Gets the #GModule of the plugin. If the plugin isn't loaded yet, NULL is - * returned. + * There may be plugins that do not have a valid release date set on them. * - * Returns: (transfer none): module belonging to the plugin or NULL if the - * plugin isn't loaded yet. + * Returns: the date string of the plugin, or %NULL if not available. */ -GModule * -gst_plugin_get_module (GstPlugin * plugin) +const gchar * +gst_plugin_get_release_date_string (GstPlugin * plugin) { g_return_val_if_fail (plugin != NULL, NULL); - return plugin->module; + return plugin->desc.release_datetime; } /** @@ -1154,26 +1155,8 @@ gst_plugin_list_feature_filter (GList * list, return data.result; } -#endif /** - * gst_plugin_name_filter: - * @plugin: the plugin to check - * @name: the name of the plugin - * - * A standard filter that returns TRUE when the plugin is of the - * given name. - * - * Returns: TRUE if the plugin is of the given name. - */ -gboolean -gst_plugin_name_filter (GstPlugin * plugin, const gchar * name) -{ - return (plugin->desc.name && !strcmp (plugin->desc.name, name)); -} - -#if 0 -/** * gst_plugin_find_feature: * @plugin: plugin to get the feature from * @name: The name of the feature to find diff --git a/gst/gstplugin.h b/gst/gstplugin.h index f1be63b..8d5f6c7 100644 --- a/gst/gstplugin.h +++ b/gst/gstplugin.h @@ -26,19 +26,19 @@ #include <gst/gstconfig.h> -#include <time.h> /* time_t */ -#include <sys/types.h> /* off_t */ -#include <sys/stat.h> /* off_t */ -#include <gmodule.h> #include <gst/gstobject.h> #include <gst/gstmacros.h> #include <gst/gststructure.h> G_BEGIN_DECLS +/** + * GstPlugin: + * + * The opaque plugin object + */ typedef struct _GstPlugin GstPlugin; typedef struct _GstPluginClass GstPluginClass; -typedef struct _GstPluginPrivate GstPluginPrivate; typedef struct _GstPluginDesc GstPluginDesc; /** @@ -80,8 +80,8 @@ typedef enum */ typedef enum { - GST_PLUGIN_FLAG_CACHED = (1<<0), - GST_PLUGIN_FLAG_BLACKLISTED = (1<<1) + GST_PLUGIN_FLAG_CACHED = (GST_OBJECT_FLAG_LAST << 0), + GST_PLUGIN_FLAG_BLACKLISTED = (GST_OBJECT_FLAG_LAST << 1) } GstPluginFlags; /** @@ -187,43 +187,6 @@ struct _GstPluginDesc { #define GST_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_PLUGIN, GstPluginClass)) #define GST_PLUGIN_CAST(obj) ((GstPlugin*)(obj)) -/** - * GstPlugin: - * - * The plugin object - */ -struct _GstPlugin { - GstObject object; - - /*< private >*/ - GstPluginDesc desc; - - GstPluginDesc *orig_desc; - - unsigned int flags; - - gchar * filename; - gchar * basename; /* base name (non-dir part) of plugin path */ - - GModule * module; /* contains the module if plugin is loaded */ - - off_t file_size; - time_t file_mtime; - gboolean registered; /* TRUE when the registry has seen a filename - * that matches the plugin's basename */ - - GstPluginPrivate *priv; - - gpointer _gst_reserved[GST_PADDING]; -}; - -struct _GstPluginClass { - GstObjectClass object_class; - - /*< private >*/ - gpointer _gst_reserved[GST_PADDING]; -}; - #ifdef GST_PACKAGE_RELEASE_DATETIME #define __GST_PACKAGE_RELEASE_DATETIME GST_PACKAGE_RELEASE_DATETIME #else @@ -276,8 +239,7 @@ G_END_DECLS /** * GST_LICENSE_UNKNOWN: * - * To be used in GST_PLUGIN_DEFINE or GST_PLUGIN_DEFINE_STATIC if usure about - * the licence. + * To be used in GST_PLUGIN_DEFINE if usure about the licence. */ #define GST_LICENSE_UNKNOWN "unknown" @@ -329,14 +291,12 @@ const gchar* gst_plugin_get_license (GstPlugin *plugin); const gchar* gst_plugin_get_source (GstPlugin *plugin); const gchar* gst_plugin_get_package (GstPlugin *plugin); const gchar* gst_plugin_get_origin (GstPlugin *plugin); +const gchar* gst_plugin_get_release_date_string (GstPlugin *plugin); const GstStructure* gst_plugin_get_cache_data (GstPlugin * plugin); void gst_plugin_set_cache_data (GstPlugin * plugin, GstStructure *cache_data); -GModule * gst_plugin_get_module (GstPlugin *plugin); gboolean gst_plugin_is_loaded (GstPlugin *plugin); -gboolean gst_plugin_name_filter (GstPlugin *plugin, const gchar *name); - GstPlugin * gst_plugin_load_file (const gchar *filename, GError** error); GstPlugin * gst_plugin_load (GstPlugin *plugin); diff --git a/gst/gstpluginfeature.c b/gst/gstpluginfeature.c index 5b86fd3..e61fee2 100644 --- a/gst/gstpluginfeature.c +++ b/gst/gstpluginfeature.c @@ -221,7 +221,7 @@ gst_plugin_feature_list_copy (GList * list) GList *last; new_list = g_list_alloc (); - new_list->data = g_object_ref ((GObject *) list->data); + new_list->data = gst_object_ref (list->data); new_list->prev = NULL; last = new_list; list = list->next; @@ -229,7 +229,7 @@ gst_plugin_feature_list_copy (GList * list) last->next = g_list_alloc (); last->next->prev = last; last = last->next; - last->data = g_object_ref ((GObject *) list->data); + last->data = gst_object_ref (list->data); list = list->next; } last->next = NULL; diff --git a/gst/gstpluginloader.c b/gst/gstpluginloader.c index 4539421..a51fa89 100644 --- a/gst/gstpluginloader.c +++ b/gst/gstpluginloader.c @@ -339,7 +339,7 @@ plugin_loader_create_blacklist_plugin (GstPluginLoader * l, plugin->filename = g_strdup (entry->filename); plugin->file_mtime = entry->file_mtime; plugin->file_size = entry->file_size; - plugin->flags |= GST_PLUGIN_FLAG_BLACKLISTED; + GST_OBJECT_FLAG_SET (plugin, GST_PLUGIN_FLAG_BLACKLISTED); plugin->basename = g_path_get_basename (plugin->filename); plugin->desc.name = g_intern_string (plugin->basename); @@ -849,7 +849,7 @@ handle_rx_packet (GstPluginLoader * l, return FALSE; } - newplugin->flags &= ~GST_PLUGIN_FLAG_CACHED; + GST_OBJECT_FLAG_UNSET (newplugin, GST_PLUGIN_FLAG_CACHED); GST_LOG_OBJECT (l->registry, "marking plugin %p as registered as %s", newplugin, newplugin->filename); diff --git a/gst/gstpoll.c b/gst/gstpoll.c index 7aab1d1..77be7e3 100644 --- a/gst/gstpoll.c +++ b/gst/gstpoll.c @@ -72,7 +72,6 @@ #ifdef G_OS_WIN32 #include <winsock2.h> -#define EINPROGRESS WSAEINPROGRESS #else #define _GNU_SOURCE 1 #ifdef HAVE_SYS_POLL_H diff --git a/gst/gstregistry.c b/gst/gstregistry.c index 6f41dcf..0575709 100644 --- a/gst/gstregistry.c +++ b/gst/gstregistry.c @@ -438,7 +438,7 @@ gst_registry_add_plugin (GstRegistry * registry, GstPlugin * plugin) GST_STR_NULL (plugin->filename)); /* If the new plugin is blacklisted and the existing one isn't cached, do not * accept if it's from a different location than the existing one */ - if ((plugin->flags & GST_PLUGIN_FLAG_BLACKLISTED) && + if (GST_OBJECT_FLAG_IS_SET (plugin, GST_PLUGIN_FLAG_BLACKLISTED) && strcmp (plugin->filename, existing_plugin->filename)) { GST_WARNING_OBJECT (registry, "Not replacing plugin because new one (%s) is blacklisted but for a different location than existing one (%s)", @@ -816,6 +816,12 @@ gst_registry_feature_filter (GstRegistry * registry, return list; } +static gboolean +gst_registry_plugin_name_filter (GstPlugin * plugin, const gchar * name) +{ + return (plugin->desc.name && !strcmp (plugin->desc.name, name)); +} + /** * gst_registry_find_plugin: * @registry: the registry to search @@ -839,7 +845,7 @@ gst_registry_find_plugin (GstRegistry * registry, const gchar * name) g_return_val_if_fail (name != NULL, NULL); walk = gst_registry_plugin_filter (registry, - (GstPluginFilter) gst_plugin_name_filter, TRUE, (gpointer) name); + (GstPluginFilter) gst_registry_plugin_name_filter, TRUE, (gpointer) name); if (walk) { result = GST_PLUGIN_CAST (walk->data); @@ -1272,7 +1278,7 @@ gst_registry_scan_path_level (GstRegistryScanContext * context, !(deps_changed = _priv_plugin_deps_files_changed (plugin)) && !strcmp (plugin->filename, filename)) { GST_LOG_OBJECT (context->registry, "file %s cached", filename); - plugin->flags &= ~GST_PLUGIN_FLAG_CACHED; + GST_OBJECT_FLAG_UNSET (plugin, GST_PLUGIN_FLAG_CACHED); GST_LOG_OBJECT (context->registry, "marking plugin %p as registered as %s", plugin, filename); plugin->registered = TRUE; @@ -1481,7 +1487,7 @@ gst_registry_remove_cache_plugins (GstRegistry * registry) while (g) { g_next = g->next; plugin = g->data; - if (plugin->flags & GST_PLUGIN_FLAG_CACHED) { + if (GST_OBJECT_FLAG_IS_SET (plugin, GST_PLUGIN_FLAG_CACHED)) { GST_DEBUG_OBJECT (registry, "removing cached plugin \"%s\"", GST_STR_NULL (plugin->filename)); registry->priv->plugins = g_list_delete_link (registry->priv->plugins, g); @@ -1593,7 +1599,9 @@ scan_and_update_registry (GstRegistry * default_registry, g_win32_get_package_installation_directory_of_module (_priv_gst_dll_handle); - dir = g_build_filename (base_dir, "lib", "gstreamer-0.10", NULL); + dir = + g_build_filename (base_dir, "lib", "gstreamer-" GST_API_VERSION, + NULL); GST_DEBUG ("scanning DLL dir %s", dir); changed |= gst_registry_scan_path_internal (&context, dir); diff --git a/gst/gstregistrybinary.c b/gst/gstregistrybinary.c index c358f31..fe1710a 100644 --- a/gst/gstregistrybinary.c +++ b/gst/gstregistrybinary.c @@ -378,7 +378,7 @@ priv_gst_registry_binary_write_cache (GstRegistry * registry, GList * plugins, if (!plugin->filename) continue; - if (plugin->flags & GST_PLUGIN_FLAG_CACHED) { + if (GST_OBJECT_FLAG_IS_SET (plugin, GST_PLUGIN_FLAG_CACHED)) { GStatBuf statbuf; if (g_stat (plugin->filename, &statbuf) < 0 || diff --git a/gst/gstregistrychunks.c b/gst/gstregistrychunks.c index 0c58dab..683738d 100644 --- a/gst/gstregistrychunks.c +++ b/gst/gstregistrychunks.c @@ -768,7 +768,7 @@ _priv_gst_registry_chunks_load_plugin (GstRegistry * registry, gchar ** in, plugin = g_object_newv (GST_TYPE_PLUGIN, 0, NULL); /* TODO: also set GST_PLUGIN_FLAG_CONST */ - plugin->flags |= GST_PLUGIN_FLAG_CACHED; + GST_OBJECT_FLAG_SET (plugin, GST_PLUGIN_FLAG_CACHED); plugin->file_mtime = pe->file_mtime; plugin->file_size = pe->file_size; @@ -804,7 +804,7 @@ _priv_gst_registry_chunks_load_plugin (GstRegistry * registry, gchar ** in, /* If the license string is 'BLACKLIST', mark this as a blacklisted * plugin */ if (strcmp (plugin->desc.license, "BLACKLIST") == 0) - plugin->flags |= GST_PLUGIN_FLAG_BLACKLISTED; + GST_OBJECT_FLAG_SET (plugin, GST_PLUGIN_FLAG_BLACKLISTED); plugin->basename = g_path_get_basename (plugin->filename); diff --git a/gst/gstsegment.h b/gst/gstsegment.h index 65f9210..9d3a8d1 100644 --- a/gst/gstsegment.h +++ b/gst/gstsegment.h @@ -59,6 +59,17 @@ typedef enum { * @GST_SEEK_FLAG_SKIP: when doing fast foward or fast reverse playback, allow * elements to skip frames instead of generating all * frames. Since 0.10.22. + * @GST_SEEK_FLAG_SNAP_BEFORE: go to a location before the requested position, + * if KEY_UNIT this means the keyframe at or before the + * requested position the one at or before the seek target. + * Since 0.10.37. + * @GST_SEEK_FLAG_SNAP_AFTER: go to a location after the requested position, + * if KEY_UNIT this means the keyframe at of after the + * requested position. Since 0.10.37. + * @GST_SEEK_FLAG_SNAP_NEAREST: go to a position near the requested position, + * if KEY_UNIT this means the keyframe closest to the + * requested position, if both keyframes are at an equal + * distance, behaves like SNAP_BEFORE. Since 0.10.37. * * Flags to be used with gst_element_seek() or gst_event_new_seek(). All flags * can be used together. @@ -82,6 +93,16 @@ typedef enum { * and demuxers to adjust the playback rate by skipping frames. This can improve * performance and decrease CPU usage because not all frames need to be decoded. * + * The @GST_SEEK_FLAG_SNAP_BEFORE flag can be used to snap to the previous + * relevant location, and the @GST_SEEK_FLAG_SNAP_AFTER flag can be used to + * select the next relevant location. If KEY_UNIT is specified, the relevant + * location is a keyframe. If both flags are specified, the nearest of these + * locations will be selected. If none are specified, the implementation is + * free to select whichever it wants. + * The before and after here are in running time, so when playing backwards, + * the next location refers to the one that will played in next, and not the + * one that is located after in the actual source stream. + * * Also see part-seeking.txt in the GStreamer design documentation for more * details on the meaning of these flags and the behaviour expected of * elements that handle them. @@ -92,7 +113,11 @@ typedef enum { GST_SEEK_FLAG_ACCURATE = (1 << 1), GST_SEEK_FLAG_KEY_UNIT = (1 << 2), GST_SEEK_FLAG_SEGMENT = (1 << 3), - GST_SEEK_FLAG_SKIP = (1 << 4) + GST_SEEK_FLAG_SKIP = (1 << 4), + GST_SEEK_FLAG_SNAP_BEFORE = (1 << 5), + GST_SEEK_FLAG_SNAP_AFTER = (1 << 6), + GST_SEEK_FLAG_SNAP_NEAREST = GST_SEEK_FLAG_SNAP_BEFORE | GST_SEEK_FLAG_SNAP_AFTER, + /* Careful to restart next flag with 1<<7 here */ } GstSeekFlags; /** diff --git a/gst/gstsystemclock.c b/gst/gstsystemclock.c index 7c461c9..9cac9ee 100644 --- a/gst/gstsystemclock.c +++ b/gst/gstsystemclock.c @@ -52,7 +52,9 @@ # define WIN32_LEAN_AND_MEAN /* prevents from including too many things */ # include <windows.h> /* QueryPerformance* stuff */ # undef WIN32_LEAN_AND_MEAN +# ifndef EWOULDBLOCK # define EWOULDBLOCK EAGAIN /* This is just to placate gcc */ +# endif #endif /* G_OS_WIN32 */ #define GET_ENTRY_STATUS(e) ((GstClockReturn) g_atomic_int_get(&GST_CLOCK_ENTRY_STATUS(e))) diff --git a/gst/gsttrace.c b/gst/gsttrace.c index a6e4d95..d4fd262 100644 --- a/gst/gsttrace.c +++ b/gst/gsttrace.c @@ -63,7 +63,11 @@ _priv_gst_alloc_trace_initialize (void) trace = g_getenv ("GST_TRACE"); if (trace != NULL) { - _gst_trace_flags = atoi (trace); + const GDebugKey keys[] = { + {"live", GST_ALLOC_TRACE_LIVE}, + {"mem-live", GST_ALLOC_TRACE_MEM_LIVE}, + }; + _gst_trace_flags = g_parse_debug_string (trace, keys, G_N_ELEMENTS (keys)); atexit (_at_exit); } diff --git a/gst/gsttypefindfactory.c b/gst/gsttypefindfactory.c index aca0698..c8f9d60 100644 --- a/gst/gsttypefindfactory.c +++ b/gst/gsttypefindfactory.c @@ -186,12 +186,12 @@ gst_type_find_factory_get_caps (GstTypeFindFactory * factory) * Returns: (transfer none) (array zero-terminated=1) (element-type utf8): a * NULL-terminated array of extensions associated with this factory */ -gchar ** +const gchar *const * gst_type_find_factory_get_extensions (GstTypeFindFactory * factory) { g_return_val_if_fail (GST_IS_TYPE_FIND_FACTORY (factory), NULL); - return factory->extensions; + return (const gchar * const *) factory->extensions; } /** @@ -222,3 +222,21 @@ gst_type_find_factory_call_function (GstTypeFindFactory * factory, gst_object_unref (new_factory); } } + +/** + * gst_type_find_factory_has_function: + * @factory: A #GstTypeFindFactory + * + * Check whether the factory has a typefind function. Typefind factories + * without typefind functions are a last-effort fallback mechanism to + * e.g. assume a certain media type based on the file extension. + * + * Returns: TRUE if the factory has a typefind functions set, otherwise FALSE + */ +gboolean +gst_type_find_factory_has_function (GstTypeFindFactory * factory) +{ + g_return_val_if_fail (GST_IS_TYPE_FIND_FACTORY (factory), FALSE); + + return (factory->function != NULL); +} diff --git a/gst/gsttypefindfactory.h b/gst/gsttypefindfactory.h index 3d8ff31..332134b 100644 --- a/gst/gsttypefindfactory.h +++ b/gst/gsttypefindfactory.h @@ -36,34 +36,13 @@ G_BEGIN_DECLS #define GST_IS_TYPE_FIND_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_TYPE_FIND_FACTORY)) #define GST_TYPE_FIND_FACTORY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_TYPE_FIND_FACTORY, GstTypeFindFactoryClass)) -typedef struct _GstTypeFindFactory GstTypeFindFactory; -typedef struct _GstTypeFindFactoryClass GstTypeFindFactoryClass; - /** * GstTypeFindFactory: * - * Object that stores information about a typefind function. + * Opaque object that stores information about a typefind function. */ -struct _GstTypeFindFactory { - GstPluginFeature feature; - /* <private> */ - - GstTypeFindFunction function; - gchar ** extensions; - GstCaps * caps; /* FIXME: not yet saved in registry */ - - gpointer user_data; - GDestroyNotify user_data_notify; - - gpointer _gst_reserved[GST_PADDING]; -}; - -struct _GstTypeFindFactoryClass { - GstPluginFeatureClass parent; - /* <private> */ - - gpointer _gst_reserved[GST_PADDING]; -}; +typedef struct _GstTypeFindFactory GstTypeFindFactory; +typedef struct _GstTypeFindFactoryClass GstTypeFindFactoryClass; /* typefinding interface */ @@ -71,8 +50,10 @@ GType gst_type_find_factory_get_type (void); GList * gst_type_find_factory_get_list (void); -gchar ** gst_type_find_factory_get_extensions (GstTypeFindFactory *factory); +const gchar * const * gst_type_find_factory_get_extensions (GstTypeFindFactory *factory); + GstCaps * gst_type_find_factory_get_caps (GstTypeFindFactory *factory); +gboolean gst_type_find_factory_has_function (GstTypeFindFactory *factory); void gst_type_find_factory_call_function (GstTypeFindFactory *factory, GstTypeFind *find); diff --git a/gst/gsturi.c b/gst/gsturi.c index 75c3440..afe2907 100644 --- a/gst/gsturi.c +++ b/gst/gsturi.c @@ -313,7 +313,7 @@ gst_uri_protocol_is_valid (const gchar * protocol) gst_uri_protocol_check_internal (protocol, &endptr); - return *endptr == '\0' && endptr != protocol; + return *endptr == '\0' && ((gsize) (endptr - protocol)) >= 3; } /** @@ -334,7 +334,7 @@ gst_uri_is_valid (const gchar * uri) gst_uri_protocol_check_internal (uri, &endptr); - return *endptr == ':'; + return *endptr == ':' && ((gsize) (endptr - uri)) >= 3; } /** diff --git a/gst/gstvalue.c b/gst/gstvalue.c index 9910265..c9f344b 100644 --- a/gst/gstvalue.c +++ b/gst/gstvalue.c @@ -1841,6 +1841,65 @@ gst_value_deserialize_caps (GValue * dest, const gchar * s) return FALSE; } +/************** + * GstSegment * + **************/ +static gchar * +gst_value_serialize_segment (const GValue * value) +{ + GstSegment *seg = g_value_get_boxed (value); + gchar *t, *res; + GstStructure *s; + + s = gst_structure_new ("GstSegment", + "flags", GST_TYPE_SEGMENT_FLAGS, seg->flags, + "rate", G_TYPE_DOUBLE, seg->rate, + "applied-rate", G_TYPE_DOUBLE, seg->applied_rate, + "format", GST_TYPE_FORMAT, seg->format, + "base", G_TYPE_UINT64, seg->base, + "start", G_TYPE_UINT64, seg->start, + "stop", G_TYPE_UINT64, seg->stop, + "time", G_TYPE_UINT64, seg->time, + "position", G_TYPE_UINT64, seg->position, + "duration", G_TYPE_UINT64, seg->duration, NULL); + t = gst_structure_to_string (s); + res = g_strdup_printf ("\"%s\"", t); + g_free (t); + gst_structure_free (s); + + return res; +} + +static gboolean +gst_value_deserialize_segment (GValue * dest, const gchar * s) +{ + GstStructure *str; + GstSegment seg; + gboolean res; + + str = gst_structure_from_string (s, NULL); + if (str == NULL) + return FALSE; + + res = gst_structure_get (str, + "flags", GST_TYPE_SEGMENT_FLAGS, &seg.flags, + "rate", G_TYPE_DOUBLE, &seg.rate, + "applied-rate", G_TYPE_DOUBLE, &seg.applied_rate, + "format", GST_TYPE_FORMAT, &seg.format, + "base", G_TYPE_UINT64, &seg.base, + "start", G_TYPE_UINT64, &seg.start, + "stop", G_TYPE_UINT64, &seg.stop, + "time", G_TYPE_UINT64, &seg.time, + "position", G_TYPE_UINT64, &seg.position, + "duration", G_TYPE_UINT64, &seg.duration, NULL); + gst_structure_free (str); + + if (res) + g_value_set_boxed (dest, &seg); + + return res; +} + /**************** * GstStructure * ****************/ @@ -5730,6 +5789,17 @@ _priv_gst_value_initialize (void) static GstValueTable gst_value = { 0, NULL, + gst_value_serialize_segment, + gst_value_deserialize_segment, + }; + + gst_value.type = GST_TYPE_SEGMENT; + gst_value_register (&gst_value); + } + { + static GstValueTable gst_value = { + 0, + NULL, gst_value_serialize_structure, gst_value_deserialize_structure, }; diff --git a/gst/parse/Makefile.in b/gst/parse/Makefile.in index 6b0e37d..5915f4d 100644 --- a/gst/parse/Makefile.in +++ b/gst/parse/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/gst/parse/grammar.y b/gst/parse/grammar.y index 70d8c7b..30c37a9 100644 --- a/gst/parse/grammar.y +++ b/gst/parse/grammar.y @@ -379,7 +379,7 @@ out: return; error: - GST_CAT_ERROR (GST_CAT_PIPELINE, "could not set property \"%s\" in " + GST_CAT_ERROR (GST_CAT_PIPELINE, "could not set property \"%s\" in %" GST_PTR_FORMAT, pspec->name, target); goto out; } diff --git a/gstreamer.doap b/gstreamer.doap index 6ab32cc..f21642f 100644 --- a/gstreamer.doap +++ b/gstreamer.doap @@ -40,6 +40,16 @@ hierarchy, and a set of media-agnostic core elements. <release> <Version> + <revision>0.11.91</revision> + <branch>0.11</branch> + <name>I will give you five magic beans!</name> + <created>2012-05-13</created> + <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.11.91.tar.xz" /> + </Version> + </release> + + <release> + <Version> <revision>0.11.90</revision> <branch>0.11</branch> <name>And all with pearl and ruby glowing was the fair palace door</name> diff --git a/gstreamer.spec b/gstreamer.spec index aba690b..79ae557 100644 --- a/gstreamer.spec +++ b/gstreamer.spec @@ -4,7 +4,7 @@ %define _glib2 2.31.14 Name: %{gstreamer} -Version: 0.11.90 +Version: 0.11.91 Release: 1 Summary: GStreamer streaming media framework runtime diff --git a/libs/Makefile.in b/libs/Makefile.in index 044e42c..dc97f29 100644 --- a/libs/Makefile.in +++ b/libs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/libs/gst/Makefile.in b/libs/gst/Makefile.in index 82e7a95..2f91786 100644 --- a/libs/gst/Makefile.in +++ b/libs/gst/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/libs/gst/base/Makefile.am b/libs/gst/base/Makefile.am index 18b8e48..069f96b 100644 --- a/libs/gst/base/Makefile.am +++ b/libs/gst/base/Makefile.am @@ -11,7 +11,7 @@ libgstbase_@GST_API_VERSION@_la_SOURCES = \ gstbitreader.c \ gstbytereader.c \ gstbytewriter.c \ - gstcollectpads2.c \ + gstcollectpads.c \ gstpushsrc.c \ gsttypefindhelper.c @@ -31,7 +31,7 @@ libgstbase_@GST_API_VERSION@include_HEADERS = \ gstbitreader.h \ gstbytereader.h \ gstbytewriter.h \ - gstcollectpads2.h \ + gstcollectpads.h \ gstpushsrc.h \ gsttypefindhelper.h diff --git a/libs/gst/base/Makefile.in b/libs/gst/base/Makefile.in index 3e7bc71..ed702b5 100644 --- a/libs/gst/base/Makefile.in +++ b/libs/gst/base/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -140,7 +140,7 @@ am_libgstbase_@GST_API_VERSION@_la_OBJECTS = \ libgstbase_@GST_API_VERSION@_la-gstbitreader.lo \ libgstbase_@GST_API_VERSION@_la-gstbytereader.lo \ libgstbase_@GST_API_VERSION@_la-gstbytewriter.lo \ - libgstbase_@GST_API_VERSION@_la-gstcollectpads2.lo \ + libgstbase_@GST_API_VERSION@_la-gstcollectpads.lo \ libgstbase_@GST_API_VERSION@_la-gstpushsrc.lo \ libgstbase_@GST_API_VERSION@_la-gsttypefindhelper.lo libgstbase_@GST_API_VERSION@_la_OBJECTS = \ @@ -469,7 +469,7 @@ libgstbase_@GST_API_VERSION@_la_SOURCES = \ gstbitreader.c \ gstbytereader.c \ gstbytewriter.c \ - gstcollectpads2.c \ + gstcollectpads.c \ gstpushsrc.c \ gsttypefindhelper.c @@ -488,7 +488,7 @@ libgstbase_@GST_API_VERSION@include_HEADERS = \ gstbitreader.h \ gstbytereader.h \ gstbytewriter.h \ - gstcollectpads2.h \ + gstcollectpads.h \ gstpushsrc.h \ gsttypefindhelper.h @@ -555,7 +555,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) done; \ test -z "$$list2" || { \ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(libdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -594,7 +594,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstbase_@GST_API_VERSION@_la-gstbitreader.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstbase_@GST_API_VERSION@_la-gstbytereader.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstbase_@GST_API_VERSION@_la-gstbytewriter.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstbase_@GST_API_VERSION@_la-gstcollectpads2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstbase_@GST_API_VERSION@_la-gstcollectpads.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstbase_@GST_API_VERSION@_la-gstpushsrc.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgstbase_@GST_API_VERSION@_la-gsttypefindhelper.Plo@am__quote@ @@ -675,12 +675,12 @@ libgstbase_@GST_API_VERSION@_la-gstbytewriter.lo: gstbytewriter.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstbase_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstbase_@GST_API_VERSION@_la-gstbytewriter.lo `test -f 'gstbytewriter.c' || echo '$(srcdir)/'`gstbytewriter.c -libgstbase_@GST_API_VERSION@_la-gstcollectpads2.lo: gstcollectpads2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstbase_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstbase_@GST_API_VERSION@_la-gstcollectpads2.lo -MD -MP -MF $(DEPDIR)/libgstbase_@GST_API_VERSION@_la-gstcollectpads2.Tpo -c -o libgstbase_@GST_API_VERSION@_la-gstcollectpads2.lo `test -f 'gstcollectpads2.c' || echo '$(srcdir)/'`gstcollectpads2.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstbase_@GST_API_VERSION@_la-gstcollectpads2.Tpo $(DEPDIR)/libgstbase_@GST_API_VERSION@_la-gstcollectpads2.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstcollectpads2.c' object='libgstbase_@GST_API_VERSION@_la-gstcollectpads2.lo' libtool=yes @AMDEPBACKSLASH@ +libgstbase_@GST_API_VERSION@_la-gstcollectpads.lo: gstcollectpads.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstbase_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstbase_@GST_API_VERSION@_la-gstcollectpads.lo -MD -MP -MF $(DEPDIR)/libgstbase_@GST_API_VERSION@_la-gstcollectpads.Tpo -c -o libgstbase_@GST_API_VERSION@_la-gstcollectpads.lo `test -f 'gstcollectpads.c' || echo '$(srcdir)/'`gstcollectpads.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgstbase_@GST_API_VERSION@_la-gstcollectpads.Tpo $(DEPDIR)/libgstbase_@GST_API_VERSION@_la-gstcollectpads.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='gstcollectpads.c' object='libgstbase_@GST_API_VERSION@_la-gstcollectpads.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstbase_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstbase_@GST_API_VERSION@_la-gstcollectpads2.lo `test -f 'gstcollectpads2.c' || echo '$(srcdir)/'`gstcollectpads2.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstbase_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -c -o libgstbase_@GST_API_VERSION@_la-gstcollectpads.lo `test -f 'gstcollectpads.c' || echo '$(srcdir)/'`gstcollectpads.c libgstbase_@GST_API_VERSION@_la-gstpushsrc.lo: gstpushsrc.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgstbase_@GST_API_VERSION@_la_CFLAGS) $(CFLAGS) -MT libgstbase_@GST_API_VERSION@_la-gstpushsrc.lo -MD -MP -MF $(DEPDIR)/libgstbase_@GST_API_VERSION@_la-gstpushsrc.Tpo -c -o libgstbase_@GST_API_VERSION@_la-gstpushsrc.lo `test -f 'gstpushsrc.c' || echo '$(srcdir)/'`gstpushsrc.c @@ -706,7 +706,7 @@ install-girDATA: $(gir_DATA) @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(girdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -727,7 +727,7 @@ install-typelibsDATA: $(typelibs_DATA) @list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(typelibsdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(typelibsdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(typelibsdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -748,7 +748,7 @@ install-libgstbase_@GST_API_VERSION@includeHEADERS: $(libgstbase_@GST_API_VERSIO @list='$(libgstbase_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstbase_@GST_API_VERSION@includedir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(libgstbase_@GST_API_VERSION@includedir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(libgstbase_@GST_API_VERSION@includedir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(libgstbase_@GST_API_VERSION@includedir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ diff --git a/libs/gst/base/gstadapter.c b/libs/gst/base/gstadapter.c index 3342536..b27edcf 100644 --- a/libs/gst/base/gstadapter.c +++ b/libs/gst/base/gstadapter.c @@ -124,11 +124,21 @@ static void gst_adapter_flush_unchecked (GstAdapter * adapter, gsize flush); GST_DEBUG_CATEGORY_STATIC (gst_adapter_debug); #define GST_CAT_DEFAULT gst_adapter_debug -#define GST_ADAPTER_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GST_TYPE_ADAPTER, GstAdapterPrivate)) - -struct _GstAdapterPrivate +struct _GstAdapter { + GObject object; + + /*< private > */ + GSList *buflist; + GSList *buflist_end; + gsize size; + gsize skip; + + /* we keep state of assembled pieces */ + gpointer assembled_data; + gsize assembled_size; + gsize assembled_len; + GstClockTime pts; guint64 pts_distance; GstClockTime dts; @@ -140,6 +150,11 @@ struct _GstAdapterPrivate GstMapInfo info; }; +struct _GstAdapterClass +{ + GObjectClass parent_class; +}; + #define _do_init \ GST_DEBUG_CATEGORY_INIT (gst_adapter_debug, "adapter", 0, "object to splice and merge buffers to desired size") #define gst_adapter_parent_class parent_class @@ -153,8 +168,6 @@ gst_adapter_class_init (GstAdapterClass * klass) { GObjectClass *object = G_OBJECT_CLASS (klass); - g_type_class_add_private (klass, sizeof (GstAdapterPrivate)); - object->dispose = gst_adapter_dispose; object->finalize = gst_adapter_finalize; } @@ -162,13 +175,12 @@ gst_adapter_class_init (GstAdapterClass * klass) static void gst_adapter_init (GstAdapter * adapter) { - adapter->priv = GST_ADAPTER_GET_PRIVATE (adapter); adapter->assembled_data = g_malloc (DEFAULT_SIZE); adapter->assembled_size = DEFAULT_SIZE; - adapter->priv->pts = GST_CLOCK_TIME_NONE; - adapter->priv->pts_distance = 0; - adapter->priv->dts = GST_CLOCK_TIME_NONE; - adapter->priv->dts_distance = 0; + adapter->pts = GST_CLOCK_TIME_NONE; + adapter->pts_distance = 0; + adapter->dts = GST_CLOCK_TIME_NONE; + adapter->dts_distance = 0; } static void @@ -213,13 +225,9 @@ gst_adapter_new (void) void gst_adapter_clear (GstAdapter * adapter) { - GstAdapterPrivate *priv; - g_return_if_fail (GST_IS_ADAPTER (adapter)); - priv = adapter->priv; - - if (priv->info.memory) + if (adapter->info.memory) gst_adapter_unmap (adapter); g_slist_foreach (adapter->buflist, (GFunc) gst_mini_object_unref, NULL); @@ -229,12 +237,12 @@ gst_adapter_clear (GstAdapter * adapter) adapter->size = 0; adapter->skip = 0; adapter->assembled_len = 0; - priv->pts = GST_CLOCK_TIME_NONE; - priv->pts_distance = 0; - priv->dts = GST_CLOCK_TIME_NONE; - priv->dts_distance = 0; - priv->scan_offset = 0; - priv->scan_entry = NULL; + adapter->pts = GST_CLOCK_TIME_NONE; + adapter->pts_distance = 0; + adapter->dts = GST_CLOCK_TIME_NONE; + adapter->dts_distance = 0; + adapter->scan_offset = 0; + adapter->scan_entry = NULL; } static inline void @@ -245,14 +253,14 @@ update_timestamps (GstAdapter * adapter, GstBuffer * buf) pts = GST_BUFFER_PTS (buf); if (GST_CLOCK_TIME_IS_VALID (pts)) { GST_LOG_OBJECT (adapter, "new pts %" GST_TIME_FORMAT, GST_TIME_ARGS (pts)); - adapter->priv->pts = pts; - adapter->priv->pts_distance = 0; + adapter->pts = pts; + adapter->pts_distance = 0; } dts = GST_BUFFER_DTS (buf); if (GST_CLOCK_TIME_IS_VALID (dts)) { GST_LOG_OBJECT (adapter, "new dts %" GST_TIME_FORMAT, GST_TIME_ARGS (dts)); - adapter->priv->dts = dts; - adapter->priv->dts_distance = 0; + adapter->dts = dts; + adapter->dts_distance = 0; } } @@ -267,9 +275,9 @@ copy_into_unchecked (GstAdapter * adapter, guint8 * dest, gsize skip, /* first step, do skipping */ /* we might well be copying where we were scanning */ - if (adapter->priv->scan_entry && (adapter->priv->scan_offset <= skip)) { - g = adapter->priv->scan_entry; - skip -= adapter->priv->scan_offset; + if (adapter->scan_entry && (adapter->scan_offset <= skip)) { + g = adapter->scan_entry; + skip -= adapter->scan_offset; } else { g = adapter->buflist; } @@ -341,6 +349,7 @@ gst_adapter_push (GstAdapter * adapter, GstBuffer * buf) } } +#if 0 /* Internal method only. Tries to merge buffers at the head of the queue * to form a single larger buffer of size 'size'. * @@ -359,13 +368,18 @@ gst_adapter_try_to_merge_up (GstAdapter * adapter, gsize size) return FALSE; head = g->data; - g = g_slist_next (g); - /* How large do we want our head buffer? The requested size, plus whatever's - * been skipped already */ - size += adapter->skip; hsize = gst_buffer_get_size (head); + /* Remove skipped part from the buffer (otherwise the buffer might grow indefinitely) */ + head = gst_buffer_make_writable (head); + gst_buffer_resize (head, adapter->skip, hsize - adapter->skip); + hsize -= adapter->skip; + adapter->skip = 0; + g->data = head; + + g = g_slist_next (g); + while (g != NULL && hsize < size) { cur = g->data; /* Merge the head buffer and the next in line */ @@ -383,14 +397,15 @@ gst_adapter_try_to_merge_up (GstAdapter * adapter, gsize size) g->data = head; /* invalidate scan position */ - adapter->priv->scan_offset = 0; - adapter->priv->scan_entry = NULL; + adapter->scan_offset = 0; + adapter->scan_entry = NULL; g = g_slist_next (g); } return ret; } +#endif /** * gst_adapter_map: @@ -417,7 +432,6 @@ gst_adapter_try_to_merge_up (GstAdapter * adapter, gsize size) gconstpointer gst_adapter_map (GstAdapter * adapter, gsize size) { - GstAdapterPrivate *priv; GstBuffer *cur; gsize skip, csize; gsize toreuse, tocopy; @@ -426,9 +440,7 @@ gst_adapter_map (GstAdapter * adapter, gsize size) g_return_val_if_fail (GST_IS_ADAPTER (adapter), NULL); g_return_val_if_fail (size > 0, NULL); - priv = adapter->priv; - - if (priv->info.memory) + if (adapter->info.memory) gst_adapter_unmap (adapter); /* we don't have enough data, return NULL. This is unlikely @@ -441,20 +453,24 @@ gst_adapter_map (GstAdapter * adapter, gsize size) if (adapter->assembled_len >= size) return adapter->assembled_data; +#if 0 do { +#endif cur = adapter->buflist->data; skip = adapter->skip; csize = gst_buffer_get_size (cur); if (csize >= size + skip) { - if (!gst_buffer_map (cur, &priv->info, GST_MAP_READ)) + if (!gst_buffer_map (cur, &adapter->info, GST_MAP_READ)) return FALSE; - return (guint8 *) priv->info.data + skip; + return (guint8 *) adapter->info.data + skip; } /* We may be able to efficiently merge buffers in our pool to * gather a big enough chunk to return it from the head buffer directly */ +#if 0 } while (gst_adapter_try_to_merge_up (adapter, size)); +#endif /* see how much data we can reuse from the assembled memory and how much * we need to copy */ @@ -498,17 +514,13 @@ gst_adapter_map (GstAdapter * adapter, gsize size) void gst_adapter_unmap (GstAdapter * adapter) { - GstAdapterPrivate *priv; - g_return_if_fail (GST_IS_ADAPTER (adapter)); - priv = adapter->priv; - - if (priv->info.memory) { + if (adapter->info.memory) { GstBuffer *cur = adapter->buflist->data; GST_LOG_OBJECT (adapter, "unmap memory buffer %p", cur); - gst_buffer_unmap (cur, &priv->info); - priv->info.memory = NULL; + gst_buffer_unmap (cur, &adapter->info); + adapter->info.memory = NULL; } } @@ -553,14 +565,11 @@ gst_adapter_flush_unchecked (GstAdapter * adapter, gsize flush) { GstBuffer *cur; gsize size; - GstAdapterPrivate *priv; GSList *g; GST_LOG_OBJECT (adapter, "flushing %" G_GSIZE_FORMAT " bytes", flush); - priv = adapter->priv; - - if (priv->info.memory) + if (adapter->info.memory) gst_adapter_unmap (adapter); /* clear state */ @@ -570,8 +579,8 @@ gst_adapter_flush_unchecked (GstAdapter * adapter, gsize flush) /* take skip into account */ flush += adapter->skip; /* distance is always at least the amount of skipped bytes */ - priv->pts_distance -= adapter->skip; - priv->dts_distance -= adapter->skip; + adapter->pts_distance -= adapter->skip; + adapter->dts_distance -= adapter->skip; g = adapter->buflist; cur = g->data; @@ -579,8 +588,8 @@ gst_adapter_flush_unchecked (GstAdapter * adapter, gsize flush) while (flush >= size) { /* can skip whole buffer */ GST_LOG_OBJECT (adapter, "flushing out head buffer"); - priv->pts_distance += size; - priv->dts_distance += size; + adapter->pts_distance += size; + adapter->dts_distance += size; flush -= size; gst_buffer_unref (cur); @@ -599,11 +608,11 @@ gst_adapter_flush_unchecked (GstAdapter * adapter, gsize flush) adapter->buflist = g; /* account for the remaining bytes */ adapter->skip = flush; - adapter->priv->pts_distance += flush; - adapter->priv->dts_distance += flush; + adapter->pts_distance += flush; + adapter->dts_distance += flush; /* invalidate scan position */ - priv->scan_offset = 0; - priv->scan_entry = NULL; + adapter->scan_offset = 0; + adapter->scan_entry = NULL; } void @@ -754,10 +763,11 @@ gst_adapter_take_buffer (GstAdapter * adapter, gsize nbytes) buffer = gst_buffer_copy_region (cur, GST_BUFFER_COPY_ALL, skip, nbytes); goto done; } - +#if 0 if (gst_adapter_try_to_merge_up (adapter, nbytes)) { /* Merged something, let's try again for sub-buffering */ cur = adapter->buflist->data; + skip = adapter->skip; if (gst_buffer_get_size (cur) >= nbytes + skip) { GST_LOG_OBJECT (adapter, "providing buffer of %" G_GSIZE_FORMAT " bytes" " via sub-buffer", nbytes); @@ -765,6 +775,7 @@ gst_adapter_take_buffer (GstAdapter * adapter, gsize nbytes) goto done; } } +#endif data = gst_adapter_take_internal (adapter, nbytes); @@ -903,9 +914,9 @@ gst_adapter_prev_pts (GstAdapter * adapter, guint64 * distance) g_return_val_if_fail (GST_IS_ADAPTER (adapter), GST_CLOCK_TIME_NONE); if (distance) - *distance = adapter->priv->pts_distance; + *distance = adapter->pts_distance; - return adapter->priv->pts; + return adapter->pts; } /** @@ -930,9 +941,9 @@ gst_adapter_prev_dts (GstAdapter * adapter, guint64 * distance) g_return_val_if_fail (GST_IS_ADAPTER (adapter), GST_CLOCK_TIME_NONE); if (distance) - *distance = adapter->priv->dts_distance; + *distance = adapter->dts_distance; - return adapter->priv->dts; + return adapter->dts; } /** @@ -983,21 +994,21 @@ gst_adapter_masked_scan_uint32_peek (GstAdapter * adapter, guint32 mask, /* first step, do skipping and position on the first buffer */ /* optimistically assume scanning continues sequentially */ - if (adapter->priv->scan_entry && (adapter->priv->scan_offset <= skip)) { - g = adapter->priv->scan_entry; - skip -= adapter->priv->scan_offset; + if (adapter->scan_entry && (adapter->scan_offset <= skip)) { + g = adapter->scan_entry; + skip -= adapter->scan_offset; } else { g = adapter->buflist; - adapter->priv->scan_offset = 0; - adapter->priv->scan_entry = NULL; + adapter->scan_offset = 0; + adapter->scan_entry = NULL; } buf = g->data; bsize = gst_buffer_get_size (buf); while (G_UNLIKELY (skip >= bsize)) { skip -= bsize; g = g_slist_next (g); - adapter->priv->scan_offset += bsize; - adapter->priv->scan_entry = g; + adapter->scan_offset += bsize; + adapter->scan_entry = g; buf = g->data; bsize = gst_buffer_get_size (buf); } @@ -1035,8 +1046,8 @@ gst_adapter_masked_scan_uint32_peek (GstAdapter * adapter, guint32 mask, /* nothing found yet, go to next buffer */ skip += bsize; g = g_slist_next (g); - adapter->priv->scan_offset += info.size; - adapter->priv->scan_entry = g; + adapter->scan_offset += info.size; + adapter->scan_entry = g; gst_buffer_unmap (buf, &info); buf = g->data; diff --git a/libs/gst/base/gstadapter.h b/libs/gst/base/gstadapter.h index 17bf323..5b89744 100644 --- a/libs/gst/base/gstadapter.h +++ b/libs/gst/base/gstadapter.h @@ -38,40 +38,13 @@ G_BEGIN_DECLS #define GST_IS_ADAPTER_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_ADAPTER)) -typedef struct _GstAdapter GstAdapter; -typedef struct _GstAdapterClass GstAdapterClass; -typedef struct _GstAdapterPrivate GstAdapterPrivate; - /** * GstAdapter: * * The opaque #GstAdapter data structure. */ -struct _GstAdapter { - GObject object; - - /*< private >*/ - GSList * buflist; - GSList * buflist_end; - gsize size; - gsize skip; - - /* we keep state of assembled pieces */ - gpointer assembled_data; - gsize assembled_size; - gsize assembled_len; - - GstAdapterPrivate *priv; - - gpointer _gst_reserved[GST_PADDING]; -}; - -struct _GstAdapterClass { - GObjectClass parent_class; - - /*< private >*/ - gpointer _gst_reserved[GST_PADDING]; -}; +typedef struct _GstAdapter GstAdapter; +typedef struct _GstAdapterClass GstAdapterClass; GType gst_adapter_get_type (void); diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c index 151015d..e404ed4 100644 --- a/libs/gst/base/gstbasesink.c +++ b/libs/gst/base/gstbasesink.c @@ -4546,6 +4546,7 @@ gst_base_sink_default_query (GstBaseSink * basesink, GstQuery * query) gst_query_parse_accept_caps (query, &caps); allowed = gst_base_sink_query_caps (basesink, basesink->sinkpad, NULL); subset = gst_caps_is_subset (caps, allowed); + gst_caps_unref (allowed); gst_query_set_accept_caps_result (query, subset); res = TRUE; break; diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c index fdd3a4d..7b8ec85 100644 --- a/libs/gst/base/gstbasesrc.c +++ b/libs/gst/base/gstbasesrc.c @@ -314,6 +314,8 @@ static GstFlowReturn gst_base_src_default_create (GstBaseSrc * basesrc, guint64 offset, guint size, GstBuffer ** buf); static GstFlowReturn gst_base_src_default_alloc (GstBaseSrc * basesrc, guint64 offset, guint size, GstBuffer ** buf); +static gboolean gst_base_src_decide_allocation_default (GstBaseSrc * basesrc, + GstQuery * query); static gboolean gst_base_src_set_flushing (GstBaseSrc * basesrc, gboolean flushing, gboolean live_play, gboolean unlock, gboolean * playing); @@ -385,6 +387,8 @@ gst_base_src_class_init (GstBaseSrcClass * klass) klass->event = GST_DEBUG_FUNCPTR (gst_base_src_default_event); klass->create = GST_DEBUG_FUNCPTR (gst_base_src_default_create); klass->alloc = GST_DEBUG_FUNCPTR (gst_base_src_default_alloc); + klass->decide_allocation = + GST_DEBUG_FUNCPTR (gst_base_src_decide_allocation_default); /* Registering debug symbols for function pointers */ GST_DEBUG_REGISTER_FUNCPTR (gst_base_src_activate_mode); @@ -1451,7 +1455,7 @@ not_ok: * When we are in the loop() function, we might be in the middle * of pushing a buffer, which might block in a sink. To make sure * that the push gets unblocked we push out a FLUSH_START event. - * Our loop function will get a WRONG_STATE return value from + * Our loop function will get a FLUSHING return value from * the push and will pause, effectively releasing the STREAM_LOCK. * * For a non-flushing seek, we pause the task, which might eventually @@ -1698,7 +1702,7 @@ gst_base_src_send_event (GstElement * element, GstEvent * event) * first and do EOS instead of entering it. * - If we are in the _create function or we did not manage to set the * flag fast enough and we are about to enter the _create function, - * we unlock it so that we exit with WRONG_STATE immediately. We then + * we unlock it so that we exit with FLUSHING immediately. We then * check the EOS flag and do the EOS logic. */ g_atomic_int_set (&src->priv->pending_eos, TRUE); @@ -2344,10 +2348,10 @@ again: gst_buffer_unref (res_buf); if (!src->live_running) { - /* We return WRONG_STATE when we are not running to stop the dataflow also + /* We return FLUSHING when we are not running to stop the dataflow also * get rid of the produced buffer. */ GST_DEBUG_OBJECT (src, - "clock was unscheduled (%d), returning WRONG_STATE", status); + "clock was unscheduled (%d), returning FLUSHING", status); ret = GST_FLOW_FLUSHING; } else { /* If we are running when this happens, we quickly switched between @@ -2697,7 +2701,7 @@ pause: gst_event_set_seqnum (event, src->priv->seqnum); /* for fatal errors we post an error message, post the error * first so the app knows about the error first. - * Also don't do this for WRONG_STATE because it happens + * Also don't do this for FLUSHING because it happens * due to flushing and posting an error message because of * that is the wrong thing to do, e.g. when we're doing * a flushing seek. */ @@ -2784,47 +2788,37 @@ gst_base_src_activate_pool (GstBaseSrc * basesrc, gboolean active) return res; } + static gboolean -gst_base_src_prepare_allocation (GstBaseSrc * basesrc, GstCaps * caps) +gst_base_src_decide_allocation_default (GstBaseSrc * basesrc, GstQuery * query) { - GstBaseSrcClass *bclass; - gboolean result = TRUE; - GstQuery *query; - GstBufferPool *pool = NULL; - GstAllocator *allocator = NULL; + GstCaps *outcaps; + GstBufferPool *pool; guint size, min, max; + GstAllocator *allocator; GstAllocationParams params; + GstStructure *config; + gboolean update_allocator; - bclass = GST_BASE_SRC_GET_CLASS (basesrc); - - /* make query and let peer pad answer, we don't really care if it worked or - * not, if it failed, the allocation query would contain defaults and the - * subclass would then set better values if needed */ - query = gst_query_new_allocation (caps, TRUE); - if (!gst_pad_peer_query (basesrc->srcpad, query)) { - /* not a problem, just debug a little */ - GST_DEBUG_OBJECT (basesrc, "peer ALLOCATION query failed"); - } - - if (G_LIKELY (bclass->decide_allocation)) - result = bclass->decide_allocation (basesrc, query); - - GST_DEBUG_OBJECT (basesrc, "ALLOCATION (%d) params: %" GST_PTR_FORMAT, result, - query); + gst_query_parse_allocation (query, &outcaps, NULL); + /* we got configuration from our peer or the decide_allocation method, + * parse them */ if (gst_query_get_n_allocation_params (query) > 0) { /* try the allocator */ gst_query_parse_nth_allocation_param (query, 0, &allocator, ¶ms); + update_allocator = TRUE; } else { allocator = NULL; gst_allocation_params_init (¶ms); + update_allocator = FALSE; } if (gst_query_get_n_allocation_pools (query) > 0) { gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max); if (pool == NULL) { - /* no pool, just parameters, we can make our own */ + /* no pool, we can make our own */ GST_DEBUG_OBJECT (basesrc, "no pool, making new pool"); pool = gst_buffer_pool_new (); } @@ -2835,20 +2829,83 @@ gst_base_src_prepare_allocation (GstBaseSrc * basesrc, GstCaps * caps) /* now configure */ if (pool) { - GstStructure *config; - config = gst_buffer_pool_get_config (pool); - gst_buffer_pool_config_set_params (config, caps, size, min, max); + gst_buffer_pool_config_set_params (config, outcaps, size, min, max); gst_buffer_pool_config_set_allocator (config, allocator, ¶ms); gst_buffer_pool_set_config (pool, config); } + if (update_allocator) + gst_query_set_nth_allocation_param (query, 0, allocator, ¶ms); + else + gst_query_add_allocation_param (query, allocator, ¶ms); + if (allocator) + gst_allocator_unref (allocator); + + if (pool) { + gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max); + gst_object_unref (pool); + } + + return TRUE; +} + +static gboolean +gst_base_src_prepare_allocation (GstBaseSrc * basesrc, GstCaps * caps) +{ + GstBaseSrcClass *bclass; + gboolean result = TRUE; + GstQuery *query; + GstBufferPool *pool = NULL; + GstAllocator *allocator = NULL; + GstAllocationParams params; + + bclass = GST_BASE_SRC_GET_CLASS (basesrc); + + /* make query and let peer pad answer, we don't really care if it worked or + * not, if it failed, the allocation query would contain defaults and the + * subclass would then set better values if needed */ + query = gst_query_new_allocation (caps, TRUE); + if (!gst_pad_peer_query (basesrc->srcpad, query)) { + /* not a problem, just debug a little */ + GST_DEBUG_OBJECT (basesrc, "peer ALLOCATION query failed"); + } + + g_assert (bclass->decide_allocation != NULL); + result = bclass->decide_allocation (basesrc, query); + + GST_DEBUG_OBJECT (basesrc, "ALLOCATION (%d) params: %" GST_PTR_FORMAT, result, + query); + + if (!result) + goto no_decide_allocation; + + /* we got configuration from our peer or the decide_allocation method, + * parse them */ + if (gst_query_get_n_allocation_params (query) > 0) { + gst_query_parse_nth_allocation_param (query, 0, &allocator, ¶ms); + } else { + allocator = NULL; + gst_allocation_params_init (¶ms); + } + + if (gst_query_get_n_allocation_pools (query) > 0) + gst_query_parse_nth_allocation_pool (query, 0, &pool, NULL, NULL, NULL); + result = gst_base_src_set_allocation (basesrc, pool, allocator, ¶ms); gst_query_unref (query); return result; + /* Errors */ +no_decide_allocation: + { + GST_WARNING_OBJECT (basesrc, "Subclass failed to decide allocation"); + gst_query_unref (query); + + return result; + } } /* default negotiation code. diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c index b5e30e1..3941392 100644 --- a/libs/gst/base/gstbasetransform.c +++ b/libs/gst/base/gstbasetransform.c @@ -802,6 +802,13 @@ gst_base_transform_default_decide_allocation (GstBaseTransform * trans, { guint i, n_metas; GstBaseTransformClass *klass; + GstCaps *outcaps; + GstBufferPool *pool; + guint size, min, max; + GstAllocator *allocator; + GstAllocationParams params; + GstStructure *config; + gboolean update_allocator; klass = GST_BASE_TRANSFORM_GET_CLASS (trans); @@ -836,6 +843,54 @@ gst_base_transform_default_decide_allocation (GstBaseTransform * trans, n_metas--; } } + + gst_query_parse_allocation (query, &outcaps, NULL); + + /* we got configuration from our peer or the decide_allocation method, + * parse them */ + if (gst_query_get_n_allocation_params (query) > 0) { + /* try the allocator */ + gst_query_parse_nth_allocation_param (query, 0, &allocator, ¶ms); + update_allocator = TRUE; + } else { + allocator = NULL; + gst_allocation_params_init (¶ms); + update_allocator = FALSE; + } + + if (gst_query_get_n_allocation_pools (query) > 0) { + gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max); + + if (pool == NULL) { + /* no pool, we can make our own */ + GST_DEBUG_OBJECT (trans, "no pool, making new pool"); + pool = gst_buffer_pool_new (); + } + } else { + pool = NULL; + size = min = max = 0; + } + + /* now configure */ + if (pool) { + config = gst_buffer_pool_get_config (pool); + gst_buffer_pool_config_set_params (config, outcaps, size, min, max); + gst_buffer_pool_config_set_allocator (config, allocator, ¶ms); + gst_buffer_pool_set_config (pool, config); + } + + if (update_allocator) + gst_query_set_nth_allocation_param (query, 0, allocator, ¶ms); + else + gst_query_add_allocation_param (query, allocator, ¶ms); + if (allocator) + gst_allocator_unref (allocator); + + if (pool) { + gst_query_set_nth_allocation_pool (query, 0, pool, size, min, max); + gst_object_unref (pool); + } + return TRUE; } @@ -844,8 +899,7 @@ gst_base_transform_do_bufferpool (GstBaseTransform * trans, GstCaps * outcaps) { GstQuery *query; gboolean result = TRUE; - GstBufferPool *pool; - guint size, min, max; + GstBufferPool *pool = NULL; GstBaseTransformClass *klass; GstBaseTransformPrivate *priv = trans->priv; GstAllocator *allocator; @@ -882,43 +936,28 @@ gst_base_transform_do_bufferpool (GstBaseTransform * trans, GstCaps * outcaps) klass = GST_BASE_TRANSFORM_GET_CLASS (trans); GST_DEBUG_OBJECT (trans, "calling decide_allocation"); - if (G_LIKELY (klass->decide_allocation)) - if ((result = klass->decide_allocation (trans, query)) == FALSE) - goto no_decide_allocation; + g_assert (klass->decide_allocation != NULL); + result = klass->decide_allocation (trans, query); + + GST_DEBUG_OBJECT (trans, "ALLOCATION (%d) params: %" GST_PTR_FORMAT, result, + query); + + if (!result) + goto no_decide_allocation; /* we got configuration from our peer or the decide_allocation method, * parse them */ if (gst_query_get_n_allocation_params (query) > 0) { - /* try the allocator */ gst_query_parse_nth_allocation_param (query, 0, &allocator, ¶ms); } else { allocator = NULL; gst_allocation_params_init (¶ms); } - if (gst_query_get_n_allocation_pools (query) > 0) { - gst_query_parse_nth_allocation_pool (query, 0, &pool, &size, &min, &max); + if (gst_query_get_n_allocation_pools (query) > 0) + gst_query_parse_nth_allocation_pool (query, 0, &pool, NULL, NULL, NULL); - if (pool == NULL) { - /* no pool, just parameters, we can make our own */ - GST_DEBUG_OBJECT (trans, "no pool, making new pool"); - pool = gst_buffer_pool_new (); - } - } else { - pool = NULL; - size = min = max = 0; - } - - /* now configure */ - if (pool) { - GstStructure *config; - - config = gst_buffer_pool_get_config (pool); - gst_buffer_pool_config_set_params (config, outcaps, size, min, max); - gst_buffer_pool_config_set_allocator (config, allocator, ¶ms); - gst_buffer_pool_set_config (pool, config); - } - /* and store */ + /* now store */ result = gst_base_transform_set_allocation (trans, pool, allocator, ¶ms, query); diff --git a/libs/gst/base/gstcollectpads2.c b/libs/gst/base/gstcollectpads.c index 600fd4f..f40463c 100644 --- a/libs/gst/base/gstcollectpads2.c +++ b/libs/gst/base/gstcollectpads.c @@ -3,7 +3,7 @@ * Copyright (C) 2008 Mark Nauwelaerts <mnauw@users.sourceforge.net> * Copyright (C) 2010 Sebastian Dröge <sebastian.droege@collabora.co.uk> * - * gstcollectpads2.c: + * gstcollectpads.c: * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -21,7 +21,7 @@ * Boston, MA 02111-1307, USA. */ /** - * SECTION:gstcollectpads2 + * SECTION:gstcollectpads * @short_description: manages a set of pads that operate in collect mode * @see_also: * @@ -29,12 +29,12 @@ * is given to the manager of this object when all pads have data. * <itemizedlist> * <listitem><para> - * Collectpads are created with gst_collect_pads2_new(). A callback should then - * be installed with gst_collect_pads2_set_function (). + * Collectpads are created with gst_collect_pads_new(). A callback should then + * be installed with gst_collect_pads_set_function (). * </para></listitem> * <listitem><para> - * Pads are added to the collection with gst_collect_pads2_add_pad()/ - * gst_collect_pads2_remove_pad(). The pad + * Pads are added to the collection with gst_collect_pads_add_pad()/ + * gst_collect_pads_remove_pad(). The pad * has to be a sinkpad. The chain and event functions of the pad are * overridden. The element_private of the pad is used to store * private information for the collectpads. @@ -47,30 +47,30 @@ * When data is queued on all pads in waiting mode, the callback function is called. * </para></listitem> * <listitem><para> - * Data can be dequeued from the pad with the gst_collect_pads2_pop() method. - * One can peek at the data with the gst_collect_pads2_peek() function. + * Data can be dequeued from the pad with the gst_collect_pads_pop() method. + * One can peek at the data with the gst_collect_pads_peek() function. * These functions will return NULL if the pad received an EOS event. When all - * pads return NULL from a gst_collect_pads2_peek(), the element can emit an EOS + * pads return NULL from a gst_collect_pads_peek(), the element can emit an EOS * event itself. * </para></listitem> * <listitem><para> - * Data can also be dequeued in byte units using the gst_collect_pads2_available(), - * gst_collect_pads2_read() and gst_collect_pads2_flush() calls. + * Data can also be dequeued in byte units using the gst_collect_pads_available(), + * gst_collect_pads_read() and gst_collect_pads_flush() calls. * </para></listitem> * <listitem><para> - * Elements should call gst_collect_pads2_start() and gst_collect_pads2_stop() in + * Elements should call gst_collect_pads_start() and gst_collect_pads_stop() in * their state change functions to start and stop the processing of the collectpads. - * The gst_collect_pads2_stop() call should be called before calling the parent + * The gst_collect_pads_stop() call should be called before calling the parent * element state change function in the PAUSED_TO_READY state change to ensure * no pad is blocked and the element can finish streaming. * </para></listitem> * <listitem><para> - * gst_collect_pads2_collect() and gst_collect_pads2_collect_range() can be used by - * elements that start a #GstTask to drive the collect_pads2. This feature is however + * gst_collect_pads_collect() and gst_collect_pads_collect_range() can be used by + * elements that start a #GstTask to drive the collect_pads. This feature is however * not yet implemented. * </para></listitem> * <listitem><para> - * gst_collect_pads2_set_waiting() sets a pad to waiting or non-waiting mode. + * gst_collect_pads_set_waiting() sets a pad to waiting or non-waiting mode. * CollectPads element is not waiting for data to be collected on non-waiting pads. * Thus these pads may but need not have data when the callback is called. * All pads are in waiting mode by default. @@ -88,24 +88,24 @@ #include <gst/gst_private.h> -#include "gstcollectpads2.h" +#include "gstcollectpads.h" #include "../../../gst/glib-compat-private.h" -GST_DEBUG_CATEGORY_STATIC (collect_pads2_debug); -#define GST_CAT_DEFAULT collect_pads2_debug +GST_DEBUG_CATEGORY_STATIC (collect_pads_debug); +#define GST_CAT_DEFAULT collect_pads_debug -#define parent_class gst_collect_pads2_parent_class -G_DEFINE_TYPE (GstCollectPads2, gst_collect_pads2, GST_TYPE_OBJECT); +#define parent_class gst_collect_pads_parent_class +G_DEFINE_TYPE (GstCollectPads, gst_collect_pads, GST_TYPE_OBJECT); -struct _GstCollectData2Private +struct _GstCollectDataPrivate { /* refcounting for struct, and destroy callback */ - GstCollectData2DestroyNotify destroy_notify; + GstCollectDataDestroyNotify destroy_notify; gint refcount; }; -struct _GstCollectPads2Private +struct _GstCollectPadsPrivate { /* with LOCK and/or STREAM_LOCK */ gboolean started; @@ -116,21 +116,23 @@ struct _GstCollectPads2Private guint queuedpads; /* number of pads with a buffer */ guint eospads; /* number of pads that are EOS */ GstClockTime earliest_time; /* Current earliest time */ - GstCollectData2 *earliest_data; /* Pad data for current earliest time */ + GstCollectData *earliest_data; /* Pad data for current earliest time */ /* with LOCK */ GSList *pad_list; /* updated pad list */ guint32 pad_cookie; /* updated cookie */ - GstCollectPads2Function func; /* function and user_data for callback */ + GstCollectPadsFunction func; /* function and user_data for callback */ gpointer user_data; - GstCollectPads2BufferFunction buffer_func; /* function and user_data for buffer callback */ + GstCollectPadsBufferFunction buffer_func; /* function and user_data for buffer callback */ gpointer buffer_user_data; - GstCollectPads2CompareFunction compare_func; + GstCollectPadsCompareFunction compare_func; gpointer compare_user_data; - GstCollectPads2EventFunction event_func; /* function and data for event callback */ + GstCollectPadsEventFunction event_func; /* function and data for event callback */ gpointer event_user_data; - GstCollectPads2ClipFunction clip_func; + GstCollectPadsQueryFunction query_func; + gpointer query_user_data; + GstCollectPadsClipFunction clip_func; gpointer clip_user_data; /* no other lock needed */ @@ -139,21 +141,29 @@ struct _GstCollectPads2Private guint32 evt_cookie; }; -static void gst_collect_pads2_clear (GstCollectPads2 * pads, - GstCollectData2 * data); -static GstFlowReturn gst_collect_pads2_chain (GstPad * pad, GstObject * parent, +static void gst_collect_pads_clear (GstCollectPads * pads, + GstCollectData * data); +static GstFlowReturn gst_collect_pads_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer); -static gboolean gst_collect_pads2_event (GstPad * pad, GstObject * parent, +static gboolean gst_collect_pads_event (GstPad * pad, GstObject * parent, GstEvent * event); -static void gst_collect_pads2_finalize (GObject * object); -static GstFlowReturn gst_collect_pads2_default_collected (GstCollectPads2 * +static gboolean gst_collect_pads_query (GstPad * pad, GstObject * parent, + GstQuery * query); +static void gst_collect_pads_finalize (GObject * object); +static GstFlowReturn gst_collect_pads_default_collected (GstCollectPads * pads, gpointer user_data); -static gint gst_collect_pads2_default_compare_func (GstCollectPads2 * pads, - GstCollectData2 * data1, GstClockTime timestamp1, GstCollectData2 * data2, +static gint gst_collect_pads_default_compare_func (GstCollectPads * pads, + GstCollectData * data1, GstClockTime timestamp1, GstCollectData * data2, GstClockTime timestamp2, gpointer user_data); -static gboolean gst_collect_pads2_recalculate_full (GstCollectPads2 * pads); -static void ref_data (GstCollectData2 * data); -static void unref_data (GstCollectData2 * data); +static gboolean gst_collect_pads_recalculate_full (GstCollectPads * pads); +static void ref_data (GstCollectData * data); +static void unref_data (GstCollectData * data); + +static gboolean gst_collect_pads_event_default_internal (GstCollectPads * + pads, GstCollectData * data, GstEvent * event, gpointer user_data); +static gboolean gst_collect_pads_query_default_internal (GstCollectPads * + pads, GstCollectData * data, GstQuery * query, gpointer user_data); + /* Some properties are protected by LOCK, others by STREAM_LOCK * However, manipulating either of these partitions may require @@ -161,63 +171,63 @@ static void unref_data (GstCollectData2 * data); * Alternative implementations are possible, e.g. some low-level re-implementing * of the 2 above locks to drop both of them atomically when going into _WAIT. */ -#define GST_COLLECT_PADS2_GET_EVT_COND(pads) (&((GstCollectPads2 *)pads)->priv->evt_cond) -#define GST_COLLECT_PADS2_GET_EVT_LOCK(pads) (&((GstCollectPads2 *)pads)->priv->evt_lock) -#define GST_COLLECT_PADS2_EVT_WAIT(pads, cookie) G_STMT_START { \ - g_mutex_lock (GST_COLLECT_PADS2_GET_EVT_LOCK (pads)); \ +#define GST_COLLECT_PADS_GET_EVT_COND(pads) (&((GstCollectPads *)pads)->priv->evt_cond) +#define GST_COLLECT_PADS_GET_EVT_LOCK(pads) (&((GstCollectPads *)pads)->priv->evt_lock) +#define GST_COLLECT_PADS_EVT_WAIT(pads, cookie) G_STMT_START { \ + g_mutex_lock (GST_COLLECT_PADS_GET_EVT_LOCK (pads)); \ /* should work unless a lot of event'ing and thread starvation */\ - while (cookie == ((GstCollectPads2 *) pads)->priv->evt_cookie) \ - g_cond_wait (GST_COLLECT_PADS2_GET_EVT_COND (pads), \ - GST_COLLECT_PADS2_GET_EVT_LOCK (pads)); \ - cookie = ((GstCollectPads2 *) pads)->priv->evt_cookie; \ - g_mutex_unlock (GST_COLLECT_PADS2_GET_EVT_LOCK (pads)); \ + while (cookie == ((GstCollectPads *) pads)->priv->evt_cookie) \ + g_cond_wait (GST_COLLECT_PADS_GET_EVT_COND (pads), \ + GST_COLLECT_PADS_GET_EVT_LOCK (pads)); \ + cookie = ((GstCollectPads *) pads)->priv->evt_cookie; \ + g_mutex_unlock (GST_COLLECT_PADS_GET_EVT_LOCK (pads)); \ } G_STMT_END -#define GST_COLLECT_PADS2_EVT_WAIT_TIMED(pads, cookie, timeout) G_STMT_START { \ +#define GST_COLLECT_PADS_EVT_WAIT_TIMED(pads, cookie, timeout) G_STMT_START { \ GTimeVal __tv; \ \ g_get_current_time (&tv); \ g_time_val_add (&tv, timeout); \ \ - g_mutex_lock (GST_COLLECT_PADS2_GET_EVT_LOCK (pads)); \ + g_mutex_lock (GST_COLLECT_PADS_GET_EVT_LOCK (pads)); \ /* should work unless a lot of event'ing and thread starvation */\ - while (cookie == ((GstCollectPads2 *) pads)->priv->evt_cookie) \ - g_cond_timed_wait (GST_COLLECT_PADS2_GET_EVT_COND (pads), \ - GST_COLLECT_PADS2_GET_EVT_LOCK (pads), &tv); \ - cookie = ((GstCollectPads2 *) pads)->priv->evt_cookie; \ - g_mutex_unlock (GST_COLLECT_PADS2_GET_EVT_LOCK (pads)); \ + while (cookie == ((GstCollectPads *) pads)->priv->evt_cookie) \ + g_cond_timed_wait (GST_COLLECT_PADS_GET_EVT_COND (pads), \ + GST_COLLECT_PADS_GET_EVT_LOCK (pads), &tv); \ + cookie = ((GstCollectPads *) pads)->priv->evt_cookie; \ + g_mutex_unlock (GST_COLLECT_PADS_GET_EVT_LOCK (pads)); \ } G_STMT_END -#define GST_COLLECT_PADS2_EVT_BROADCAST(pads) G_STMT_START { \ - g_mutex_lock (GST_COLLECT_PADS2_GET_EVT_LOCK (pads)); \ +#define GST_COLLECT_PADS_EVT_BROADCAST(pads) G_STMT_START { \ + g_mutex_lock (GST_COLLECT_PADS_GET_EVT_LOCK (pads)); \ /* never mind wrap-around */ \ - ++(((GstCollectPads2 *) pads)->priv->evt_cookie); \ - g_cond_broadcast (GST_COLLECT_PADS2_GET_EVT_COND (pads)); \ - g_mutex_unlock (GST_COLLECT_PADS2_GET_EVT_LOCK (pads)); \ + ++(((GstCollectPads *) pads)->priv->evt_cookie); \ + g_cond_broadcast (GST_COLLECT_PADS_GET_EVT_COND (pads)); \ + g_mutex_unlock (GST_COLLECT_PADS_GET_EVT_LOCK (pads)); \ } G_STMT_END -#define GST_COLLECT_PADS2_EVT_INIT(cookie) G_STMT_START { \ - g_mutex_lock (GST_COLLECT_PADS2_GET_EVT_LOCK (pads)); \ - cookie = ((GstCollectPads2 *) pads)->priv->evt_cookie; \ - g_mutex_unlock (GST_COLLECT_PADS2_GET_EVT_LOCK (pads)); \ +#define GST_COLLECT_PADS_EVT_INIT(cookie) G_STMT_START { \ + g_mutex_lock (GST_COLLECT_PADS_GET_EVT_LOCK (pads)); \ + cookie = ((GstCollectPads *) pads)->priv->evt_cookie; \ + g_mutex_unlock (GST_COLLECT_PADS_GET_EVT_LOCK (pads)); \ } G_STMT_END static void -gst_collect_pads2_class_init (GstCollectPads2Class * klass) +gst_collect_pads_class_init (GstCollectPadsClass * klass) { GObjectClass *gobject_class = (GObjectClass *) klass; - g_type_class_add_private (klass, sizeof (GstCollectPads2Private)); + g_type_class_add_private (klass, sizeof (GstCollectPadsPrivate)); - GST_DEBUG_CATEGORY_INIT (collect_pads2_debug, "collectpads2", 0, - "GstCollectPads2"); + GST_DEBUG_CATEGORY_INIT (collect_pads_debug, "collectpads", 0, + "GstCollectPads"); - gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_collect_pads2_finalize); + gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_collect_pads_finalize); } static void -gst_collect_pads2_init (GstCollectPads2 * pads) +gst_collect_pads_init (GstCollectPads * pads) { pads->priv = - G_TYPE_INSTANCE_GET_PRIVATE (pads, GST_TYPE_COLLECT_PADS2, - GstCollectPads2Private); + G_TYPE_INSTANCE_GET_PRIVATE (pads, GST_TYPE_COLLECT_PADS, + GstCollectPadsPrivate); pads->data = NULL; pads->priv->cookie = 0; @@ -228,7 +238,7 @@ gst_collect_pads2_init (GstCollectPads2 * pads) g_rec_mutex_init (&pads->stream_lock); - pads->priv->func = gst_collect_pads2_default_collected; + pads->priv->func = gst_collect_pads_default_collected; pads->priv->user_data = NULL; pads->priv->event_func = NULL; pads->priv->event_user_data = NULL; @@ -236,11 +246,14 @@ gst_collect_pads2_init (GstCollectPads2 * pads) /* members for default muxing */ pads->priv->buffer_func = NULL; pads->priv->buffer_user_data = NULL; - pads->priv->compare_func = gst_collect_pads2_default_compare_func; + pads->priv->compare_func = gst_collect_pads_default_compare_func; pads->priv->compare_user_data = NULL; pads->priv->earliest_data = NULL; pads->priv->earliest_time = GST_CLOCK_TIME_NONE; + pads->priv->event_func = gst_collect_pads_event_default_internal; + pads->priv->query_func = gst_collect_pads_query_default_internal; + /* members to manage the pad list */ pads->priv->pad_cookie = 0; pads->priv->pad_list = NULL; @@ -252,9 +265,9 @@ gst_collect_pads2_init (GstCollectPads2 * pads) } static void -gst_collect_pads2_finalize (GObject * object) +gst_collect_pads_finalize (GObject * object) { - GstCollectPads2 *pads = GST_COLLECT_PADS2 (object); + GstCollectPads *pads = GST_COLLECT_PADS (object); GST_DEBUG_OBJECT (object, "finalize"); @@ -273,37 +286,37 @@ gst_collect_pads2_finalize (GObject * object) } /** - * gst_collect_pads2_new: + * gst_collect_pads_new: * * Create a new instance of #GstCollectsPads. * * MT safe. * - * Returns: (transfer full): a new #GstCollectPads2, or NULL in case of an error. + * Returns: (transfer full): a new #GstCollectPads, or NULL in case of an error. * * Since: 0.10.36 */ -GstCollectPads2 * -gst_collect_pads2_new (void) +GstCollectPads * +gst_collect_pads_new (void) { - GstCollectPads2 *newcoll; + GstCollectPads *newcoll; - newcoll = g_object_new (GST_TYPE_COLLECT_PADS2, NULL); + newcoll = g_object_new (GST_TYPE_COLLECT_PADS, NULL); return newcoll; } /* Must be called with GstObject lock! */ static void -gst_collect_pads2_set_buffer_function_locked (GstCollectPads2 * pads, - GstCollectPads2BufferFunction func, gpointer user_data) +gst_collect_pads_set_buffer_function_locked (GstCollectPads * pads, + GstCollectPadsBufferFunction func, gpointer user_data) { pads->priv->buffer_func = func; pads->priv->buffer_user_data = user_data; } /** - * gst_collect_pads2_set_buffer_function: + * gst_collect_pads_set_buffer_function: * @pads: the collectpads to use * @func: the function to set * @user_data: (closure): user data passed to the function @@ -316,19 +329,19 @@ gst_collect_pads2_set_buffer_function_locked (GstCollectPads2 * pads, * Since: 0.10.36 */ void -gst_collect_pads2_set_buffer_function (GstCollectPads2 * pads, - GstCollectPads2BufferFunction func, gpointer user_data) +gst_collect_pads_set_buffer_function (GstCollectPads * pads, + GstCollectPadsBufferFunction func, gpointer user_data) { g_return_if_fail (pads != NULL); - g_return_if_fail (GST_IS_COLLECT_PADS2 (pads)); + g_return_if_fail (GST_IS_COLLECT_PADS (pads)); GST_OBJECT_LOCK (pads); - gst_collect_pads2_set_buffer_function_locked (pads, func, user_data); + gst_collect_pads_set_buffer_function_locked (pads, func, user_data); GST_OBJECT_UNLOCK (pads); } /** - * gst_collect_pads2_set_compare_function: + * gst_collect_pads_set_compare_function: * @pads: the pads to use * @func: the function to set * @user_data: (closure): user data passed to the function @@ -344,11 +357,11 @@ no known use-case, and collaboration with default algorithm is unpredictable. If custom compairing/operation is needed, just use a collect function of your own */ void -gst_collect_pads2_set_compare_function (GstCollectPads2 * pads, - GstCollectPads2CompareFunction func, gpointer user_data) +gst_collect_pads_set_compare_function (GstCollectPads * pads, + GstCollectPadsCompareFunction func, gpointer user_data) { g_return_if_fail (pads != NULL); - g_return_if_fail (GST_IS_COLLECT_PADS2 (pads)); + g_return_if_fail (GST_IS_COLLECT_PADS (pads)); GST_OBJECT_LOCK (pads); pads->priv->compare_func = func; @@ -357,7 +370,7 @@ gst_collect_pads2_set_compare_function (GstCollectPads2 * pads, } /** - * gst_collect_pads2_set_function: + * gst_collect_pads_set_function: * @pads: the collectspads to use * @func: the function to set * @user_data: user data passed to the function @@ -369,7 +382,7 @@ gst_collect_pads2_set_compare_function (GstCollectPads2 * pads, * is desired, this sets a callback that will be invoked instead when * all the pads added to the collection have buffers queued. * Evidently, this callback is not compatible with - * gst_collect_pads2_set_buffer_function() callback. + * gst_collect_pads_set_buffer_function() callback. * If this callback is set, the former will be unset. * * MT safe. @@ -377,21 +390,21 @@ gst_collect_pads2_set_compare_function (GstCollectPads2 * pads, * Since: 0.10.36 */ void -gst_collect_pads2_set_function (GstCollectPads2 * pads, - GstCollectPads2Function func, gpointer user_data) +gst_collect_pads_set_function (GstCollectPads * pads, + GstCollectPadsFunction func, gpointer user_data) { g_return_if_fail (pads != NULL); - g_return_if_fail (GST_IS_COLLECT_PADS2 (pads)); + g_return_if_fail (GST_IS_COLLECT_PADS (pads)); GST_OBJECT_LOCK (pads); pads->priv->func = func; pads->priv->user_data = user_data; - gst_collect_pads2_set_buffer_function_locked (pads, NULL, NULL); + gst_collect_pads_set_buffer_function_locked (pads, NULL, NULL); GST_OBJECT_UNLOCK (pads); } static void -ref_data (GstCollectData2 * data) +ref_data (GstCollectData * data) { g_assert (data != NULL); @@ -399,7 +412,7 @@ ref_data (GstCollectData2 * data) } static void -unref_data (GstCollectData2 * data) +unref_data (GstCollectData * data) { g_assert (data != NULL); g_assert (data->priv->refcount > 0); @@ -419,13 +432,13 @@ unref_data (GstCollectData2 * data) } /** - * gst_collect_pads2_set_event_function: + * gst_collect_pads_set_event_function: * @pads: the collectspads to use * @func: the function to set * @user_data: user data passed to the function * - * Set the event callback function and user data that will be called after - * collectpads has processed and event originating from one of the collected + * Set the event callback function and user data that will be called when + * collectpads has received an event originating from one of the collected * pads. If the event being processed is a serialized one, this callback is * called with @pads STREAM_LOCK held, otherwise not. As this lock should be * held when calling a number of CollectPads functions, it should be acquired @@ -436,11 +449,11 @@ unref_data (GstCollectData2 * data) * Since: 0.10.36 */ void -gst_collect_pads2_set_event_function (GstCollectPads2 * pads, - GstCollectPads2EventFunction func, gpointer user_data) +gst_collect_pads_set_event_function (GstCollectPads * pads, + GstCollectPadsEventFunction func, gpointer user_data) { g_return_if_fail (pads != NULL); - g_return_if_fail (GST_IS_COLLECT_PADS2 (pads)); + g_return_if_fail (GST_IS_COLLECT_PADS (pads)); GST_OBJECT_LOCK (pads); pads->priv->event_func = func; @@ -449,7 +462,37 @@ gst_collect_pads2_set_event_function (GstCollectPads2 * pads, } /** -* gst_collect_pads2_clip_running_time: + * gst_collect_pads_set_query_function: + * @pads: the collectspads to use + * @func: the function to set + * @user_data: user data passed to the function + * + * Set the query callback function and user data that will be called after + * collectpads has received a query originating from one of the collected + * pads. If the query being processed is a serialized one, this callback is + * called with @pads STREAM_LOCK held, otherwise not. As this lock should be + * held when calling a number of CollectPads functions, it should be acquired + * if so (unusually) needed. + * + * MT safe. + * + * Since: 0.10.36 + */ +void +gst_collect_pads_set_query_function (GstCollectPads * pads, + GstCollectPadsQueryFunction func, gpointer user_data) +{ + g_return_if_fail (pads != NULL); + g_return_if_fail (GST_IS_COLLECT_PADS (pads)); + + GST_OBJECT_LOCK (pads); + pads->priv->query_func = func; + pads->priv->query_user_data = user_data; + GST_OBJECT_UNLOCK (pads); +} + +/** +* gst_collect_pads_clip_running_time: * @pads: the collectspads to use * @cdata: collect data of corresponding pad * @buf: buffer being clipped @@ -462,8 +505,8 @@ gst_collect_pads2_set_event_function (GstCollectPads2 * pads, * Since: 0.10.37 */ GstFlowReturn -gst_collect_pads2_clip_running_time (GstCollectPads2 * pads, - GstCollectData2 * cdata, GstBuffer * buf, GstBuffer ** outbuf, +gst_collect_pads_clip_running_time (GstCollectPads * pads, + GstCollectData * cdata, GstBuffer * buf, GstBuffer ** outbuf, gpointer user_data) { GstClockTime time; @@ -491,7 +534,7 @@ gst_collect_pads2_clip_running_time (GstCollectPads2 * pads, } /** - * gst_collect_pads2_set_clip_function: + * gst_collect_pads_set_clip_function: * @pads: the collectspads to use * @clipfunc: clip function to install * @user_data: user data to pass to @clip_func @@ -502,68 +545,68 @@ gst_collect_pads2_clip_running_time (GstCollectPads2 * pads, * Since: 0.10.36 */ void -gst_collect_pads2_set_clip_function (GstCollectPads2 * pads, - GstCollectPads2ClipFunction clipfunc, gpointer user_data) +gst_collect_pads_set_clip_function (GstCollectPads * pads, + GstCollectPadsClipFunction clipfunc, gpointer user_data) { g_return_if_fail (pads != NULL); - g_return_if_fail (GST_IS_COLLECT_PADS2 (pads)); + g_return_if_fail (GST_IS_COLLECT_PADS (pads)); pads->priv->clip_func = clipfunc; pads->priv->clip_user_data = user_data; } /** - * gst_collect_pads2_add_pad: + * gst_collect_pads_add_pad: * @pads: the collectspads to use * @pad: (transfer none): the pad to add - * @size: the size of the returned #GstCollectData2 structure + * @size: the size of the returned #GstCollectData structure * * Add a pad to the collection of collect pads. The pad has to be * a sinkpad. The refcount of the pad is incremented. Use - * gst_collect_pads2_remove_pad() to remove the pad from the collection + * gst_collect_pads_remove_pad() to remove the pad from the collection * again. * - * You specify a size for the returned #GstCollectData2 structure + * You specify a size for the returned #GstCollectData structure * so that you can use it to store additional information. * * The pad will be automatically activated in push mode when @pads is * started. * - * This function calls gst_collect_pads2_add_pad_full() passing a value of NULL + * This function calls gst_collect_pads_add_pad_full() passing a value of NULL * for destroy_notify and TRUE for locked. * * MT safe. * - * Returns: a new #GstCollectData2 to identify the new pad. Or NULL + * Returns: a new #GstCollectData to identify the new pad. Or NULL * if wrong parameters are supplied. * * Since: 0.10.36 */ -GstCollectData2 * -gst_collect_pads2_add_pad (GstCollectPads2 * pads, GstPad * pad, guint size) +GstCollectData * +gst_collect_pads_add_pad (GstCollectPads * pads, GstPad * pad, guint size) { - return gst_collect_pads2_add_pad_full (pads, pad, size, NULL, TRUE); + return gst_collect_pads_add_pad_full (pads, pad, size, NULL, TRUE); } /** - * gst_collect_pads2_add_pad_full: + * gst_collect_pads_add_pad_full: * @pads: the collectspads to use * @pad: (transfer none): the pad to add - * @size: the size of the returned #GstCollectData2 structure - * @destroy_notify: function to be called before the returned #GstCollectData2 + * @size: the size of the returned #GstCollectData structure + * @destroy_notify: function to be called before the returned #GstCollectData * structure is freed * @lock: whether to lock this pad in usual waiting state * * Add a pad to the collection of collect pads. The pad has to be * a sinkpad. The refcount of the pad is incremented. Use - * gst_collect_pads2_remove_pad() to remove the pad from the collection + * gst_collect_pads_remove_pad() to remove the pad from the collection * again. * - * You specify a size for the returned #GstCollectData2 structure + * You specify a size for the returned #GstCollectData structure * so that you can use it to store additional information. * - * You can also specify a #GstCollectData2DestroyNotify that will be called - * just before the #GstCollectData2 structure is freed. It is passed the + * You can also specify a #GstCollectDataDestroyNotify that will be called + * just before the #GstCollectData structure is freed. It is passed the * pointer to the structure and should free any custom memory and resources * allocated for it. * @@ -582,32 +625,32 @@ gst_collect_pads2_add_pad (GstCollectPads2 * pads, GstPad * pad, guint size) * * Since: 0.10.36 * - * Returns: a new #GstCollectData2 to identify the new pad. Or NULL + * Returns: a new #GstCollectData to identify the new pad. Or NULL * if wrong parameters are supplied. */ -GstCollectData2 * -gst_collect_pads2_add_pad_full (GstCollectPads2 * pads, GstPad * pad, - guint size, GstCollectData2DestroyNotify destroy_notify, gboolean lock) +GstCollectData * +gst_collect_pads_add_pad_full (GstCollectPads * pads, GstPad * pad, + guint size, GstCollectDataDestroyNotify destroy_notify, gboolean lock) { - GstCollectData2 *data; + GstCollectData *data; g_return_val_if_fail (pads != NULL, NULL); - g_return_val_if_fail (GST_IS_COLLECT_PADS2 (pads), NULL); + g_return_val_if_fail (GST_IS_COLLECT_PADS (pads), NULL); g_return_val_if_fail (pad != NULL, NULL); g_return_val_if_fail (GST_PAD_IS_SINK (pad), NULL); - g_return_val_if_fail (size >= sizeof (GstCollectData2), NULL); + g_return_val_if_fail (size >= sizeof (GstCollectData), NULL); GST_DEBUG_OBJECT (pads, "adding pad %s:%s", GST_DEBUG_PAD_NAME (pad)); data = g_malloc0 (size); - data->priv = g_new0 (GstCollectData2Private, 1); + data->priv = g_new0 (GstCollectDataPrivate, 1); data->collect = pads; data->pad = gst_object_ref (pad); data->buffer = NULL; data->pos = 0; gst_segment_init (&data->segment, GST_FORMAT_UNDEFINED); - data->state = GST_COLLECT_PADS2_STATE_WAITING; - data->state |= lock ? GST_COLLECT_PADS2_STATE_LOCKED : 0; + data->state = GST_COLLECT_PADS_STATE_WAITING; + data->state |= lock ? GST_COLLECT_PADS_STATE_LOCKED : 0; data->priv->refcount = 1; data->priv->destroy_notify = destroy_notify; @@ -616,8 +659,9 @@ gst_collect_pads2_add_pad_full (GstCollectPads2 * pads, GstPad * pad, gst_pad_set_element_private (pad, data); GST_OBJECT_UNLOCK (pad); pads->priv->pad_list = g_slist_append (pads->priv->pad_list, data); - gst_pad_set_chain_function (pad, GST_DEBUG_FUNCPTR (gst_collect_pads2_chain)); - gst_pad_set_event_function (pad, GST_DEBUG_FUNCPTR (gst_collect_pads2_event)); + gst_pad_set_chain_function (pad, GST_DEBUG_FUNCPTR (gst_collect_pads_chain)); + gst_pad_set_event_function (pad, GST_DEBUG_FUNCPTR (gst_collect_pads_event)); + gst_pad_set_query_function (pad, GST_DEBUG_FUNCPTR (gst_collect_pads_query)); /* backward compat, also add to data if stopped, so that the element already * has this in the public data list before going PAUSED (typically) * this can only be done when we are stopped because we don't take the @@ -636,7 +680,7 @@ gst_collect_pads2_add_pad_full (GstCollectPads2 * pads, GstPad * pad, } static gint -find_pad (GstCollectData2 * data, GstPad * pad) +find_pad (GstCollectData * data, GstPad * pad) { if (data->pad == pad) return 0; @@ -644,13 +688,13 @@ find_pad (GstCollectData2 * data, GstPad * pad) } /** - * gst_collect_pads2_remove_pad: + * gst_collect_pads_remove_pad: * @pads: the collectspads to use * @pad: (transfer none): the pad to remove * * Remove a pad from the collection of collect pads. This function will also - * free the #GstCollectData2 and all the resources that were allocated with - * gst_collect_pads2_add_pad(). + * free the #GstCollectData and all the resources that were allocated with + * gst_collect_pads_add_pad(). * * The pad will be deactivated automatically when @pads is stopped. * @@ -661,13 +705,13 @@ find_pad (GstCollectData2 * data, GstPad * pad) * Since: 0.10.36 */ gboolean -gst_collect_pads2_remove_pad (GstCollectPads2 * pads, GstPad * pad) +gst_collect_pads_remove_pad (GstCollectPads * pads, GstPad * pad) { - GstCollectData2 *data; + GstCollectData *data; GSList *list; g_return_val_if_fail (pads != NULL, FALSE); - g_return_val_if_fail (GST_IS_COLLECT_PADS2 (pads), FALSE); + g_return_val_if_fail (GST_IS_COLLECT_PADS (pads), FALSE); g_return_val_if_fail (pad != NULL, FALSE); g_return_val_if_fail (GST_IS_PAD (pad), FALSE); @@ -679,7 +723,7 @@ gst_collect_pads2_remove_pad (GstCollectPads2 * pads, GstPad * pad) if (!list) goto unknown_pad; - data = (GstCollectData2 *) list->data; + data = (GstCollectData *) list->data; GST_DEBUG_OBJECT (pads, "found pad %s:%s at %p", GST_DEBUG_PAD_NAME (pad), data); @@ -699,7 +743,7 @@ gst_collect_pads2_remove_pad (GstCollectPads2 * pads, GstPad * pad) dlist = g_slist_find_custom (pads->data, pad, (GCompareFunc) find_pad); if (dlist) { - GstCollectData2 *pdata = dlist->data; + GstCollectData *pdata = dlist->data; pads->data = g_slist_delete_link (pads->data, dlist); unref_data (pdata); @@ -710,7 +754,7 @@ gst_collect_pads2_remove_pad (GstCollectPads2 * pads, GstPad * pad) pads->priv->pad_cookie++; /* signal waiters because something changed */ - GST_COLLECT_PADS2_EVT_BROADCAST (pads); + GST_COLLECT_PADS_EVT_BROADCAST (pads); /* deactivate the pad when needed */ if (!pads->priv->started) @@ -733,7 +777,7 @@ unknown_pad: } /** - * gst_collect_pads2_is_active: + * gst_collect_pads_is_active: * @pads: the collectspads to use * @pad: the pad to check * @@ -748,20 +792,20 @@ unknown_pad: * Since: 0.10.36 */ gboolean -gst_collect_pads2_is_active (GstCollectPads2 * pads, GstPad * pad) +gst_collect_pads_is_active (GstCollectPads * pads, GstPad * pad) { g_return_val_if_fail (pads != NULL, FALSE); - g_return_val_if_fail (GST_IS_COLLECT_PADS2 (pads), FALSE); + g_return_val_if_fail (GST_IS_COLLECT_PADS (pads), FALSE); g_return_val_if_fail (pad != NULL, FALSE); g_return_val_if_fail (GST_IS_PAD (pad), FALSE); - g_warning ("gst_collect_pads2_is_active() is not implemented"); + g_warning ("gst_collect_pads_is_active() is not implemented"); return FALSE; } /** - * gst_collect_pads2_collect: + * gst_collect_pads_collect: * @pads: the collectspads to use * * Collect data on all pads. This function is usually called @@ -776,18 +820,18 @@ gst_collect_pads2_is_active (GstCollectPads2 * pads, GstPad * pad) * Since: 0.10.36 */ GstFlowReturn -gst_collect_pads2_collect (GstCollectPads2 * pads) +gst_collect_pads_collect (GstCollectPads * pads) { g_return_val_if_fail (pads != NULL, GST_FLOW_ERROR); - g_return_val_if_fail (GST_IS_COLLECT_PADS2 (pads), GST_FLOW_ERROR); + g_return_val_if_fail (GST_IS_COLLECT_PADS (pads), GST_FLOW_ERROR); - g_warning ("gst_collect_pads2_collect() is not implemented"); + g_warning ("gst_collect_pads_collect() is not implemented"); return GST_FLOW_NOT_SUPPORTED; } /** - * gst_collect_pads2_collect_range: + * gst_collect_pads_collect_range: * @pads: the collectspads to use * @offset: the offset to collect * @length: the length to collect @@ -804,13 +848,13 @@ gst_collect_pads2_collect (GstCollectPads2 * pads) * Since: 0.10.36 */ GstFlowReturn -gst_collect_pads2_collect_range (GstCollectPads2 * pads, guint64 offset, +gst_collect_pads_collect_range (GstCollectPads * pads, guint64 offset, guint length) { g_return_val_if_fail (pads != NULL, GST_FLOW_ERROR); - g_return_val_if_fail (GST_IS_COLLECT_PADS2 (pads), GST_FLOW_ERROR); + g_return_val_if_fail (GST_IS_COLLECT_PADS (pads), GST_FLOW_ERROR); - g_warning ("gst_collect_pads2_collect_range() is not implemented"); + g_warning ("gst_collect_pads_collect_range() is not implemented"); return GST_FLOW_NOT_SUPPORTED; } @@ -819,14 +863,14 @@ gst_collect_pads2_collect_range (GstCollectPads2 * pads, guint64 offset, * Must be called with STREAM_LOCK. */ static void -gst_collect_pads2_set_flushing_unlocked (GstCollectPads2 * pads, +gst_collect_pads_set_flushing_unlocked (GstCollectPads * pads, gboolean flushing) { GSList *walk = NULL; /* Update the pads flushing flag */ for (walk = pads->data; walk; walk = g_slist_next (walk)) { - GstCollectData2 *cdata = walk->data; + GstCollectData *cdata = walk->data; if (GST_IS_PAD (cdata->pad)) { GST_OBJECT_LOCK (cdata->pad); @@ -835,20 +879,20 @@ gst_collect_pads2_set_flushing_unlocked (GstCollectPads2 * pads, else GST_PAD_UNSET_FLUSHING (cdata->pad); if (flushing) - GST_COLLECT_PADS2_STATE_SET (cdata, GST_COLLECT_PADS2_STATE_FLUSHING); + GST_COLLECT_PADS_STATE_SET (cdata, GST_COLLECT_PADS_STATE_FLUSHING); else - GST_COLLECT_PADS2_STATE_UNSET (cdata, GST_COLLECT_PADS2_STATE_FLUSHING); - gst_collect_pads2_clear (pads, cdata); + GST_COLLECT_PADS_STATE_UNSET (cdata, GST_COLLECT_PADS_STATE_FLUSHING); + gst_collect_pads_clear (pads, cdata); GST_OBJECT_UNLOCK (cdata->pad); } } /* inform _chain of changes */ - GST_COLLECT_PADS2_EVT_BROADCAST (pads); + GST_COLLECT_PADS_EVT_BROADCAST (pads); } /** - * gst_collect_pads2_set_flushing: + * gst_collect_pads_set_flushing: * @pads: the collectspads to use * @flushing: desired state of the pads * @@ -863,39 +907,39 @@ gst_collect_pads2_set_flushing_unlocked (GstCollectPads2 * pads, * Since: 0.10.36 */ void -gst_collect_pads2_set_flushing (GstCollectPads2 * pads, gboolean flushing) +gst_collect_pads_set_flushing (GstCollectPads * pads, gboolean flushing) { g_return_if_fail (pads != NULL); - g_return_if_fail (GST_IS_COLLECT_PADS2 (pads)); + g_return_if_fail (GST_IS_COLLECT_PADS (pads)); /* NOTE since this eventually calls _pop, some (STREAM_)LOCK is needed here */ - GST_COLLECT_PADS2_STREAM_LOCK (pads); - gst_collect_pads2_set_flushing_unlocked (pads, flushing); - GST_COLLECT_PADS2_STREAM_UNLOCK (pads); + GST_COLLECT_PADS_STREAM_LOCK (pads); + gst_collect_pads_set_flushing_unlocked (pads, flushing); + GST_COLLECT_PADS_STREAM_UNLOCK (pads); } /** - * gst_collect_pads2_start: + * gst_collect_pads_start: * @pads: the collectspads to use * - * Starts the processing of data in the collect_pads2. + * Starts the processing of data in the collect_pads. * * MT safe. * * Since: 0.10.36 */ void -gst_collect_pads2_start (GstCollectPads2 * pads) +gst_collect_pads_start (GstCollectPads * pads) { GSList *collected; g_return_if_fail (pads != NULL); - g_return_if_fail (GST_IS_COLLECT_PADS2 (pads)); + g_return_if_fail (GST_IS_COLLECT_PADS (pads)); GST_DEBUG_OBJECT (pads, "starting collect pads"); /* make sure stop and collect cannot be called anymore */ - GST_COLLECT_PADS2_STREAM_LOCK (pads); + GST_COLLECT_PADS_STREAM_LOCK (pads); /* make pads streamable */ GST_OBJECT_LOCK (pads); @@ -903,25 +947,25 @@ gst_collect_pads2_start (GstCollectPads2 * pads) /* loop over the master pad list and reset the segment */ collected = pads->priv->pad_list; for (; collected; collected = g_slist_next (collected)) { - GstCollectData2 *data; + GstCollectData *data; data = collected->data; gst_segment_init (&data->segment, GST_FORMAT_UNDEFINED); } - gst_collect_pads2_set_flushing_unlocked (pads, FALSE); + gst_collect_pads_set_flushing_unlocked (pads, FALSE); /* Start collect pads */ pads->priv->started = TRUE; GST_OBJECT_UNLOCK (pads); - GST_COLLECT_PADS2_STREAM_UNLOCK (pads); + GST_COLLECT_PADS_STREAM_UNLOCK (pads); } /** - * gst_collect_pads2_stop: + * gst_collect_pads_stop: * @pads: the collectspads to use * - * Stops the processing of data in the collect_pads2. this function + * Stops the processing of data in the collect_pads. this function * will also unblock any blocking operations. * * MT safe. @@ -929,21 +973,21 @@ gst_collect_pads2_start (GstCollectPads2 * pads) * Since: 0.10.36 */ void -gst_collect_pads2_stop (GstCollectPads2 * pads) +gst_collect_pads_stop (GstCollectPads * pads) { GSList *collected; g_return_if_fail (pads != NULL); - g_return_if_fail (GST_IS_COLLECT_PADS2 (pads)); + g_return_if_fail (GST_IS_COLLECT_PADS (pads)); GST_DEBUG_OBJECT (pads, "stopping collect pads"); /* make sure collect and start cannot be called anymore */ - GST_COLLECT_PADS2_STREAM_LOCK (pads); + GST_COLLECT_PADS_STREAM_LOCK (pads); /* make pads not accept data anymore */ GST_OBJECT_LOCK (pads); - gst_collect_pads2_set_flushing_unlocked (pads, TRUE); + gst_collect_pads_set_flushing_unlocked (pads, TRUE); /* Stop collect pads */ pads->priv->started = FALSE; @@ -953,7 +997,7 @@ gst_collect_pads2_stop (GstCollectPads2 * pads) /* loop over the master pad list and flush buffers */ collected = pads->priv->pad_list; for (; collected; collected = g_slist_next (collected)) { - GstCollectData2 *data; + GstCollectData *data; GstBuffer **buffer_p; data = collected->data; @@ -962,7 +1006,7 @@ gst_collect_pads2_stop (GstCollectPads2 * pads) gst_buffer_replace (buffer_p, NULL); data->pos = 0; } - GST_COLLECT_PADS2_STATE_UNSET (data, GST_COLLECT_PADS2_STATE_EOS); + GST_COLLECT_PADS_STATE_UNSET (data, GST_COLLECT_PADS_STATE_EOS); } if (pads->priv->earliest_data) @@ -972,13 +1016,13 @@ gst_collect_pads2_stop (GstCollectPads2 * pads) GST_OBJECT_UNLOCK (pads); /* Wake them up so they can end the chain functions. */ - GST_COLLECT_PADS2_EVT_BROADCAST (pads); + GST_COLLECT_PADS_EVT_BROADCAST (pads); - GST_COLLECT_PADS2_STREAM_UNLOCK (pads); + GST_COLLECT_PADS_STREAM_UNLOCK (pads); } /** - * gst_collect_pads2_peek: + * gst_collect_pads_peek: * @pads: the collectspads to peek * @data: the data to use * @@ -994,12 +1038,12 @@ gst_collect_pads2_stop (GstCollectPads2 * pads) * Since: 0.10.36 */ GstBuffer * -gst_collect_pads2_peek (GstCollectPads2 * pads, GstCollectData2 * data) +gst_collect_pads_peek (GstCollectPads * pads, GstCollectData * data) { GstBuffer *result; g_return_val_if_fail (pads != NULL, NULL); - g_return_val_if_fail (GST_IS_COLLECT_PADS2 (pads), NULL); + g_return_val_if_fail (GST_IS_COLLECT_PADS (pads), NULL); g_return_val_if_fail (data != NULL, NULL); if ((result = data->buffer)) @@ -1012,7 +1056,7 @@ gst_collect_pads2_peek (GstCollectPads2 * pads, GstCollectData2 * data) } /** - * gst_collect_pads2_pop: + * gst_collect_pads_pop: * @pads: the collectspads to pop * @data: the data to use * @@ -1028,23 +1072,23 @@ gst_collect_pads2_peek (GstCollectPads2 * pads, GstCollectData2 * data) * Since: 0.10.36 */ GstBuffer * -gst_collect_pads2_pop (GstCollectPads2 * pads, GstCollectData2 * data) +gst_collect_pads_pop (GstCollectPads * pads, GstCollectData * data) { GstBuffer *result; g_return_val_if_fail (pads != NULL, NULL); - g_return_val_if_fail (GST_IS_COLLECT_PADS2 (pads), NULL); + g_return_val_if_fail (GST_IS_COLLECT_PADS (pads), NULL); g_return_val_if_fail (data != NULL, NULL); if ((result = data->buffer)) { data->buffer = NULL; data->pos = 0; /* one less pad with queued data now */ - if (GST_COLLECT_PADS2_STATE_IS_SET (data, GST_COLLECT_PADS2_STATE_WAITING)) + if (GST_COLLECT_PADS_STATE_IS_SET (data, GST_COLLECT_PADS_STATE_WAITING)) pads->priv->queuedpads--; } - GST_COLLECT_PADS2_EVT_BROADCAST (pads); + GST_COLLECT_PADS_EVT_BROADCAST (pads); GST_DEBUG_OBJECT (pads, "Pop buffer on pad %s:%s: buffer=%p", GST_DEBUG_PAD_NAME (data->pad), result); @@ -1055,16 +1099,16 @@ gst_collect_pads2_pop (GstCollectPads2 * pads, GstCollectData2 * data) /* pop and unref the currently queued buffer, should be called with STREAM_LOCK * held */ static void -gst_collect_pads2_clear (GstCollectPads2 * pads, GstCollectData2 * data) +gst_collect_pads_clear (GstCollectPads * pads, GstCollectData * data) { GstBuffer *buf; - if ((buf = gst_collect_pads2_pop (pads, data))) + if ((buf = gst_collect_pads_pop (pads, data))) gst_buffer_unref (buf); } /** - * gst_collect_pads2_available: + * gst_collect_pads_available: * @pads: the collectspads to query * * Query how much bytes can be read from each queued buffer. This means @@ -1085,25 +1129,25 @@ gst_collect_pads2_clear (GstCollectPads2 * pads, GstCollectData2 * data) * but would then have to maintain this in _chain and particularly _pop, etc, * even if element is never interested in this information */ guint -gst_collect_pads2_available (GstCollectPads2 * pads) +gst_collect_pads_available (GstCollectPads * pads) { GSList *collected; guint result = G_MAXUINT; g_return_val_if_fail (pads != NULL, 0); - g_return_val_if_fail (GST_IS_COLLECT_PADS2 (pads), 0); + g_return_val_if_fail (GST_IS_COLLECT_PADS (pads), 0); collected = pads->data; for (; collected; collected = g_slist_next (collected)) { - GstCollectData2 *pdata; + GstCollectData *pdata; GstBuffer *buffer; gint size; - pdata = (GstCollectData2 *) collected->data; + pdata = (GstCollectData *) collected->data; /* ignore pad with EOS */ - if (G_UNLIKELY (GST_COLLECT_PADS2_STATE_IS_SET (pdata, - GST_COLLECT_PADS2_STATE_EOS))) { + if (G_UNLIKELY (GST_COLLECT_PADS_STATE_IS_SET (pdata, + GST_COLLECT_PADS_STATE_EOS))) { GST_DEBUG_OBJECT (pads, "pad %p is EOS", pdata); continue; } @@ -1135,7 +1179,7 @@ not_filled: } /** - * gst_collect_pads2_flush: + * gst_collect_pads_flush: * @pads: the collectspads to query * @data: the data to use * @size: the number of bytes to flush @@ -1153,7 +1197,7 @@ not_filled: * Since: 0.10.36 */ guint -gst_collect_pads2_flush (GstCollectPads2 * pads, GstCollectData2 * data, +gst_collect_pads_flush (GstCollectPads * pads, GstCollectData * data, guint size) { guint flushsize; @@ -1161,7 +1205,7 @@ gst_collect_pads2_flush (GstCollectPads2 * pads, GstCollectData2 * data, GstBuffer *buffer; g_return_val_if_fail (pads != NULL, 0); - g_return_val_if_fail (GST_IS_COLLECT_PADS2 (pads), 0); + g_return_val_if_fail (GST_IS_COLLECT_PADS (pads), 0); g_return_val_if_fail (data != NULL, 0); /* no buffer, must be EOS */ @@ -1177,13 +1221,13 @@ gst_collect_pads2_flush (GstCollectPads2 * pads, GstCollectData2 * data, if (data->pos >= bsize) /* _clear will also reset data->pos to 0 */ - gst_collect_pads2_clear (pads, data); + gst_collect_pads_clear (pads, data); return flushsize; } /** - * gst_collect_pads2_read_buffer: + * gst_collect_pads_read_buffer: * @pads: the collectspads to query * @data: the data to use * @size: the number of bytes to read @@ -1202,14 +1246,14 @@ gst_collect_pads2_flush (GstCollectPads2 * pads, GstCollectData2 * data, * Unref the buffer after use. */ GstBuffer * -gst_collect_pads2_read_buffer (GstCollectPads2 * pads, GstCollectData2 * data, +gst_collect_pads_read_buffer (GstCollectPads * pads, GstCollectData * data, guint size) { guint readsize; GstBuffer *buffer; g_return_val_if_fail (pads != NULL, NULL); - g_return_val_if_fail (GST_IS_COLLECT_PADS2 (pads), NULL); + g_return_val_if_fail (GST_IS_COLLECT_PADS (pads), NULL); g_return_val_if_fail (data != NULL, NULL); /* no buffer, must be EOS */ @@ -1223,7 +1267,7 @@ gst_collect_pads2_read_buffer (GstCollectPads2 * pads, GstCollectData2 * data, } /** - * gst_collect_pads2_take_buffer: + * gst_collect_pads_take_buffer: * @pads: the collectspads to query * @data: the data to use * @size: the number of bytes to read @@ -1243,19 +1287,19 @@ gst_collect_pads2_read_buffer (GstCollectPads2 * pads, GstCollectData2 * data, * Unref the buffer after use. */ GstBuffer * -gst_collect_pads2_take_buffer (GstCollectPads2 * pads, GstCollectData2 * data, +gst_collect_pads_take_buffer (GstCollectPads * pads, GstCollectData * data, guint size) { - GstBuffer *buffer = gst_collect_pads2_read_buffer (pads, data, size); + GstBuffer *buffer = gst_collect_pads_read_buffer (pads, data, size); if (buffer) { - gst_collect_pads2_flush (pads, data, gst_buffer_get_size (buffer)); + gst_collect_pads_flush (pads, data, gst_buffer_get_size (buffer)); } return buffer; } /** - * gst_collect_pads2_set_waiting: + * gst_collect_pads_set_waiting: * @pads: the collectspads * @data: the data to use * @waiting: boolean indicating whether this pad should operate @@ -1273,29 +1317,29 @@ gst_collect_pads2_take_buffer (GstCollectPads2 * pads, GstCollectData2 * data, * Since: 0.10.36 */ void -gst_collect_pads2_set_waiting (GstCollectPads2 * pads, GstCollectData2 * data, +gst_collect_pads_set_waiting (GstCollectPads * pads, GstCollectData * data, gboolean waiting) { g_return_if_fail (pads != NULL); - g_return_if_fail (GST_IS_COLLECT_PADS2 (pads)); + g_return_if_fail (GST_IS_COLLECT_PADS (pads)); g_return_if_fail (data != NULL); GST_DEBUG_OBJECT (pads, "Setting pad %s to waiting %d, locked %d", GST_PAD_NAME (data->pad), waiting, - GST_COLLECT_PADS2_STATE_IS_SET (data, GST_COLLECT_PADS2_STATE_LOCKED)); + GST_COLLECT_PADS_STATE_IS_SET (data, GST_COLLECT_PADS_STATE_LOCKED)); /* Do something only on a change and if not locked */ - if (!GST_COLLECT_PADS2_STATE_IS_SET (data, GST_COLLECT_PADS2_STATE_LOCKED) && - (GST_COLLECT_PADS2_STATE_IS_SET (data, GST_COLLECT_PADS2_STATE_WAITING) != + if (!GST_COLLECT_PADS_STATE_IS_SET (data, GST_COLLECT_PADS_STATE_LOCKED) && + (GST_COLLECT_PADS_STATE_IS_SET (data, GST_COLLECT_PADS_STATE_WAITING) != ! !waiting)) { /* Set waiting state for this pad */ if (waiting) - GST_COLLECT_PADS2_STATE_SET (data, GST_COLLECT_PADS2_STATE_WAITING); + GST_COLLECT_PADS_STATE_SET (data, GST_COLLECT_PADS_STATE_WAITING); else - GST_COLLECT_PADS2_STATE_UNSET (data, GST_COLLECT_PADS2_STATE_WAITING); + GST_COLLECT_PADS_STATE_UNSET (data, GST_COLLECT_PADS_STATE_WAITING); /* Update number of queued pads if needed */ if (!data->buffer && - !GST_COLLECT_PADS2_STATE_IS_SET (data, GST_COLLECT_PADS2_STATE_EOS)) { + !GST_COLLECT_PADS_STATE_IS_SET (data, GST_COLLECT_PADS_STATE_EOS)) { if (waiting) pads->priv->queuedpads--; else @@ -1303,7 +1347,7 @@ gst_collect_pads2_set_waiting (GstCollectPads2 * pads, GstCollectData2 * data, } /* signal waiters because something changed */ - GST_COLLECT_PADS2_EVT_BROADCAST (pads); + GST_COLLECT_PADS_EVT_BROADCAST (pads); } } @@ -1317,7 +1361,7 @@ gst_collect_pads2_set_waiting (GstCollectPads2 * pads, GstCollectData2 * data, * Must be called with STREAM_LOCK. */ static void -gst_collect_pads2_check_pads (GstCollectPads2 * pads) +gst_collect_pads_check_pads (GstCollectPads * pads) { /* the master list and cookie are protected with LOCK */ GST_OBJECT_LOCK (pads); @@ -1339,15 +1383,15 @@ gst_collect_pads2_check_pads (GstCollectPads2 * pads) /* loop over the master pad list */ collected = pads->priv->pad_list; for (; collected; collected = g_slist_next (collected)) { - GstCollectData2 *data; + GstCollectData *data; /* update the stats */ pads->priv->numpads++; data = collected->data; - if (GST_COLLECT_PADS2_STATE_IS_SET (data, GST_COLLECT_PADS2_STATE_EOS)) + if (GST_COLLECT_PADS_STATE_IS_SET (data, GST_COLLECT_PADS_STATE_EOS)) pads->priv->eospads++; - else if (data->buffer || !GST_COLLECT_PADS2_STATE_IS_SET (data, - GST_COLLECT_PADS2_STATE_WAITING)) + else if (data->buffer || !GST_COLLECT_PADS_STATE_IS_SET (data, + GST_COLLECT_PADS_STATE_WAITING)) pads->priv->queuedpads++; /* add to the list of pads to collect */ @@ -1368,13 +1412,13 @@ gst_collect_pads2_check_pads (GstCollectPads2 * pads) * Returns: The #GstFlowReturn of collection. */ static GstFlowReturn -gst_collect_pads2_check_collected (GstCollectPads2 * pads) +gst_collect_pads_check_collected (GstCollectPads * pads) { GstFlowReturn flow_ret = GST_FLOW_OK; - GstCollectPads2Function func; + GstCollectPadsFunction func; gpointer user_data; - g_return_val_if_fail (GST_IS_COLLECT_PADS2 (pads), GST_FLOW_ERROR); + g_return_val_if_fail (GST_IS_COLLECT_PADS (pads), GST_FLOW_ERROR); GST_OBJECT_LOCK (pads); func = pads->priv->func; @@ -1384,7 +1428,7 @@ gst_collect_pads2_check_collected (GstCollectPads2 * pads) g_return_val_if_fail (pads->priv->func != NULL, GST_FLOW_NOT_SUPPORTED); /* check for new pads, update stats etc.. */ - gst_collect_pads2_check_pads (pads); + gst_collect_pads_check_pads (pads); if (G_UNLIKELY (pads->priv->eospads == pads->priv->numpads)) { /* If all our pads are EOS just collect once to let the element @@ -1438,7 +1482,7 @@ gst_collect_pads2_check_collected (GstCollectPads2 * pads) * (from non-waiting state). */ static gboolean -gst_collect_pads2_recalculate_waiting (GstCollectPads2 * pads) +gst_collect_pads_recalculate_waiting (GstCollectPads * pads) { GSList *collected; gboolean result = FALSE; @@ -1448,16 +1492,20 @@ gst_collect_pads2_recalculate_waiting (GstCollectPads2 * pads) return FALSE; for (collected = pads->data; collected; collected = g_slist_next (collected)) { - GstCollectData2 *data = (GstCollectData2 *) collected->data; + GstCollectData *data = (GstCollectData *) collected->data; int cmp_res; /* check if pad has a segment */ - if (data->segment.format == GST_FORMAT_UNDEFINED) - continue; + if (data->segment.format == GST_FORMAT_UNDEFINED) { + GST_WARNING_OBJECT (pads, + "GstCollectPads has no time segment, assuming 0 based."); + gst_segment_init (&data->segment, GST_FORMAT_TIME); + GST_COLLECT_PADS_STATE_SET (data, GST_COLLECT_PADS_STATE_NEW_SEGMENT); + } /* check segment format */ if (data->segment.format != GST_FORMAT_TIME) { - GST_ERROR_OBJECT (pads, "GstCollectPads2 can handle only time segments."); + GST_ERROR_OBJECT (pads, "GstCollectPads can handle only time segments."); continue; } @@ -1467,12 +1515,11 @@ gst_collect_pads2_recalculate_waiting (GstCollectPads2 * pads) pads->priv->compare_user_data); if (cmp_res > 0) /* stop waiting */ - gst_collect_pads2_set_waiting (pads, data, FALSE); + gst_collect_pads_set_waiting (pads, data, FALSE); else { - if (!GST_COLLECT_PADS2_STATE_IS_SET (data, - GST_COLLECT_PADS2_STATE_WAITING)) { + if (!GST_COLLECT_PADS_STATE_IS_SET (data, GST_COLLECT_PADS_STATE_WAITING)) { /* start waiting */ - gst_collect_pads2_set_waiting (pads, data, TRUE); + gst_collect_pads_set_waiting (pads, data, TRUE); result = TRUE; } } @@ -1482,13 +1529,13 @@ gst_collect_pads2_recalculate_waiting (GstCollectPads2 * pads) } /** - * gst_collect_pads2_find_best_pad: + * gst_collect_pads_find_best_pad: * @pads: the collectpads to use * @data: returns the collectdata for earliest data * @time: returns the earliest available buffertime * * Find the oldest/best pad, i.e. pad holding the oldest buffer and - * and return the corresponding #GstCollectData2 and buffertime. + * and return the corresponding #GstCollectData and buffertime. * * This function should be called with STREAM_LOCK held, * such as in the callback. @@ -1496,11 +1543,11 @@ gst_collect_pads2_recalculate_waiting (GstCollectPads2 * pads) * Since: 0.10.36 */ static void -gst_collect_pads2_find_best_pad (GstCollectPads2 * pads, - GstCollectData2 ** data, GstClockTime * time) +gst_collect_pads_find_best_pad (GstCollectPads * pads, + GstCollectData ** data, GstClockTime * time) { GSList *collected; - GstCollectData2 *best = NULL; + GstCollectData *best = NULL; GstClockTime best_time = GST_CLOCK_TIME_NONE; g_return_if_fail (data != NULL); @@ -1508,10 +1555,10 @@ gst_collect_pads2_find_best_pad (GstCollectPads2 * pads, for (collected = pads->data; collected; collected = g_slist_next (collected)) { GstBuffer *buffer; - GstCollectData2 *data = (GstCollectData2 *) collected->data; + GstCollectData *data = (GstCollectData *) collected->data; GstClockTime timestamp; - buffer = gst_collect_pads2_peek (pads, data); + buffer = gst_collect_pads_peek (pads, data); /* if we have a buffer check if it is better then the current best one */ if (buffer != NULL) { timestamp = GST_BUFFER_TIMESTAMP (buffer); @@ -1529,43 +1576,43 @@ gst_collect_pads2_find_best_pad (GstCollectPads2 * pads, *time = best_time; GST_DEBUG_OBJECT (pads, "best pad %s, best time %" GST_TIME_FORMAT, - best ? GST_PAD_NAME (((GstCollectData2 *) best)->pad) : "(nil)", + best ? GST_PAD_NAME (((GstCollectData *) best)->pad) : "(nil)", GST_TIME_ARGS (best_time)); } /* * Function to recalculate earliest_data and earliest_timestamp. This also calls - * gst_collect_pads2_recalculate_waiting + * gst_collect_pads_recalculate_waiting * * Must be called with STREAM_LOCK. */ static gboolean -gst_collect_pads2_recalculate_full (GstCollectPads2 * pads) +gst_collect_pads_recalculate_full (GstCollectPads * pads) { if (pads->priv->earliest_data) unref_data (pads->priv->earliest_data); - gst_collect_pads2_find_best_pad (pads, &pads->priv->earliest_data, + gst_collect_pads_find_best_pad (pads, &pads->priv->earliest_data, &pads->priv->earliest_time); if (pads->priv->earliest_data) ref_data (pads->priv->earliest_data); - return gst_collect_pads2_recalculate_waiting (pads); + return gst_collect_pads_recalculate_waiting (pads); } /* - * Default collect callback triggered when #GstCollectPads2 gathered all data. + * Default collect callback triggered when #GstCollectPads gathered all data. * * Called with STREAM_LOCK. */ static GstFlowReturn -gst_collect_pads2_default_collected (GstCollectPads2 * pads, gpointer user_data) +gst_collect_pads_default_collected (GstCollectPads * pads, gpointer user_data) { - GstCollectData2 *best = NULL; + GstCollectData *best = NULL; GstBuffer *buffer; GstFlowReturn ret = GST_FLOW_OK; - GstCollectPads2BufferFunction func; + GstCollectPadsBufferFunction func; gpointer buffer_user_data; - g_return_val_if_fail (GST_IS_COLLECT_PADS2 (pads), GST_FLOW_ERROR); + g_return_val_if_fail (GST_IS_COLLECT_PADS (pads), GST_FLOW_ERROR); GST_OBJECT_LOCK (pads); func = pads->priv->buffer_func; @@ -1575,7 +1622,7 @@ gst_collect_pads2_default_collected (GstCollectPads2 * pads, gpointer user_data) g_return_val_if_fail (func != NULL, GST_FLOW_NOT_SUPPORTED); /* Find the oldest pad at all cost */ - if (gst_collect_pads2_recalculate_full (pads)) { + if (gst_collect_pads_recalculate_full (pads)) { /* waiting was switched on, * so give another thread a chance to deliver a possibly * older buffer; don't charge on yet with the current oldest */ @@ -1596,16 +1643,16 @@ gst_collect_pads2_default_collected (GstCollectPads2 * pads, gpointer user_data) /* make sure that the pad we take a buffer from is waiting; * otherwise popping a buffer will seem not to have happened * and collectpads can get into a busy loop */ - gst_collect_pads2_set_waiting (pads, best, TRUE); + gst_collect_pads_set_waiting (pads, best, TRUE); /* Send buffer */ - buffer = gst_collect_pads2_pop (pads, best); + buffer = gst_collect_pads_pop (pads, best); ret = func (pads, best, buffer, buffer_user_data); /* maybe non-waiting was forced to waiting above due to * newsegment events coming too sparsely, * so re-check to restore state to avoid hanging/waiting */ - gst_collect_pads2_recalculate_full (pads); + gst_collect_pads_recalculate_full (pads); done: return ret; @@ -1615,9 +1662,9 @@ done: * Default timestamp compare function. */ static gint -gst_collect_pads2_default_compare_func (GstCollectPads2 * pads, - GstCollectData2 * data1, GstClockTime timestamp1, - GstCollectData2 * data2, GstClockTime timestamp2, gpointer user_data) +gst_collect_pads_default_compare_func (GstCollectPads * pads, + GstCollectData * data1, GstClockTime timestamp1, + GstCollectData * data2, GstClockTime timestamp2, gpointer user_data) { GST_LOG_OBJECT (pads, "comparing %" GST_TIME_FORMAT @@ -1640,59 +1687,54 @@ gst_collect_pads2_default_compare_func (GstCollectPads2 * pads, return 0; } -static gboolean -gst_collect_pads2_event (GstPad * pad, GstObject * parent, GstEvent * event) +/** + * gst_collect_pads_event_default: + * @pads: the collectspads to use + * @data: collect data of corresponding pad + * @event: event being processed + * @discard: process but do not send event downstream + * + * Default GstCollectPads event handling that elements should always + * chain up to to ensure proper operation. Element might however indicate + * event should not be forwarded downstream. + * + * Since: 0.11.x + */ +gboolean +gst_collect_pads_event_default (GstCollectPads * pads, GstCollectData * data, + GstEvent * event, gboolean discard) { - gboolean res = FALSE, need_unlock = FALSE; - GstCollectData2 *data; - GstCollectPads2 *pads; - GstCollectPads2EventFunction event_func; - GstCollectPads2BufferFunction buffer_func; - gpointer event_user_data; - - /* some magic to get the managing collect_pads2 */ - GST_OBJECT_LOCK (pad); - data = (GstCollectData2 *) gst_pad_get_element_private (pad); - if (G_UNLIKELY (data == NULL)) - goto pad_removed; - ref_data (data); - GST_OBJECT_UNLOCK (pad); - - res = FALSE; - - pads = data->collect; - - GST_DEBUG_OBJECT (data->pad, "Got %s event on sink pad", - GST_EVENT_TYPE_NAME (event)); + gboolean res = TRUE; + GstCollectPadsBufferFunction buffer_func; + GstObject *parent; + GstPad *pad; GST_OBJECT_LOCK (pads); - event_func = pads->priv->event_func; - event_user_data = pads->priv->event_user_data; buffer_func = pads->priv->buffer_func; GST_OBJECT_UNLOCK (pads); + pad = data->pad; + parent = GST_OBJECT_PARENT (pad); + switch (GST_EVENT_TYPE (event)) { case GST_EVENT_FLUSH_START: { /* forward event to unblock check_collected */ - if (event_func) { - res = event_func (pads, data, event, event_user_data); - } else { - GST_DEBUG_OBJECT (pad, "forwarding flush start"); - res = gst_pad_event_default (pad, parent, event); - } + GST_DEBUG_OBJECT (pad, "forwarding flush start"); + res = gst_pad_event_default (pad, parent, event); + event = NULL; /* now unblock the chain function. - * no cond per pad, so they all unblock, + * no cond per pad, so they all unblock, * non-flushing block again */ - GST_COLLECT_PADS2_STREAM_LOCK (pads); - GST_COLLECT_PADS2_STATE_SET (data, GST_COLLECT_PADS2_STATE_FLUSHING); - gst_collect_pads2_clear (pads, data); + GST_COLLECT_PADS_STREAM_LOCK (pads); + GST_COLLECT_PADS_STATE_SET (data, GST_COLLECT_PADS_STATE_FLUSHING); + gst_collect_pads_clear (pads, data); /* cater for possible default muxing functionality */ if (buffer_func) { /* restore to initial state */ - gst_collect_pads2_set_waiting (pads, data, TRUE); + gst_collect_pads_set_waiting (pads, data, TRUE); /* if the current pad is affected, reset state, recalculate later */ if (pads->priv->earliest_data == data) { unref_data (data); @@ -1701,84 +1743,81 @@ gst_collect_pads2_event (GstPad * pad, GstObject * parent, GstEvent * event) } } - GST_COLLECT_PADS2_STREAM_UNLOCK (pads); + GST_COLLECT_PADS_STREAM_UNLOCK (pads); - /* event already cleaned up by forwarding */ - res = TRUE; - goto done; + goto eat; } case GST_EVENT_FLUSH_STOP: { /* flush the 1 buffer queue */ - GST_COLLECT_PADS2_STREAM_LOCK (pads); - GST_COLLECT_PADS2_STATE_UNSET (data, GST_COLLECT_PADS2_STATE_FLUSHING); - gst_collect_pads2_clear (pads, data); + GST_COLLECT_PADS_STREAM_LOCK (pads); + GST_COLLECT_PADS_STATE_UNSET (data, GST_COLLECT_PADS_STATE_FLUSHING); + gst_collect_pads_clear (pads, data); /* we need new segment info after the flush */ gst_segment_init (&data->segment, GST_FORMAT_UNDEFINED); - GST_COLLECT_PADS2_STATE_UNSET (data, GST_COLLECT_PADS2_STATE_NEW_SEGMENT); + GST_COLLECT_PADS_STATE_UNSET (data, GST_COLLECT_PADS_STATE_NEW_SEGMENT); /* if the pad was EOS, remove the EOS flag and * decrement the number of eospads */ - if (G_UNLIKELY (GST_COLLECT_PADS2_STATE_IS_SET (data, - GST_COLLECT_PADS2_STATE_EOS))) { - if (!GST_COLLECT_PADS2_STATE_IS_SET (data, - GST_COLLECT_PADS2_STATE_WAITING)) + if (G_UNLIKELY (GST_COLLECT_PADS_STATE_IS_SET (data, + GST_COLLECT_PADS_STATE_EOS))) { + if (!GST_COLLECT_PADS_STATE_IS_SET (data, + GST_COLLECT_PADS_STATE_WAITING)) pads->priv->queuedpads++; pads->priv->eospads--; - GST_COLLECT_PADS2_STATE_UNSET (data, GST_COLLECT_PADS2_STATE_EOS); + GST_COLLECT_PADS_STATE_UNSET (data, GST_COLLECT_PADS_STATE_EOS); } - GST_COLLECT_PADS2_STREAM_UNLOCK (pads); + GST_COLLECT_PADS_STREAM_UNLOCK (pads); - /* forward event */ - goto forward_or_default; + goto forward; } case GST_EVENT_EOS: { - GST_COLLECT_PADS2_STREAM_LOCK (pads); + GST_COLLECT_PADS_STREAM_LOCK (pads); /* if the pad was not EOS, make it EOS and so we * have one more eospad */ - if (G_LIKELY (!GST_COLLECT_PADS2_STATE_IS_SET (data, - GST_COLLECT_PADS2_STATE_EOS))) { - GST_COLLECT_PADS2_STATE_SET (data, GST_COLLECT_PADS2_STATE_EOS); - if (!GST_COLLECT_PADS2_STATE_IS_SET (data, - GST_COLLECT_PADS2_STATE_WAITING)) + if (G_LIKELY (!GST_COLLECT_PADS_STATE_IS_SET (data, + GST_COLLECT_PADS_STATE_EOS))) { + GST_COLLECT_PADS_STATE_SET (data, GST_COLLECT_PADS_STATE_EOS); + if (!GST_COLLECT_PADS_STATE_IS_SET (data, + GST_COLLECT_PADS_STATE_WAITING)) pads->priv->queuedpads--; pads->priv->eospads++; } /* check if we need collecting anything, we ignore the result. */ - gst_collect_pads2_check_collected (pads); - GST_COLLECT_PADS2_STREAM_UNLOCK (pads); + gst_collect_pads_check_collected (pads); + GST_COLLECT_PADS_STREAM_UNLOCK (pads); - goto forward_or_eat; + goto eat; } case GST_EVENT_SEGMENT: { GstSegment seg; gint cmp_res; - GST_COLLECT_PADS2_STREAM_LOCK (pads); + GST_COLLECT_PADS_STREAM_LOCK (pads); gst_event_copy_segment (event, &seg); GST_DEBUG_OBJECT (data->pad, "got segment %" GST_SEGMENT_FORMAT, &seg); + /* default collection can not handle other segment formats than time */ + if (buffer_func && seg.format != GST_FORMAT_TIME) { + GST_WARNING_OBJECT (pads, "GstCollectPads default collecting " + "can only handle time segments. Non time segment ignored."); + goto newsegment_done; + } + data->segment = seg; - GST_COLLECT_PADS2_STATE_SET (data, GST_COLLECT_PADS2_STATE_NEW_SEGMENT); + GST_COLLECT_PADS_STATE_SET (data, GST_COLLECT_PADS_STATE_NEW_SEGMENT); /* default muxing functionality */ if (!buffer_func) goto newsegment_done; - /* default collection can not handle other segment formats than time */ - if (seg.format != GST_FORMAT_TIME) { - GST_ERROR_OBJECT (pads, "GstCollectPads2 default collecting " - "can only handle time segments."); - goto newsegment_done; - } - /* If oldest time is not known, or current pad got newsegment; * recalculate the state */ if (!pads->priv->earliest_data || pads->priv->earliest_data == data) { - gst_collect_pads2_recalculate_full (pads); + gst_collect_pads_recalculate_full (pads); goto newsegment_done; } @@ -1790,54 +1829,188 @@ gst_collect_pads2_event (GstPad * pad, GstObject * parent, GstEvent * event) if (cmp_res > 0) /* Stop waiting */ - gst_collect_pads2_set_waiting (pads, data, FALSE); + gst_collect_pads_set_waiting (pads, data, FALSE); newsegment_done: - GST_COLLECT_PADS2_STREAM_UNLOCK (pads); + GST_COLLECT_PADS_STREAM_UNLOCK (pads); /* we must not forward this event since multiple segments will be * accumulated and this is certainly not what we want. */ - goto forward_or_eat; + goto eat; } case GST_EVENT_CAPS: case GST_EVENT_STREAM_START: case GST_EVENT_STREAM_CONFIG: - goto forward_or_eat; + goto eat; default: /* forward other events */ - goto forward_or_default; + goto forward; } -forward_or_default: +eat: + if (event) + gst_event_unref (event); + return res; + +forward: + if (discard) + goto eat; + else + return gst_pad_event_default (pad, parent, event); +} + +static gboolean +gst_collect_pads_event_default_internal (GstCollectPads * pads, + GstCollectData * data, GstEvent * event, gpointer user_data) +{ + return gst_collect_pads_event_default (pads, data, event, FALSE); +} + +static gboolean +gst_collect_pads_event (GstPad * pad, GstObject * parent, GstEvent * event) +{ + gboolean res = FALSE, need_unlock = FALSE; + GstCollectData *data; + GstCollectPads *pads; + GstCollectPadsEventFunction event_func; + gpointer event_user_data; + + /* some magic to get the managing collect_pads */ + GST_OBJECT_LOCK (pad); + data = (GstCollectData *) gst_pad_get_element_private (pad); + if (G_UNLIKELY (data == NULL)) + goto pad_removed; + ref_data (data); + GST_OBJECT_UNLOCK (pad); + + res = FALSE; + + pads = data->collect; + + GST_DEBUG_OBJECT (data->pad, "Got %s event on sink pad", + GST_EVENT_TYPE_NAME (event)); + + GST_OBJECT_LOCK (pads); + event_func = pads->priv->event_func; + event_user_data = pads->priv->event_user_data; + GST_OBJECT_UNLOCK (pads); + if (GST_EVENT_IS_SERIALIZED (event)) { - GST_COLLECT_PADS2_STREAM_LOCK (pads); + GST_COLLECT_PADS_STREAM_LOCK (pads); need_unlock = TRUE; } - if (event_func) { + + if (G_LIKELY (event_func)) { res = event_func (pads, data, event, event_user_data); - } else { - GST_DEBUG_OBJECT (pad, "forwarding %s", GST_EVENT_TYPE_NAME (event)); - res = gst_pad_event_default (pad, parent, event); } + if (need_unlock) - GST_COLLECT_PADS2_STREAM_UNLOCK (pads); - goto done; + GST_COLLECT_PADS_STREAM_UNLOCK (pads); -forward_or_eat: - if (GST_EVENT_IS_SERIALIZED (event)) { - GST_COLLECT_PADS2_STREAM_LOCK (pads); + unref_data (data); + return res; + + /* ERRORS */ +pad_removed: + { + GST_DEBUG ("%s got removed from collectpads", GST_OBJECT_NAME (pad)); + GST_OBJECT_UNLOCK (pad); + return FALSE; + } +} + +/** + * gst_collect_pads_query_default: + * @pads: the collectspads to use + * @data: collect data of corresponding pad + * @query: query being processed + * @discard: process but do not send event downstream + * + * Default GstCollectPads query handling that elements should always + * chain up to to ensure proper operation. Element might however indicate + * query should not be forwarded downstream. + * + * Since: 0.11.x + */ +gboolean +gst_collect_pads_query_default (GstCollectPads * pads, GstCollectData * data, + GstQuery * query, gboolean discard) +{ + gboolean res = TRUE; + GstObject *parent; + GstPad *pad; + + pad = data->pad; + parent = GST_OBJECT_PARENT (pad); + + switch (GST_QUERY_TYPE (query)) { + case GST_QUERY_SEEKING: + { + GstFormat format; + + /* don't pass it along as some (file)sink might claim it does + * whereas with a collectpads in between that will not likely work */ + gst_query_parse_seeking (query, &format, NULL, NULL, NULL); + gst_query_set_seeking (query, format, FALSE, 0, -1); + res = TRUE; + discard = TRUE; + break; + } + default: + break; + } + + if (!discard) + return gst_pad_query_default (pad, parent, query); + else + return res; +} + +static gboolean +gst_collect_pads_query_default_internal (GstCollectPads * pads, + GstCollectData * data, GstQuery * query, gpointer user_data) +{ + return gst_collect_pads_query_default (pads, data, query, FALSE); +} + +static gboolean +gst_collect_pads_query (GstPad * pad, GstObject * parent, GstQuery * query) +{ + gboolean res = FALSE, need_unlock = FALSE; + GstCollectData *data; + GstCollectPads *pads; + GstCollectPadsQueryFunction query_func; + gpointer query_user_data; + + GST_DEBUG_OBJECT (pad, "Got %s query on sink pad", + GST_QUERY_TYPE_NAME (query)); + + /* some magic to get the managing collect_pads */ + GST_OBJECT_LOCK (pad); + data = (GstCollectData *) gst_pad_get_element_private (pad); + if (G_UNLIKELY (data == NULL)) + goto pad_removed; + ref_data (data); + GST_OBJECT_UNLOCK (pad); + + pads = data->collect; + + GST_OBJECT_LOCK (pads); + query_func = pads->priv->query_func; + query_user_data = pads->priv->query_user_data; + GST_OBJECT_UNLOCK (pads); + + if (GST_QUERY_IS_SERIALIZED (query)) { + GST_COLLECT_PADS_STREAM_LOCK (pads); need_unlock = TRUE; } - if (event_func) { - res = event_func (pads, data, event, event_user_data); - } else { - gst_event_unref (event); - res = TRUE; + + if (G_LIKELY (query_func)) { + res = query_func (pads, data, query, query_user_data); } + if (need_unlock) - GST_COLLECT_PADS2_STREAM_UNLOCK (pads); - goto done; + GST_COLLECT_PADS_STREAM_UNLOCK (pads); -done: unref_data (data); return res; @@ -1850,6 +2023,7 @@ pad_removed: } } + /* For each buffer we receive we check if our collected condition is reached * and if so we call the collected function. When this is done we check if * data has been unqueued. If data is still queued we wait holding the stream @@ -1857,19 +2031,19 @@ pad_removed: * collected */ static GstFlowReturn -gst_collect_pads2_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) +gst_collect_pads_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) { - GstCollectData2 *data; - GstCollectPads2 *pads; + GstCollectData *data; + GstCollectPads *pads; GstFlowReturn ret; GstBuffer **buffer_p; guint32 cookie; GST_DEBUG ("Got buffer for pad %s:%s", GST_DEBUG_PAD_NAME (pad)); - /* some magic to get the managing collect_pads2 */ + /* some magic to get the managing collect_pads */ GST_OBJECT_LOCK (pad); - data = (GstCollectData2 *) gst_pad_get_element_private (pad); + data = (GstCollectData *) gst_pad_get_element_private (pad); if (G_UNLIKELY (data == NULL)) goto no_data; ref_data (data); @@ -1877,17 +2051,17 @@ gst_collect_pads2_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) pads = data->collect; - GST_COLLECT_PADS2_STREAM_LOCK (pads); + GST_COLLECT_PADS_STREAM_LOCK (pads); /* if not started, bail out */ if (G_UNLIKELY (!pads->priv->started)) goto not_started; /* check if this pad is flushing */ - if (G_UNLIKELY (GST_COLLECT_PADS2_STATE_IS_SET (data, - GST_COLLECT_PADS2_STATE_FLUSHING))) + if (G_UNLIKELY (GST_COLLECT_PADS_STATE_IS_SET (data, + GST_COLLECT_PADS_STATE_FLUSHING))) goto flushing; /* pad was EOS, we can refuse this data */ - if (G_UNLIKELY (GST_COLLECT_PADS2_STATE_IS_SET (data, - GST_COLLECT_PADS2_STATE_EOS))) + if (G_UNLIKELY (GST_COLLECT_PADS_STATE_IS_SET (data, + GST_COLLECT_PADS_STATE_EOS))) goto eos; /* see if we need to clip */ @@ -1911,7 +2085,7 @@ gst_collect_pads2_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) GST_DEBUG_PAD_NAME (pad)); /* One more pad has data queued */ - if (GST_COLLECT_PADS2_STATE_IS_SET (data, GST_COLLECT_PADS2_STATE_WAITING)) + if (GST_COLLECT_PADS_STATE_IS_SET (data, GST_COLLECT_PADS_STATE_WAITING)) pads->priv->queuedpads++; buffer_p = &data->buffer; gst_buffer_replace (buffer_p, buffer); @@ -1928,7 +2102,7 @@ gst_collect_pads2_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) do { /* Check if our collected condition is matched and call the collected * function if it is */ - ret = gst_collect_pads2_check_collected (pads); + ret = gst_collect_pads_check_collected (pads); /* when an error occurs, we want to report this back to the caller ASAP * without having to block if the buffer was not popped */ if (G_UNLIKELY (ret != GST_FLOW_OK)) @@ -1944,7 +2118,7 @@ gst_collect_pads2_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) * point. Putting it here also makes this thread ignores any evt it raised * itself (as is a usual WAIT semantic). */ - GST_COLLECT_PADS2_EVT_INIT (cookie); + GST_COLLECT_PADS_EVT_INIT (cookie); /* pad could be removed and re-added */ unref_data (data); @@ -1962,9 +2136,9 @@ gst_collect_pads2_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) * can get stopped or flushed as well. We can however not get EOS * because we still hold the STREAM_LOCK. */ - GST_COLLECT_PADS2_STREAM_UNLOCK (pads); - GST_COLLECT_PADS2_EVT_WAIT (pads, cookie); - GST_COLLECT_PADS2_STREAM_LOCK (pads); + GST_COLLECT_PADS_STREAM_UNLOCK (pads); + GST_COLLECT_PADS_EVT_WAIT (pads, cookie); + GST_COLLECT_PADS_STREAM_LOCK (pads); GST_DEBUG_OBJECT (pads, "Pad %s:%s resuming", GST_DEBUG_PAD_NAME (pad)); @@ -1972,14 +2146,14 @@ gst_collect_pads2_chain (GstPad * pad, GstObject * parent, GstBuffer * buffer) if (G_UNLIKELY (!pads->priv->started)) goto not_started; /* check if this pad is flushing */ - if (G_UNLIKELY (GST_COLLECT_PADS2_STATE_IS_SET (data, - GST_COLLECT_PADS2_STATE_FLUSHING))) + if (G_UNLIKELY (GST_COLLECT_PADS_STATE_IS_SET (data, + GST_COLLECT_PADS_STATE_FLUSHING))) goto flushing; } while (data->buffer != NULL); unlock_done: - GST_COLLECT_PADS2_STREAM_UNLOCK (pads); + GST_COLLECT_PADS_STREAM_UNLOCK (pads); unref_data (data); if (buffer) gst_buffer_unref (buffer); @@ -2003,14 +2177,14 @@ no_data: not_started: { GST_DEBUG ("not started"); - gst_collect_pads2_clear (pads, data); + gst_collect_pads_clear (pads, data); ret = GST_FLOW_FLUSHING; goto unlock_done; } flushing: { GST_DEBUG ("pad %s:%s is flushing", GST_DEBUG_PAD_NAME (pad)); - gst_collect_pads2_clear (pads, data); + gst_collect_pads_clear (pads, data); ret = GST_FLOW_FLUSHING; goto unlock_done; } @@ -2033,7 +2207,7 @@ error: /* we print the error, the element should post a reasonable error * message for fatal errors */ GST_DEBUG ("collect failed, reason %d (%s)", ret, gst_flow_get_name (ret)); - gst_collect_pads2_clear (pads, data); + gst_collect_pads_clear (pads, data); goto unlock_done; } } diff --git a/libs/gst/base/gstcollectpads.h b/libs/gst/base/gstcollectpads.h new file mode 100644 index 0000000..b4dfa75 --- /dev/null +++ b/libs/gst/base/gstcollectpads.h @@ -0,0 +1,396 @@ +/* GStreamer + * Copyright (C) 2005 Wim Taymans <wim@fluendo.com> + * Copyright (C) 2008 Mark Nauwelaerts <mnauw@users.sourceforge.net> + * + * gstcollectpads.h: + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, + * Boston, MA 02111-1307, USA. + */ + +#ifndef __GST_COLLECT_PADS_H__ +#define __GST_COLLECT_PADS_H__ + +#include <gst/gst.h> + +G_BEGIN_DECLS + +#define GST_TYPE_COLLECT_PADS (gst_collect_pads_get_type()) +#define GST_COLLECT_PADS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_COLLECT_PADS,GstCollectPads)) +#define GST_COLLECT_PADS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_COLLECT_PADS,GstCollectPadsClass)) +#define GST_COLLECT_PADS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_COLLECT_PADS,GstCollectPadsClass)) +#define GST_IS_COLLECT_PADS(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_COLLECT_PADS)) +#define GST_IS_COLLECT_PADS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_COLLECT_PADS)) + +typedef struct _GstCollectData GstCollectData; +typedef struct _GstCollectDataPrivate GstCollectDataPrivate; +typedef struct _GstCollectPads GstCollectPads; +typedef struct _GstCollectPadsPrivate GstCollectPadsPrivate; +typedef struct _GstCollectPadsClass GstCollectPadsClass; + +/** + * GstCollectDataDestroyNotify: + * @data: the #GstCollectData that will be freed + * + * A function that will be called when the #GstCollectData will be freed. + * It is passed the pointer to the structure and should free any custom + * memory and resources allocated for it. + * + * Since: 0.10.36 + */ +typedef void (*GstCollectDataDestroyNotify) (GstCollectData *data); + +/** + * GstCollectPadsStateFlags: + * @GST_COLLECT_PADS_STATE_EOS: Set if collectdata's pad is EOS. + * @GST_COLLECT_PADS_STATE_FLUSHING: Set if collectdata's pad is flushing. + * @GST_COLLECT_PADS_STATE_NEW_SEGMENT: Set if collectdata's pad received a + * new_segment event. + * @GST_COLLECT_PADS_STATE_WAITING: Set if collectdata's pad must be waited + * for when collecting. + * @GST_COLLECT_PADS_STATE_LOCKED: Set collectdata's pad WAITING state must + * not be changed. + * #GstCollectPadsStateFlags indicate private state of a collectdata('s pad). + * + * Since: 0.10.36 + */ +typedef enum { + GST_COLLECT_PADS_STATE_EOS = 1 << 0, + GST_COLLECT_PADS_STATE_FLUSHING = 1 << 1, + GST_COLLECT_PADS_STATE_NEW_SEGMENT = 1 << 2, + GST_COLLECT_PADS_STATE_WAITING = 1 << 3, + GST_COLLECT_PADS_STATE_LOCKED = 1 << 4 +} GstCollectPadsStateFlags; + +/** + * GST_COLLECT_PADS_STATE: + * @data: a #GstCollectData. + * + * A flags word containing #GstCollectPadsStateFlags flags set + * on this collected pad. + * + * Since: 0.10.36 + */ +#define GST_COLLECT_PADS_STATE(data) (((GstCollectData *) data)->state) +/** + * GST_COLLECT_PADS_STATE_IS_SET: + * @data: a #GstCollectData. + * @flag: the #GstCollectPadsStateFlags to check. + * + * Gives the status of a specific flag on a collected pad. + * + * Since: 0.10.36 + */ +#define GST_COLLECT_PADS_STATE_IS_SET(data,flag) !!(GST_COLLECT_PADS_STATE (data) & flag) +/** + * GST_COLLECT_PADS_STATE_SET: + * @data: a #GstCollectData. + * @flag: the #GstCollectPadsStateFlags to set. + * + * Sets a state flag on a collected pad. + * + * Since: 0.10.36 + */ +#define GST_COLLECT_PADS_STATE_SET(data,flag) (GST_COLLECT_PADS_STATE (data) |= flag) +/** + * GST_COLLECT_PADS_STATE_UNSET: + * @data: a #GstCollectData. + * @flag: the #GstCollectPadsStateFlags to clear. + * + * Clears a state flag on a collected pad. + * + * Since: 0.10.36 + */ +#define GST_COLLECT_PADS_STATE_UNSET(data,flag) (GST_COLLECT_PADS_STATE (data) &= ~(flag)) + +/** + * GstCollectData: + * @collect: owner #GstCollectPads + * @pad: #GstPad managed by this data + * @buffer: currently queued buffer. + * @pos: position in the buffer + * @segment: last segment received. + * + * Structure used by the collect_pads. + * + * Since: 0.10.36 + */ +struct _GstCollectData +{ + /* with STREAM_LOCK of @collect */ + GstCollectPads *collect; + GstPad *pad; + GstBuffer *buffer; + guint pos; + GstSegment segment; + + /*< private >*/ + /* state: bitfield for easier extension; + * eos, flushing, new_segment, waiting */ + GstCollectPadsStateFlags state; + + GstCollectDataPrivate *priv; + + gpointer _gst_reserved[GST_PADDING]; +}; + +/** + * GstCollectPadsFunction: + * @pads: the #GstCollectPads that trigered the callback + * @user_data: user data passed to gst_collect_pads_set_function() + * + * A function that will be called when all pads have received data. + * + * Returns: #GST_FLOW_OK for success + * + * Since: 0.10.36 + */ +typedef GstFlowReturn (*GstCollectPadsFunction) (GstCollectPads *pads, gpointer user_data); + +/** + * GstCollectPadsBufferFunction: + * @pads: the #GstCollectPads that trigered the callback + * @data: the #GstCollectData of pad that has received the buffer + * @buffer: the #GstBuffer + * @user_data: user data passed to gst_collect_pads_set_buffer_function() + * + * A function that will be called when a (considered oldest) buffer can be muxed. + * If all pads have reached EOS, this function is called with NULL @buffer + * and NULL @data. + * + * Returns: #GST_FLOW_OK for success + * + * Since: 0.10.36 + */ +typedef GstFlowReturn (*GstCollectPadsBufferFunction) (GstCollectPads *pads, GstCollectData *data, + GstBuffer *buffer, gpointer user_data); + +/** + * GstCollectPadsCompareFunction: + * @pads: the #GstCollectPads that is comparing the timestamps + * @data1: the first #GstCollectData + * @timestamp1: the first timestamp + * @data2: the second #GstCollectData + * @timestamp2: the second timestamp + * @user_data: user data passed to gst_collect_pads_set_compare_function() + * + * A function for comparing two timestamps of buffers or newsegments collected on one pad. + * + * Returns: Integer less than zero when first timestamp is deemed older than the second one. + * Zero if the timestamps are deemed equally old. + * Integer greate than zero when second timestamp is deemed older than the first one. + * + * Since: 0.10.36 + */ +typedef gint (*GstCollectPadsCompareFunction) (GstCollectPads *pads, + GstCollectData * data1, GstClockTime timestamp1, + GstCollectData * data2, GstClockTime timestamp2, + gpointer user_data); + +/** + * GstCollectPadsEventFunction: + * @pads: the #GstCollectPads that trigered the callback + * @pad: the #GstPad that received an event + * @event: the #GstEvent received + * @user_data: user data passed to gst_collect_pads_set_event_function() + * + * A function that will be called while processing an event. It takes + * ownership of the event and is responsible for chaining up (to + * gst_collect_pads_event_default()) or dropping events (such typical cases + * being handled by the default handler). + * + * Returns: %TRUE if the pad could handle the event + * + * Since: 0.10.36 + */ +typedef gboolean (*GstCollectPadsEventFunction) (GstCollectPads *pads, GstCollectData * pad, + GstEvent * event, gpointer user_data); + + +/** + * GstCollectPadsQueryFunction: + * @pads: the #GstCollectPads that trigered the callback + * @pad: the #GstPad that received an event + * @query: the #GstEvent received + * @user_data: user data passed to gst_collect_pads_set_query_function() + * + * A function that will be called while processing a query. It takes + * ownership of the query and is responsible for chaining up (to + * events downstream (with gst_pad_event_default()). + * + * Returns: %TRUE if the pad could handle the event + * + * Since: 0.11.x + */ +typedef gboolean (*GstCollectPadsQueryFunction) (GstCollectPads *pads, GstCollectData * pad, + GstQuery * query, gpointer user_data); + +/** + * GstCollectPadsClipFunction: + * @pads: a #GstCollectPads + * @data: a #GstCollectData + * @inbuffer: the input #GstBuffer + * @outbuffer: the output #GstBuffer + * @user_data: user data + * + * A function that will be called when @inbuffer is received on the pad managed + * by @data in the collecpad object @pads. + * + * The function should use the segment of @data and the negotiated media type on + * the pad to perform clipping of @inbuffer. + * + * This function takes ownership of @inbuffer and should output a buffer in + * @outbuffer or return %NULL in @outbuffer if the buffer should be dropped. + * + * Returns: a #GstFlowReturn that corresponds to the result of clipping. + * + * Since: 0.10.36 + */ +typedef GstFlowReturn (*GstCollectPadsClipFunction) (GstCollectPads *pads, GstCollectData *data, + GstBuffer *inbuffer, GstBuffer **outbuffer, + gpointer user_data); + +/** + * GST_COLLECT_PADS_GET_STREAM_LOCK: + * @pads: a #GstCollectPads + * + * Get the stream lock of @pads. The stream lock is used to coordinate and + * serialize execution among the various streams being collected, and in + * protecting the resources used to accomplish this. + * + * Since: 0.10.36 + */ +#define GST_COLLECT_PADS_GET_STREAM_LOCK(pads) (&((GstCollectPads *)pads)->stream_lock) +/** + * GST_COLLECT_PADS_STREAM_LOCK: + * @pads: a #GstCollectPads + * + * Lock the stream lock of @pads. + * + * Since: 0.10.36 + */ +#define GST_COLLECT_PADS_STREAM_LOCK(pads) g_rec_mutex_lock(GST_COLLECT_PADS_GET_STREAM_LOCK (pads)) +/** + * GST_COLLECT_PADS_STREAM_UNLOCK: + * @pads: a #GstCollectPads + * + * Unlock the stream lock of @pads. + * + * Since: 0.10.36 + */ +#define GST_COLLECT_PADS_STREAM_UNLOCK(pads) g_rec_mutex_unlock(GST_COLLECT_PADS_GET_STREAM_LOCK (pads)) + +/** + * GstCollectPads: + * @data: #GList of #GstCollectData managed by this #GstCollectPads. + * + * Collectpads object. + * + * Since: 0.10.36 + */ +struct _GstCollectPads { + GstObject object; + + /*< public >*/ /* with LOCK and/or STREAM_LOCK */ + GSList *data; /* list of CollectData items */ + + /*< private >*/ + GRecMutex stream_lock; /* used to serialize collection among several streams */ + + GstCollectPadsPrivate *priv; + + gpointer _gst_reserved[GST_PADDING]; +}; + +struct _GstCollectPadsClass { + GstObjectClass parent_class; + + /*< private >*/ + gpointer _gst_reserved[GST_PADDING]; +}; + +GType gst_collect_pads_get_type(void); + +/* creating the object */ +GstCollectPads* gst_collect_pads_new (void); + +/* set the callbacks */ +void gst_collect_pads_set_function (GstCollectPads *pads, + GstCollectPadsFunction func, + gpointer user_data); +void gst_collect_pads_set_buffer_function (GstCollectPads *pads, + GstCollectPadsBufferFunction func, + gpointer user_data); +void gst_collect_pads_set_event_function (GstCollectPads *pads, + GstCollectPadsEventFunction func, + gpointer user_data); +void gst_collect_pads_set_query_function (GstCollectPads *pads, + GstCollectPadsQueryFunction func, + gpointer user_data); +void gst_collect_pads_set_compare_function (GstCollectPads *pads, + GstCollectPadsCompareFunction func, + gpointer user_data); +void gst_collect_pads_set_clip_function (GstCollectPads *pads, + GstCollectPadsClipFunction clipfunc, + gpointer user_data); + +/* pad management */ +GstCollectData* gst_collect_pads_add_pad (GstCollectPads *pads, GstPad *pad, guint size); +GstCollectData* gst_collect_pads_add_pad_full (GstCollectPads *pads, GstPad *pad, guint size, + GstCollectDataDestroyNotify destroy_notify, + gboolean lock); +gboolean gst_collect_pads_remove_pad (GstCollectPads *pads, GstPad *pad); +gboolean gst_collect_pads_is_active (GstCollectPads *pads, GstPad *pad); + +/* start/stop collection */ +GstFlowReturn gst_collect_pads_collect (GstCollectPads *pads); +GstFlowReturn gst_collect_pads_collect_range (GstCollectPads *pads, guint64 offset, guint length); + +void gst_collect_pads_start (GstCollectPads *pads); +void gst_collect_pads_stop (GstCollectPads *pads); +void gst_collect_pads_set_flushing (GstCollectPads *pads, gboolean flushing); + +/* get collected buffers */ +GstBuffer* gst_collect_pads_peek (GstCollectPads *pads, GstCollectData *data); +GstBuffer* gst_collect_pads_pop (GstCollectPads *pads, GstCollectData *data); + +/* get collected bytes */ +guint gst_collect_pads_available (GstCollectPads *pads); +guint gst_collect_pads_flush (GstCollectPads *pads, GstCollectData *data, + guint size); +GstBuffer* gst_collect_pads_read_buffer (GstCollectPads * pads, GstCollectData * data, + guint size); +GstBuffer* gst_collect_pads_take_buffer (GstCollectPads * pads, GstCollectData * data, + guint size); + +/* setting and unsetting waiting mode */ +void gst_collect_pads_set_waiting (GstCollectPads *pads, GstCollectData *data, + gboolean waiting); + +/* convenience helper */ +GstFlowReturn gst_collect_pads_clip_running_time (GstCollectPads * pads, + GstCollectData * cdata, GstBuffer * buf, GstBuffer ** outbuf, + gpointer user_data); + +/* default handlers */ +gboolean gst_collect_pads_event_default (GstCollectPads * pads, GstCollectData * data, + GstEvent * event, gboolean discard); +gboolean gst_collect_pads_query_default (GstCollectPads * pads, GstCollectData * data, + GstQuery * query, gboolean discard); + + +G_END_DECLS + +#endif /* __GST_COLLECT_PADS_H__ */ diff --git a/libs/gst/base/gstcollectpads2.h b/libs/gst/base/gstcollectpads2.h deleted file mode 100644 index e8bfcf2..0000000 --- a/libs/gst/base/gstcollectpads2.h +++ /dev/null @@ -1,371 +0,0 @@ -/* GStreamer - * Copyright (C) 2005 Wim Taymans <wim@fluendo.com> - * Copyright (C) 2008 Mark Nauwelaerts <mnauw@users.sourceforge.net> - * - * gstcollectpads2.h: - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef __GST_COLLECT_PADS2_H__ -#define __GST_COLLECT_PADS2_H__ - -#include <gst/gst.h> - -G_BEGIN_DECLS - -#define GST_TYPE_COLLECT_PADS2 (gst_collect_pads2_get_type()) -#define GST_COLLECT_PADS2(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_COLLECT_PADS2,GstCollectPads2)) -#define GST_COLLECT_PADS2_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_COLLECT_PADS2,GstCollectPads2Class)) -#define GST_COLLECT_PADS2_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj),GST_TYPE_COLLECT_PADS2,GstCollectPads2Class)) -#define GST_IS_COLLECT_PADS2(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_COLLECT_PADS2)) -#define GST_IS_COLLECT_PADS2_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_COLLECT_PADS2)) - -typedef struct _GstCollectData2 GstCollectData2; -typedef struct _GstCollectData2Private GstCollectData2Private; -typedef struct _GstCollectPads2 GstCollectPads2; -typedef struct _GstCollectPads2Private GstCollectPads2Private; -typedef struct _GstCollectPads2Class GstCollectPads2Class; - -/** - * GstCollectData2DestroyNotify: - * @data: the #GstCollectData2 that will be freed - * - * A function that will be called when the #GstCollectData2 will be freed. - * It is passed the pointer to the structure and should free any custom - * memory and resources allocated for it. - * - * Since: 0.10.36 - */ -typedef void (*GstCollectData2DestroyNotify) (GstCollectData2 *data); - -/** - * GstCollectPads2StateFlags: - * @GST_COLLECT_PADS2_STATE_EOS: Set if collectdata's pad is EOS. - * @GST_COLLECT_PADS2_STATE_FLUSHING: Set if collectdata's pad is flushing. - * @GST_COLLECT_PADS2_STATE_NEW_SEGMENT: Set if collectdata's pad received a - * new_segment event. - * @GST_COLLECT_PADS2_STATE_WAITING: Set if collectdata's pad must be waited - * for when collecting. - * @GST_COLLECT_PADS2_STATE_LOCKED: Set collectdata's pad WAITING state must - * not be changed. - * #GstCollectPads2StateFlags indicate private state of a collectdata('s pad). - * - * Since: 0.10.36 - */ -typedef enum { - GST_COLLECT_PADS2_STATE_EOS = 1 << 0, - GST_COLLECT_PADS2_STATE_FLUSHING = 1 << 1, - GST_COLLECT_PADS2_STATE_NEW_SEGMENT = 1 << 2, - GST_COLLECT_PADS2_STATE_WAITING = 1 << 3, - GST_COLLECT_PADS2_STATE_LOCKED = 1 << 4 -} GstCollectPads2StateFlags; - -/** - * GST_COLLECT_PADS2_STATE: - * @data: a #GstCollectData2. - * - * A flags word containing #GstCollectPads2StateFlags flags set - * on this collected pad. - * - * Since: 0.10.36 - */ -#define GST_COLLECT_PADS2_STATE(data) (((GstCollectData2 *) data)->state) -/** - * GST_COLLECT_PADS2_STATE_IS_SET: - * @data: a #GstCollectData2. - * @flag: the #GstCollectPads2StateFlags to check. - * - * Gives the status of a specific flag on a collected pad. - * - * Since: 0.10.36 - */ -#define GST_COLLECT_PADS2_STATE_IS_SET(data,flag) !!(GST_COLLECT_PADS2_STATE (data) & flag) -/** - * GST_COLLECT_PADS2_STATE_SET: - * @data: a #GstCollectData2. - * @flag: the #GstCollectPads2StateFlags to set. - * - * Sets a state flag on a collected pad. - * - * Since: 0.10.36 - */ -#define GST_COLLECT_PADS2_STATE_SET(data,flag) (GST_COLLECT_PADS2_STATE (data) |= flag) -/** - * GST_COLLECT_PADS2_STATE_UNSET: - * @data: a #GstCollectData2. - * @flag: the #GstCollectPads2StateFlags to clear. - * - * Clears a state flag on a collected pad. - * - * Since: 0.10.36 - */ -#define GST_COLLECT_PADS2_STATE_UNSET(data,flag) (GST_COLLECT_PADS2_STATE (data) &= ~(flag)) - -/** - * GstCollectData2: - * @collect: owner #GstCollectPads2 - * @pad: #GstPad managed by this data - * @buffer: currently queued buffer. - * @pos: position in the buffer - * @segment: last segment received. - * - * Structure used by the collect_pads2. - * - * Since: 0.10.36 - */ -struct _GstCollectData2 -{ - /* with STREAM_LOCK of @collect */ - GstCollectPads2 *collect; - GstPad *pad; - GstBuffer *buffer; - guint pos; - GstSegment segment; - - /*< private >*/ - /* state: bitfield for easier extension; - * eos, flushing, new_segment, waiting */ - GstCollectPads2StateFlags state; - - GstCollectData2Private *priv; - - gpointer _gst_reserved[GST_PADDING]; -}; - -/** - * GstCollectPads2Function: - * @pads: the #GstCollectPads2 that trigered the callback - * @user_data: user data passed to gst_collect_pads2_set_function() - * - * A function that will be called when all pads have received data. - * - * Returns: #GST_FLOW_OK for success - * - * Since: 0.10.36 - */ -typedef GstFlowReturn (*GstCollectPads2Function) (GstCollectPads2 *pads, gpointer user_data); - -/** - * GstCollectPads2BufferFunction: - * @pads: the #GstCollectPads2 that trigered the callback - * @data: the #GstCollectData2 of pad that has received the buffer - * @buffer: the #GstBuffer - * @user_data: user data passed to gst_collect_pads2_set_buffer_function() - * - * A function that will be called when a (considered oldest) buffer can be muxed. - * If all pads have reached EOS, this function is called with NULL @buffer - * and NULL @data. - * - * Returns: #GST_FLOW_OK for success - * - * Since: 0.10.36 - */ -typedef GstFlowReturn (*GstCollectPads2BufferFunction) (GstCollectPads2 *pads, GstCollectData2 *data, - GstBuffer *buffer, gpointer user_data); - -/** - * GstCollectPads2CompareFunction: - * @pads: the #GstCollectPads that is comparing the timestamps - * @data1: the first #GstCollectData2 - * @timestamp1: the first timestamp - * @data2: the second #GstCollectData2 - * @timestamp2: the second timestamp - * @user_data: user data passed to gst_collect_pads2_set_compare_function() - * - * A function for comparing two timestamps of buffers or newsegments collected on one pad. - * - * Returns: Integer less than zero when first timestamp is deemed older than the second one. - * Zero if the timestamps are deemed equally old. - * Integer greate than zero when second timestamp is deemed older than the first one. - * - * Since: 0.10.36 - */ -typedef gint (*GstCollectPads2CompareFunction) (GstCollectPads2 *pads, - GstCollectData2 * data1, GstClockTime timestamp1, - GstCollectData2 * data2, GstClockTime timestamp2, - gpointer user_data); - -/** - * GstCollectPads2EventFunction: - * @pads: the #GstCollectPads2 that trigered the callback - * @pad: the #GstPad that received an event - * @event: the #GstEvent received - * @user_data: user data passed to gst_collect_pads2_set_event_function() - * - * A function that will be called while processing an event. It takes - * ownership of the event and is responsible for forwarding - * events downstream (with gst_pad_event_default()) or dropping events. - * - * The STREAM_START, CAPS, STREAM_CONFIG, SEGMENT and EOS events should - * usually be dropped by this function. - * - * Returns: %TRUE if the pad could handle the event - * - * Since: 0.10.36 - */ -typedef gboolean (*GstCollectPads2EventFunction) (GstCollectPads2 *pads, GstCollectData2 * pad, - GstEvent * event, gpointer user_data); - - -/** - * GstCollectPads2ClipFunction: - * @pads: a #GstCollectPads2 - * @data: a #GstCollectData2 - * @inbuffer: the input #GstBuffer - * @outbuffer: the output #GstBuffer - * @user_data: user data - * - * A function that will be called when @inbuffer is received on the pad managed - * by @data in the collecpad object @pads. - * - * The function should use the segment of @data and the negotiated media type on - * the pad to perform clipping of @inbuffer. - * - * This function takes ownership of @inbuffer and should output a buffer in - * @outbuffer or return %NULL in @outbuffer if the buffer should be dropped. - * - * Returns: a #GstFlowReturn that corresponds to the result of clipping. - * - * Since: 0.10.36 - */ -typedef GstFlowReturn (*GstCollectPads2ClipFunction) (GstCollectPads2 *pads, GstCollectData2 *data, - GstBuffer *inbuffer, GstBuffer **outbuffer, - gpointer user_data); - -/** - * GST_COLLECT_PADS2_GET_STREAM_LOCK: - * @pads: a #GstCollectPads2 - * - * Get the stream lock of @pads. The stream lock is used to coordinate and - * serialize execution among the various streams being collected, and in - * protecting the resources used to accomplish this. - * - * Since: 0.10.36 - */ -#define GST_COLLECT_PADS2_GET_STREAM_LOCK(pads) (&((GstCollectPads2 *)pads)->stream_lock) -/** - * GST_COLLECT_PADS2_STREAM_LOCK: - * @pads: a #GstCollectPads2 - * - * Lock the stream lock of @pads. - * - * Since: 0.10.36 - */ -#define GST_COLLECT_PADS2_STREAM_LOCK(pads) g_rec_mutex_lock(GST_COLLECT_PADS2_GET_STREAM_LOCK (pads)) -/** - * GST_COLLECT_PADS2_STREAM_UNLOCK: - * @pads: a #GstCollectPads2 - * - * Unlock the stream lock of @pads. - * - * Since: 0.10.36 - */ -#define GST_COLLECT_PADS2_STREAM_UNLOCK(pads) g_rec_mutex_unlock(GST_COLLECT_PADS2_GET_STREAM_LOCK (pads)) - -/** - * GstCollectPads2: - * @data: #GList of #GstCollectData2 managed by this #GstCollectPads2. - * - * Collectpads object. - * - * Since: 0.10.36 - */ -struct _GstCollectPads2 { - GstObject object; - - /*< public >*/ /* with LOCK and/or STREAM_LOCK */ - GSList *data; /* list of CollectData items */ - - /*< private >*/ - GRecMutex stream_lock; /* used to serialize collection among several streams */ - - GstCollectPads2Private *priv; - - gpointer _gst_reserved[GST_PADDING]; -}; - -struct _GstCollectPads2Class { - GstObjectClass parent_class; - - /*< private >*/ - gpointer _gst_reserved[GST_PADDING]; -}; - -GType gst_collect_pads2_get_type(void); - -/* creating the object */ -GstCollectPads2* gst_collect_pads2_new (void); - -/* set the callbacks */ -void gst_collect_pads2_set_function (GstCollectPads2 *pads, - GstCollectPads2Function func, - gpointer user_data); -void gst_collect_pads2_set_buffer_function (GstCollectPads2 *pads, - GstCollectPads2BufferFunction func, - gpointer user_data); -void gst_collect_pads2_set_event_function (GstCollectPads2 *pads, - GstCollectPads2EventFunction func, - gpointer user_data); -void gst_collect_pads2_set_compare_function (GstCollectPads2 *pads, - GstCollectPads2CompareFunction func, - gpointer user_data); -void gst_collect_pads2_set_clip_function (GstCollectPads2 *pads, - GstCollectPads2ClipFunction clipfunc, - gpointer user_data); - -/* pad management */ -GstCollectData2* gst_collect_pads2_add_pad (GstCollectPads2 *pads, GstPad *pad, guint size); -GstCollectData2* gst_collect_pads2_add_pad_full (GstCollectPads2 *pads, GstPad *pad, guint size, - GstCollectData2DestroyNotify destroy_notify, - gboolean lock); -gboolean gst_collect_pads2_remove_pad (GstCollectPads2 *pads, GstPad *pad); -gboolean gst_collect_pads2_is_active (GstCollectPads2 *pads, GstPad *pad); - -/* start/stop collection */ -GstFlowReturn gst_collect_pads2_collect (GstCollectPads2 *pads); -GstFlowReturn gst_collect_pads2_collect_range (GstCollectPads2 *pads, guint64 offset, guint length); - -void gst_collect_pads2_start (GstCollectPads2 *pads); -void gst_collect_pads2_stop (GstCollectPads2 *pads); -void gst_collect_pads2_set_flushing (GstCollectPads2 *pads, gboolean flushing); - -/* get collected buffers */ -GstBuffer* gst_collect_pads2_peek (GstCollectPads2 *pads, GstCollectData2 *data); -GstBuffer* gst_collect_pads2_pop (GstCollectPads2 *pads, GstCollectData2 *data); - -/* get collected bytes */ -guint gst_collect_pads2_available (GstCollectPads2 *pads); -guint gst_collect_pads2_flush (GstCollectPads2 *pads, GstCollectData2 *data, - guint size); -GstBuffer* gst_collect_pads2_read_buffer (GstCollectPads2 * pads, GstCollectData2 * data, - guint size); -GstBuffer* gst_collect_pads2_take_buffer (GstCollectPads2 * pads, GstCollectData2 * data, - guint size); - -/* setting and unsetting waiting mode */ -void gst_collect_pads2_set_waiting (GstCollectPads2 *pads, GstCollectData2 *data, - gboolean waiting); - -/* convenience helper */ -GstFlowReturn gst_collect_pads2_clip_running_time (GstCollectPads2 * pads, - GstCollectData2 * cdata, GstBuffer * buf, GstBuffer ** outbuf, - gpointer user_data); - - -G_END_DECLS - -#endif /* __GST_COLLECT_PADS22_H__ */ diff --git a/libs/gst/base/gsttypefindhelper.c b/libs/gst/base/gsttypefindhelper.c index 41f66bf..cdb267a 100644 --- a/libs/gst/base/gsttypefindhelper.c +++ b/libs/gst/base/gsttypefindhelper.c @@ -308,9 +308,8 @@ gst_type_find_helper_get_range (GstObject * obj, GstObject * parent, extension); for (l = type_list; l; l = next) { + const gchar *const *ext; GstTypeFindFactory *factory; - gint i; - gchar **ext; next = l->next; @@ -323,8 +322,8 @@ gst_type_find_helper_get_range (GstObject * obj, GstObject * parent, GST_LOG_OBJECT (obj, "testing factory %s for extension %s", GST_OBJECT_NAME (factory), extension); - for (i = 0; ext[i]; i++) { - if (strcmp (ext[i], extension) == 0) { + while (*ext != NULL) { + if (strcmp (*ext, extension) == 0) { /* found extension, move in front */ GST_LOG_OBJECT (obj, "moving typefind for extension %s to head", extension); @@ -336,6 +335,7 @@ gst_type_find_helper_get_range (GstObject * obj, GstObject * parent, pos++; break; } + ++ext; } } } @@ -617,13 +617,12 @@ gst_type_find_helper_for_extension (GstObject * obj, const gchar * extension) for (l = type_list; l; l = g_list_next (l)) { GstTypeFindFactory *factory; - gchar **ext; - gint i; + const gchar *const *ext; factory = GST_TYPE_FIND_FACTORY (l->data); /* we only want to check those factories without a function */ - if (factory->function != NULL) + if (gst_type_find_factory_has_function (factory)) continue; /* get the extension that this typefind factory can handle */ @@ -633,14 +632,15 @@ gst_type_find_helper_for_extension (GstObject * obj, const gchar * extension) /* there are extension, see if one of them matches the requested * extension */ - for (i = 0; ext[i]; i++) { - if (strcmp (ext[i], extension) == 0) { + while (*ext != NULL) { + if (strcmp (*ext, extension) == 0) { /* we found a matching extension, take the caps */ if ((result = gst_type_find_factory_get_caps (factory))) { gst_caps_ref (result); goto done; } } + ++ext; } } done: diff --git a/libs/gst/check/Makefile.in b/libs/gst/check/Makefile.in index e1f5ac4..617f5a6 100644 --- a/libs/gst/check/Makefile.in +++ b/libs/gst/check/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -637,7 +637,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) done; \ test -z "$$list2" || { \ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(libdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -724,7 +724,7 @@ install-girDATA: $(gir_DATA) @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(girdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -745,7 +745,7 @@ install-typelibsDATA: $(typelibs_DATA) @list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(typelibsdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(typelibsdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(typelibsdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -766,7 +766,7 @@ install-libgstcheck_@GST_API_VERSION@includeHEADERS: $(libgstcheck_@GST_API_VERS @list='$(libgstcheck_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstcheck_@GST_API_VERSION@includedir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(libgstcheck_@GST_API_VERSION@includedir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(libgstcheck_@GST_API_VERSION@includedir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(libgstcheck_@GST_API_VERSION@includedir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -787,7 +787,7 @@ install-nodist_libgstcheck_@GST_API_VERSION@includeHEADERS: $(nodist_libgstcheck @list='$(nodist_libgstcheck_@GST_API_VERSION@include_HEADERS)'; test -n "$(libgstcheck_@GST_API_VERSION@includedir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(libgstcheck_@GST_API_VERSION@includedir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(libgstcheck_@GST_API_VERSION@includedir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(libgstcheck_@GST_API_VERSION@includedir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ diff --git a/libs/gst/check/gstconsistencychecker.c b/libs/gst/check/gstconsistencychecker.c index 35f325f..576b575 100644 --- a/libs/gst/check/gstconsistencychecker.c +++ b/libs/gst/check/gstconsistencychecker.c @@ -276,7 +276,7 @@ gst_consistency_checker_free (GstStreamConsistency * consist) for (node = consist->pads; node; node = g_list_next (node)) { p = (GstStreamConsistencyProbe *) node->data; gst_pad_remove_probe (p->pad, p->probeid); - g_object_unref (p->pad); + gst_object_unref (p->pad); g_free (p); } g_list_free (consist->pads); diff --git a/libs/gst/check/libcheck/Makefile.in b/libs/gst/check/libcheck/Makefile.in index df73417..085986e 100644 --- a/libs/gst/check/libcheck/Makefile.in +++ b/libs/gst/check/libcheck/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/libs/gst/controller/Makefile.in b/libs/gst/controller/Makefile.in index 3c71914..aa3cbda 100644 --- a/libs/gst/controller/Makefile.in +++ b/libs/gst/controller/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -529,7 +529,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) done; \ test -z "$$list2" || { \ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(libdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -640,7 +640,7 @@ install-girDATA: $(gir_DATA) @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(girdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -661,7 +661,7 @@ install-typelibsDATA: $(typelibs_DATA) @list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(typelibsdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(typelibsdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(typelibsdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -682,7 +682,7 @@ install-libgstcontroller_@GST_API_VERSION@_includeHEADERS: $(libgstcontroller_@G @list='$(libgstcontroller_@GST_API_VERSION@_include_HEADERS)'; test -n "$(libgstcontroller_@GST_API_VERSION@_includedir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(libgstcontroller_@GST_API_VERSION@_includedir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(libgstcontroller_@GST_API_VERSION@_includedir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(libgstcontroller_@GST_API_VERSION@_includedir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ diff --git a/libs/gst/controller/gstargbcontrolbinding.c b/libs/gst/controller/gstargbcontrolbinding.c index 829b616..9e4728a 100644 --- a/libs/gst/controller/gstargbcontrolbinding.c +++ b/libs/gst/controller/gstargbcontrolbinding.c @@ -53,12 +53,16 @@ static GValue *gst_argb_control_binding_get_value (GstControlBinding * _self, GstClockTime timestamp); static gboolean gst_argb_control_binding_get_value_array (GstControlBinding * _self, GstClockTime timestamp, GstClockTime interval, guint n_values, + gpointer values); +static gboolean gst_argb_control_binding_get_g_value_array (GstControlBinding * + _self, GstClockTime timestamp, GstClockTime interval, guint n_values, GValue * values); #define _do_init \ GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "gstargbcontrolbinding", 0, \ "dynamic parameter control source attachment"); +#define gst_argb_control_binding_parent_class parent_class G_DEFINE_TYPE_WITH_CODE (GstARGBControlBinding, gst_argb_control_binding, GST_TYPE_CONTROL_BINDING, _do_init); @@ -93,6 +97,8 @@ gst_argb_control_binding_class_init (GstARGBControlBindingClass * klass) control_binding_class->get_value = gst_argb_control_binding_get_value; control_binding_class->get_value_array = gst_argb_control_binding_get_value_array; + control_binding_class->get_g_value_array = + gst_argb_control_binding_get_g_value_array; properties[PROP_CS_A] = g_param_spec_object ("control-source-a", "ControlSource A", @@ -133,9 +139,8 @@ gst_argb_control_binding_constructor (GType type, guint n_construct_params, GstARGBControlBinding *self; self = - GST_ARGB_CONTROL_BINDING (G_OBJECT_CLASS - (gst_argb_control_binding_parent_class) - ->constructor (type, n_construct_params, construct_params)); + GST_ARGB_CONTROL_BINDING (G_OBJECT_CLASS (parent_class)->constructor + (type, n_construct_params, construct_params)); if (GST_CONTROL_BINDING_PSPEC (self)) { if (!(G_PARAM_SPEC_VALUE_TYPE (GST_CONTROL_BINDING_PSPEC (self)) == @@ -213,6 +218,8 @@ gst_argb_control_binding_dispose (GObject * object) gst_object_replace ((GstObject **) & self->cs_g, NULL); if (self->cs_b) gst_object_replace ((GstObject **) & self->cs_b, NULL); + + G_OBJECT_CLASS (parent_class)->dispose (object); } static void @@ -221,6 +228,8 @@ gst_argb_control_binding_finalize (GObject * object) GstARGBControlBinding *self = GST_ARGB_CONTROL_BINDING (object); g_value_unset (&self->cur_value); + + G_OBJECT_CLASS (parent_class)->finalize (object); } static gboolean @@ -312,6 +321,71 @@ gst_argb_control_binding_get_value (GstControlBinding * _self, static gboolean gst_argb_control_binding_get_value_array (GstControlBinding * _self, GstClockTime timestamp, GstClockTime interval, guint n_values, + gpointer values_) +{ + GstARGBControlBinding *self = GST_ARGB_CONTROL_BINDING (_self); + gint i; + gdouble *src_val_a = NULL, *src_val_r = NULL, *src_val_g = NULL, *src_val_b = + NULL; + guint *values = (guint *) values_; + gboolean ret = TRUE; + + g_return_val_if_fail (GST_IS_ARGB_CONTROL_BINDING (self), FALSE); + g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (timestamp), FALSE); + g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (interval), FALSE); + g_return_val_if_fail (values, FALSE); + g_return_val_if_fail (GST_CONTROL_BINDING_PSPEC (self), FALSE); + + if (self->cs_a) { + src_val_a = g_new0 (gdouble, n_values); + ret &= gst_control_source_get_value_array (self->cs_a, timestamp, + interval, n_values, src_val_a); + } + if (self->cs_r) { + src_val_r = g_new0 (gdouble, n_values); + ret &= gst_control_source_get_value_array (self->cs_r, timestamp, + interval, n_values, src_val_r); + } + if (self->cs_g) { + src_val_g = g_new0 (gdouble, n_values); + ret &= gst_control_source_get_value_array (self->cs_g, timestamp, + interval, n_values, src_val_g); + } + if (self->cs_b) { + src_val_b = g_new0 (gdouble, n_values); + ret &= gst_control_source_get_value_array (self->cs_b, timestamp, + interval, n_values, src_val_b); + } + if (G_LIKELY (ret)) { + for (i = 0; i < n_values; i++) { + gdouble a = 1.0, r = 0.0, g = 0.0, b = 0.0; + if (src_val_a && !isnan (src_val_a[i])) + a = src_val_a[i]; + if (src_val_r && !isnan (src_val_r[i])) + r = src_val_r[i]; + if (src_val_g && !isnan (src_val_g[i])) + g = src_val_g[i]; + if (src_val_b && !isnan (src_val_b[i])) + b = src_val_b[i]; + values[i] = (((guint) (CLAMP (a, 0.0, 1.0) * 255)) << 24) | + (((guint) (CLAMP (r, 0.0, 1.0) * 255)) << 16) | + (((guint) (CLAMP (g, 0.0, 1.0) * 255)) << 8) | + ((guint) (CLAMP (b, 0.0, 1.0) * 255)); + } + } else { + GST_LOG ("failed to get control value for property %s at ts %" + GST_TIME_FORMAT, _self->name, GST_TIME_ARGS (timestamp)); + } + g_free (src_val_a); + g_free (src_val_r); + g_free (src_val_g); + g_free (src_val_b); + return ret; +} + +static gboolean +gst_argb_control_binding_get_g_value_array (GstControlBinding * _self, + GstClockTime timestamp, GstClockTime interval, guint n_values, GValue * values) { GstARGBControlBinding *self = GST_ARGB_CONTROL_BINDING (_self); diff --git a/libs/gst/controller/gstdirectcontrolbinding.c b/libs/gst/controller/gstdirectcontrolbinding.c index 97a23b2..0596489 100644 --- a/libs/gst/controller/gstdirectcontrolbinding.c +++ b/libs/gst/controller/gstdirectcontrolbinding.c @@ -52,12 +52,16 @@ static GValue *gst_direct_control_binding_get_value (GstControlBinding * _self, GstClockTime timestamp); static gboolean gst_direct_control_binding_get_value_array (GstControlBinding * _self, GstClockTime timestamp, GstClockTime interval, guint n_values, + gpointer values); +static gboolean gst_direct_control_binding_get_g_value_array (GstControlBinding + * _self, GstClockTime timestamp, GstClockTime interval, guint n_values, GValue * values); #define _do_init \ GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "gstdirectcontrolbinding", 0, \ "dynamic parameter control source attachment"); +#define gst_direct_control_binding_parent_class parent_class G_DEFINE_TYPE_WITH_CODE (GstDirectControlBinding, gst_direct_control_binding, GST_TYPE_CONTROL_BINDING, _do_init); @@ -74,7 +78,7 @@ static GParamSpec *properties[PROP_LAST]; #define DEFINE_CONVERT(type,Type,TYPE) \ static void \ -convert_to_##type (GstDirectControlBinding *self, gdouble s, GValue *d) \ +convert_g_value_to_##type (GstDirectControlBinding *self, gdouble s, GValue *d) \ { \ GParamSpec##Type *pspec = G_PARAM_SPEC_##TYPE (((GstControlBinding *)self)->pspec); \ g##type v; \ @@ -82,8 +86,19 @@ convert_to_##type (GstDirectControlBinding *self, gdouble s, GValue *d) \ s = CLAMP (s, 0.0, 1.0); \ v = pspec->minimum + (g##type) ((pspec->maximum - pspec->minimum) * s); \ g_value_set_##type (d, v); \ +} \ +\ +static void \ +convert_value_to_##type (GstDirectControlBinding *self, gdouble s, gpointer d_) \ +{ \ + GParamSpec##Type *pspec = G_PARAM_SPEC_##TYPE (((GstControlBinding *)self)->pspec); \ + g##type *d = (g##type *)d_; \ + \ + s = CLAMP (s, 0.0, 1.0); \ + *d = pspec->minimum + (g##type) ((pspec->maximum - pspec->minimum) * s); \ } + DEFINE_CONVERT (int, Int, INT); DEFINE_CONVERT (uint, UInt, UINT); DEFINE_CONVERT (long, Long, LONG); @@ -94,14 +109,25 @@ DEFINE_CONVERT (float, Float, FLOAT); DEFINE_CONVERT (double, Double, DOUBLE); static void -convert_to_boolean (GstDirectControlBinding * self, gdouble s, GValue * d) +convert_g_value_to_boolean (GstDirectControlBinding * self, gdouble s, + GValue * d) { s = CLAMP (s, 0.0, 1.0); g_value_set_boolean (d, (gboolean) (s + 0.5)); } static void -convert_to_enum (GstDirectControlBinding * self, gdouble s, GValue * d) +convert_value_to_boolean (GstDirectControlBinding * self, gdouble s, + gpointer d_) +{ + gboolean *d = (gboolean *) d_; + + s = CLAMP (s, 0.0, 1.0); + *d = (gboolean) (s + 0.5); +} + +static void +convert_g_value_to_enum (GstDirectControlBinding * self, gdouble s, GValue * d) { GParamSpecEnum *pspec = G_PARAM_SPEC_ENUM (((GstControlBinding *) self)->pspec); @@ -113,6 +139,18 @@ convert_to_enum (GstDirectControlBinding * self, gdouble s, GValue * d) g_value_set_enum (d, e->values[v].value); } +static void +convert_value_to_enum (GstDirectControlBinding * self, gdouble s, gpointer d_) +{ + GParamSpecEnum *pspec = + G_PARAM_SPEC_ENUM (((GstControlBinding *) self)->pspec); + GEnumClass *e = pspec->enum_class; + gint *d = (gint *) d_; + + s = CLAMP (s, 0.0, 1.0); + *d = e->values[(gint) (s * (e->n_values - 1))].value; +} + /* vmethods */ static void @@ -132,6 +170,8 @@ gst_direct_control_binding_class_init (GstDirectControlBindingClass * klass) control_binding_class->get_value = gst_direct_control_binding_get_value; control_binding_class->get_value_array = gst_direct_control_binding_get_value_array; + control_binding_class->get_g_value_array = + gst_direct_control_binding_get_g_value_array; properties[PROP_CS] = g_param_spec_object ("control-source", "ControlSource", @@ -154,9 +194,8 @@ gst_direct_control_binding_constructor (GType type, guint n_construct_params, GstDirectControlBinding *self; self = - GST_DIRECT_CONTROL_BINDING (G_OBJECT_CLASS - (gst_direct_control_binding_parent_class) - ->constructor (type, n_construct_params, construct_params)); + GST_DIRECT_CONTROL_BINDING (G_OBJECT_CLASS (parent_class)->constructor + (type, n_construct_params, construct_params)); if (GST_CONTROL_BINDING_PSPEC (self)) { GType type, base; @@ -171,34 +210,54 @@ gst_direct_control_binding_constructor (GType type, guint n_construct_params, // select mapping function switch (base) { case G_TYPE_INT: - self->convert = convert_to_int; + self->convert_g_value = convert_g_value_to_int; + self->convert_value = convert_value_to_int; + self->byte_size = sizeof (gint); break; case G_TYPE_UINT: - self->convert = convert_to_uint; + self->convert_g_value = convert_g_value_to_uint; + self->convert_value = convert_value_to_uint; + self->byte_size = sizeof (guint); break; case G_TYPE_LONG: - self->convert = convert_to_long; + self->convert_g_value = convert_g_value_to_long; + self->convert_value = convert_value_to_long; + self->byte_size = sizeof (glong); break; case G_TYPE_ULONG: - self->convert = convert_to_ulong; + self->convert_g_value = convert_g_value_to_ulong; + self->convert_value = convert_value_to_ulong; + self->byte_size = sizeof (gulong); break; case G_TYPE_INT64: - self->convert = convert_to_int64; + self->convert_g_value = convert_g_value_to_int64; + self->convert_value = convert_value_to_int64; + self->byte_size = sizeof (gint64); break; case G_TYPE_UINT64: - self->convert = convert_to_uint64; + self->convert_g_value = convert_g_value_to_uint64; + self->convert_value = convert_value_to_uint64; + self->byte_size = sizeof (guint64); break; case G_TYPE_FLOAT: - self->convert = convert_to_float; + self->convert_g_value = convert_g_value_to_float; + self->convert_value = convert_value_to_float; + self->byte_size = sizeof (gfloat); break; case G_TYPE_DOUBLE: - self->convert = convert_to_double; + self->convert_g_value = convert_g_value_to_double; + self->convert_value = convert_value_to_double; + self->byte_size = sizeof (gdouble); break; case G_TYPE_BOOLEAN: - self->convert = convert_to_boolean; + self->convert_g_value = convert_g_value_to_boolean; + self->convert_value = convert_value_to_boolean; + self->byte_size = sizeof (gboolean); break; case G_TYPE_ENUM: - self->convert = convert_to_enum; + self->convert_g_value = convert_g_value_to_enum; + self->convert_value = convert_value_to_enum; + self->byte_size = sizeof (gint); break; default: GST_WARNING ("incomplete implementation for paramspec type '%s'", @@ -249,6 +308,8 @@ gst_direct_control_binding_dispose (GObject * object) if (self->cs) gst_object_replace ((GstObject **) & self->cs, NULL); + + G_OBJECT_CLASS (parent_class)->dispose (object); } static void @@ -257,6 +318,8 @@ gst_direct_control_binding_finalize (GObject * object) GstDirectControlBinding *self = GST_DIRECT_CONTROL_BINDING (object); g_value_unset (&self->cur_value); + + G_OBJECT_CLASS (parent_class)->finalize (object); } static gboolean @@ -286,7 +349,7 @@ gst_direct_control_binding_sync_values (GstControlBinding * _self, GST_LOG_OBJECT (object, " mapping %s to value of type %s", _self->name, G_VALUE_TYPE_NAME (dst_val)); /* run mapping function to convert gdouble to GValue */ - self->convert (self, src_val, dst_val); + self->convert_g_value (self, src_val, dst_val); /* we can make this faster * http://bugzilla.gnome.org/show_bug.cgi?id=536939 */ @@ -315,7 +378,7 @@ gst_direct_control_binding_get_value (GstControlBinding * _self, if (gst_control_source_get_value (self->cs, timestamp, &src_val)) { dst_val = g_new0 (GValue, 1); g_value_init (dst_val, G_PARAM_SPEC_VALUE_TYPE (_self->pspec)); - self->convert (self, src_val, dst_val); + self->convert_g_value (self, src_val, dst_val); } else { GST_LOG ("no control value for property %s at ts %" GST_TIME_FORMAT, _self->name, GST_TIME_ARGS (timestamp)); @@ -327,6 +390,49 @@ gst_direct_control_binding_get_value (GstControlBinding * _self, static gboolean gst_direct_control_binding_get_value_array (GstControlBinding * _self, GstClockTime timestamp, GstClockTime interval, guint n_values, + gpointer values_) +{ + GstDirectControlBinding *self = GST_DIRECT_CONTROL_BINDING (_self); + gint i; + gdouble *src_val; + gboolean res = FALSE; + GstDirectControlBindingConvertValue convert; + gint byte_size; + guint8 *values = (guint8 *) values_; + + g_return_val_if_fail (GST_IS_DIRECT_CONTROL_BINDING (self), FALSE); + g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (timestamp), FALSE); + g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (interval), FALSE); + g_return_val_if_fail (values, FALSE); + g_return_val_if_fail (GST_CONTROL_BINDING_PSPEC (self), FALSE); + + convert = self->convert_value; + byte_size = self->byte_size; + + src_val = g_new0 (gdouble, n_values); + if ((res = gst_control_source_get_value_array (self->cs, timestamp, + interval, n_values, src_val))) { + for (i = 0; i < n_values; i++) { + /* we will only get NAN for sparse control sources, such as triggers */ + if (!isnan (src_val[i])) { + convert (self, src_val[i], (gpointer) values); + } else { + GST_LOG ("no control value for property %s at index %d", _self->name, + i); + } + values += byte_size; + } + } else { + GST_LOG ("failed to get control value for property %s at ts %" + GST_TIME_FORMAT, _self->name, GST_TIME_ARGS (timestamp)); + } + g_free (src_val); + return res; +} + +static gboolean +gst_direct_control_binding_get_g_value_array (GstControlBinding * _self, + GstClockTime timestamp, GstClockTime interval, guint n_values, GValue * values) { GstDirectControlBinding *self = GST_DIRECT_CONTROL_BINDING (_self); @@ -334,7 +440,7 @@ gst_direct_control_binding_get_value_array (GstControlBinding * _self, gdouble *src_val; gboolean res = FALSE; GType type; - GstDirectControlBindingConvert convert; + GstDirectControlBindingConvertGValue convert; g_return_val_if_fail (GST_IS_DIRECT_CONTROL_BINDING (self), FALSE); g_return_val_if_fail (GST_CLOCK_TIME_IS_VALID (timestamp), FALSE); @@ -342,13 +448,14 @@ gst_direct_control_binding_get_value_array (GstControlBinding * _self, g_return_val_if_fail (values, FALSE); g_return_val_if_fail (GST_CONTROL_BINDING_PSPEC (self), FALSE); - convert = self->convert; + convert = self->convert_g_value; type = G_PARAM_SPEC_VALUE_TYPE (_self->pspec); src_val = g_new0 (gdouble, n_values); if ((res = gst_control_source_get_value_array (self->cs, timestamp, interval, n_values, src_val))) { for (i = 0; i < n_values; i++) { + /* we will only get NAN for sparse control sources, such as triggers */ if (!isnan (src_val[i])) { g_value_init (&values[i], type); convert (self, src_val[i], &values[i]); diff --git a/libs/gst/controller/gstdirectcontrolbinding.h b/libs/gst/controller/gstdirectcontrolbinding.h index 729d117..24ece6d 100644 --- a/libs/gst/controller/gstdirectcontrolbinding.h +++ b/libs/gst/controller/gstdirectcontrolbinding.h @@ -48,14 +48,24 @@ typedef struct _GstDirectControlBinding GstDirectControlBinding; typedef struct _GstDirectControlBindingClass GstDirectControlBindingClass; /** - * GstDirectControlBindingConvert: + * GstDirectControlBindingConvertValue: + * @self: the #GstDirectControlBinding instance + * @src_value: the value returned by the cotnrol source + * @dest_value: the target location + * + * Function to map a control-value to the target plain data type. + */ +typedef void (* GstDirectControlBindingConvertValue) (GstDirectControlBinding *self, gdouble src_value, gpointer dest_value); + +/** + * GstDirectControlBindingConvertGValue: * @self: the #GstDirectControlBinding instance * @src_value: the value returned by the cotnrol source * @dest_value: the target GValue * * Function to map a control-value to the target GValue. */ -typedef void (* GstDirectControlBindingConvert) (GstDirectControlBinding *self, gdouble src_value, GValue *dest_value); +typedef void (* GstDirectControlBindingConvertGValue) (GstDirectControlBinding *self, gdouble src_value, GValue *dest_value); /** * GstDirectControlBinding: @@ -70,8 +80,10 @@ struct _GstDirectControlBinding { GstControlSource *cs; /* GstControlSource for this property */ GValue cur_value; gdouble last_value; + gint byte_size; - GstDirectControlBindingConvert convert; + GstDirectControlBindingConvertValue convert_value; + GstDirectControlBindingConvertGValue convert_g_value; gpointer _gst_reserved[GST_PADDING]; }; diff --git a/libs/gst/controller/gstlfocontrolsource.c b/libs/gst/controller/gstlfocontrolsource.c index d5f23f6..819518d 100644 --- a/libs/gst/controller/gstlfocontrolsource.c +++ b/libs/gst/controller/gstlfocontrolsource.c @@ -399,6 +399,7 @@ gst_lfo_waveform_get_type (void) #define _do_init \ GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "lfo control source", 0, "low frequency oscillator control source") +#define gst_lfo_control_source_parent_class parent_class G_DEFINE_TYPE_WITH_CODE (GstLFOControlSource, gst_lfo_control_source, GST_TYPE_CONTROL_SOURCE, _do_init); @@ -466,7 +467,7 @@ gst_lfo_control_source_finalize (GObject * obj) gst_lfo_control_source_reset (self); g_mutex_clear (&self->lock); - G_OBJECT_CLASS (gst_lfo_control_source_parent_class)->finalize (obj); + G_OBJECT_CLASS (parent_class)->finalize (obj); } static void diff --git a/libs/gst/controller/gsttimedvaluecontrolsource.c b/libs/gst/controller/gsttimedvaluecontrolsource.c index 38723eb..cd24549 100644 --- a/libs/gst/controller/gsttimedvaluecontrolsource.c +++ b/libs/gst/controller/gsttimedvaluecontrolsource.c @@ -48,6 +48,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "timed value control source", 0, \ "timed value control source base class") +#define gst_timed_value_control_source_parent_class parent_class G_DEFINE_ABSTRACT_TYPE_WITH_CODE (GstTimedValueControlSource, gst_timed_value_control_source, GST_TYPE_CONTROL_SOURCE, _do_init); @@ -408,7 +409,7 @@ gst_timed_value_control_source_finalize (GObject * obj) g_mutex_unlock (&self->lock); g_mutex_clear (&self->lock); - G_OBJECT_CLASS (gst_timed_value_control_source_parent_class)->finalize (obj); + G_OBJECT_CLASS (parent_class)->finalize (obj); } static void diff --git a/libs/gst/helpers/Makefile.in b/libs/gst/helpers/Makefile.in index 70bd6b2..c12b276 100644 --- a/libs/gst/helpers/Makefile.in +++ b/libs/gst/helpers/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/libs/gst/net/Makefile.in b/libs/gst/net/Makefile.in index 9db5659..c4b49a1 100644 --- a/libs/gst/net/Makefile.in +++ b/libs/gst/net/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -524,7 +524,7 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) done; \ test -z "$$list2" || { \ echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(libdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -619,7 +619,7 @@ install-girDATA: $(gir_DATA) @list='$(gir_DATA)'; test -n "$(girdir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(girdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(girdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(girdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -640,7 +640,7 @@ install-typelibsDATA: $(typelibs_DATA) @list='$(typelibs_DATA)'; test -n "$(typelibsdir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(typelibsdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(typelibsdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(typelibsdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ @@ -661,7 +661,7 @@ install-libgstnet_@GST_API_VERSION@_includeHEADERS: $(libgstnet_@GST_API_VERSION @list='$(libgstnet_@GST_API_VERSION@_include_HEADERS)'; test -n "$(libgstnet_@GST_API_VERSION@_includedir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(libgstnet_@GST_API_VERSION@_includedir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(libgstnet_@GST_API_VERSION@_includedir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(libgstnet_@GST_API_VERSION@_includedir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ diff --git a/m4/Makefile.in b/m4/Makefile.in index 4ef8737..138013b 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/pkgconfig/Makefile.in b/pkgconfig/Makefile.in index 47145a4..f97eaf1 100644 --- a/pkgconfig/Makefile.in +++ b/pkgconfig/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -519,7 +519,7 @@ install-pkgconfigDATA: $(pkgconfig_DATA) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ if test -n "$$list"; then \ echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ diff --git a/plugins/Makefile.in b/plugins/Makefile.in index 539c2ed..4d019da 100644 --- a/plugins/Makefile.in +++ b/plugins/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/plugins/elements/Makefile.in b/plugins/elements/Makefile.in index 2cc34f1..15c6d3d 100644 --- a/plugins/elements/Makefile.in +++ b/plugins/elements/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -555,7 +555,7 @@ install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES) done; \ test -z "$$list2" || { \ echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \ - $(MKDIR_P) '$(DESTDIR)$(plugindir)' || exit 1; \ + $(MKDIR_P) "$(DESTDIR)$(plugindir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \ } diff --git a/plugins/elements/gstfilesrc.c b/plugins/elements/gstfilesrc.c index 8f55d1f..8536f4a 100644 --- a/plugins/elements/gstfilesrc.c +++ b/plugins/elements/gstfilesrc.c @@ -42,11 +42,14 @@ #include <stdio.h> #include <sys/types.h> +#include <sys/stat.h> #ifdef G_OS_WIN32 #include <io.h> /* lseek, open, close, read */ /* On win32, stat* default to 32 bit; we need the 64-bit * variants, so explicitly define it that way. */ +#undef stat #define stat __stat64 +#undef fstat #define fstat _fstat64 #undef lseek #define lseek _lseeki64 @@ -56,7 +59,6 @@ * _stat*, since we're explicitly overriding that */ #undef _INC_STAT_INL #endif -#include <sys/stat.h> #include <fcntl.h> #ifdef HAVE_UNISTD_H diff --git a/plugins/elements/gstinputselector.c b/plugins/elements/gstinputselector.c index 564e721..eb6fba5 100644 --- a/plugins/elements/gstinputselector.c +++ b/plugins/elements/gstinputselector.c @@ -146,7 +146,7 @@ struct _GstSelectorPad GstSegment segment; /* the current segment on the pad */ guint32 segment_seqnum; /* sequence number of the current segment */ - gboolean segment_pending; + gboolean events_pending; /* TRUE if sticky events need to be updated */ }; struct _GstSelectorPadClass @@ -307,7 +307,7 @@ gst_selector_pad_reset (GstSelectorPad * pad) pad->pushed = FALSE; pad->eos = FALSE; pad->eos_sent = FALSE; - pad->segment_pending = FALSE; + pad->events_pending = FALSE; pad->discont = FALSE; pad->flushing = FALSE; pad->position = GST_CLOCK_TIME_NONE; @@ -401,15 +401,6 @@ gst_selector_pad_event (GstPad * pad, GstObject * parent, GstEvent * event) GST_DEBUG_OBJECT (pad, "configured SEGMENT %" GST_SEGMENT_FORMAT, &selpad->segment); - /* If we aren't forwarding the event because the pad is not the - * active_sinkpad, then set the flag on the pad - * that says a segment needs sending if/when that pad is activated. - * For all other cases, we send the event immediately, which makes - * sparse streams and other segment updates work correctly downstream. - */ - if (!forward) - selpad->segment_pending = TRUE; - GST_OBJECT_UNLOCK (selpad); GST_INPUT_SELECTOR_UNLOCK (sel); break; @@ -462,8 +453,17 @@ gst_selector_pad_event (GstPad * pad, GstObject * parent, GstEvent * event) if (forward) { GST_DEBUG_OBJECT (pad, "forwarding event"); res = gst_pad_push_event (sel->srcpad, event); - } else + } else { + /* If we aren't forwarding the event because the pad is not the + * active_sinkpad, then set the flag on the pad + * that says a segment needs sending if/when that pad is activated. + * For all other cases, we send the event immediately, which makes + * sparse streams and other segment updates work correctly downstream. + */ + if (GST_EVENT_IS_STICKY (event)) + selpad->events_pending = TRUE; gst_event_unref (event); + } return res; } @@ -594,6 +594,25 @@ gst_input_selector_wait_running_time (GstInputSelector * sel, return (sel->flushing || pad->flushing); } +static gboolean +forward_sticky_events (GstPad * sinkpad, GstEvent ** event, gpointer user_data) +{ + GstInputSelector *sel = GST_INPUT_SELECTOR (user_data); + + if (GST_EVENT_TYPE (*event) == GST_EVENT_SEGMENT) { + GstSegment *seg = &GST_SELECTOR_PAD (sinkpad)->segment; + GstEvent *e; + + e = gst_event_new_segment (seg); + gst_event_set_seqnum (e, GST_SELECTOR_PAD_CAST (sinkpad)->segment_seqnum); + + gst_pad_push_event (sel->srcpad, e); + } else { + gst_pad_push_event (sel->srcpad, gst_event_ref (*event)); + } + + return TRUE; +} static GstFlowReturn gst_selector_pad_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) @@ -604,12 +623,9 @@ gst_selector_pad_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) GstPad *prev_active_sinkpad; GstSelectorPad *selpad; GstClockTime start_time; - GstSegment *seg; - GstEvent *start_event = NULL; sel = GST_INPUT_SELECTOR (parent); selpad = GST_SELECTOR_PAD_CAST (pad); - seg = &selpad->segment; GST_INPUT_SELECTOR_LOCK (sel); /* wait or check for flushing */ @@ -642,6 +658,7 @@ gst_selector_pad_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) GST_OBJECT_LOCK (pad); selpad->position = start_time; + selpad->segment.position = start_time; GST_OBJECT_UNLOCK (pad); } @@ -653,31 +670,19 @@ gst_selector_pad_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) if (sel->sync_streams) GST_INPUT_SELECTOR_BROADCAST (sel); - /* if we have a pending segment, push it out now */ - if (G_UNLIKELY (prev_active_sinkpad != active_sinkpad - || selpad->segment_pending)) { - if (G_UNLIKELY (seg->format == GST_FORMAT_UNDEFINED)) { - GST_ERROR_OBJECT (pad, "Buffers arrived before NEWSEGMENT event"); - } else { - GST_DEBUG_OBJECT (pad, - "pushing pending NEWSEGMENT update %d, rate %lf, applied rate %lf, " - "format %d, " "%" G_GINT64_FORMAT " -- %" G_GINT64_FORMAT ", time %" - G_GINT64_FORMAT, FALSE, seg->rate, seg->applied_rate, seg->format, - seg->start, seg->stop, seg->time); - - start_event = gst_event_new_segment (seg); - gst_event_set_seqnum (start_event, selpad->segment_seqnum); - selpad->segment_pending = FALSE; - } - } GST_INPUT_SELECTOR_UNLOCK (sel); if (prev_active_sinkpad != active_sinkpad && pad == active_sinkpad) { g_object_notify (G_OBJECT (sel), "active-pad"); } - if (start_event) - gst_pad_push_event (sel->srcpad, start_event); + /* if we have a pending events, push them now */ + if (G_UNLIKELY (prev_active_sinkpad != active_sinkpad + || selpad->events_pending)) { + gst_pad_sticky_events_foreach (GST_PAD_CAST (selpad), forward_sticky_events, + sel); + selpad->events_pending = FALSE; + } if (selpad->discont) { buf = gst_buffer_make_writable (buf); @@ -924,11 +929,13 @@ gst_input_selector_set_active_pad (GstInputSelector * self, GstPad * pad) /* Send a new SEGMENT event on the new pad next */ if (old != new && new) - new->segment_pending = TRUE; + new->events_pending = TRUE; active_pad_p = &self->active_sinkpad; gst_object_replace ((GstObject **) active_pad_p, GST_OBJECT_CAST (pad)); + gst_pad_push_event (pad, gst_event_new_reconfigure ()); + /* Wake up all non-active pads in sync mode, they might be * the active pad now */ if (self->sync_streams) diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c index 09db153..bd3b69c 100644 --- a/plugins/elements/gstmultiqueue.c +++ b/plugins/elements/gstmultiqueue.c @@ -755,7 +755,6 @@ gst_single_queue_flush (GstMultiQueue * mq, GstSingleQueue * sq, gboolean flush) gst_data_queue_set_flushing (sq->queue, TRUE); sq->flushing = TRUE; - GST_MULTI_QUEUE_MUTEX_UNLOCK (mq); /* wake up non-linked task */ GST_LOG_OBJECT (mq, "SingleQueue %d : waking up eventually waiting task", diff --git a/plugins/elements/gsttee.c b/plugins/elements/gsttee.c index 3cae773..33f2d8d 100644 --- a/plugins/elements/gsttee.c +++ b/plugins/elements/gsttee.c @@ -107,24 +107,66 @@ GST_STATIC_PAD_TEMPLATE ("src_%u", GST_PAD_REQUEST, GST_STATIC_CAPS_ANY); -/* structure and quark to keep track of which pads have been pushed */ -static GQuark push_data; - #define _do_init \ - GST_DEBUG_CATEGORY_INIT (gst_tee_debug, "tee", 0, "tee element"); \ - push_data = g_quark_from_static_string ("tee-push-data"); + GST_DEBUG_CATEGORY_INIT (gst_tee_debug, "tee", 0, "tee element"); #define gst_tee_parent_class parent_class G_DEFINE_TYPE_WITH_CODE (GstTee, gst_tee, GST_TYPE_ELEMENT, _do_init); static GParamSpec *pspec_last_message = NULL; static GParamSpec *pspec_alloc_pad = NULL; -typedef struct +GType gst_tee_pad_get_type (void); + +#define GST_TYPE_TEE_PAD \ + (gst_tee_pad_get_type()) +#define GST_TEE_PAD(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TEE_PAD, GstTeePad)) +#define GST_TEE_PAD_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_TEE_PAD, GstTeePadClass)) +#define GST_IS_TEE_PAD(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TEE_PAD)) +#define GST_IS_TEE_PAD_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_TEE_PAD)) +#define GST_TEE_PAD_CAST(obj) \ + ((GstTeePad *)(obj)) + +typedef struct _GstTeePad GstTeePad; +typedef struct _GstTeePadClass GstTeePadClass; + +struct _GstTeePad { + GstPad parent; + gboolean pushed; GstFlowReturn result; gboolean removed; -} PushData; +}; + +struct _GstTeePadClass +{ + GstPadClass parent; +}; + +G_DEFINE_TYPE (GstTeePad, gst_tee_pad, GST_TYPE_PAD); + +static void +gst_tee_pad_class_init (GstTeePadClass * klass) +{ +} + +static void +gst_tee_pad_reset (GstTeePad * pad) +{ + pad->pushed = FALSE; + pad->result = GST_FLOW_NOT_LINKED; + pad->removed = FALSE; +} + +static void +gst_tee_pad_init (GstTeePad * pad) +{ + gst_tee_pad_reset (pad); +} static GstPad *gst_tee_request_new_pad (GstElement * element, GstPadTemplate * temp, const gchar * unused, const GstCaps * caps); @@ -295,7 +337,6 @@ gst_tee_request_new_pad (GstElement * element, GstPadTemplate * templ, GstTee *tee; GstPadMode mode; gboolean res; - PushData *data; tee = GST_TEE (element); @@ -304,19 +345,13 @@ gst_tee_request_new_pad (GstElement * element, GstPadTemplate * templ, GST_OBJECT_LOCK (tee); name = g_strdup_printf ("src_%u", tee->pad_counter++); - srcpad = gst_pad_new_from_template (templ, name); + srcpad = GST_PAD_CAST (g_object_new (GST_TYPE_TEE_PAD, + "name", name, "direction", templ->direction, "template", templ, + NULL)); g_free (name); mode = tee->sink_mode; - /* install the data, we automatically free it when the pad is disposed because - * of _release_pad or when the element goes away. */ - data = g_new0 (PushData, 1); - data->pushed = FALSE; - data->result = GST_FLOW_NOT_LINKED; - data->removed = FALSE; - g_object_set_qdata_full (G_OBJECT (srcpad), push_data, data, g_free); - GST_OBJECT_UNLOCK (tee); switch (mode) { @@ -370,7 +405,6 @@ static void gst_tee_release_pad (GstElement * element, GstPad * pad) { GstTee *tee; - PushData *data; gboolean changed = FALSE; tee = GST_TEE (element); @@ -379,11 +413,9 @@ gst_tee_release_pad (GstElement * element, GstPad * pad) /* wait for pending pad_alloc to finish */ GST_TEE_DYN_LOCK (tee); - data = g_object_get_qdata (G_OBJECT (pad), push_data); - GST_OBJECT_LOCK (tee); /* mark the pad as removed so that future pad_alloc fails with NOT_LINKED. */ - data->removed = TRUE; + GST_TEE_PAD_CAST (pad)->removed = TRUE; if (tee->allocpad == pad) { tee->allocpad = NULL; changed = TRUE; @@ -550,15 +582,8 @@ gst_tee_do_push (GstTee * tee, GstPad * pad, gpointer data, gboolean is_list) static void clear_pads (GstPad * pad, GstTee * tee) { - PushData *data; - - data = g_object_get_qdata ((GObject *) pad, push_data); - - /* the data must be there or we have a screwed up internal state */ - g_assert (data != NULL); - - data->pushed = FALSE; - data->result = GST_FLOW_NOT_LINKED; + GST_TEE_PAD_CAST (pad)->pushed = FALSE; + GST_TEE_PAD_CAST (pad)->result = GST_FLOW_NOT_LINKED; } static GstFlowReturn @@ -604,16 +629,10 @@ restart: while (pads) { GstPad *pad; - PushData *pdata; pad = GST_PAD_CAST (pads->data); - /* get the private data, something is really wrong with the internal state - * when it is not there */ - pdata = g_object_get_qdata ((GObject *) pad, push_data); - g_assert (pdata != NULL); - - if (G_LIKELY (!pdata->pushed)) { + if (G_LIKELY (!GST_TEE_PAD_CAST (pad)->pushed)) { /* not yet pushed, release lock and start pushing */ gst_object_ref (pad); GST_OBJECT_UNLOCK (tee); @@ -627,15 +646,13 @@ restart: gst_flow_get_name (ret)); GST_OBJECT_LOCK (tee); - /* keep track of which pad we pushed and the result value. We need to do - * this before we release the refcount on the pad, the PushData is - * destroyed when the last ref of the pad goes away. */ - pdata->pushed = TRUE; - pdata->result = ret; + /* keep track of which pad we pushed and the result value */ + GST_TEE_PAD_CAST (pad)->pushed = TRUE; + GST_TEE_PAD_CAST (pad)->result = ret; gst_object_unref (pad); } else { /* already pushed, use previous return value */ - ret = pdata->result; + ret = GST_TEE_PAD_CAST (pad)->result; GST_LOG_OBJECT (tee, "pad already pushed with %s", gst_flow_get_name (ret)); } @@ -803,7 +820,6 @@ gst_tee_src_activate_mode (GstPad * pad, GstObject * parent, GstPadMode mode, res = TRUE; break; } - GST_OBJECT_UNLOCK (tee); return res; @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.9.7\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2005-12-05 11:45+0200\n" "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n" "Language-Team: Afrikaans <i18n@af.org.za>\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer-0.8.0\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2004-03-19 18:40+0200\n" "Last-Translator: Metin Amiroff <metin@karegen.com>\n" "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.9.7\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2006-01-18 22:26+0200\n" "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n" "Language-Team: Belarusian <i18n@mova.org>\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.32.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2011-04-26 22:40+0300\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@fsa-bg.org>\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.30.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2010-11-04 19:41+0100\n" "Last-Translator: Jordi Mallach <jordi@sindominio.net>\n" "Language-Team: Catalan <ca@dodds.net>\n" Binary files differ@@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.32.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2011-12-01 08:17+0100\n" "Last-Translator: Marek Černocký <marek@manet.cz>\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.30.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2010-11-06 22:52+0100\n" "Last-Translator: Mogens Jaeger <mogensjaeger@gmail.com>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" Binary files differ@@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.32.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2011-04-27 23:44+0200\n" "Last-Translator: Christian Kirbach <christian.kirbach@googlemail.com>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer-0.10.30.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2010-11-29 11:14+0200\n" "Last-Translator: Michael Kotsarinis <mk73628@gmail.com>\n" "Language-Team: Greek <team@lists.gnome.gr>\n" diff --git a/po/en_GB.gmo b/po/en_GB.gmo Binary files differindex ed213d1..5653952 100644 --- a/po/en_GB.gmo +++ b/po/en_GB.gmo diff --git a/po/en_GB.po b/po/en_GB.po index 3e482c7..febb66a 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.1\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2004-04-26 10:36-0400\n" "Last-Translator: Gareth Owen <gowen72@yahoo.com>\n" "Language-Team: English (British) <en_gb@li.org>\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.32.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2011-06-04 21:11+0100\n" "Last-Translator: Kristjan SCHMIDT <kristjan.schmidt@googlemail.com>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.32.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2011-10-02 15:45+0200\n" "Last-Translator: Jorge González González <aloriel@gmail.com>\n" "Language-Team: Spanish <es@li.org>\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer-0.10.26.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2010-03-25 13:10+0100\n" "Last-Translator: Mikel Olasagasti Uranga <hey_neken@mundurat.net>\n" "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n" Binary files differ@@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.30.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2010-11-17 23:10+0200\n" "Last-Translator: Tommi Vainikainen <Tommi.Vainikainen@iki.fi>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" Binary files differ@@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.32.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2011-04-28 09:34+0200\n" "Last-Translator: Claude Paroz <claude@2xlibre.net>\n" "Language-Team: French <traduc@traduc.org>\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.32.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2011-09-05 12:49+0200\n" "Last-Translator: Fran Dieguez <frandieguez@ubuntu.com>\n" "Language-Team: Galician <proxecto@trasno.net>\n" diff --git a/po/gstreamer-1.0.pot b/po/gstreamer-1.0.pot index 5c20836..293261a 100644 --- a/po/gstreamer-1.0.pot +++ b/po/gstreamer-1.0.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: gstreamer 0.11.90\n" +"Project-Id-Version: gstreamer 0.11.91\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -98,7 +98,7 @@ msgstr "" msgid "Show GStreamer Options" msgstr "" -#: gst/gst.c:925 +#: gst/gst.c:927 msgid "Unknown option" msgstr "" @@ -973,7 +973,7 @@ msgstr "" msgid "ERROR: from element %s: %s\n" msgstr "" -#: gst/gstutils.c:2447 tools/gst-launch.c:367 tools/gst-launch.c:694 +#: gst/gstutils.c:2447 tools/gst-launch.c:367 tools/gst-launch.c:717 #, c-format msgid "" "Additional debug info:\n" @@ -1048,11 +1048,11 @@ msgstr "" msgid "empty pipeline not allowed" msgstr "" -#: libs/gst/base/gstbasesrc.c:2363 +#: libs/gst/base/gstbasesrc.c:2367 msgid "Internal clock error." msgstr "" -#: libs/gst/base/gstbasesrc.c:2705 libs/gst/base/gstbasesrc.c:2714 +#: libs/gst/base/gstbasesrc.c:2709 libs/gst/base/gstbasesrc.c:2718 #: libs/gst/base/gstbasesink.c:3715 plugins/elements/gstqueue.c:1175 #: plugins/elements/gstqueue2.c:2577 msgid "Internal data flow error." @@ -1104,26 +1104,26 @@ msgstr "" msgid "Error while writing to file \"%s\"." msgstr "" -#: plugins/elements/gstfilesrc.c:522 +#: plugins/elements/gstfilesrc.c:524 msgid "No file name specified for reading." msgstr "" -#: plugins/elements/gstfilesrc.c:534 plugins/elements/gstqueue2.c:1443 +#: plugins/elements/gstfilesrc.c:536 plugins/elements/gstqueue2.c:1443 #, c-format msgid "Could not open file \"%s\" for reading." msgstr "" -#: plugins/elements/gstfilesrc.c:543 +#: plugins/elements/gstfilesrc.c:545 #, c-format msgid "Could not get info on \"%s\"." msgstr "" -#: plugins/elements/gstfilesrc.c:549 +#: plugins/elements/gstfilesrc.c:551 #, c-format msgid "\"%s\" is a directory." msgstr "" -#: plugins/elements/gstfilesrc.c:555 +#: plugins/elements/gstfilesrc.c:557 #, c-format msgid "File \"%s\" is a socket." msgstr "" @@ -1201,51 +1201,51 @@ msgstr "" msgid "changeable only in NULL or READY state" msgstr "" -#: tools/gst-inspect.c:960 +#: tools/gst-inspect.c:958 msgid "Blacklisted files:" msgstr "" -#: tools/gst-inspect.c:972 tools/gst-inspect.c:1066 +#: tools/gst-inspect.c:970 tools/gst-inspect.c:1067 msgid "Total count: " msgstr "" -#: tools/gst-inspect.c:973 +#: tools/gst-inspect.c:971 #, c-format msgid "%d blacklisted file" msgid_plural "%d blacklisted files" msgstr[0] "" msgstr[1] "" -#: tools/gst-inspect.c:1067 +#: tools/gst-inspect.c:1068 #, c-format msgid "%d plugin" msgid_plural "%d plugins" msgstr[0] "" msgstr[1] "" -#: tools/gst-inspect.c:1070 +#: tools/gst-inspect.c:1071 #, c-format msgid "%d blacklist entry" msgid_plural "%d blacklist entries" msgstr[0] "" msgstr[1] "" -#: tools/gst-inspect.c:1075 +#: tools/gst-inspect.c:1076 #, c-format msgid "%d feature" msgid_plural "%d features" msgstr[0] "" msgstr[1] "" -#: tools/gst-inspect.c:1507 +#: tools/gst-inspect.c:1514 msgid "Print all elements" msgstr "" -#: tools/gst-inspect.c:1509 +#: tools/gst-inspect.c:1516 msgid "Print list of blacklisted files" msgstr "" -#: tools/gst-inspect.c:1511 +#: tools/gst-inspect.c:1518 msgid "" "Print a machine-parsable list of features the specified plugin or all " "plugins provide.\n" @@ -1253,20 +1253,20 @@ msgid "" "automatic plugin installation mechanisms" msgstr "" -#: tools/gst-inspect.c:1516 +#: tools/gst-inspect.c:1523 msgid "List the plugin contents" msgstr "" -#: tools/gst-inspect.c:1519 +#: tools/gst-inspect.c:1526 msgid "Print supported URI schemes, with the elements that implement them" msgstr "" -#: tools/gst-inspect.c:1620 +#: tools/gst-inspect.c:1627 #, c-format msgid "Could not load plugin file: %s\n" msgstr "" -#: tools/gst-inspect.c:1625 +#: tools/gst-inspect.c:1632 #, c-format msgid "No such element or plugin '%s'\n" msgstr "" @@ -1275,228 +1275,228 @@ msgstr "" msgid "Index statistics" msgstr "" -#: tools/gst-launch.c:576 +#: tools/gst-launch.c:599 #, c-format msgid "Got message #%u from element \"%s\" (%s): " msgstr "" -#: tools/gst-launch.c:580 +#: tools/gst-launch.c:603 #, c-format msgid "Got message #%u from pad \"%s:%s\" (%s): " msgstr "" -#: tools/gst-launch.c:584 +#: tools/gst-launch.c:607 #, c-format msgid "Got message #%u from object \"%s\" (%s): " msgstr "" -#: tools/gst-launch.c:588 +#: tools/gst-launch.c:611 #, c-format msgid "Got message #%u (%s): " msgstr "" -#: tools/gst-launch.c:620 +#: tools/gst-launch.c:643 #, c-format msgid "Got EOS from element \"%s\".\n" msgstr "" -#: tools/gst-launch.c:629 +#: tools/gst-launch.c:652 #, c-format msgid "FOUND TAG : found by element \"%s\".\n" msgstr "" -#: tools/gst-launch.c:632 +#: tools/gst-launch.c:655 #, c-format msgid "FOUND TAG : found by pad \"%s:%s\".\n" msgstr "" -#: tools/gst-launch.c:635 +#: tools/gst-launch.c:658 #, c-format msgid "FOUND TAG : found by object \"%s\".\n" msgstr "" -#: tools/gst-launch.c:638 +#: tools/gst-launch.c:661 msgid "FOUND TAG\n" msgstr "" -#: tools/gst-launch.c:652 +#: tools/gst-launch.c:675 #, c-format msgid "FOUND TOC : found by element \"%s\".\n" msgstr "" -#: tools/gst-launch.c:655 +#: tools/gst-launch.c:678 #, c-format msgid "FOUND TOC : found by object \"%s\".\n" msgstr "" -#: tools/gst-launch.c:658 +#: tools/gst-launch.c:681 msgid "FOUND TOC\n" msgstr "" -#: tools/gst-launch.c:675 +#: tools/gst-launch.c:698 #, c-format msgid "" "INFO:\n" "%s\n" msgstr "" -#: tools/gst-launch.c:692 +#: tools/gst-launch.c:715 #, c-format msgid "WARNING: from element %s: %s\n" msgstr "" -#: tools/gst-launch.c:722 +#: tools/gst-launch.c:745 msgid "Prerolled, waiting for buffering to finish...\n" msgstr "" -#: tools/gst-launch.c:739 +#: tools/gst-launch.c:762 msgid "buffering..." msgstr "" -#: tools/gst-launch.c:750 +#: tools/gst-launch.c:773 msgid "Done buffering, setting pipeline to PLAYING ...\n" msgstr "" -#: tools/gst-launch.c:758 +#: tools/gst-launch.c:781 msgid "Buffering, setting pipeline to PAUSED ...\n" msgstr "" -#: tools/gst-launch.c:767 +#: tools/gst-launch.c:790 msgid "Redistribute latency...\n" msgstr "" -#: tools/gst-launch.c:778 +#: tools/gst-launch.c:801 #, c-format msgid "Setting state to %s as requested by %s...\n" msgstr "" -#: tools/gst-launch.c:794 +#: tools/gst-launch.c:817 msgid "Interrupt: Stopping pipeline ...\n" msgstr "" -#: tools/gst-launch.c:805 +#: tools/gst-launch.c:828 #, c-format msgid "Missing element: %s\n" msgstr "" -#: tools/gst-launch.c:887 +#: tools/gst-launch.c:910 msgid "Output tags (also known as metadata)" msgstr "" -#: tools/gst-launch.c:889 +#: tools/gst-launch.c:912 msgid "Ouput TOC (chapters and editions)" msgstr "" -#: tools/gst-launch.c:891 +#: tools/gst-launch.c:914 msgid "Output status information and property notifications" msgstr "" -#: tools/gst-launch.c:893 +#: tools/gst-launch.c:916 msgid "Do not print any progress information" msgstr "" -#: tools/gst-launch.c:895 +#: tools/gst-launch.c:918 msgid "Output messages" msgstr "" -#: tools/gst-launch.c:897 +#: tools/gst-launch.c:920 msgid "Do not output status information of TYPE" msgstr "" -#: tools/gst-launch.c:897 +#: tools/gst-launch.c:920 msgid "TYPE1,TYPE2,..." msgstr "" -#: tools/gst-launch.c:899 +#: tools/gst-launch.c:922 msgid "Do not install a fault handler" msgstr "" -#: tools/gst-launch.c:901 +#: tools/gst-launch.c:924 msgid "Force EOS on sources before shutting the pipeline down" msgstr "" -#: tools/gst-launch.c:904 +#: tools/gst-launch.c:927 msgid "Gather and print index statistics" msgstr "" -#: tools/gst-launch.c:966 +#: tools/gst-launch.c:989 #, c-format msgid "ERROR: pipeline could not be constructed: %s.\n" msgstr "" -#: tools/gst-launch.c:970 +#: tools/gst-launch.c:993 msgid "ERROR: pipeline could not be constructed.\n" msgstr "" -#: tools/gst-launch.c:974 +#: tools/gst-launch.c:997 #, c-format msgid "WARNING: erroneous pipeline: %s\n" msgstr "" -#: tools/gst-launch.c:997 +#: tools/gst-launch.c:1020 msgid "ERROR: the 'pipeline' element wasn't found.\n" msgstr "" -#: tools/gst-launch.c:1024 tools/gst-launch.c:1100 +#: tools/gst-launch.c:1047 tools/gst-launch.c:1123 msgid "Setting pipeline to PAUSED ...\n" msgstr "" -#: tools/gst-launch.c:1029 +#: tools/gst-launch.c:1052 msgid "ERROR: Pipeline doesn't want to pause.\n" msgstr "" -#: tools/gst-launch.c:1034 +#: tools/gst-launch.c:1057 msgid "Pipeline is live and does not need PREROLL ...\n" msgstr "" -#: tools/gst-launch.c:1038 +#: tools/gst-launch.c:1061 msgid "Pipeline is PREROLLING ...\n" msgstr "" -#: tools/gst-launch.c:1041 tools/gst-launch.c:1054 +#: tools/gst-launch.c:1064 tools/gst-launch.c:1077 msgid "ERROR: pipeline doesn't want to preroll.\n" msgstr "" -#: tools/gst-launch.c:1047 +#: tools/gst-launch.c:1070 msgid "Pipeline is PREROLLED ...\n" msgstr "" -#: tools/gst-launch.c:1059 +#: tools/gst-launch.c:1082 msgid "Setting pipeline to PLAYING ...\n" msgstr "" -#: tools/gst-launch.c:1066 +#: tools/gst-launch.c:1089 msgid "ERROR: pipeline doesn't want to play.\n" msgstr "" -#: tools/gst-launch.c:1080 +#: tools/gst-launch.c:1103 msgid "EOS on shutdown enabled -- Forcing EOS on the pipeline\n" msgstr "" -#: tools/gst-launch.c:1083 +#: tools/gst-launch.c:1106 msgid "Waiting for EOS...\n" msgstr "" -#: tools/gst-launch.c:1088 +#: tools/gst-launch.c:1111 msgid "EOS received - stopping pipeline...\n" msgstr "" -#: tools/gst-launch.c:1090 +#: tools/gst-launch.c:1113 msgid "An error happened while waiting for EOS\n" msgstr "" -#: tools/gst-launch.c:1097 +#: tools/gst-launch.c:1120 msgid "Execution ended after %" msgstr "" -#: tools/gst-launch.c:1108 +#: tools/gst-launch.c:1131 msgid "Setting pipeline to READY ...\n" msgstr "" -#: tools/gst-launch.c:1120 +#: tools/gst-launch.c:1143 msgid "Setting pipeline to NULL ...\n" msgstr "" -#: tools/gst-launch.c:1125 +#: tools/gst-launch.c:1148 msgid "Freeing pipeline ...\n" msgstr "" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.30.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2010-11-01 13:39+0100\n" "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.32.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2012-01-28 11:44+0700\n" "Last-Translator: Andhika Padmawan <andhika.padmawan@gmail.com>\n" "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n" Binary files differ@@ -106,7 +106,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.30.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2010-10-25 10:03+0200\n" "Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n" "Language-Team: Italian <tp@lists.linux.it>\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.20.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2008-10-16 19:57+0900\n" "Last-Translator: Makoto Kato <makoto.kt@gmail.com>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.29.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2010-07-16 00:50+0300\n" "Last-Translator: Žygimantas Beručka <uid0@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.30.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2010-10-24 21:36+0200\n" "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n" "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n" Binary files differ@@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.32.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2011-04-26 23:10+0200\n" "Last-Translator: Freek de Kruijf <f.de.kruijf@gmail.com>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.32.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2011-04-26 17:54+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo Binary files differindex ebda9f7..24b28cc 100644 --- a/po/pt_BR.gmo +++ b/po/pt_BR.gmo diff --git a/po/pt_BR.po b/po/pt_BR.po index 40054d4..9dbb9e4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer-0.10.31.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2011-01-08 01:36-0300\n" "Last-Translator: Fabrício Godoy <skarllot@gmail.com>\n" "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n" Binary files differ@@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.29.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2010-08-16 01:10+0300\n" "Last-Translator: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" Binary files differ@@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer-0.10.32.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2011-04-26 20:25+0400\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <gnu@mx.ru>\n" Binary files differ@@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.8\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2005-04-04 10:55-0700\n" "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n" "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.30.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2010-11-08 16:13+0100\n" "Last-Translator: Peter Tuhársky <tuharsky@misbb.sk>\n" "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n" Binary files differ@@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.32.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2012-03-01 14:05+0100\n" "Last-Translator: Klemen Košir <klemen.kosir@gmx.com>\n" "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.4\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2004-08-07 23:46+0200\n" "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n" "Language-Team: Albanian <begraj@hotmail.com>\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer-0.10.32.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2011-12-05 10:40+0200\n" "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n" "Language-Team: Serbian <gnu@prevod.org>\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.31.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2011-01-09 19:46+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" Binary files differ@@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.0\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2004-04-03 03:14+0300\n" "Last-Translator: Baris Cicek <baris@teamforce.name.tr>\n" "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n" Binary files differ@@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.32.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2011-04-30 20:26+0300\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n" Binary files differ@@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.29.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2010-10-03 19:09+1030\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo Binary files differindex 10294f4..0639218 100644 --- a/po/zh_CN.gmo +++ b/po/zh_CN.gmo diff --git a/po/zh_CN.po b/po/zh_CN.po index ad2c594..5a42a6f 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.10.25.2\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2010-02-02 18:58+0800\n" "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo Binary files differindex 7ad6f7b..17b7fdc 100644 --- a/po/zh_TW.gmo +++ b/po/zh_TW.gmo diff --git a/po/zh_TW.po b/po/zh_TW.po index e88944e..af719f3 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gstreamer 0.8.8\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2012-04-12 09:55+0200\n" +"POT-Creation-Date: 2012-05-13 15:53+0200\n" "PO-Revision-Date: 2005-04-27 14:55+0800\n" "Last-Translator: Abel Cheung <abelcheung@gmail.com>\n" "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n" diff --git a/scripts/gst-uninstalled b/scripts/gst-uninstalled index 6cc1b37..ac99e03 100755 --- a/scripts/gst-uninstalled +++ b/scripts/gst-uninstalled @@ -164,9 +164,16 @@ export MONO_PATH=$GST/gstreamer-sharp/gstreamer-sharp:$MONO_PATH export LD_LIBRARY_PATH=$GST/gstreamer-sharp/gstreamer-sharp/glue/.libs:$LD_LIBRARY_PATH export DYLD_LIBRARY_PATH=$GST/gstreamer-sharp/gstreamer-sharp/glue/.libs:$DYLD_LIBRARY_PATH -# gst-qa-system -export PYTHONPATH=$GST/gst-qa-system:$PYTHONPATH -export PATH=$GST/gst-qa-system/bin:$PATH +# insanity +export PYTHONPATH=$GST/insanity:$PYTHONPATH +export PATH=$GST/insanity/bin:$PATH +export PKG_CONFIG_PATH=$GST/insanity/lib:$GST/insanity-gst/lib:$PKG_CONFIG_PATH +export GI_TYPELIB_PATH=$GST/insanity/lib/insanity:$GST/insanity-gst/lib/insanity-gst:$GI_TYPELIB_PATH + +# GStreamer editing services library +export LD_LIBRARY_PATH=$GST/gst-editing-services/ges/.libs:$LD_LIBRARY_PATH +export DYLD_LIBRARY_PATH=$GST/gst-editing-services/ges/.libs:$DYLD_LIBRARY_PATH +export PATH=$GST/gst-editing-services/tools:$PATH # if we got a command, run it, else start a shell if test ! -z "$1"; diff --git a/tests/Makefile.in b/tests/Makefile.in index 9e6fc62..ab64603 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in index 34da120..17b0c45 100644 --- a/tests/benchmarks/Makefile.in +++ b/tests/benchmarks/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index fa814f8..cbee2fa 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -144,7 +144,7 @@ check_PROGRAMS = \ # failing tests noinst_PROGRAMS = \ gst/gstpipeline \ - libs/collectpads2 + libs/collectpads # elements to ignore for the state tests # STATE_IGNORE_ELEMENTS = diff --git a/tests/check/Makefile.in b/tests/check/Makefile.in index 8546a23..b261337 100644 --- a/tests/check/Makefile.in +++ b/tests/check/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -72,7 +72,7 @@ check_PROGRAMS = gst/gstatomicqueue$(EXEEXT) gst/gstbuffer$(EXEEXT) \ libs/bytereader$(EXEEXT) libs/bytewriter$(EXEEXT) \ libs/gstnetclientclock$(EXEEXT) \ libs/gstnettimeprovider$(EXEEXT) libs/transform1$(EXEEXT) -noinst_PROGRAMS = gst/gstpipeline$(EXEEXT) libs/collectpads2$(EXEEXT) +noinst_PROGRAMS = gst/gstpipeline$(EXEEXT) libs/collectpads$(EXEEXT) subdir = tests/check ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ @@ -558,10 +558,10 @@ libs_bytewriter_LDADD = $(LDADD) libs_bytewriter_DEPENDENCIES = $(top_builddir)/libs/gst/check/libgstcheck-@GST_API_VERSION@.la \ $(top_builddir)/libs/gst/base/libgstbase-@GST_API_VERSION@.la \ $(am__DEPENDENCIES_1) -libs_collectpads2_SOURCES = libs/collectpads2.c -libs_collectpads2_OBJECTS = collectpads2.$(OBJEXT) -libs_collectpads2_LDADD = $(LDADD) -libs_collectpads2_DEPENDENCIES = $(top_builddir)/libs/gst/check/libgstcheck-@GST_API_VERSION@.la \ +libs_collectpads_SOURCES = libs/collectpads.c +libs_collectpads_OBJECTS = collectpads.$(OBJEXT) +libs_collectpads_LDADD = $(LDADD) +libs_collectpads_DEPENDENCIES = $(top_builddir)/libs/gst/check/libgstcheck-@GST_API_VERSION@.la \ $(top_builddir)/libs/gst/base/libgstbase-@GST_API_VERSION@.la \ $(am__DEPENDENCIES_1) libs_controller_SOURCES = libs/controller.c @@ -700,7 +700,7 @@ SOURCES = elements/capsfilter.c elements/fakesink.c elements/fakesrc.c \ gst/gsttag.c gst/gsttagsetter.c gst/gsttask.c gst/gsttoc.c \ gst/gsttocsetter.c gst/gsturi.c gst/gstutils.c gst/gstvalue.c \ libs/adapter.c libs/basesink.c libs/basesrc.c libs/bitreader.c \ - libs/bytereader.c libs/bytewriter.c libs/collectpads2.c \ + libs/bytereader.c libs/bytewriter.c libs/collectpads.c \ libs/controller.c $(libs_gstlibscpp_SOURCES) \ libs/gstnetclientclock.c libs/gstnettimeprovider.c \ libs/transform1.c libs/typefindhelper.c pipelines/cleanup.c \ @@ -727,7 +727,7 @@ DIST_SOURCES = elements/capsfilter.c elements/fakesink.c \ gst/gsttag.c gst/gsttagsetter.c gst/gsttask.c gst/gsttoc.c \ gst/gsttocsetter.c gst/gsturi.c gst/gstutils.c gst/gstvalue.c \ libs/adapter.c libs/basesink.c libs/basesrc.c libs/bitreader.c \ - libs/bytereader.c libs/bytewriter.c libs/collectpads2.c \ + libs/bytereader.c libs/bytewriter.c libs/collectpads.c \ libs/controller.c $(libs_gstlibscpp_SOURCES) \ libs/gstnetclientclock.c libs/gstnettimeprovider.c \ libs/transform1.c libs/typefindhelper.c pipelines/cleanup.c \ @@ -1423,9 +1423,9 @@ libs/bytereader$(EXEEXT): $(libs_bytereader_OBJECTS) $(libs_bytereader_DEPENDENC libs/bytewriter$(EXEEXT): $(libs_bytewriter_OBJECTS) $(libs_bytewriter_DEPENDENCIES) $(EXTRA_libs_bytewriter_DEPENDENCIES) libs/$(am__dirstamp) @rm -f libs/bytewriter$(EXEEXT) $(AM_V_CCLD)$(LINK) $(libs_bytewriter_OBJECTS) $(libs_bytewriter_LDADD) $(LIBS) -libs/collectpads2$(EXEEXT): $(libs_collectpads2_OBJECTS) $(libs_collectpads2_DEPENDENCIES) $(EXTRA_libs_collectpads2_DEPENDENCIES) libs/$(am__dirstamp) - @rm -f libs/collectpads2$(EXEEXT) - $(AM_V_CCLD)$(LINK) $(libs_collectpads2_OBJECTS) $(libs_collectpads2_LDADD) $(LIBS) +libs/collectpads$(EXEEXT): $(libs_collectpads_OBJECTS) $(libs_collectpads_DEPENDENCIES) $(EXTRA_libs_collectpads_DEPENDENCIES) libs/$(am__dirstamp) + @rm -f libs/collectpads$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(libs_collectpads_OBJECTS) $(libs_collectpads_LDADD) $(LIBS) libs/controller$(EXEEXT): $(libs_controller_OBJECTS) $(libs_controller_DEPENDENCIES) $(EXTRA_libs_controller_DEPENDENCIES) libs/$(am__dirstamp) @rm -f libs/controller$(EXEEXT) $(AM_V_CCLD)$(LINK) $(libs_controller_OBJECTS) $(libs_controller_LDADD) $(LIBS) @@ -1483,7 +1483,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bytewriter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/capsfilter.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cleanup.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collectpads2.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/collectpads.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/controller.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elements_fdsrc-fdsrc.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elements_filesrc-filesrc.Po@am__quote@ @@ -2457,19 +2457,19 @@ bytewriter.obj: libs/bytewriter.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bytewriter.obj `if test -f 'libs/bytewriter.c'; then $(CYGPATH_W) 'libs/bytewriter.c'; else $(CYGPATH_W) '$(srcdir)/libs/bytewriter.c'; fi` -collectpads2.o: libs/collectpads2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT collectpads2.o -MD -MP -MF $(DEPDIR)/collectpads2.Tpo -c -o collectpads2.o `test -f 'libs/collectpads2.c' || echo '$(srcdir)/'`libs/collectpads2.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/collectpads2.Tpo $(DEPDIR)/collectpads2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libs/collectpads2.c' object='collectpads2.o' libtool=no @AMDEPBACKSLASH@ +collectpads.o: libs/collectpads.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT collectpads.o -MD -MP -MF $(DEPDIR)/collectpads.Tpo -c -o collectpads.o `test -f 'libs/collectpads.c' || echo '$(srcdir)/'`libs/collectpads.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/collectpads.Tpo $(DEPDIR)/collectpads.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libs/collectpads.c' object='collectpads.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o collectpads2.o `test -f 'libs/collectpads2.c' || echo '$(srcdir)/'`libs/collectpads2.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o collectpads.o `test -f 'libs/collectpads.c' || echo '$(srcdir)/'`libs/collectpads.c -collectpads2.obj: libs/collectpads2.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT collectpads2.obj -MD -MP -MF $(DEPDIR)/collectpads2.Tpo -c -o collectpads2.obj `if test -f 'libs/collectpads2.c'; then $(CYGPATH_W) 'libs/collectpads2.c'; else $(CYGPATH_W) '$(srcdir)/libs/collectpads2.c'; fi` -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/collectpads2.Tpo $(DEPDIR)/collectpads2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libs/collectpads2.c' object='collectpads2.obj' libtool=no @AMDEPBACKSLASH@ +collectpads.obj: libs/collectpads.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT collectpads.obj -MD -MP -MF $(DEPDIR)/collectpads.Tpo -c -o collectpads.obj `if test -f 'libs/collectpads.c'; then $(CYGPATH_W) 'libs/collectpads.c'; else $(CYGPATH_W) '$(srcdir)/libs/collectpads.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/collectpads.Tpo $(DEPDIR)/collectpads.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='libs/collectpads.c' object='collectpads.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o collectpads2.obj `if test -f 'libs/collectpads2.c'; then $(CYGPATH_W) 'libs/collectpads2.c'; else $(CYGPATH_W) '$(srcdir)/libs/collectpads2.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o collectpads.obj `if test -f 'libs/collectpads.c'; then $(CYGPATH_W) 'libs/collectpads.c'; else $(CYGPATH_W) '$(srcdir)/libs/collectpads.c'; fi` controller.o: libs/controller.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT controller.o -MD -MP -MF $(DEPDIR)/controller.Tpo -c -o controller.o `test -f 'libs/controller.c' || echo '$(srcdir)/'`libs/controller.c diff --git a/tests/check/elements/filesrc.c b/tests/check/elements/filesrc.c index 8fd9bc2..2a3fac4 100644 --- a/tests/check/elements/filesrc.c +++ b/tests/check/elements/filesrc.c @@ -404,6 +404,7 @@ GST_START_TEST (test_uri_interface) GST_END_TEST; +#ifdef G_OS_UNIX static void check_uri_for_uri (GstElement * e, const gchar * in_uri, const gchar * uri) { @@ -459,6 +460,7 @@ check_uri_for_location (GstElement * e, const gchar * location, g_free (query_uri); } +#endif GST_START_TEST (test_uri_query) { diff --git a/tests/check/elements/queue2.c b/tests/check/elements/queue2.c index 598cfef..e850730 100644 --- a/tests/check/elements/queue2.c +++ b/tests/check/elements/queue2.c @@ -249,6 +249,7 @@ GST_START_TEST (test_filled_read) &buffer) == GST_FLOW_OK); fail_unless (gst_buffer_get_size (buffer) == 4 * 1024); + gst_buffer_unref (buffer); gst_element_set_state (queue2, GST_STATE_NULL); diff --git a/tests/check/gst/gstmeta.c b/tests/check/gst/gstmeta.c index 2840196..73b5d56 100644 --- a/tests/check/gst/gstmeta.c +++ b/tests/check/gst/gstmeta.c @@ -210,6 +210,40 @@ GST_START_TEST (test_meta_test) GST_END_TEST; +static gboolean +foreach_meta (GstBuffer * buffer, GstMeta ** meta, gpointer user_data) +{ + /* try to remove */ + *meta = NULL; + return TRUE; +} + +GST_START_TEST (test_meta_locked) +{ + GstBuffer *buffer; + GstMetaTest *meta; + + buffer = gst_buffer_new_and_alloc (4); + fail_if (buffer == NULL); + + /* add some metadata */ + meta = GST_META_TEST_ADD (buffer); + fail_if (meta == NULL); + GST_META_FLAG_SET (meta, GST_META_FLAG_LOCKED); + + ASSERT_CRITICAL (gst_buffer_remove_meta (buffer, (GstMeta *) meta)); + ASSERT_CRITICAL (gst_buffer_foreach_meta (buffer, foreach_meta, NULL)); + + GST_META_FLAG_UNSET (meta, GST_META_FLAG_LOCKED); + + gst_buffer_remove_meta (buffer, (GstMeta *) meta); + + /* clean up */ + gst_buffer_unref (buffer); +} + +GST_END_TEST; + static Suite * gst_buffermeta_suite (void) { @@ -218,6 +252,7 @@ gst_buffermeta_suite (void) suite_add_tcase (s, tc_chain); tcase_add_test (tc_chain, test_meta_test); + tcase_add_test (tc_chain, test_meta_locked); return s; } diff --git a/tests/check/gst/gstpad.c b/tests/check/gst/gstpad.c index cb5ef36..88f93fa 100644 --- a/tests/check/gst/gstpad.c +++ b/tests/check/gst/gstpad.c @@ -1085,6 +1085,7 @@ test_queue_src_caps_notify (gboolean link_queue) { GstElement *queue; GstPad *src, *sink, *another_pad; + GstCaps *caps; queue = gst_element_factory_make ("queue", NULL); fail_unless (queue != NULL); @@ -1111,7 +1112,9 @@ test_queue_src_caps_notify (gboolean link_queue) g_signal_connect (src, "notify::caps", G_CALLBACK (caps_notify), NULL); - gst_pad_send_event (sink, gst_event_new_caps (gst_caps_from_string ("caps"))); + caps = gst_caps_from_string ("caps"); + gst_pad_send_event (sink, gst_event_new_caps (caps)); + gst_caps_unref (caps); g_usleep (10000); diff --git a/tests/check/gst/gstplugin.c b/tests/check/gst/gstplugin.c index 3db1150..0824b06 100644 --- a/tests/check/gst/gstplugin.c +++ b/tests/check/gst/gstplugin.c @@ -61,7 +61,7 @@ GST_START_TEST (test_registry) /* one for the registry, one for the list */ GST_DEBUG ("refcount %d %s", GST_OBJECT_REFCOUNT_VALUE (plugin), - plugin->desc.name); + gst_plugin_get_name (plugin)); ASSERT_OBJECT_REFCOUNT (plugin, "plugin in registry", 2); gst_object_unref (plugin); @@ -145,11 +145,12 @@ GST_START_TEST (test_find_plugin) fail_if (plugin == NULL, "Failed to find coreelements plugin"); ASSERT_OBJECT_REFCOUNT (plugin, "plugin", 2); - fail_unless_equals_string (plugin->desc.version, VERSION); - fail_unless_equals_string (plugin->desc.license, "LGPL"); - fail_unless_equals_string (plugin->desc.source, "gstreamer"); - fail_unless_equals_string (plugin->desc.package, GST_PACKAGE_NAME); - fail_unless_equals_string (plugin->desc.origin, GST_PACKAGE_ORIGIN); + fail_unless_equals_string (gst_plugin_get_version (plugin), VERSION); + fail_unless_equals_string (gst_plugin_get_license (plugin), "LGPL"); + fail_unless_equals_string (gst_plugin_get_source (plugin), "gstreamer"); + fail_unless_equals_string (gst_plugin_get_package (plugin), GST_PACKAGE_NAME); + fail_unless_equals_string (gst_plugin_get_origin (plugin), + GST_PACKAGE_ORIGIN); gst_object_unref (plugin); } diff --git a/tests/check/gst/gstpoll.c b/tests/check/gst/gstpoll.c index 612cda1..d25c421 100644 --- a/tests/check/gst/gstpoll.c +++ b/tests/check/gst/gstpoll.c @@ -26,7 +26,6 @@ #ifdef G_OS_WIN32 #include <winsock2.h> #include <fcntl.h> -#define EINPROGRESS WSAEINPROGRESS #else #include <sys/socket.h> #endif diff --git a/tests/check/gst/gsturi.c b/tests/check/gst/gsturi.c index ca6c2c9..4eee4f1 100644 --- a/tests/check/gst/gsturi.c +++ b/tests/check/gst/gsturi.c @@ -105,6 +105,30 @@ GST_END_TEST; #endif /* G_OS_WIN32 */ +GST_START_TEST (test_uri_misc) +{ + /* require at least three characters for the protocol */ + fail_if (gst_uri_is_valid ("B:\\foo.txt")); + fail_if (gst_uri_is_valid ("B:/foo.txt")); + fail_if (gst_uri_is_valid ("B://foo.txt")); + fail_if (gst_uri_is_valid ("B:foo.txt")); + + fail_if (gst_uri_is_valid ("AB:\\foo.txt")); + fail_if (gst_uri_is_valid ("AB:/foo.txt")); + fail_if (gst_uri_is_valid ("AB://foo.txt")); + fail_if (gst_uri_is_valid ("AB:foo.txt")); + + fail_unless (gst_uri_is_valid ("ABC:/foo.txt")); + fail_unless (gst_uri_is_valid ("ABC://foo.txt")); + fail_unless (gst_uri_is_valid ("ABC:foo.txt")); + + fail_unless (gst_uri_is_valid ("ABCD:/foo.txt")); + fail_unless (gst_uri_is_valid ("ABCD://foo.txt")); + fail_unless (gst_uri_is_valid ("ABCD:foo.txt")); +} + +GST_END_TEST; + static Suite * gst_uri_suite (void) { @@ -116,6 +140,7 @@ gst_uri_suite (void) suite_add_tcase (s, tc_chain); tcase_add_test (tc_chain, test_protocol_case); tcase_add_test (tc_chain, test_uri_get_location); + tcase_add_test (tc_chain, test_uri_misc); #ifdef G_OS_WIN32 tcase_add_test (tc_chain, test_win32_uri); #endif diff --git a/tests/check/libs/adapter.c b/tests/check/libs/adapter.c index bf356b9..e3b801a 100644 --- a/tests/check/libs/adapter.c +++ b/tests/check/libs/adapter.c @@ -257,8 +257,10 @@ GST_START_TEST (test_take3) avail = gst_adapter_available (adapter); fail_unless (avail == 0); - /* the data should be the same */ +#if 0 + /* the data should be the same FIXME, implement span in adapter again. */ fail_unless (info.data == info2.data); +#endif gst_buffer_unmap (buffer2, &info2); gst_buffer_unref (buffer2); @@ -805,6 +807,33 @@ GST_START_TEST (test_take_list) GST_END_TEST; +GST_START_TEST (test_merge) +{ + GstAdapter *adapter; + GstBuffer *buffer; + gint i; + + adapter = gst_adapter_new (); + fail_if (adapter == NULL); + + buffer = gst_buffer_new_and_alloc (10); + fail_if (buffer == NULL); + gst_adapter_push (adapter, buffer); + + for (i = 0; i < 1000; i++) { + buffer = gst_buffer_new_and_alloc (10); + gst_adapter_push (adapter, buffer); + + fail_unless (gst_adapter_map (adapter, 20) != NULL); + gst_adapter_unmap (adapter); + + gst_adapter_flush (adapter, 10); + } + g_object_unref (adapter); +} + +GST_END_TEST; + static Suite * gst_adapter_suite (void) { @@ -823,6 +852,7 @@ gst_adapter_suite (void) tcase_add_test (tc_chain, test_timestamp); tcase_add_test (tc_chain, test_scan); tcase_add_test (tc_chain, test_take_list); + tcase_add_test (tc_chain, test_merge); return s; } diff --git a/tests/check/libs/collectpads2.c b/tests/check/libs/collectpads.c index 2a04aa2..72cac1b 100644 --- a/tests/check/libs/collectpads2.c +++ b/tests/check/libs/collectpads.c @@ -1,5 +1,5 @@ /* - * collectpads.c - GstCollectPads2 testsuite + * collectpads.c - GstCollectPads testsuite * Copyright (C) 2006 Alessandro Decina <alessandro@nnva.org> * * Authors: @@ -22,7 +22,7 @@ */ #include <gst/check/gstcheck.h> -#include <gst/base/gstcollectpads2.h> +#include <gst/base/gstcollectpads.h> #define fail_unless_collected(expected) \ G_STMT_START { \ @@ -36,11 +36,11 @@ G_STMT_START { \ typedef struct { char foo; -} BadCollectData2; +} BadCollectData; typedef struct { - GstCollectData2 data; + GstCollectData data; GstPad *pad; GstBuffer *buffer; GstEvent *event; @@ -56,7 +56,7 @@ static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", GST_PAD_ALWAYS, GST_STATIC_CAPS_ANY); -static GstCollectPads2 *collect; +static GstCollectPads *collect; static gboolean collected; static GstPad *srcpad1, *srcpad2; static GstPad *sinkpad1, *sinkpad2; @@ -66,7 +66,7 @@ static GMutex *lock; static GCond *cond; static GstFlowReturn -collected_cb (GstCollectPads2 * pads, gpointer user_data) +collected_cb (GstCollectPads * pads, gpointer user_data) { g_mutex_lock (lock); collected = TRUE; @@ -100,8 +100,8 @@ push_event (gpointer user_data) static void setup (void) { - collect = gst_collect_pads2_new (); - gst_collect_pads2_set_function (collect, collected_cb, NULL); + collect = gst_collect_pads_new (); + gst_collect_pads_set_function (collect, collected_cb, NULL); srcpad1 = gst_pad_new_from_static_template (&srctemplate, "src1"); srcpad2 = gst_pad_new_from_static_template (&srctemplate, "src2"); @@ -134,15 +134,15 @@ teardown (void) GST_START_TEST (test_pad_add_remove) { - ASSERT_CRITICAL (gst_collect_pads2_add_pad (collect, sinkpad1, - sizeof (BadCollectData2))); + ASSERT_CRITICAL (gst_collect_pads_add_pad (collect, sinkpad1, + sizeof (BadCollectData))); - data1 = (TestData *) gst_collect_pads2_add_pad (collect, + data1 = (TestData *) gst_collect_pads_add_pad (collect, sinkpad1, sizeof (TestData)); fail_unless (data1 != NULL); - fail_unless (gst_collect_pads2_remove_pad (collect, sinkpad2) == FALSE); - fail_unless (gst_collect_pads2_remove_pad (collect, sinkpad1) == TRUE); + fail_unless (gst_collect_pads_remove_pad (collect, sinkpad2) == FALSE); + fail_unless (gst_collect_pads_remove_pad (collect, sinkpad1) == TRUE); } GST_END_TEST; @@ -152,11 +152,11 @@ GST_START_TEST (test_collect) GstBuffer *buf1, *buf2, *tmp; GThread *thread1, *thread2; - data1 = (TestData *) gst_collect_pads2_add_pad (collect, + data1 = (TestData *) gst_collect_pads_add_pad (collect, sinkpad1, sizeof (TestData)); fail_unless (data1 != NULL); - data2 = (TestData *) gst_collect_pads2_add_pad (collect, + data2 = (TestData *) gst_collect_pads_add_pad (collect, sinkpad2, sizeof (TestData)); fail_unless (data2 != NULL); @@ -164,7 +164,7 @@ GST_START_TEST (test_collect) buf2 = gst_buffer_new (); /* start collect pads */ - gst_collect_pads2_start (collect); + gst_collect_pads_start (collect); /* push buffers on the pads */ data1->pad = srcpad1; @@ -180,9 +180,9 @@ GST_START_TEST (test_collect) /* now both pads have a buffer */ fail_unless_collected (TRUE); - tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data1); + tmp = gst_collect_pads_pop (collect, (GstCollectData *) data1); fail_unless (tmp == buf1); - tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data2); + tmp = gst_collect_pads_pop (collect, (GstCollectData *) data2); fail_unless (tmp == buf2); /* these will return immediately as at this point the threads have been @@ -190,7 +190,7 @@ GST_START_TEST (test_collect) g_thread_join (thread1); g_thread_join (thread2); - gst_collect_pads2_stop (collect); + gst_collect_pads_stop (collect); gst_buffer_unref (buf1); gst_buffer_unref (buf2); @@ -203,18 +203,18 @@ GST_START_TEST (test_collect_eos) GstBuffer *buf1, *tmp; GThread *thread1, *thread2; - data1 = (TestData *) gst_collect_pads2_add_pad (collect, + data1 = (TestData *) gst_collect_pads_add_pad (collect, sinkpad1, sizeof (TestData)); fail_unless (data1 != NULL); - data2 = (TestData *) gst_collect_pads2_add_pad (collect, + data2 = (TestData *) gst_collect_pads_add_pad (collect, sinkpad2, sizeof (TestData)); fail_unless (data2 != NULL); buf1 = gst_buffer_new (); /* start collect pads */ - gst_collect_pads2_start (collect); + gst_collect_pads_start (collect); /* push a buffer on srcpad1 and EOS on srcpad2 */ data1->pad = srcpad1; @@ -229,10 +229,10 @@ GST_START_TEST (test_collect_eos) /* now sinkpad1 has a buffer and sinkpad2 has EOS */ fail_unless_collected (TRUE); - tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data1); + tmp = gst_collect_pads_pop (collect, (GstCollectData *) data1); fail_unless (tmp == buf1); /* sinkpad2 has EOS so a NULL buffer is returned */ - tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data2); + tmp = gst_collect_pads_pop (collect, (GstCollectData *) data2); fail_unless (tmp == NULL); /* these will return immediately as when the data is popped the threads are @@ -240,7 +240,7 @@ GST_START_TEST (test_collect_eos) g_thread_join (thread1); g_thread_join (thread2); - gst_collect_pads2_stop (collect); + gst_collect_pads_stop (collect); gst_buffer_unref (buf1); } @@ -252,18 +252,18 @@ GST_START_TEST (test_collect_twice) GstBuffer *buf1, *buf2, *tmp; GThread *thread1, *thread2; - data1 = (TestData *) gst_collect_pads2_add_pad (collect, + data1 = (TestData *) gst_collect_pads_add_pad (collect, sinkpad1, sizeof (TestData)); fail_unless (data1 != NULL); - data2 = (TestData *) gst_collect_pads2_add_pad (collect, + data2 = (TestData *) gst_collect_pads_add_pad (collect, sinkpad2, sizeof (TestData)); fail_unless (data2 != NULL); buf1 = gst_buffer_new (); /* start collect pads */ - gst_collect_pads2_start (collect); + gst_collect_pads_start (collect); /* queue a buffer */ data1->pad = srcpad1; @@ -280,10 +280,10 @@ GST_START_TEST (test_collect_twice) /* one of the pads has a buffer, the other has EOS */ fail_unless_collected (TRUE); - tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data1); + tmp = gst_collect_pads_pop (collect, (GstCollectData *) data1); fail_unless (tmp == buf1); /* there's nothing to pop from the one which received EOS */ - tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data2); + tmp = gst_collect_pads_pop (collect, (GstCollectData *) data2); fail_unless (tmp == NULL); /* these will return immediately as at this point the threads have been @@ -291,13 +291,13 @@ GST_START_TEST (test_collect_twice) g_thread_join (thread1); g_thread_join (thread2); - gst_collect_pads2_stop (collect); + gst_collect_pads_stop (collect); collected = FALSE; buf2 = gst_buffer_new (); /* start collect pads */ - gst_collect_pads2_start (collect); + gst_collect_pads_start (collect); /* push buffers on the pads */ data1->pad = srcpad1; @@ -313,9 +313,9 @@ GST_START_TEST (test_collect_twice) /* now both pads have a buffer */ fail_unless_collected (TRUE); - tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data1); + tmp = gst_collect_pads_pop (collect, (GstCollectData *) data1); fail_unless (tmp == buf1); - tmp = gst_collect_pads2_pop (collect, (GstCollectData2 *) data2); + tmp = gst_collect_pads_pop (collect, (GstCollectData *) data2); fail_unless (tmp == buf2); /* these will return immediately as at this point the threads have been @@ -323,7 +323,7 @@ GST_START_TEST (test_collect_twice) g_thread_join (thread1); g_thread_join (thread2); - gst_collect_pads2_stop (collect); + gst_collect_pads_stop (collect); gst_buffer_unref (buf1); gst_buffer_unref (buf2); @@ -333,12 +333,12 @@ GST_START_TEST (test_collect_twice) GST_END_TEST; static Suite * -gst_collect_pads2_suite (void) +gst_collect_pads_suite (void) { Suite *suite; TCase *general; - suite = suite_create ("GstCollectPads2"); + suite = suite_create ("GstCollectPads"); general = tcase_create ("general"); suite_add_tcase (suite, general); tcase_add_checked_fixture (general, setup, teardown); @@ -350,4 +350,4 @@ gst_collect_pads2_suite (void) return suite; } -GST_CHECK_MAIN (gst_collect_pads2); +GST_CHECK_MAIN (gst_collect_pads); diff --git a/tests/check/libs/controller.c b/tests/check/libs/controller.c index 68388c7..c8d9528 100644 --- a/tests/check/libs/controller.c +++ b/tests/check/libs/controller.c @@ -605,6 +605,7 @@ GST_START_TEST (controller_interpolation_linear_value_array) GstElement *elem; gdouble *raw_values; GValue *g_values; + gint *values; elem = gst_element_factory_make ("testobj", NULL); @@ -633,10 +634,10 @@ GST_START_TEST (controller_interpolation_linear_value_array) g_free (raw_values); - /* now pull in mapped values for some timestamps */ + /* now pull in mapped GValues for some timestamps */ g_values = g_new0 (GValue, 3); - fail_unless (gst_object_get_value_array (GST_OBJECT (elem), "int", + fail_unless (gst_object_get_g_value_array (GST_OBJECT (elem), "int", 0, GST_SECOND / 2, 3, g_values)); fail_unless_equals_int (g_value_get_int (&g_values[0]), 0); fail_unless_equals_int (g_value_get_int (&g_values[1]), 50); @@ -644,6 +645,17 @@ GST_START_TEST (controller_interpolation_linear_value_array) g_free (g_values); + /* now pull in mapped values for some timestamps */ + values = g_new0 (gint, 3); + + fail_unless (gst_object_get_value_array (GST_OBJECT (elem), "int", + 0, GST_SECOND / 2, 3, values)); + fail_unless_equals_int (values[0], 0); + fail_unless_equals_int (values[1], 50); + fail_unless_equals_int (values[2], 100); + + g_free (values); + gst_object_unref (cs); gst_object_unref (elem); } diff --git a/tests/check/libs/gstlibscpp.cc b/tests/check/libs/gstlibscpp.cc index 29939a3..0009ec3 100644 --- a/tests/check/libs/gstlibscpp.cc +++ b/tests/check/libs/gstlibscpp.cc @@ -31,7 +31,7 @@ #include <gst/base/gstbitreader.h> #include <gst/base/gstbytereader.h> #include <gst/base/gstbytewriter.h> -#include <gst/base/gstcollectpads2.h> +#include <gst/base/gstcollectpads.h> #include <gst/base/gstpushsrc.h> #include <gst/base/gsttypefindhelper.h> diff --git a/tests/examples/Makefile.in b/tests/examples/Makefile.in index 1be1810..2b91820 100644 --- a/tests/examples/Makefile.in +++ b/tests/examples/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tests/examples/adapter/Makefile.in b/tests/examples/adapter/Makefile.in index 2855e15..eff729e 100644 --- a/tests/examples/adapter/Makefile.in +++ b/tests/examples/adapter/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tests/examples/controller/Makefile.in b/tests/examples/controller/Makefile.in index 263defe..9dae073 100644 --- a/tests/examples/controller/Makefile.in +++ b/tests/examples/controller/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tests/examples/controller/control-sources.c b/tests/examples/controller/control-sources.c index 950cee2..7d74a87 100644 --- a/tests/examples/controller/control-sources.c +++ b/tests/examples/controller/control-sources.c @@ -230,15 +230,15 @@ test_interpolation (void) g_object_set (cs, "mode", GST_INTERPOLATION_MODE_NONE, NULL); v1 = g_new0 (GValue, n_values); - gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v1); + gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v1); g_object_set (cs, "mode", GST_INTERPOLATION_MODE_LINEAR, NULL); v2 = g_new0 (GValue, n_values); - gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v2); + gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v2); g_object_set (cs, "mode", GST_INTERPOLATION_MODE_CUBIC, NULL); v3 = g_new0 (GValue, n_values); - gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v3); + gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v3); for (t = 0; t < n_values; t++) { i1 = g_value_get_int (&v1[t]); @@ -320,23 +320,23 @@ test_lfo (void) g_object_set (cs, "waveform", GST_LFO_WAVEFORM_SINE, NULL); v1 = g_new0 (GValue, n_values); - gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v1); + gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v1); g_object_set (cs, "waveform", GST_LFO_WAVEFORM_SQUARE, NULL); v2 = g_new0 (GValue, n_values); - gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v2); + gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v2); g_object_set (cs, "waveform", GST_LFO_WAVEFORM_SAW, NULL); v3 = g_new0 (GValue, n_values); - gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v3); + gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v3); g_object_set (cs, "waveform", GST_LFO_WAVEFORM_REVERSE_SAW, NULL); v4 = g_new0 (GValue, n_values); - gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v4); + gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v4); g_object_set (cs, "waveform", GST_LFO_WAVEFORM_TRIANGLE, NULL); v5 = g_new0 (GValue, n_values); - gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v5); + gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v5); for (t = 0; t < n_values; t++) { i1 = g_value_get_int (&v1[t]); @@ -418,7 +418,7 @@ test_chained_lfo (void) n_values = 40 * 10; v1 = g_new0 (GValue, n_values); - gst_object_get_value_array (e, "int", 0, GST_SECOND / 10, n_values, v1); + gst_object_get_g_value_array (e, "int", 0, GST_SECOND / 10, n_values, v1); for (t = 0; t < n_values; t++) { i1 = g_value_get_int (&v1[t]); diff --git a/tests/examples/helloworld/Makefile.in b/tests/examples/helloworld/Makefile.in index 3d6b019..0b76d4a 100644 --- a/tests/examples/helloworld/Makefile.in +++ b/tests/examples/helloworld/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tests/examples/launch/Makefile.in b/tests/examples/launch/Makefile.in index 254433f..dc26c1e 100644 --- a/tests/examples/launch/Makefile.in +++ b/tests/examples/launch/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tests/examples/manual/Makefile.in b/tests/examples/manual/Makefile.in index 4b86cef..ea8c449 100644 --- a/tests/examples/manual/Makefile.in +++ b/tests/examples/manual/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tests/examples/metadata/Makefile.in b/tests/examples/metadata/Makefile.in index 9b2f4fb..a3817bb 100644 --- a/tests/examples/metadata/Makefile.in +++ b/tests/examples/metadata/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tests/examples/queue/Makefile.in b/tests/examples/queue/Makefile.in index 7bd50f3..9a25fc8 100644 --- a/tests/examples/queue/Makefile.in +++ b/tests/examples/queue/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tests/examples/stepping/Makefile.in b/tests/examples/stepping/Makefile.in index 2f29500..e7d9916 100644 --- a/tests/examples/stepping/Makefile.in +++ b/tests/examples/stepping/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tests/examples/streams/Makefile.in b/tests/examples/streams/Makefile.in index fcdcb2d..12cb5a0 100644 --- a/tests/examples/streams/Makefile.in +++ b/tests/examples/streams/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tests/examples/typefind/Makefile.in b/tests/examples/typefind/Makefile.in index 62589cd..843995f 100644 --- a/tests/examples/typefind/Makefile.in +++ b/tests/examples/typefind/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in index 75c9826..2ad1eea 100644 --- a/tests/misc/Makefile.in +++ b/tests/misc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tools/Makefile.in b/tools/Makefile.in index 830f756..4e906d7 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.4 from Makefile.am. +# Makefile.in generated by automake 1.11.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tools/gst-inspect.c b/tools/gst-inspect.c index fe5b98d..a8000e7 100644 --- a/tools/gst-inspect.c +++ b/tools/gst-inspect.c @@ -900,24 +900,22 @@ print_signal_info (GstElement * element) g_type_name (query->return_type), g_type_name (type)); for (j = 0; j < query->n_params; j++) { - if (_name) - g_print ("%s", _name); + g_print (",\n"); if (G_TYPE_IS_FUNDAMENTAL (query->param_types[j])) { - g_print (",\n%s%s arg%d", indent, + n_print ("%s%s arg%d", indent, g_type_name (query->param_types[j]), j); } else if (G_TYPE_IS_ENUM (query->param_types[j])) { - g_print (",\n%s%s arg%d", indent, + n_print ("%s%s arg%d", indent, g_type_name (query->param_types[j]), j); } else { - g_print (",\n%s%s* arg%d", indent, + n_print ("%s%s* arg%d", indent, g_type_name (query->param_types[j]), j); } } if (k == 0) { - if (_name) - g_print ("%s", _name); - g_print (",\n%sgpointer user_data);\n", indent); + g_print (",\n"); + n_print ("%sgpointer user_data);\n", indent); } else g_print (");\n"); @@ -942,7 +940,7 @@ print_children_info (GstElement * element) children = (GList *) GST_BIN (element)->children; if (children) { n_print ("\n"); - g_print ("Children:\n"); + n_print ("Children:\n"); } while (children) { @@ -962,8 +960,8 @@ print_blacklist (void) plugins = gst_registry_get_plugin_list (gst_registry_get ()); for (cur = plugins; cur != NULL; cur = g_list_next (cur)) { GstPlugin *plugin = (GstPlugin *) (cur->data); - if (plugin->flags & GST_PLUGIN_FLAG_BLACKLISTED) { - g_print (" %s\n", plugin->desc.name); + if (GST_OBJECT_FLAG_IS_SET (plugin, GST_PLUGIN_FLAG_BLACKLISTED)) { + g_print (" %s\n", gst_plugin_get_name (plugin)); count++; } } @@ -991,14 +989,14 @@ print_element_list (gboolean print_all) plugins = g_list_next (plugins); plugincount++; - if (plugin->flags & GST_PLUGIN_FLAG_BLACKLISTED) { + if (GST_OBJECT_FLAG_IS_SET (plugin, GST_PLUGIN_FLAG_BLACKLISTED)) { blacklistcount++; continue; } orig_features = features = gst_registry_get_feature_list_by_plugin (gst_registry_get (), - plugin->desc.name); + gst_plugin_get_name (plugin)); while (features) { GstPluginFeature *feature; @@ -1014,7 +1012,7 @@ print_element_list (gboolean print_all) if (print_all) print_element_info (factory, TRUE); else - g_print ("%s: %s: %s\n", plugin->desc.name, + g_print ("%s: %s: %s\n", gst_plugin_get_name (plugin), GST_OBJECT_NAME (factory), gst_element_factory_get_longname (factory)); #if 0 @@ -1028,17 +1026,20 @@ print_element_list (gboolean print_all) #endif } else if (GST_IS_TYPE_FIND_FACTORY (feature)) { GstTypeFindFactory *factory; + const gchar *const *extensions; factory = GST_TYPE_FIND_FACTORY (feature); if (!print_all) - g_print ("%s: %s: ", plugin->desc.name, + g_print ("%s: %s: ", gst_plugin_get_name (plugin), gst_plugin_feature_get_name (feature)); - if (factory->extensions) { + + extensions = gst_type_find_factory_get_extensions (factory); + if (extensions != NULL) { guint i = 0; - while (factory->extensions[i]) { + while (extensions[i]) { if (!print_all) - g_print ("%s%s", i > 0 ? ", " : "", factory->extensions[i]); + g_print ("%s%s", i > 0 ? ", " : "", extensions[i]); i++; } if (!print_all) @@ -1049,7 +1050,7 @@ print_element_list (gboolean print_all) } } else { if (!print_all) - n_print ("%s: %s (%s)\n", plugin->desc.name, + n_print ("%s: %s (%s)\n", gst_plugin_get_name (plugin), GST_OBJECT_NAME (feature), g_type_name (G_OBJECT_TYPE (feature))); } @@ -1088,7 +1089,7 @@ print_all_uri_handlers (void) features = gst_registry_get_feature_list_by_plugin (gst_registry_get (), - plugin->desc.name); + gst_plugin_get_name (plugin)); for (f = features; f; f = f->next) { GstPluginFeature *feature = GST_PLUGIN_FEATURE (f->data); @@ -1099,7 +1100,8 @@ print_all_uri_handlers (void) factory = GST_ELEMENT_FACTORY (gst_plugin_feature_load (feature)); if (!factory) { - g_print ("element plugin %s couldn't be loaded\n", plugin->desc.name); + g_print ("element plugin %s couldn't be loaded\n", + gst_plugin_get_name (plugin)); continue; } @@ -1154,21 +1156,24 @@ print_all_uri_handlers (void) static void print_plugin_info (GstPlugin * plugin) { + const gchar *release_date = gst_plugin_get_release_date_string (plugin); + const gchar *filename = gst_plugin_get_filename (plugin); + n_print ("Plugin Details:\n"); - n_print (" Name:\t\t\t%s\n", plugin->desc.name); - n_print (" Description:\t\t%s\n", plugin->desc.description); - n_print (" Filename:\t\t%s\n", - plugin->filename ? plugin->filename : "(null)"); - n_print (" Version:\t\t%s\n", plugin->desc.version); - n_print (" License:\t\t%s\n", plugin->desc.license); - n_print (" Source module:\t%s\n", plugin->desc.source); - if (plugin->desc.release_datetime != NULL) { + n_print (" Name:\t\t\t%s\n", gst_plugin_get_name (plugin)); + n_print (" Description:\t\t%s\n", gst_plugin_get_description (plugin)); + n_print (" Filename:\t\t%s\n", (filename != NULL) ? filename : "(null)"); + n_print (" Version:\t\t%s\n", gst_plugin_get_version (plugin)); + n_print (" License:\t\t%s\n", gst_plugin_get_license (plugin)); + n_print (" Source module:\t%s\n", gst_plugin_get_source (plugin)); + + if (release_date != NULL) { const gchar *tz = "(UTC)"; gchar *str, *sep; /* may be: YYYY-MM-DD or YYYY-MM-DDTHH:MMZ */ /* YYYY-MM-DDTHH:MMZ => YYYY-MM-DD HH:MM (UTC) */ - str = g_strdup (plugin->desc.release_datetime); + str = g_strdup (release_date); sep = strstr (str, "T"); if (sep != NULL) { *sep = ' '; @@ -1181,8 +1186,8 @@ print_plugin_info (GstPlugin * plugin) n_print (" Source release date:\t%s%s\n", str, tz); g_free (str); } - n_print (" Binary package:\t%s\n", plugin->desc.package); - n_print (" Origin URL:\t\t%s\n", plugin->desc.origin); + n_print (" Binary package:\t%s\n", gst_plugin_get_package (plugin)); + n_print (" Origin URL:\t\t%s\n", gst_plugin_get_origin (plugin)); n_print ("\n"); } @@ -1198,7 +1203,7 @@ print_plugin_features (GstPlugin * plugin) origlist = features = gst_registry_get_feature_list_by_plugin (gst_registry_get (), - plugin->desc.name); + gst_plugin_get_name (plugin)); while (features) { GstPluginFeature *feature; @@ -1222,20 +1227,22 @@ print_plugin_features (GstPlugin * plugin) #endif } else if (GST_IS_TYPE_FIND_FACTORY (feature)) { GstTypeFindFactory *factory; + const gchar *const *extensions; factory = GST_TYPE_FIND_FACTORY (feature); - if (factory->extensions) { + extensions = gst_type_find_factory_get_extensions (factory); + if (extensions) { guint i = 0; - g_print ("%s: %s: ", plugin->desc.name, + g_print ("%s: %s: ", gst_plugin_get_name (plugin), gst_plugin_feature_get_name (feature)); - while (factory->extensions[i]) { - g_print ("%s%s", i > 0 ? ", " : "", factory->extensions[i]); + while (extensions[i]) { + g_print ("%s%s", i > 0 ? ", " : "", extensions[i]); i++; } g_print ("\n"); } else - g_print ("%s: %s: no extensions\n", plugin->desc.name, + g_print ("%s: %s: no extensions\n", gst_plugin_get_name (plugin), gst_plugin_feature_get_name (feature)); num_typefinders++; diff --git a/tools/gst-launch.c b/tools/gst-launch.c index 2113bf4..9161594 100644 --- a/tools/gst-launch.c +++ b/tools/gst-launch.c @@ -438,6 +438,27 @@ print_tag (const GstTagList * list, const gchar * tag, gpointer unused) } } +static void +print_tag_foreach (const GstTagList * tags, const gchar * tag, + gpointer user_data) +{ + GValue val = { 0, }; + gchar *str; + gint depth = GPOINTER_TO_INT (user_data); + + gst_tag_list_copy_value (&val, tags, tag); + + if (G_VALUE_HOLDS_STRING (&val)) + str = g_value_dup_string (&val); + else + str = gst_value_serialize (&val); + + g_print ("%*s%s: %s\n", 2 * depth, " ", gst_tag_get_nick (tag), str); + g_free (str); + + g_value_unset (&val); +} + #define MAX_INDENT 40 static void @@ -461,7 +482,9 @@ print_toc_entry (gpointer data, gpointer user_data) PRINT ("\n"); indent += 2; - /* TODO: print tags */ + /* print tags */ + gst_tag_list_foreach (entry->tags, print_tag_foreach, + GINT_TO_POINTER (indent)); /* loop over sub-toc entries */ g_list_foreach (entry->subentries, print_toc_entry, diff --git a/win32/common/config.h b/win32/common/config.h index 2681569..1d32cf7 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -62,7 +62,7 @@ #define GST_PACKAGE_ORIGIN "Unknown package origin" /* GStreamer package release date/time for plugins as YYYY-MM-DD */ -#define GST_PACKAGE_RELEASE_DATETIME "2012-04-12" +#define GST_PACKAGE_RELEASE_DATETIME "2012-05-13" /* location of the installed gst-plugin-scanner */ #define GST_PLUGIN_SCANNER_INSTALLED LIBDIR "\\gst-plugin-scanner" @@ -334,7 +334,7 @@ #define PACKAGE_NAME "GStreamer" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer 0.11.90" +#define PACKAGE_STRING "GStreamer 0.11.91" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gstreamer" @@ -343,7 +343,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "0.11.90" +#define PACKAGE_VERSION "0.11.91" /* directory where plugins are located */ #ifdef _DEBUG @@ -374,7 +374,7 @@ #undef USE_POISONING /* Version number of package */ -#define VERSION "0.11.90" +#define VERSION "0.11.91" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ @@ -388,6 +388,11 @@ # endif #endif +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS diff --git a/win32/common/gstenumtypes.c b/win32/common/gstenumtypes.c index 92103ec..436df4b 100644 --- a/win32/common/gstenumtypes.c +++ b/win32/common/gstenumtypes.c @@ -912,6 +912,7 @@ gst_meta_flags_get_type (void) {C_FLAGS (GST_META_FLAG_NONE), "GST_META_FLAG_NONE", "none"}, {C_FLAGS (GST_META_FLAG_READONLY), "GST_META_FLAG_READONLY", "readonly"}, {C_FLAGS (GST_META_FLAG_POOLED), "GST_META_FLAG_POOLED", "pooled"}, + {C_FLAGS (GST_META_FLAG_LOCKED), "GST_META_FLAG_LOCKED", "locked"}, {C_FLAGS (GST_META_FLAG_LAST), "GST_META_FLAG_LAST", "last"}, {0, NULL, NULL} }; @@ -1472,6 +1473,12 @@ gst_seek_flags_get_type (void) {C_FLAGS (GST_SEEK_FLAG_KEY_UNIT), "GST_SEEK_FLAG_KEY_UNIT", "key-unit"}, {C_FLAGS (GST_SEEK_FLAG_SEGMENT), "GST_SEEK_FLAG_SEGMENT", "segment"}, {C_FLAGS (GST_SEEK_FLAG_SKIP), "GST_SEEK_FLAG_SKIP", "skip"}, + {C_FLAGS (GST_SEEK_FLAG_SNAP_BEFORE), "GST_SEEK_FLAG_SNAP_BEFORE", + "snap-before"}, + {C_FLAGS (GST_SEEK_FLAG_SNAP_AFTER), "GST_SEEK_FLAG_SNAP_AFTER", + "snap-after"}, + {C_FLAGS (GST_SEEK_FLAG_SNAP_NEAREST), "GST_SEEK_FLAG_SNAP_NEAREST", + "snap-nearest"}, {0, NULL, NULL} }; diff --git a/win32/common/libgstbase.def b/win32/common/libgstbase.def index fcd4666..236c4a7 100644 --- a/win32/common/libgstbase.def +++ b/win32/common/libgstbase.def @@ -209,30 +209,33 @@ EXPORTS gst_byte_writer_reset gst_byte_writer_reset_and_get_buffer gst_byte_writer_reset_and_get_data - gst_collect_pads2_add_pad - gst_collect_pads2_add_pad_full - gst_collect_pads2_available - gst_collect_pads2_clip_running_time - gst_collect_pads2_collect - gst_collect_pads2_collect_range - gst_collect_pads2_flush - gst_collect_pads2_get_type - gst_collect_pads2_is_active - gst_collect_pads2_new - gst_collect_pads2_peek - gst_collect_pads2_pop - gst_collect_pads2_read_buffer - gst_collect_pads2_remove_pad - gst_collect_pads2_set_buffer_function - gst_collect_pads2_set_clip_function - gst_collect_pads2_set_compare_function - gst_collect_pads2_set_event_function - gst_collect_pads2_set_flushing - gst_collect_pads2_set_function - gst_collect_pads2_set_waiting - gst_collect_pads2_start - gst_collect_pads2_stop - gst_collect_pads2_take_buffer + gst_collect_pads_add_pad + gst_collect_pads_add_pad_full + gst_collect_pads_available + gst_collect_pads_clip_running_time + gst_collect_pads_collect + gst_collect_pads_collect_range + gst_collect_pads_event_default + gst_collect_pads_flush + gst_collect_pads_get_type + gst_collect_pads_is_active + gst_collect_pads_new + gst_collect_pads_peek + gst_collect_pads_pop + gst_collect_pads_query_default + gst_collect_pads_read_buffer + gst_collect_pads_remove_pad + gst_collect_pads_set_buffer_function + gst_collect_pads_set_clip_function + gst_collect_pads_set_compare_function + gst_collect_pads_set_event_function + gst_collect_pads_set_flushing + gst_collect_pads_set_function + gst_collect_pads_set_query_function + gst_collect_pads_set_waiting + gst_collect_pads_start + gst_collect_pads_stop + gst_collect_pads_take_buffer gst_push_src_get_type gst_type_find_helper gst_type_find_helper_for_buffer diff --git a/win32/common/libgstreamer.def b/win32/common/libgstreamer.def index f7fba34..3823726 100644 --- a/win32/common/libgstreamer.def +++ b/win32/common/libgstreamer.def @@ -254,6 +254,7 @@ EXPORTS gst_clock_single_shot_id_reinit gst_clock_type_get_type gst_clock_unadjust_unlocked + gst_control_binding_get_g_value_array gst_control_binding_get_type gst_control_binding_get_value gst_control_binding_get_value_array @@ -605,6 +606,7 @@ EXPORTS gst_object_flags_get_type gst_object_get_control_binding gst_object_get_control_rate + gst_object_get_g_value_array gst_object_get_name gst_object_get_parent gst_object_get_path_string @@ -759,10 +761,10 @@ EXPORTS gst_plugin_get_description gst_plugin_get_filename gst_plugin_get_license - gst_plugin_get_module gst_plugin_get_name gst_plugin_get_origin gst_plugin_get_package + gst_plugin_get_release_date_string gst_plugin_get_source gst_plugin_get_type gst_plugin_get_version @@ -771,7 +773,6 @@ EXPORTS gst_plugin_load gst_plugin_load_by_name gst_plugin_load_file - gst_plugin_name_filter gst_plugin_register_static gst_plugin_register_static_full gst_plugin_set_cache_data @@ -1143,6 +1144,7 @@ EXPORTS gst_type_find_factory_get_extensions gst_type_find_factory_get_list gst_type_find_factory_get_type + gst_type_find_factory_has_function gst_type_find_get_length gst_type_find_get_type gst_type_find_peek |