diff options
239 files changed, 2393 insertions, 853 deletions
@@ -1,9 +1,375 @@ +=== release 1.1.3 === + +2013-07-29 Sebastian Dröge <sebastian.droege@collabora.co.uk> + + * configure.ac: + releasing 1.1.3 + +2013-07-29 12:10:45 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * libs/gst/base/gstbaseparse.c: + * libs/gst/base/gstbasesink.c: + * libs/gst/base/gstbasesrc.c: + base: Fix handling of SEGMENT query + The values should be in stream-time, and start/stop should not + be swapped for negative rates. + +2013-07-29 11:05:09 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * plugins/elements/gsttypefindelement.c: + typefind: Only advance offset by the number of bytes we actually read + There might be a short read at EOS. + +2013-07-29 10:48:30 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * libs/gst/base/gstbaseparse.c: + baseparse: Implement SEGMENT query + +2013-07-26 18:36:04 +0100 Tim-Philipp Müller <tim@centricular.net> + + * gst/gstbuffer.c: + buffer: fix Since: marker for new gst_buffer_extract_dup() + +2013-07-26 12:19:32 +0200 Wim Taymans <wim.taymans@collabora.co.uk> + + * gst/gstclock.c: + clock: debug the clock return values + +2013-07-25 12:20:14 -0300 Thiago Santos <thiago.sousa.santos@collabora.com> + + * libs/gst/base/gstbaseparse.c: + baseparse: fix seqnum handling for seeks + Use the same seqnum as the seek for flushes/segments that are + caused by the seek. Also do the same for segment events + Fixes #676242 + +2013-07-24 10:29:30 -0700 David Schleef <ds@schleef.org> + + * gst/gstinfo.c: + info: parse debug levels > 9 + +2013-07-24 16:57:46 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * gst/gstvalue.c: + value: Fix copy&paste mistakes in the bitmask function docs + +2013-07-24 11:21:27 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * libs/gst/base/gstbasesink.c: + basesink: Don't shadow variables that are set inside our scope and then used outside our scope + Fixes uninitialized use of these variables. + +2013-07-24 10:30:25 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * tests/check/gst/struct_arm.h: + * tests/check/gst/struct_hppa.h: + * tests/check/gst/struct_i386.h: + * tests/check/gst/struct_i386w.h: + * tests/check/gst/struct_ppc32.h: + * tests/check/gst/struct_ppc64.h: + * tests/check/gst/struct_sparc.h: + * tests/check/gst/struct_x86_64.h: + tests: Remove other interface structs from the ABI tests too + +2010-10-15 13:16:59 -0300 Thiago Santos <thiago.sousa.santos@collabora.co.uk> + + * tests/check/gst/struct_arm.h: + * tests/check/gst/struct_hppa.h: + * tests/check/gst/struct_i386.h: + * tests/check/gst/struct_i386w.h: + * tests/check/gst/struct_ppc32.h: + * tests/check/gst/struct_ppc64.h: + * tests/check/gst/struct_sparc.h: + * tests/check/gst/struct_x86_64.h: + tests: Remove GstTagSetter from ABI checks + Interfaces can have new members added without breaking ABI, so + remove it from the check. + https://bugzilla.gnome.org/show_bug.cgi?id=623799 + +2013-07-23 15:39:53 -0400 Thibault Saunier <thibault.saunier@collabora.com> + + * libs/gst/check/libcheck/check_print.c: + libcheck: Escape strings in the generated xml files + This is copy pasted from upstream libcheck + +2013-07-23 18:53:44 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * libs/gst/base/gstbasesink.c: + basesink: Print some debug output if a stream-start event without group-id arrives + Ideally all elements would implement handling of that to get proper + stream-start message handling and other things. + +2013-07-22 18:03:01 +0200 Arnaud Vrac <avrac@freebox.fr> + + * plugins/elements/gstinputselector.c: + input-selector: Fix missing pad activation notification + A new active pad might not be notified in some cases, which results + in the current track number not being set in playbin. + The active-pad notification is only sent in the chain and sink_event + functions, and only when the buffer or event that triggered the active + pad selection is from the newly activated pad. So in the other case + the notification will never be sent. + https://bugzilla.gnome.org/show_bug.cgi?id=704691 + +2013-07-22 17:25:47 +0100 Tim-Philipp Müller <tim.muller@collabora.co.uk> + + * gst/gstvalue.c: + value: handle deserialisation of nonexistant enum value more gracefully + +2013-07-22 14:12:18 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * plugins/elements/gstinputselector.c: + * plugins/elements/gstinputselector.h: + inputselector: Don't push new stream-start events on stream change unless they all have group ids + https://bugzilla.gnome.org/show_bug.cgi?id=704408 + +2013-07-22 12:06:29 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * plugins/elements/gsttypefindelement.c: + typefind: Use new group-id in stream-start event + +2013-07-22 12:06:08 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * libs/gst/base/gstbaseparse.c: + * libs/gst/base/gstbasesink.c: + * libs/gst/base/gstbasesrc.c: + base: Use new group-id field in stream-start event and message + +2013-07-22 11:42:18 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * gst/gstbin.c: + bin: Use the new group-id field of the stream-start message for stream-start message aggregation + If all stream-start messages had a group id (for backwards compatibility), + we only consider a stream started if all had the same group id. + In 2.0 we should make the group id mandatory. + +2013-07-22 11:41:35 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * docs/gst/gstreamer-sections.txt: + * gst/gstevent.c: + * gst/gstevent.h: + * gst/gstmessage.c: + * gst/gstmessage.h: + * gst/gstquark.c: + * gst/gstquark.h: + * gst/gstutils.c: + * gst/gstutils.h: + * win32/common/libgstreamer.def: + gst: Add new group-id field to the stream-start event + All streams that have the same group id are supposed to be played + together, i.e. all streams inside a container file should have the + same group id but different stream ids. The group id should change + each time the stream is started, resulting in different group ids + each time a file is played for example. + +2013-07-18 23:29:49 +0100 Tim-Philipp Müller <tim@centricular.net> + + * common: + common: revert accidental change of common submodule + +2013-07-18 14:39:42 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * gst/gstcaps.c: + * gst/gstmessage.c: + * gst/gstmessage.h: + gst: Add some more Since: 1.2 + +2013-07-18 14:34:31 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * gst/gstinfo.c: + info: Add some Since: 1.2 + +2013-07-18 15:10:10 +0400 Руслан Ижбулатов <lrn1986@gmail.com> + + * common: + * docs/gst/gstreamer-sections.txt: + * docs/gst/running.xml: + * docs/manual/appendix-checklist.xml: + * gst/gst.c: + * gst/gstinfo.c: + * gst/gstinfo.h: + * tools/gst-launch.1.in: + * tools/gst-plot-timeline.py: + * win32/common/libgstreamer.def: + info: Add debug color mode option + This allows to explicitely set the debug output color + mode to UNIX on every platform, enable it (use platform + default color mode) or enable it. + https://bugzilla.gnome.org/show_bug.cgi?id=674320 + +2012-04-18 14:35:32 +0400 Руслан Ижбулатов <lrn1986@gmail.com> + + * gst/gstinfo.c: + info: Fix black and underline coloring on W32 + Fixes #674320 + +2012-04-18 14:12:16 +0400 Руслан Ижбулатов <lrn1986@gmail.com> + + * gst/gstinfo.c: + info: Cut down src file names for MinGW too + Fixes #674320 + +2013-07-16 17:47:45 +0200 Nicola Murino <nicola.murino@gmail.com> + + * scripts/gst-uninstalled: + gst-uninstalled: Fix gst-plugins-gl in uninstalled setup + https://bugzilla.gnome.org/show_bug.cgi?id=703499 + +2013-07-16 15:35:08 -0400 Olivier Crête <olivier.crete@collabora.com> + + * libs/gst/base/gstadapter.c: + * tests/check/libs/adapter.c: + adapter: Take account of the skip in gst_adapter_take_buffer_fast() + Include regression test + +2013-07-15 15:41:44 -0400 Olivier Crête <olivier.crete@collabora.com> + + * libs/gst/base/gstadapter.c: + * libs/gst/base/gstadapter.h: + * tests/check/libs/adapter.c: + * win32/common/libgstbase.def: + adapter: Add function to return buffer composed of multiple memories + API: gst_adapter_take_fast() + +2013-07-16 16:24:38 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * gst/gstquery.c: + query: Don't assert if no context is set in the query + +2013-07-16 14:47:05 +0100 Tim-Philipp Müller <tim@centricular.net> + + * tests/benchmarks/.gitignore: + benchmarks: ignore new benchmark binary + +2013-07-16 14:46:15 +0100 Tim-Philipp Müller <tim@centricular.net> + + * gst/gstquery.c: + * gst/gstquery.h: + query: sprinkle some Since 1.2 markers in docs + +2013-07-16 14:44:03 +0100 Tim-Philipp Müller <tim@centricular.net> + + * libs/gst/net/gstnettimeprovider.c: + timeprovider: g-i: allow None as address for gst_net_time_provider_new() + +2013-07-16 15:34:57 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * gst/gstelement.c: + element: Return an empty GstContext if none was set yet + +2013-07-16 15:16:16 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * docs/gst/gstreamer-sections.txt: + * gst/gstquery.c: + * gst/gstquery.h: + * win32/common/libgstreamer.def: + query: Add gst_query_has_context_type() + +2013-07-16 11:36:50 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * plugins/elements/gstmultiqueue.c: + multiqueue: only block serialized query when it's safe + We must be certain that we don't cause a deadlock when blocking the serialized + queries. One such deadlock can happen when we are buffering and downstream is + blocked in preroll and a serialized query arrives. Downstream will not unblock + (and allow our query to execute) until we complete buffering and buffering will + not complete until we can answer the query.. + https://bugzilla.gnome.org/show_bug.cgi?id=702840 + +2013-07-15 11:36:18 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * gst/gstpad.c: + pad: A newly activated pad should be marked as needing reconfiguration + +2013-07-15 11:32:54 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * gst/gstpad.c: + Revert "pad: Don't consider flushing pads as needing reconfiguration" + This reverts commit 948a9d2f2b728f5fb60be45d47a818cebeb60c7d. + This is racy and trying to reconfigure and fail is still better + than not trying to reconfigure at all. + https://bugzilla.gnome.org/show_bug.cgi?id=704100 + +2013-07-15 11:32:10 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * libs/gst/base/gstbasesrc.c: + basesrc: Leave the loop function faster if we're flushing + Especially don't even try to send stream-start event or try + to negotiate. + https://bugzilla.gnome.org/show_bug.cgi?id=704100 + +2013-07-12 10:08:26 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * plugins/elements/gstinputselector.c: + inputselector: Deactivate and remove pad without the inputselector lock + Otherwise we might get deadlocks caused by lock order inversion: + During the chain function the stream lock is first locked and then the + inputselector lock. During pad release we first locked the inputselector + lock and then deactivating the pad would lock the stream lock. + There's no reason why the inputselector lock should be required while + deactivating and removing the pad, it's only needed before. + https://bugzilla.gnome.org/show_bug.cgi?id=704002 + +2013-07-11 16:57:06 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * configure.ac: + Back to development + === release 1.1.2 === -2013-07-11 Sebastian Dröge <sebastian.droege@collabora.co.uk> +2013-07-11 15:12:39 +0200 Sebastian Dröge <slomo@circular-chaos.org> + * ChangeLog: + * NEWS: + * RELEASE: * configure.ac: - releasing 1.1.2 + * docs/plugins/inspect/plugin-coreelements.xml: + * gstreamer.doap: + * win32/common/config.h: + * win32/common/gstversion.h: + Release 1.1.2 + +2013-07-11 15:11:27 +0200 Sebastian Dröge <slomo@circular-chaos.org> + + * 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 2013-07-10 15:52:10 +0200 Sebastian Dröge <slomo@circular-chaos.org> diff --git a/Makefile.in b/Makefile.in index 5bbf783..57c6afb 100644 --- a/Makefile.in +++ b/Makefile.in @@ -388,6 +388,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -398,7 +399,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ @@ -1,2 +1,2 @@ -This is GStreamer 1.1.2 +This is GStreamer 1.1.3 @@ -1,5 +1,5 @@ -Release notes for GStreamer 1.1.2 +Release notes for GStreamer 1.1.3 The GStreamer team is proud to announce a new bug-fix release @@ -45,14 +45,11 @@ Features of this release Bugs fixed in this release - * 652037 : basesrc: less persistent caching of size - * 701985 : gst-launch: Unreffing GstContext that is still used - * 702089 : gst_init: Don't intercept --help - * 702520 : queue: deadlock when reconfigure event - * 702632 : acceptcaps query can be very very slow - * 703267 : funnel: Needs to be usable in playbin - * 703377 : gst_check_setup_events() and multiple src or sink pads - * 703682 : POTFILES.in is out of date + * 674320 : Various improvements for logging on W32 + * 676242 : [metabug] Verify that elements handle seqnum for seeks correctly + * 704333 : gst-uninstalled: fix gst-plugins-gl in unistalled setup + * 704408 : inputselector: stream start event forwarding prevents track change + * 704691 : input-selector: active pad not notified ==== Download ==== @@ -89,19 +86,14 @@ subscribe to the gstreamer-devel list. Contributors to this release - * Brendan Long - * Edward Hervey - * Hans de Goede - * Jonas Holmberg - * Kim Lam - * Nicolas Dufresne + * Arnaud Vrac + * David Schleef + * Nicola Murino * Olivier Crête - * Paul HENRYS - * Piotr Drąg * Sebastian Dröge - * Sjoerd Simons - * Stefan Sauer + * Thiago Santos * Thibault Saunier * Tim-Philipp Müller * Wim Taymans + * Руслан Ижбулатов
\ No newline at end of file diff --git a/common/Makefile.in b/common/Makefile.in index 2043b94..92bd1b1 100644 --- a/common/Makefile.in +++ b/common/Makefile.in @@ -79,8 +79,7 @@ build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ subdir = common -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ChangeLog \ - README +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/common/m4/as-ac-expand.m4 \ $(top_srcdir)/common/m4/as-auto-alt.m4 \ @@ -317,6 +316,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -327,7 +327,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/common/README b/common/README deleted file mode 100644 index 83a1b88..0000000 --- a/common/README +++ /dev/null @@ -1,255 +0,0 @@ -GStreamer @SERIES_VERSION@ - -WHAT IT IS ----------- - -This is GStreamer, a framework for streaming media. - -WHERE TO START --------------- - -We have a website at -http://gstreamer.freedesktop.org/ - -You should start by going through our FAQ at -http://gstreamer.freedesktop.org/data/doc/gstreamer/head/faq/html/ - -There is more documentation; go to -http://gstreamer.freedesktop.org/documentation - -You can subscribe to our mailing lists; see the website for details. - -We track bugs in GNOME's bugzilla; see the website for details. - -You can join us on IRC - #gstreamer on irc.freenode.org - -GStreamer 1.0 series --------------------- - -Starring - - GSTREAMER - -The core around which all other modules revolve. Base functionality and -libraries, some essential elements, documentation, and testing. - - BASE - -A well-groomed and well-maintained collection of GStreamer plug-ins and -elements, spanning the range of possible types of elements one would want -to write for GStreamer. - -And introducing, for the first time ever, on the development screen ... - - THE GOOD - - --- "Such ingratitude. After all the times I've saved your life." - -A collection of plug-ins you'd want to have right next to you on the -battlefield. Shooting sharp and making no mistakes, these plug-ins have it -all: good looks, good code, and good licensing. Documented and dressed up -in tests. If you're looking for a role model to base your own plug-in on, -here it is. - -If you find a plot hole or a badly lip-synced line of code in them, -let us know - it is a matter of honour for us to ensure Blondie doesn't look -like he's been walking 100 miles through the desert without water. - - THE UGLY - - --- "When you have to shoot, shoot. Don't talk." - -There are times when the world needs a color between black and white. -Quality code to match the good's, but two-timing, backstabbing and ready to -sell your freedom down the river. These plug-ins might have a patent noose -around their neck, or a lock-up license, or any other problem that makes you -think twice about shipping them. - -We don't call them ugly because we like them less. Does a mother love her -son less because he's not as pretty as the other ones ? No - she commends -him on his great personality. These plug-ins are the life of the party. -And we'll still step in and set them straight if you report any unacceptable -behaviour - because there are two kinds of people in the world, my friend: -those with a rope around their neck and the people who do the cutting. - - THE BAD - - --- "That an accusation?" - -No perfectly groomed moustache or any amount of fine clothing is going to -cover up the truth - these plug-ins are Bad with a capital B. -They look fine on the outside, and might even appear to get the job done, but -at the end of the day they're a black sheep. Without a golden-haired angel -to watch over them, they'll probably land in an unmarked grave at the final -showdown. - -Don't bug us about their quality - exercise your Free Software rights, -patch up the offender and send us the patch on the fastest steed you can -steal from the Confederates. Because you see, in this world, there's two -kinds of people, my friend: those with loaded guns and those who dig. -You dig. - -The Lowdown ------------ - - --- "I've never seen so many plug-ins wasted so badly." - -GStreamer Plug-ins has grown so big that it's hard to separate the wheat from -the chaff. Also, distributors have brought up issues about the legal status -of some of the plug-ins we ship. To remedy this, we've divided the previous -set of available plug-ins into four modules: - -- gst-plugins-base: a small and fixed set of plug-ins, covering a wide range - of possible types of elements; these are continuously kept up-to-date - with any core changes during the development series. - - - We believe distributors can safely ship these plug-ins. - - People writing elements should base their code on these elements. - - These elements come with examples, documentation, and regression tests. - -- gst-plugins-good: a set of plug-ins that we consider to have good quality - code, correct functionality, our preferred license (LGPL for the plug-in - code, LGPL or LGPL-compatible for the supporting library). - - - We believe distributors can safely ship these plug-ins. - - People writing elements should base their code on these elements. - -- gst-plugins-ugly: a set of plug-ins that have good quality and correct - functionality, but distributing them might pose problems. The license - on either the plug-ins or the supporting libraries might not be how we'd - like. The code might be widely known to present patent problems. - - - Distributors should check if they want/can ship these plug-ins. - - People writing elements should base their code on these elements. - -- gst-plugins-bad: a set of plug-ins that aren't up to par compared to the - rest. They might be close to being good quality, but they're missing - something - be it a good code review, some documentation, a set of tests, - a real live maintainer, or some actual wide use. - If the blanks are filled in they might be upgraded to become part of - either gst-plugins-good or gst-plugins-ugly, depending on the other factors. - - - If the plug-ins break, you can't complain - instead, you can fix the - problem and send us a patch, or bribe someone into fixing them for you. - - New contributors can start here for things to work on. - -PLATFORMS ---------- - -- Linux is of course fully supported -- FreeBSD is reported to work; other BSDs should work too -- Solaris is reported to work; a specific sunaudiosink plugin has been written -- MacOSX works, binary 1.x packages can be built using the cerbero build tool -- Windows works; binary 1.x packages can be built using the cerbero build tool - - MSys/MinGW builds - - Microsoft Visual Studio builds are not yet available or supported -- Android works, binary 1.x packages can be built using the cerbero build tool -- iOS works - -INSTALLING FROM PACKAGES ------------------------- - -You should always prefer installing from packages first. GStreamer is -well-maintained for a number of distributions, including Fedora, Debian, -Ubuntu, Mandrake, Gentoo, ... - -Only in cases where you: -- want to hack on GStreamer -- want to verify that a bug has been fixed -- do not have a sane distribution -should you choose to build from source tarballs or git. - -Find more information about the various packages at -http://gstreamer.freedesktop.org/download/ - -COMPILING FROM SOURCE TARBALLS ------------------------------- - -- again, make sure that you really need to install from source ! - If GStreamer is one of your first projects ever that you build from source, - consider taking on an easier project. - -- check output of ./configure --help to see if any options apply to you -- run - ./configure - make - - to build GStreamer. -- if you want to install it (not required, but what you usually want to do), run - make install - -- try out a simple test: - gst-launch -v fakesrc num_buffers=5 ! fakesink - (If you didn't install GStreamer, prefix gst-launch with tools/) - - If it outputs a bunch of messages from fakesrc and fakesink, everything is - ok. - - If it did not work, keep in mind that you might need to adjust the - PATH and/or LD_LIBRARY_PATH environment variables to make the system - find GStreamer in the prefix where you installed (by default that is /usr/local). - -- After this, you're ready to install gst-plugins, which will provide the - functionality you're probably looking for by now, so go on and read - that README. - -COMPILING FROM GIT ------------------- - -When building from git sources, you will need to run autogen.sh to generate -the build system files. - -You will need a set of additional tools typical for building from git, -including: -- autoconf -- automake -- libtool - -autogen.sh will check for recent enough versions and complain if you don't have -them. You can also specify specific versions of automake and autoconf with ---with-automake and --with-autoconf - -Check autogen.sh options by running autogen.sh --help - -autogen.sh can pass on arguments to configure - -When you have done this once, you can use autoregen.sh to re-autogen with -the last passed options as a handy shortcut. Use it. - -After the autogen.sh stage, you can follow the directions listed in -"COMPILING FROM SOURCE" - -You can also run your whole git stack uninstalled in your home directory, -so that you can quickly test changes without affecting your system setup or -interfering with GStreamer installed from packages. Many GStreamer developers -use an uninstalled setup for their work. - -There is a 'create-uninstalled-setup.sh' script in - - http://cgit.freedesktop.org/gstreamer/gstreamer/tree/scripts/ - -to easily create an uninstalled setup from scratch. - - -PLUG-IN DEPENDENCIES AND LICENSES ---------------------------------- - -GStreamer is developed under the terms of the LGPL (see LICENSE file for -details). Some of our plug-ins however rely on libraries which are available -under other licenses. This means that if you are distributing an application -which has a non-GPL compatible license (for instance a closed-source -application) with GStreamer, you have to make sure not to distribute GPL-linked -plug-ins. - -When using GPL-linked plug-ins, GStreamer is for all practical reasons -under the GPL itself. - -HISTORY -------- - -The fundamental design comes from the video pipeline at Oregon Graduate -Institute, as well as some ideas from DirectMedia. It's based on plug-ins that -will provide the various codec and other functionality. The interface -hopefully is generic enough for various companies (ahem, Apple) to release -binary codecs for Linux, until such time as they get a clue and release the -source. diff --git a/common/gst.supp b/common/gst.supp index 8a3617f..5a23946 100644 --- a/common/gst.supp +++ b/common/gst.supp @@ -91,14 +91,6 @@ fun:pthread_create@@* } -{ - <tls> - Memcheck:Leak - fun:calloc - fun:allocate_dtv - fun:_dl_allocate_tls -} - # I get an extra stack entry on x86/dapper { <tls> @@ -3977,10 +3969,3 @@ fun:gobject_init_ctor } -{ - <quark table is leaked on purpose if it grows too big> - Memcheck:Leak - fun:malloc - ... - fun:g_quark_from*_string -} diff --git a/common/m4/Makefile.in b/common/m4/Makefile.in index f3b2905..23ce371 100644 --- a/common/m4/Makefile.in +++ b/common/m4/Makefile.in @@ -256,6 +256,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -266,7 +267,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/common/m4/as-docbook.m4 b/common/m4/as-docbook.m4 index 2e27050..8a1b32a 100644 --- a/common/m4/as-docbook.m4 +++ b/common/m4/as-docbook.m4 @@ -14,19 +14,7 @@ AC_DEFUN([AS_DOCBOOK], TYPE_UC=XML DOCBOOK_VERSION=4.1.2 - if test -n "$XML_CATALOG_FILES"; then - oldIFS=$IFS - IFS=' ' - for xml_catalog_file in $XML_CATALOG_FILES; do - if test -f $xml_catalog_file; then - XML_CATALOG=$xml_catalog_file - CAT_ENTRY_START='<!--' - CAT_ENTRY_END='-->' - break - fi - done - IFS=$oldIFS - elif test ! -f /etc/xml/catalog; then + if test ! -f /etc/xml/catalog; then for i in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/sgml/docbook/xsl-stylesheets/ /usr/local/share/xsl/docbook ; do if test -d "$i"; then diff --git a/common/m4/gst-doc.m4 b/common/m4/gst-doc.m4 index 5d3f0fd..cf83184 100644 --- a/common/m4/gst-doc.m4 +++ b/common/m4/gst-doc.m4 @@ -20,10 +20,34 @@ AC_DEFUN([AG_GST_DOCBOOK_CHECK], dnl check for docbook tools AC_CHECK_PROG(HAVE_DOCBOOK2PS, docbook2ps, yes, no) - AC_CHECK_PROG(HAVE_XSLTPROC, xsltproc, yes, no) + AC_CHECK_PROG(HAVE_DOCBOOK2HTML, docbook2html, yes, no) AC_CHECK_PROG(HAVE_JADETEX, jadetex, yes, no) AC_CHECK_PROG(HAVE_PS2PDF, ps2pdf, yes, no) + # -V option appeared in 0.6.10 + docbook2html_min_version=0.6.10 + if test "x$HAVE_DOCBOOK2HTML" != "xno"; then + docbook2html_version=`docbook2html --version` + AC_MSG_CHECKING([docbook2html version ($docbook2html_version) >= $docbook2html_min_version]) + if perl -w <<EOF + (\$min_version_major, \$min_version_minor, \$min_version_micro ) = "$docbook2html_min_version" =~ /(\d+)\.(\d+)\.(\d+)/; + (\$docbook2html_version_major, \$docbook2html_version_minor, \$docbook2html_version_micro ) = "$docbook2html_version" =~ /(\d+)\.(\d+)\.(\d+)/; + exit (((\$docbook2html_version_major > \$min_version_major) || + ((\$docbook2html_version_major == \$min_version_major) && + (\$docbook2html_version_minor >= \$min_version_minor)) || + ((\$docbook2html_version_major == \$min_version_major) && + (\$docbook2html_version_minor >= \$min_version_minor) && + (\$docbook2html_version_micro >= \$min_version_micro))) + ? 0 : 1); +EOF + then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + HAVE_DOCBOOK2HTML=no + fi + fi + dnl check if we can process docbook stuff AS_DOCBOOK(have_docbook=yes, have_docbook=no) @@ -36,7 +60,7 @@ AC_DEFUN([AG_GST_DOCBOOK_CHECK], AC_CHECK_PROG(HAVE_EPSTOPDF, epstopdf, yes, no) dnl check if we can generate HTML - if test "x$HAVE_XSLTPROC" = "xyes" && \ + if test "x$HAVE_DOCBOOK2HTML" = "xyes" && \ test "x$enable_docbook" = "xyes" && \ test "x$HAVE_XMLLINT" = "xyes"; then DOC_HTML=yes diff --git a/common/m4/gst-glib2.m4 b/common/m4/gst-glib2.m4 index 9a3a923..b80be0b 100644 --- a/common/m4/gst-glib2.m4 +++ b/common/m4/gst-glib2.m4 @@ -28,7 +28,7 @@ AC_DEFUN([AG_GST_GLIB_CHECK], GLIB_EXTRA_CFLAGS="$GLIB_EXTRA_CFLAGS -DG_THREADS_MANDATORY" dnl Define G_DISABLE_DEPRECATED for GIT versions - if test "x$PACKAGE_VERSION_NANO" = "x1" -o "x`expr $PACKAGE_VERSION_MINOR % 2`" = "x1"; then + if test "x$PACKAGE_VERSION_NANO" = "x1"; then GLIB_EXTRA_CFLAGS="$GLIB_EXTRA_CFLAGS -DG_DISABLE_DEPRECATED" fi @@ -39,7 +39,7 @@ AC_DEFUN([AG_GST_GLIB_CHECK], if test "x$enable_gobject_cast_checks" = "xauto"; then dnl For releases, turn off the cast checks - if test "x$PACKAGE_VERSION_NANO" = "x1" -o "x`expr $PACKAGE_VERSION_MINOR % 2`" = "x1"; then + if test "x$PACKAGE_VERSION_NANO" = "x1"; then enable_gobject_cast_checks=yes else enable_gobject_cast_checks=no @@ -57,7 +57,7 @@ AC_DEFUN([AG_GST_GLIB_CHECK], if test "x$enable_glib_assertions" = "xauto"; then dnl For releases, turn off the assertions - if test "x$PACKAGE_VERSION_NANO" = "x1" -o "x`expr $PACKAGE_VERSION_MINOR % 2`" = "x1"; then + if test "x$PACKAGE_VERSION_NANO" = "x1"; then enable_glib_assertions=yes else enable_glib_assertions=no @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GStreamer 1.1.2. +# Generated by GNU Autoconf 2.69 for GStreamer 1.1.3. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer>. # @@ -591,8 +591,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GStreamer' PACKAGE_TARNAME='gstreamer' -PACKAGE_VERSION='1.1.2' -PACKAGE_STRING='GStreamer 1.1.2' +PACKAGE_VERSION='1.1.3' +PACKAGE_STRING='GStreamer 1.1.3' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer' PACKAGE_URL='' @@ -753,7 +753,7 @@ XML_CATALOG XSLTPROC HAVE_PS2PDF HAVE_JADETEX -HAVE_XSLTPROC +HAVE_DOCBOOK2HTML HAVE_DOCBOOK2PS HAVE_INTROSPECTION_FALSE HAVE_INTROSPECTION_TRUE @@ -1638,7 +1638,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 1.1.2 to adapt to many kinds of systems. +\`configure' configures GStreamer 1.1.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1709,7 +1709,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GStreamer 1.1.2:";; + short | recursive ) echo "Configuration of GStreamer 1.1.3:";; esac cat <<\_ACEOF @@ -1891,7 +1891,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GStreamer configure 1.1.2 +GStreamer configure 1.1.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2664,7 +2664,7 @@ 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 1.1.2, which was +It was created by GStreamer $as_me 1.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3645,7 +3645,7 @@ fi # Define the identity of the package. PACKAGE='gstreamer' - VERSION='1.1.2' + VERSION='1.1.3' cat >>confdefs.h <<_ACEOF @@ -3814,9 +3814,9 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; } - PACKAGE_VERSION_MAJOR=$(echo 1.1.2 | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo 1.1.2 | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo 1.1.2 | cut -d'.' -f3) + PACKAGE_VERSION_MAJOR=$(echo 1.1.3 | cut -d'.' -f1) + PACKAGE_VERSION_MINOR=$(echo 1.1.3 | cut -d'.' -f2) + PACKAGE_VERSION_MICRO=$(echo 1.1.3 | cut -d'.' -f3) @@ -3827,7 +3827,7 @@ $as_echo "$am_cv_prog_tar_ustar" >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 $as_echo_n "checking nano version... " >&6; } - NANO=$(echo 1.1.2 | cut -d'.' -f4) + NANO=$(echo 1.1.3 | cut -d'.' -f4) if test x"$NANO" = x || test "x$NANO" = "x0" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 @@ -8420,10 +8420,10 @@ fi done - GST_CURRENT=102 + GST_CURRENT=103 GST_REVISION=0 - GST_AGE=102 - GST_LIBVERSION=102:0:102 + GST_AGE=103 + GST_LIBVERSION=103:0:103 @@ -21800,15 +21800,15 @@ $as_echo "no" >&6; } fi - # Extract the first word of "xsltproc", so it can be a program name with args. -set dummy xsltproc; ac_word=$2 + # Extract the first word of "docbook2html", so it can be a program name with args. +set dummy docbook2html; 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_HAVE_XSLTPROC+:} false; then : +if ${ac_cv_prog_HAVE_DOCBOOK2HTML+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$HAVE_XSLTPROC"; then - ac_cv_prog_HAVE_XSLTPROC="$HAVE_XSLTPROC" # Let the user override the test. + if test -n "$HAVE_DOCBOOK2HTML"; then + ac_cv_prog_HAVE_DOCBOOK2HTML="$HAVE_DOCBOOK2HTML" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -21817,7 +21817,7 @@ do 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_HAVE_XSLTPROC="yes" + ac_cv_prog_HAVE_DOCBOOK2HTML="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -21825,13 +21825,13 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_prog_HAVE_XSLTPROC" && ac_cv_prog_HAVE_XSLTPROC="no" + test -z "$ac_cv_prog_HAVE_DOCBOOK2HTML" && ac_cv_prog_HAVE_DOCBOOK2HTML="no" fi fi -HAVE_XSLTPROC=$ac_cv_prog_HAVE_XSLTPROC -if test -n "$HAVE_XSLTPROC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_XSLTPROC" >&5 -$as_echo "$HAVE_XSLTPROC" >&6; } +HAVE_DOCBOOK2HTML=$ac_cv_prog_HAVE_DOCBOOK2HTML +if test -n "$HAVE_DOCBOOK2HTML"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_DOCBOOK2HTML" >&5 +$as_echo "$HAVE_DOCBOOK2HTML" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -21915,6 +21915,33 @@ fi + # -V option appeared in 0.6.10 + docbook2html_min_version=0.6.10 + if test "x$HAVE_DOCBOOK2HTML" != "xno"; then + docbook2html_version=`docbook2html --version` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking docbook2html version ($docbook2html_version) >= $docbook2html_min_version" >&5 +$as_echo_n "checking docbook2html version ($docbook2html_version) >= $docbook2html_min_version... " >&6; } + if perl -w <<EOF + (\$min_version_major, \$min_version_minor, \$min_version_micro ) = "$docbook2html_min_version" =~ /(\d+)\.(\d+)\.(\d+)/; + (\$docbook2html_version_major, \$docbook2html_version_minor, \$docbook2html_version_micro ) = "$docbook2html_version" =~ /(\d+)\.(\d+)\.(\d+)/; + exit (((\$docbook2html_version_major > \$min_version_major) || + ((\$docbook2html_version_major == \$min_version_major) && + (\$docbook2html_version_minor >= \$min_version_minor)) || + ((\$docbook2html_version_major == \$min_version_major) && + (\$docbook2html_version_minor >= \$min_version_minor) && + (\$docbook2html_version_micro >= \$min_version_micro))) + ? 0 : 1); +EOF + then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + HAVE_DOCBOOK2HTML=no + fi + fi + XSLTPROC_FLAGS=--nonet DOCBOOK_ROOT= @@ -21922,19 +21949,7 @@ fi TYPE_UC=XML DOCBOOK_VERSION=4.1.2 - if test -n "$XML_CATALOG_FILES"; then - oldIFS=$IFS - IFS=' ' - for xml_catalog_file in $XML_CATALOG_FILES; do - if test -f $xml_catalog_file; then - XML_CATALOG=$xml_catalog_file - CAT_ENTRY_START='<!--' - CAT_ENTRY_END='-->' - break - fi - done - IFS=$oldIFS - elif test ! -f /etc/xml/catalog; then + if test ! -f /etc/xml/catalog; then for i in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/sgml/docbook/xsl-stylesheets/ /usr/local/share/xsl/docbook ; do if test -d "$i"; then @@ -22212,7 +22227,7 @@ fi - if test "x$HAVE_XSLTPROC" = "xyes" && \ + if test "x$HAVE_DOCBOOK2HTML" = "xyes" && \ test "x$enable_docbook" = "xyes" && \ test "x$HAVE_XMLLINT" = "xyes"; then DOC_HTML=yes @@ -25215,7 +25230,7 @@ fi GLIB_EXTRA_CFLAGS="$GLIB_EXTRA_CFLAGS -DG_THREADS_MANDATORY" - if test "x$PACKAGE_VERSION_NANO" = "x1" -o "x`expr $PACKAGE_VERSION_MINOR % 2`" = "x1"; then + if test "x$PACKAGE_VERSION_NANO" = "x1"; then GLIB_EXTRA_CFLAGS="$GLIB_EXTRA_CFLAGS -DG_DISABLE_DEPRECATED" fi @@ -25228,7 +25243,7 @@ fi if test "x$enable_gobject_cast_checks" = "xauto"; then - if test "x$PACKAGE_VERSION_NANO" = "x1" -o "x`expr $PACKAGE_VERSION_MINOR % 2`" = "x1"; then + if test "x$PACKAGE_VERSION_NANO" = "x1"; then enable_gobject_cast_checks=yes else enable_gobject_cast_checks=no @@ -25248,7 +25263,7 @@ fi if test "x$enable_glib_assertions" = "xauto"; then - if test "x$PACKAGE_VERSION_NANO" = "x1" -o "x`expr $PACKAGE_VERSION_MINOR % 2`" = "x1"; then + if test "x$PACKAGE_VERSION_NANO" = "x1"; then enable_glib_assertions=yes else enable_glib_assertions=no @@ -27521,7 +27536,7 @@ 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 1.1.2, which was +This file was extended by GStreamer $as_me 1.1.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -27587,7 +27602,7 @@ _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 1.1.2 +GStreamer config.status 1.1.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index f74756e..e92b3c8 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ 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 dnl -AC_INIT([GStreamer],[1.1.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gstreamer]) +AC_INIT([GStreamer],[1.1.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer],[gstreamer]) AG_GST_INIT dnl initialize automake (we require GNU make) @@ -64,7 +64,7 @@ dnl 1.2.5 => 205 dnl 1.10.9 (who knows) => 1009 dnl dnl sets GST_LT_LDFLAGS -AS_LIBTOOL(GST, 102, 0, 102) +AS_LIBTOOL(GST, 103, 0, 103) dnl *** autotools stuff **** diff --git a/docs/Makefile.in b/docs/Makefile.in index e7f7bec..c73bd69 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -316,6 +316,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -326,7 +327,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/docs/design/Makefile.in b/docs/design/Makefile.in index fa94004..f4d5607 100644 --- a/docs/design/Makefile.in +++ b/docs/design/Makefile.in @@ -256,6 +256,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -266,7 +267,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/docs/faq/Makefile.in b/docs/faq/Makefile.in index d1fff89..aeab885 100644 --- a/docs/faq/Makefile.in +++ b/docs/faq/Makefile.in @@ -311,6 +311,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -321,7 +322,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/docs/gst/Makefile.in b/docs/gst/Makefile.in index 11f4bb5..610344a 100644 --- a/docs/gst/Makefile.in +++ b/docs/gst/Makefile.in @@ -279,6 +279,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -289,7 +290,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/docs/gst/gstreamer-sections.txt b/docs/gst/gstreamer-sections.txt index 49c31cf..9e9b5c6 100644 --- a/docs/gst/gstreamer-sections.txt +++ b/docs/gst/gstreamer-sections.txt @@ -1054,6 +1054,8 @@ gst_event_new_stream_start gst_event_parse_stream_start gst_event_set_stream_flags gst_event_parse_stream_flags +gst_event_set_group_id +gst_event_parse_group_id gst_event_new_segment gst_event_parse_segment @@ -1224,7 +1226,10 @@ gst_debug_remove_log_function_by_data gst_debug_set_active gst_debug_is_active gst_debug_set_colored +gst_debug_set_color_mode +gst_debug_set_color_mode_from_string gst_debug_is_colored +gst_debug_get_color_mode gst_debug_set_default_threshold gst_debug_set_threshold_from_string gst_debug_get_default_threshold @@ -1527,7 +1532,10 @@ gst_message_new_toc gst_message_parse_toc gst_message_new_reset_time gst_message_parse_reset_time + gst_message_new_stream_start +gst_message_set_group_id +gst_message_parse_group_id GstStructureChangeType gst_message_new_structure_change @@ -2376,6 +2384,7 @@ gst_query_parse_context gst_query_add_context_type gst_query_get_n_context_types gst_query_parse_nth_context_type +gst_query_has_context_type <SUBSECTION Standard> GstQueryClass GST_QUERY @@ -3057,6 +3066,7 @@ gst_util_fraction_add gst_util_fraction_compare gst_util_seqnum_next gst_util_seqnum_compare +gst_util_group_id_next gst_util_set_object_arg gst_util_set_value_from_string gst_util_get_timestamp diff --git a/docs/gst/html/GstBin.html b/docs/gst/html/GstBin.html index 63b85fd..5465096 100644 --- a/docs/gst/html/GstBin.html +++ b/docs/gst/html/GstBin.html @@ -158,7 +158,7 @@ element is removed from the bin. <p> </p> <div class="refsect2"> -<a name="idp9153312"></a><h3>Notes</h3> +<a name="idp10569248"></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/GstElementFactory.html b/docs/gst/html/GstElementFactory.html index 88f82b5..7534ea5 100644 --- a/docs/gst/html/GstElementFactory.html +++ b/docs/gst/html/GstElementFactory.html @@ -141,7 +141,7 @@ The following code example shows you how to create a GstFileSrc element. <p> </p> <div class="example"> -<a name="idp20143840"></a><p class="title"><b>Example 6. Using an element factory</b></p> +<a name="idp20742768"></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> diff --git a/docs/gst/html/GstObject.html b/docs/gst/html/GstObject.html index 72e4040..39950af 100644 --- a/docs/gst/html/GstObject.html +++ b/docs/gst/html/GstObject.html @@ -186,7 +186,7 @@ of the object. <p> </p> <div class="refsect2"> -<a name="idp28716320"></a><h3>controlled properties</h3> +<a name="idp29748688"></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 diff --git a/docs/gst/html/GstPadTemplate.html b/docs/gst/html/GstPadTemplate.html index 353e2d0..1685070 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="idp9615248"></a><p class="title"><b>Example 11. Create a pad from a padtemplate</b></p> +<a name="idp23226400"></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> diff --git a/docs/gst/html/GstTypeFindFactory.html b/docs/gst/html/GstTypeFindFactory.html index 6b88634..33d41de 100644 --- a/docs/gst/html/GstTypeFindFactory.html +++ b/docs/gst/html/GstTypeFindFactory.html @@ -73,7 +73,7 @@ the section <GTKDOCLINK HREF="gstreamer-Writing-typefind-functions"> <p> </p> <div class="example"> -<a name="idp16891792"></a><p class="title"><b>Example 13. how to write a simple typefinder</b></p> +<a name="idp8739136"></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> diff --git a/docs/gst/html/api-index-full.html b/docs/gst/html/api-index-full.html index a008e48..c506d96 100644 --- a/docs/gst/html/api-index-full.html +++ b/docs/gst/html/api-index-full.html @@ -1818,6 +1818,10 @@ </dt> <dd></dd> <dt> +<a class="link" href="gstreamer-GstInfo.html#gst-debug-get-color-mode" title="gst_debug_get_color_mode ()">gst_debug_get_color_mode</a>, function in <a class="link" href="gstreamer-GstInfo.html" title="GstInfo">GstInfo</a> +</dt> +<dd></dd> +<dt> <a class="link" href="gstreamer-GstInfo.html#gst-debug-get-default-threshold" title="gst_debug_get_default_threshold ()">gst_debug_get_default_threshold</a>, function in <a class="link" href="gstreamer-GstInfo.html" title="GstInfo">GstInfo</a> </dt> <dd></dd> @@ -1882,6 +1886,14 @@ </dt> <dd></dd> <dt> +<a class="link" href="gstreamer-GstInfo.html#gst-debug-set-color-mode" title="gst_debug_set_color_mode ()">gst_debug_set_color_mode</a>, function in <a class="link" href="gstreamer-GstInfo.html" title="GstInfo">GstInfo</a> +</dt> +<dd></dd> +<dt> +<a class="link" href="gstreamer-GstInfo.html#gst-debug-set-color-mode-from-string" title="gst_debug_set_color_mode_from_string ()">gst_debug_set_color_mode_from_string</a>, function in <a class="link" href="gstreamer-GstInfo.html" title="GstInfo">GstInfo</a> +</dt> +<dd></dd> +<dt> <a class="link" href="gstreamer-GstInfo.html#gst-debug-set-default-threshold" title="gst_debug_set_default_threshold ()">gst_debug_set_default_threshold</a>, function in <a class="link" href="gstreamer-GstInfo.html" title="GstInfo">GstInfo</a> </dt> <dd></dd> @@ -2639,6 +2651,10 @@ </dt> <dd></dd> <dt> +<a class="link" href="gstreamer-GstEvent.html#gst-event-parse-group-id" title="gst_event_parse_group_id ()">gst_event_parse_group_id</a>, function in <a class="link" href="gstreamer-GstEvent.html" title="GstEvent">GstEvent</a> +</dt> +<dd></dd> +<dt> <a class="link" href="gstreamer-GstEvent.html#gst-event-parse-latency" title="gst_event_parse_latency ()">gst_event_parse_latency</a>, function in <a class="link" href="gstreamer-GstEvent.html" title="GstEvent">GstEvent</a> </dt> <dd></dd> @@ -2699,6 +2715,10 @@ </dt> <dd></dd> <dt> +<a class="link" href="gstreamer-GstEvent.html#gst-event-set-group-id" title="gst_event_set_group_id ()">gst_event_set_group_id</a>, function in <a class="link" href="gstreamer-GstEvent.html" title="GstEvent">GstEvent</a> +</dt> +<dd></dd> +<dt> <a class="link" href="gstreamer-GstEvent.html#gst-event-set-seqnum" title="gst_event_set_seqnum ()">gst_event_set_seqnum</a>, function in <a class="link" href="gstreamer-GstEvent.html" title="GstEvent">GstEvent</a> </dt> <dd></dd> @@ -3444,6 +3464,10 @@ </dt> <dd></dd> <dt> +<a class="link" href="gstreamer-GstMessage.html#gst-message-parse-group-id" title="gst_message_parse_group_id ()">gst_message_parse_group_id</a>, function in <a class="link" href="gstreamer-GstMessage.html" title="GstMessage">GstMessage</a> +</dt> +<dd></dd> +<dt> <a class="link" href="gstreamer-GstMessage.html#gst-message-parse-have-context" title="gst_message_parse_have_context ()">gst_message_parse_have_context</a>, function in <a class="link" href="gstreamer-GstMessage.html" title="GstMessage">GstMessage</a> </dt> <dd></dd> @@ -3540,6 +3564,10 @@ </dt> <dd></dd> <dt> +<a class="link" href="gstreamer-GstMessage.html#gst-message-set-group-id" title="gst_message_set_group_id ()">gst_message_set_group_id</a>, function in <a class="link" href="gstreamer-GstMessage.html" title="GstMessage">GstMessage</a> +</dt> +<dd></dd> +<dt> <a class="link" href="gstreamer-GstMessage.html#gst-message-set-qos-stats" title="gst_message_set_qos_stats ()">gst_message_set_qos_stats</a>, function in <a class="link" href="gstreamer-GstMessage.html" title="GstMessage">GstMessage</a> </dt> <dd></dd> @@ -5136,6 +5164,10 @@ </dt> <dd></dd> <dt> +<a class="link" href="gstreamer-GstQuery.html#gst-query-has-context-type" title="gst_query_has_context_type ()">gst_query_has_context_type</a>, function in <a class="link" href="gstreamer-GstQuery.html" title="GstQuery">GstQuery</a> +</dt> +<dd></dd> +<dt> <a class="link" href="gstreamer-GstQuery.html#gst-query-has-scheduling-mode" title="gst_query_has_scheduling_mode ()">gst_query_has_scheduling_mode</a>, function in <a class="link" href="gstreamer-GstQuery.html" title="GstQuery">GstQuery</a> </dt> <dd></dd> @@ -7372,6 +7404,10 @@ </dt> <dd></dd> <dt> +<a class="link" href="gstreamer-GstUtils.html#gst-util-group-id-next" title="gst_util_group_id_next ()">gst_util_group_id_next</a>, function in <a class="link" href="gstreamer-GstUtils.html" title="GstUtils">GstUtils</a> +</dt> +<dd></dd> +<dt> <a class="link" href="gstreamer-GstUtils.html#gst-util-seqnum-compare" title="gst_util_seqnum_compare ()">gst_util_seqnum_compare</a>, function in <a class="link" href="gstreamer-GstUtils.html" title="GstUtils">GstUtils</a> </dt> <dd></dd> diff --git a/docs/gst/html/gst-building.html b/docs/gst/html/gst-building.html index c435b3b..e5666a5 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="idp9601680"></a><h2>Building GStreamer on UNIX</h2> +<a name="idp11494608"></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="idp6992976"></a><h2>Building GStreamer Applications</h2> +<a name="idp10070704"></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 ab9f7cd..4c687a0 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="idp7463296"></a><h2>Running and debugging GStreamer Applications</h2> +<a name="idp9917200"></a><h2>Running and debugging GStreamer Applications</h2> <div class="refsect2"> -<a name="idp6761232"></a><h3>Environment variables</h3> +<a name="idp11252880"></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>. @@ -193,11 +193,79 @@ e.g. GST_DEBUG=*:WARNING,*audio*:LOG <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 colouring in GST_DEBUG output. This has the same effect as specifying the -<code class="option">--gst-debug-no-color</code> command line option to well-behaved -GStreamer applications (ie. those that pass command-line options correctly to -GStreamer). +<code class="option">--gst-debug-no-color</code> or +<code class="option">--gst-debug-color-mode</code>=off command line option to +well-behaved GStreamer applications (ie. those that pass command-line +options correctly to GStreamer). This is particularly useful to reduce the size of debug output and also allows for the output to be compressed much better than with colours turned on. + +Has the same effect as setting GST_DEBUG_COLOR_MODE environment variable to +"off". + </p> +<p><a name="GST_DEBUG_COLOR_MODE"></a><b><code class="envar">GST_DEBUG_COLOR_MODE</code>. </b> +Set this environment variable to change log colouring in GST_DEBUG output. +Possible values: + </p> +<div class="variablelist"><table border="0" class="variablelist"> +<colgroup> +<col align="left" valign="top"> +<col> +</colgroup> +<tbody> +<tr> +<td><p><span class="term"><code class="option">on</code></span></p></td> +<td><p> +Enables debug log output coloring. Uses default coloring method for current +platform. This is the default. + </p></td> +</tr> +<tr> +<td><p><span class="term"><code class="option">off</code></span></p></td> +<td> +<p> +Disables debug log output coloring. This has the same effect as specifying the +<code class="option">--gst-debug-color-mode</code>=off command line option to +well-behaved GStreamer applications (ie. those that pass command-line +options correctly to GStreamer). +This is particularly useful to reduce the size of debug output and also allows +for the output to be compressed much better than with colours turned on. + </p> +<p> +Has the same effect as setting GST_DEBUG_NO_COLOR environment variable to +any value. + </p> +</td> +</tr> +<tr> +<td><p><span class="term"><code class="option">auto</code></span></p></td> +<td><p> +Same as <code class="option">on</code>. + </p></td> +</tr> +<tr> +<td><p><span class="term"><code class="option">disable</code></span></p></td> +<td><p> +Same as <code class="option">off</code>. + </p></td> +</tr> +<tr> +<td><p><span class="term"><code class="option">unix</code></span></p></td> +<td><p> +Enables debug log output coloring and forces the use of UNIX termial codes +for coloring, even if this method is not normally used on current platform. +This has the same effect as specifying the +<code class="option">--gst-debug-color-mode</code>=unix command line option to +well-behaved GStreamer applications (ie. those that pass command-line options +correctly to GStreamer). +This is particularly useful to dump debug output into a file on non-UNIX +platforms to be sent to developers who have viewers that support UNIX terminal +codes. + </p></td> +</tr> +</tbody> +</table></div> +<p> </p> <p><a name="GST_DEBUG_OPTIONS"></a><b><code class="envar">GST_DEBUG_OPTIONS</code>. </b> This environment variable can be used to tweak the behaviour of the debugging diff --git a/docs/gst/html/gstreamer-1.0.devhelp2 b/docs/gst/html/gstreamer-1.0.devhelp2 index 7112cae..ca65991 100644 --- a/docs/gst/html/gstreamer-1.0.devhelp2 +++ b/docs/gst/html/gstreamer-1.0.devhelp2 @@ -73,7 +73,7 @@ <sub name="Annotation Glossary" link="annotation-glossary.html"/> </chapters> <functions> - <keyword type="" name="Environment variables" link="gst-running.html#idp6761232"/> + <keyword type="" name="Environment variables" link="gst-running.html#idp11252880"/> <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"/> @@ -107,7 +107,7 @@ <keyword type="function" name="gst_atomic_queue_peek ()" link="gstreamer-GstAtomicQueue.html#gst-atomic-queue-peek"/> <keyword type="function" name="gst_atomic_queue_pop ()" link="gstreamer-GstAtomicQueue.html#gst-atomic-queue-pop"/> <keyword type="function" name="gst_atomic_queue_length ()" link="gstreamer-GstAtomicQueue.html#gst-atomic-queue-length"/> - <keyword type="" name="Notes" link="GstBin.html#idp9153312"/> + <keyword type="" name="Notes" link="GstBin.html#idp10569248"/> <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"/> @@ -186,7 +186,7 @@ <keyword type="function" name="gst_buffer_unmap ()" link="gstreamer-GstBuffer.html#gst-buffer-unmap"/> <keyword type="function" name="gst_buffer_memcmp ()" link="gstreamer-GstBuffer.html#gst-buffer-memcmp"/> <keyword type="function" name="gst_buffer_extract ()" link="gstreamer-GstBuffer.html#gst-buffer-extract"/> - <keyword type="function" name="gst_buffer_extract_dup ()" link="gstreamer-GstBuffer.html#gst-buffer-extract-dup" since="3.2"/> + <keyword type="function" name="gst_buffer_extract_dup ()" link="gstreamer-GstBuffer.html#gst-buffer-extract-dup" since="1.2"/> <keyword type="function" name="gst_buffer_fill ()" link="gstreamer-GstBuffer.html#gst-buffer-fill"/> <keyword type="function" name="gst_buffer_memset ()" link="gstreamer-GstBuffer.html#gst-buffer-memset"/> <keyword type="enum" name="enum GstBufferCopyFlags" link="gstreamer-GstBuffer.html#GstBufferCopyFlags"/> @@ -302,15 +302,15 @@ <keyword type="function" name="gst_caps_append ()" link="gstreamer-GstCaps.html#gst-caps-append"/> <keyword type="function" name="gst_caps_merge ()" link="gstreamer-GstCaps.html#gst-caps-merge"/> <keyword type="function" name="gst_caps_append_structure ()" link="gstreamer-GstCaps.html#gst-caps-append-structure"/> - <keyword type="function" name="gst_caps_append_structure_full ()" link="gstreamer-GstCaps.html#gst-caps-append-structure-full"/> + <keyword type="function" name="gst_caps_append_structure_full ()" link="gstreamer-GstCaps.html#gst-caps-append-structure-full" since="1.2"/> <keyword type="function" name="gst_caps_remove_structure ()" link="gstreamer-GstCaps.html#gst-caps-remove-structure"/> <keyword type="function" name="gst_caps_steal_structure ()" link="gstreamer-GstCaps.html#gst-caps-steal-structure"/> <keyword type="function" name="gst_caps_merge_structure ()" link="gstreamer-GstCaps.html#gst-caps-merge-structure"/> - <keyword type="function" name="gst_caps_merge_structure_full ()" link="gstreamer-GstCaps.html#gst-caps-merge-structure-full"/> + <keyword type="function" name="gst_caps_merge_structure_full ()" link="gstreamer-GstCaps.html#gst-caps-merge-structure-full" since="1.2"/> <keyword type="function" name="gst_caps_get_size ()" link="gstreamer-GstCaps.html#gst-caps-get-size"/> <keyword type="function" name="gst_caps_get_structure ()" link="gstreamer-GstCaps.html#gst-caps-get-structure"/> - <keyword type="function" name="gst_caps_get_features ()" link="gstreamer-GstCaps.html#gst-caps-get-features"/> - <keyword type="function" name="gst_caps_set_features ()" link="gstreamer-GstCaps.html#gst-caps-set-features"/> + <keyword type="function" name="gst_caps_get_features ()" link="gstreamer-GstCaps.html#gst-caps-get-features" since="1.2"/> + <keyword type="function" name="gst_caps_set_features ()" link="gstreamer-GstCaps.html#gst-caps-set-features" since="1.2"/> <keyword type="function" name="gst_caps_set_value ()" link="gstreamer-GstCaps.html#gst-caps-set-value"/> <keyword type="function" name="gst_caps_set_simple ()" link="gstreamer-GstCaps.html#gst-caps-set-simple"/> <keyword type="function" name="gst_caps_set_simple_valist ()" link="gstreamer-GstCaps.html#gst-caps-set-simple-valist"/> @@ -323,7 +323,7 @@ <keyword type="function" name="gst_caps_is_always_compatible ()" link="gstreamer-GstCaps.html#gst-caps-is-always-compatible"/> <keyword type="function" name="gst_caps_is_subset ()" link="gstreamer-GstCaps.html#gst-caps-is-subset"/> <keyword type="function" name="gst_caps_is_subset_structure ()" link="gstreamer-GstCaps.html#gst-caps-is-subset-structure"/> - <keyword type="function" name="gst_caps_is_subset_structure_full ()" link="gstreamer-GstCaps.html#gst-caps-is-subset-structure-full"/> + <keyword type="function" name="gst_caps_is_subset_structure_full ()" link="gstreamer-GstCaps.html#gst-caps-is-subset-structure-full" since="1.2"/> <keyword type="function" name="gst_caps_can_intersect ()" link="gstreamer-GstCaps.html#gst-caps-can-intersect"/> <keyword type="function" name="gst_caps_intersect ()" link="gstreamer-GstCaps.html#gst-caps-intersect"/> <keyword type="function" name="gst_caps_intersect_full ()" link="gstreamer-GstCaps.html#gst-caps-intersect-full"/> @@ -704,6 +704,8 @@ <keyword type="function" name="gst_event_parse_stream_start ()" link="gstreamer-GstEvent.html#gst-event-parse-stream-start"/> <keyword type="function" name="gst_event_set_stream_flags ()" link="gstreamer-GstEvent.html#gst-event-set-stream-flags" since="1.2"/> <keyword type="function" name="gst_event_parse_stream_flags ()" link="gstreamer-GstEvent.html#gst-event-parse-stream-flags" since="1.2"/> + <keyword type="function" name="gst_event_set_group_id ()" link="gstreamer-GstEvent.html#gst-event-set-group-id" since="1.2"/> + <keyword type="function" name="gst_event_parse_group_id ()" link="gstreamer-GstEvent.html#gst-event-parse-group-id" since="1.2"/> <keyword type="function" name="gst_event_new_segment ()" link="gstreamer-GstEvent.html#gst-event-new-segment"/> <keyword type="function" name="gst_event_parse_segment ()" link="gstreamer-GstEvent.html#gst-event-parse-segment"/> <keyword type="function" name="gst_event_copy_segment ()" link="gstreamer-GstEvent.html#gst-event-copy-segment"/> @@ -894,6 +896,8 @@ <keyword type="function" name="gst_message_new_reset_time ()" link="gstreamer-GstMessage.html#gst-message-new-reset-time"/> <keyword type="function" name="gst_message_parse_reset_time ()" link="gstreamer-GstMessage.html#gst-message-parse-reset-time"/> <keyword type="function" name="gst_message_new_stream_start ()" link="gstreamer-GstMessage.html#gst-message-new-stream-start"/> + <keyword type="function" name="gst_message_set_group_id ()" link="gstreamer-GstMessage.html#gst-message-set-group-id" since="1.2"/> + <keyword type="function" name="gst_message_parse_group_id ()" link="gstreamer-GstMessage.html#gst-message-parse-group-id" since="1.2"/> <keyword type="enum" name="enum GstStructureChangeType" link="gstreamer-GstMessage.html#GstStructureChangeType"/> <keyword type="function" name="gst_message_new_structure_change ()" link="gstreamer-GstMessage.html#gst-message-new-structure-change"/> <keyword type="function" name="gst_message_parse_structure_change ()" link="gstreamer-GstMessage.html#gst-message-parse-structure-change"/> @@ -907,12 +911,12 @@ <keyword type="enum" name="enum GstProgressType" link="gstreamer-GstMessage.html#GstProgressType"/> <keyword type="function" name="gst_message_new_progress ()" link="gstreamer-GstMessage.html#gst-message-new-progress"/> <keyword type="function" name="gst_message_parse_progress ()" link="gstreamer-GstMessage.html#gst-message-parse-progress"/> - <keyword type="function" name="gst_message_new_need_context ()" link="gstreamer-GstMessage.html#gst-message-new-need-context"/> - <keyword type="function" name="gst_message_add_context_type ()" link="gstreamer-GstMessage.html#gst-message-add-context-type"/> - <keyword type="function" name="gst_message_get_n_context_types ()" link="gstreamer-GstMessage.html#gst-message-get-n-context-types"/> - <keyword type="function" name="gst_message_parse_nth_context_type ()" link="gstreamer-GstMessage.html#gst-message-parse-nth-context-type"/> - <keyword type="function" name="gst_message_new_have_context ()" link="gstreamer-GstMessage.html#gst-message-new-have-context"/> - <keyword type="function" name="gst_message_parse_have_context ()" link="gstreamer-GstMessage.html#gst-message-parse-have-context"/> + <keyword type="function" name="gst_message_new_need_context ()" link="gstreamer-GstMessage.html#gst-message-new-need-context" since="1.2"/> + <keyword type="function" name="gst_message_add_context_type ()" link="gstreamer-GstMessage.html#gst-message-add-context-type" since="1.2"/> + <keyword type="function" name="gst_message_get_n_context_types ()" link="gstreamer-GstMessage.html#gst-message-get-n-context-types" since="1.2"/> + <keyword type="function" name="gst_message_parse_nth_context_type ()" link="gstreamer-GstMessage.html#gst-message-parse-nth-context-type" since="1.2"/> + <keyword type="function" name="gst_message_new_have_context ()" link="gstreamer-GstMessage.html#gst-message-new-have-context" since="1.2"/> + <keyword type="function" name="gst_message_parse_have_context ()" link="gstreamer-GstMessage.html#gst-message-parse-have-context" since="1.2"/> <keyword type="struct" name="struct GstMeta" link="gstreamer-GstMeta.html#GstMeta"/> <keyword type="enum" name="enum GstMetaFlags" link="gstreamer-GstMeta.html#GstMetaFlags"/> <keyword type="macro" name="GST_META_FLAGS()" link="gstreamer-GstMeta.html#GST-META-FLAGS:CAPS"/> @@ -963,7 +967,7 @@ <keyword type="function" name="gst_mini_object_replace ()" link="gstreamer-GstMiniObject.html#gst-mini-object-replace"/> <keyword type="function" name="gst_mini_object_take ()" link="gstreamer-GstMiniObject.html#gst-mini-object-take"/> <keyword type="function" name="gst_mini_object_steal ()" link="gstreamer-GstMiniObject.html#gst-mini-object-steal"/> - <keyword type="" name="controlled properties" link="GstObject.html#idp28716320"/> + <keyword type="" name="controlled properties" link="GstObject.html#idp29748688"/> <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"/> @@ -1357,12 +1361,12 @@ <keyword type="function" name="gst_query_get_n_allocation_pools ()" link="gstreamer-GstQuery.html#gst-query-get-n-allocation-pools"/> <keyword type="function" name="gst_query_parse_nth_allocation_pool ()" link="gstreamer-GstQuery.html#gst-query-parse-nth-allocation-pool"/> <keyword type="function" name="gst_query_set_nth_allocation_pool ()" link="gstreamer-GstQuery.html#gst-query-set-nth-allocation-pool"/> - <keyword type="function" name="gst_query_remove_nth_allocation_pool ()" link="gstreamer-GstQuery.html#gst-query-remove-nth-allocation-pool"/> + <keyword type="function" name="gst_query_remove_nth_allocation_pool ()" link="gstreamer-GstQuery.html#gst-query-remove-nth-allocation-pool" since="1.2"/> <keyword type="function" name="gst_query_add_allocation_param ()" link="gstreamer-GstQuery.html#gst-query-add-allocation-param"/> <keyword type="function" name="gst_query_get_n_allocation_params ()" link="gstreamer-GstQuery.html#gst-query-get-n-allocation-params"/> <keyword type="function" name="gst_query_parse_nth_allocation_param ()" link="gstreamer-GstQuery.html#gst-query-parse-nth-allocation-param"/> <keyword type="function" name="gst_query_set_nth_allocation_param ()" link="gstreamer-GstQuery.html#gst-query-set-nth-allocation-param"/> - <keyword type="function" name="gst_query_remove_nth_allocation_param ()" link="gstreamer-GstQuery.html#gst-query-remove-nth-allocation-param"/> + <keyword type="function" name="gst_query_remove_nth_allocation_param ()" link="gstreamer-GstQuery.html#gst-query-remove-nth-allocation-param" since="1.2"/> <keyword type="function" name="gst_query_add_allocation_meta ()" link="gstreamer-GstQuery.html#gst-query-add-allocation-meta"/> <keyword type="function" name="gst_query_get_n_allocation_metas ()" link="gstreamer-GstQuery.html#gst-query-get-n-allocation-metas"/> <keyword type="function" name="gst_query_parse_nth_allocation_meta ()" link="gstreamer-GstQuery.html#gst-query-parse-nth-allocation-meta"/> @@ -1378,12 +1382,13 @@ <keyword type="function" name="gst_query_has_scheduling_mode ()" link="gstreamer-GstQuery.html#gst-query-has-scheduling-mode"/> <keyword type="function" name="gst_query_has_scheduling_mode_with_flags ()" link="gstreamer-GstQuery.html#gst-query-has-scheduling-mode-with-flags"/> <keyword type="function" name="gst_query_new_drain ()" link="gstreamer-GstQuery.html#gst-query-new-drain"/> - <keyword type="function" name="gst_query_new_context ()" link="gstreamer-GstQuery.html#gst-query-new-context"/> - <keyword type="function" name="gst_query_set_context ()" link="gstreamer-GstQuery.html#gst-query-set-context"/> - <keyword type="function" name="gst_query_parse_context ()" link="gstreamer-GstQuery.html#gst-query-parse-context"/> - <keyword type="function" name="gst_query_add_context_type ()" link="gstreamer-GstQuery.html#gst-query-add-context-type"/> - <keyword type="function" name="gst_query_get_n_context_types ()" link="gstreamer-GstQuery.html#gst-query-get-n-context-types"/> - <keyword type="function" name="gst_query_parse_nth_context_type ()" link="gstreamer-GstQuery.html#gst-query-parse-nth-context-type"/> + <keyword type="function" name="gst_query_new_context ()" link="gstreamer-GstQuery.html#gst-query-new-context" since="1.2"/> + <keyword type="function" name="gst_query_set_context ()" link="gstreamer-GstQuery.html#gst-query-set-context" since="1.2"/> + <keyword type="function" name="gst_query_parse_context ()" link="gstreamer-GstQuery.html#gst-query-parse-context" since="1.2"/> + <keyword type="function" name="gst_query_add_context_type ()" link="gstreamer-GstQuery.html#gst-query-add-context-type" since="1.2"/> + <keyword type="function" name="gst_query_get_n_context_types ()" link="gstreamer-GstQuery.html#gst-query-get-n-context-types" since="1.2"/> + <keyword type="function" name="gst_query_parse_nth_context_type ()" link="gstreamer-GstQuery.html#gst-query-parse-nth-context-type" since="1.2"/> + <keyword type="function" name="gst_query_has_context_type ()" link="gstreamer-GstQuery.html#gst-query-has-context-type" since="1.2"/> <keyword type="struct" name="struct GstRegistry" link="GstRegistry.html#GstRegistry-struct"/> <keyword type="function" name="gst_registry_get ()" link="GstRegistry.html#gst-registry-get"/> <keyword type="function" name="gst_registry_get_feature_list ()" link="GstRegistry.html#gst-registry-get-feature-list"/> @@ -1824,6 +1829,7 @@ <keyword type="function" name="gst_util_fraction_compare ()" link="gstreamer-GstUtils.html#gst-util-fraction-compare"/> <keyword type="function" name="gst_util_seqnum_next ()" link="gstreamer-GstUtils.html#gst-util-seqnum-next"/> <keyword type="function" name="gst_util_seqnum_compare ()" link="gstreamer-GstUtils.html#gst-util-seqnum-compare"/> + <keyword type="function" name="gst_util_group_id_next ()" link="gstreamer-GstUtils.html#gst-util-group-id-next"/> <keyword type="function" name="gst_util_set_object_arg ()" link="gstreamer-GstUtils.html#gst-util-set-object-arg"/> <keyword type="function" name="gst_util_set_value_from_string ()" link="gstreamer-GstUtils.html#gst-util-set-value-from-string"/> <keyword type="function" name="gst_util_get_timestamp ()" link="gstreamer-GstUtils.html#gst-util-get-timestamp"/> @@ -1949,7 +1955,10 @@ <keyword type="function" name="gst_debug_set_active ()" link="gstreamer-GstInfo.html#gst-debug-set-active"/> <keyword type="function" name="gst_debug_is_active ()" link="gstreamer-GstInfo.html#gst-debug-is-active"/> <keyword type="function" name="gst_debug_set_colored ()" link="gstreamer-GstInfo.html#gst-debug-set-colored"/> + <keyword type="function" name="gst_debug_set_color_mode ()" link="gstreamer-GstInfo.html#gst-debug-set-color-mode" since="1.2"/> + <keyword type="function" name="gst_debug_set_color_mode_from_string ()" link="gstreamer-GstInfo.html#gst-debug-set-color-mode-from-string" since="1.2"/> <keyword type="function" name="gst_debug_is_colored ()" link="gstreamer-GstInfo.html#gst-debug-is-colored"/> + <keyword type="function" name="gst_debug_get_color_mode ()" link="gstreamer-GstInfo.html#gst-debug-get-color-mode" since="1.2"/> <keyword type="function" name="gst_debug_set_default_threshold ()" link="gstreamer-GstInfo.html#gst-debug-set-default-threshold"/> <keyword type="function" name="gst_debug_set_threshold_from_string ()" link="gstreamer-GstInfo.html#gst-debug-set-threshold-from-string" since="1.2.0"/> <keyword type="function" name="gst_debug_get_default_threshold ()" link="gstreamer-GstInfo.html#gst-debug-get-default-threshold"/> diff --git a/docs/gst/html/gstreamer-Gst.html b/docs/gst/html/gstreamer-Gst.html index 4aad1b5..3ed8653 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="idp8948784"></a><p class="title"><b>Example 1. Initializing the gstreamer library</b></p> +<a name="idp7734544"></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> @@ -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="idp11022576"></a><p class="title"><b>Example 2. Initializing own parameters when initializing gstreamer</b></p> +<a name="idp7608528"></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> diff --git a/docs/gst/html/gstreamer-GstBuffer.html b/docs/gst/html/gstreamer-GstBuffer.html index c9231ad..23c060c 100644 --- a/docs/gst/html/gstreamer-GstBuffer.html +++ b/docs/gst/html/gstreamer-GstBuffer.html @@ -217,7 +217,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="idp12040000"></a><p class="title"><b>Example 3. Creating a buffer for a video frame</b></p> +<a name="idp13037888"></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> @@ -2037,7 +2037,7 @@ the destination array will be written. <span class="annotation">[<acronym title= </tr> </tbody> </table></div> -<p class="since">Since 3.2</p> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> diff --git a/docs/gst/html/gstreamer-GstCaps.html b/docs/gst/html/gstreamer-GstCaps.html index 831fc39..94a87ac 100644 --- a/docs/gst/html/gstreamer-GstCaps.html +++ b/docs/gst/html/gstreamer-GstCaps.html @@ -174,7 +174,7 @@ A <a class="link" href="gstreamer-GstCaps.html#GstCaps" title="struct GstCaps">< <p> </p> <div class="example"> -<a name="idp16071872"></a><p class="title"><b>Example 4. Creating caps</b></p> +<a name="idp16898624"></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> @@ -995,6 +995,7 @@ becomes the owner of <em class="parameter"><code>structure</code></em>. </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -1123,6 +1124,7 @@ Appends <em class="parameter"><code>structure</code></em> with <em class="parame </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -1242,6 +1244,7 @@ to <em class="parameter"><code>index</code></em>. <span class="annotation">[<acr </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -1274,6 +1277,7 @@ Sets the <a class="link" href="gstreamer-GstCapsFeatures.html#GstCapsFeatures" t </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -1672,6 +1676,7 @@ for more information. </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> diff --git a/docs/gst/html/gstreamer-GstEvent.html b/docs/gst/html/gstreamer-GstEvent.html index 213f10e..f5fee6c 100644 --- a/docs/gst/html/gstreamer-GstEvent.html +++ b/docs/gst/html/gstreamer-GstEvent.html @@ -94,6 +94,10 @@ const <a class="link" href="gstreamer-GstStructure.html#GstStructure" title="str <em class="parameter"><code><span class="type">GstStreamFlags</span> flags</code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-GstEvent.html#gst-event-parse-stream-flags" title="gst_event_parse_stream_flags ()">gst_event_parse_stream_flags</a> (<em class="parameter"><code><a class="link" href="gstreamer-GstEvent.html#GstEvent" title="struct GstEvent"><span class="type">GstEvent</span></a> *event</code></em>, <em class="parameter"><code><span class="type">GstStreamFlags</span> *flags</code></em>); +<span class="returnvalue">void</span> <a class="link" href="gstreamer-GstEvent.html#gst-event-set-group-id" title="gst_event_set_group_id ()">gst_event_set_group_id</a> (<em class="parameter"><code><a class="link" href="gstreamer-GstEvent.html#GstEvent" title="struct 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#guint"><span class="type">guint</span></a> group_id</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-GstEvent.html#gst-event-parse-group-id" title="gst_event_parse_group_id ()">gst_event_parse_group_id</a> (<em class="parameter"><code><a class="link" href="gstreamer-GstEvent.html#GstEvent" title="struct 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#guint"><span class="type">guint</span></a> *group_id</code></em>); <a class="link" href="gstreamer-GstEvent.html#GstEvent" title="struct GstEvent"><span class="returnvalue">GstEvent</span></a> * <a class="link" href="gstreamer-GstEvent.html#gst-event-new-segment" title="gst_event_new_segment ()">gst_event_new_segment</a> (<em class="parameter"><code>const <a class="link" href="gstreamer-GstSegment.html#GstSegment" title="struct GstSegment"><span class="type">GstSegment</span></a> *segment</code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-GstEvent.html#gst-event-parse-segment" title="gst_event_parse_segment ()">gst_event_parse_segment</a> (<em class="parameter"><code><a class="link" href="gstreamer-GstEvent.html#GstEvent" title="struct GstEvent"><span class="type">GstEvent</span></a> *event</code></em>, <em class="parameter"><code>const <a class="link" href="gstreamer-GstSegment.html#GstSegment" title="struct GstSegment"><span class="type">GstSegment</span></a> **segment</code></em>); @@ -213,7 +217,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="idp22429776"></a><p class="title"><b>Example 8. performing a seek on a pipeline</b></p> +<a name="idp24141072"></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> @@ -1581,6 +1585,69 @@ modify it or store it for later use. </div> <hr> <div class="refsect2"> +<a name="gst-event-set-group-id"></a><h3>gst_event_set_group_id ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> gst_event_set_group_id (<em class="parameter"><code><a class="link" href="gstreamer-GstEvent.html#GstEvent" title="struct 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#guint"><span class="type">guint</span></a> group_id</code></em>);</pre> +<p> +All streams that have the same group id are supposed to be played +together, i.e. all streams inside a container file should have the +same group id but different stream ids. The group id should change +each time the stream is started, resulting in different group ids +each time a file is played for example. +</p> +<p> +Use <a class="link" href="gstreamer-GstUtils.html#gst-util-group-id-next" title="gst_util_group_id_next ()"><code class="function">gst_util_group_id_next()</code></a> to get a new group id. +</p> +<div class="variablelist"><table border="0" class="variablelist"> +<colgroup> +<col align="left" valign="top"> +<col> +</colgroup> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>event</code></em> :</span></p></td> +<td>a stream-start event</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>group_id</code></em> :</span></p></td> +<td>the group id to set</td> +</tr> +</tbody> +</table></div> +<p class="since">Since 1.2</p> +</div> +<hr> +<div class="refsect2"> +<a name="gst-event-parse-group-id"></a><h3>gst_event_parse_group_id ()</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_event_parse_group_id (<em class="parameter"><code><a class="link" href="gstreamer-GstEvent.html#GstEvent" title="struct 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#guint"><span class="type">guint</span></a> *group_id</code></em>);</pre> +<div class="variablelist"><table border="0" class="variablelist"> +<colgroup> +<col align="left" valign="top"> +<col> +</colgroup> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>event</code></em> :</span></p></td> +<td>a stream-start event</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>group_id</code></em> :</span></p></td> +<td>address of variable where to store the group id. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>]</span> +</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 a group id was set on the event and could be parsed, +<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> +<p class="since">Since 1.2</p> +</div> +<hr> +<div class="refsect2"> <a name="gst-event-new-segment"></a><h3>gst_event_new_segment ()</h3> <pre class="programlisting"><a class="link" href="gstreamer-GstEvent.html#GstEvent" title="struct GstEvent"><span class="returnvalue">GstEvent</span></a> * gst_event_new_segment (<em class="parameter"><code>const <a class="link" href="gstreamer-GstSegment.html#GstSegment" title="struct GstSegment"><span class="type">GstSegment</span></a> *segment</code></em>);</pre> <p> diff --git a/docs/gst/html/gstreamer-GstGError.html b/docs/gst/html/gstreamer-GstGError.html index ed808c1..497036d 100644 --- a/docs/gst/html/gstreamer-GstGError.html +++ b/docs/gst/html/gstreamer-GstGError.html @@ -115,7 +115,7 @@ Elements throw errors using the <a class="link" href="GstElement.html#GST-ELEMEN <p> </p> <div class="example"> -<a name="idp6585536"></a><p class="title"><b>Example 7. Throwing an error</b></p> +<a name="idp17392656"></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> diff --git a/docs/gst/html/gstreamer-GstInfo.html b/docs/gst/html/gstreamer-GstInfo.html index 2e612c3..3466654 100644 --- a/docs/gst/html/gstreamer-GstInfo.html +++ b/docs/gst/html/gstreamer-GstInfo.html @@ -91,7 +91,11 @@ const <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.htm <span class="returnvalue">void</span> <a class="link" href="gstreamer-GstInfo.html#gst-debug-set-active" title="gst_debug_set_active ()">gst_debug_set_active</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> active</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-GstInfo.html#gst-debug-is-active" title="gst_debug_is_active ()">gst_debug_is_active</a> (<em class="parameter"><code><span class="type">void</span></code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-GstInfo.html#gst-debug-set-colored" title="gst_debug_set_colored ()">gst_debug_set_colored</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> colored</code></em>); +<span class="returnvalue">void</span> <a class="link" href="gstreamer-GstInfo.html#gst-debug-set-color-mode" title="gst_debug_set_color_mode ()">gst_debug_set_color_mode</a> (<em class="parameter"><code><span class="type">GstDebugColorMode</span> mode</code></em>); +<span class="returnvalue">void</span> <a class="link" href="gstreamer-GstInfo.html#gst-debug-set-color-mode-from-string" title="gst_debug_set_color_mode_from_string ()">gst_debug_set_color_mode_from_string</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> *str</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-GstInfo.html#gst-debug-is-colored" title="gst_debug_is_colored ()">gst_debug_is_colored</a> (<em class="parameter"><code><span class="type">void</span></code></em>); +<span class="returnvalue">GstDebugColorMode</span> <a class="link" href="gstreamer-GstInfo.html#gst-debug-get-color-mode" title="gst_debug_get_color_mode ()">gst_debug_get_color_mode</a> (<em class="parameter"><code><span class="type">void</span></code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-GstInfo.html#gst-debug-set-default-threshold" title="gst_debug_set_default_threshold ()">gst_debug_set_default_threshold</a> (<em class="parameter"><code><a class="link" href="gstreamer-GstInfo.html#GstDebugLevel" title="enum GstDebugLevel"><span class="type">GstDebugLevel</span></a> level</code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-GstInfo.html#gst-debug-set-threshold-from-string" title="gst_debug_set_threshold_from_string ()">gst_debug_set_threshold_from_string</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> *list</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> reset</code></em>); @@ -1092,6 +1096,8 @@ Checks if debugging output is activated. <pre class="programlisting"><span class="returnvalue">void</span> gst_debug_set_colored (<em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolean"><span class="type">gboolean</span></a> colored</code></em>);</pre> <p> Sets or unsets the use of coloured debugging output. +Same as <a class="link" href="gstreamer-GstInfo.html#gst-debug-set-color-mode" title="gst_debug_set_color_mode ()"><code class="function">gst_debug_set_color_mode()</code></a> with the argument being +being GST_DEBUG_COLOR_MODE_ON or GST_DEBUG_COLOR_MODE_OFF. </p> <p> This function may be called before <a class="link" href="gstreamer-Gst.html#gst-init" title="gst_init ()"><code class="function">gst_init()</code></a>. @@ -1109,6 +1115,52 @@ This function may be called before <a class="link" href="gstreamer-Gst.html#gst- </div> <hr> <div class="refsect2"> +<a name="gst-debug-set-color-mode"></a><h3>gst_debug_set_color_mode ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> gst_debug_set_color_mode (<em class="parameter"><code><span class="type">GstDebugColorMode</span> mode</code></em>);</pre> +<p> +Changes the coloring mode for debug output. +</p> +<p> +This function may be called before <a class="link" href="gstreamer-Gst.html#gst-init" title="gst_init ()"><code class="function">gst_init()</code></a>. +</p> +<div class="variablelist"><table border="0" class="variablelist"> +<colgroup> +<col align="left" valign="top"> +<col> +</colgroup> +<tbody><tr> +<td><p><span class="term"><em class="parameter"><code>mode</code></em> :</span></p></td> +<td>The coloring mode for debug output. See <em class="parameter"><code>GstDebugColorMode</code></em>.</td> +</tr></tbody> +</table></div> +<p class="since">Since 1.2</p> +</div> +<hr> +<div class="refsect2"> +<a name="gst-debug-set-color-mode-from-string"></a><h3>gst_debug_set_color_mode_from_string ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> gst_debug_set_color_mode_from_string + (<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> *str</code></em>);</pre> +<p> +Changes the coloring mode for debug output. +</p> +<p> +This function may be called before <a class="link" href="gstreamer-Gst.html#gst-init" title="gst_init ()"><code class="function">gst_init()</code></a>. +</p> +<div class="variablelist"><table border="0" class="variablelist"> +<colgroup> +<col align="left" valign="top"> +<col> +</colgroup> +<tbody><tr> +<td><p><span class="term"><em class="parameter"><code>mode</code></em> :</span></p></td> +<td>The coloring mode for debug output. One of the following: +"on", "auto", "off", "disable", "unix".</td> +</tr></tbody> +</table></div> +<p class="since">Since 1.2</p> +</div> +<hr> +<div class="refsect2"> <a name="gst-debug-is-colored"></a><h3>gst_debug_is_colored ()</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_debug_is_colored (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> <p> @@ -1127,6 +1179,25 @@ Checks if the debugging output should be colored. </div> <hr> <div class="refsect2"> +<a name="gst-debug-get-color-mode"></a><h3>gst_debug_get_color_mode ()</h3> +<pre class="programlisting"><span class="returnvalue">GstDebugColorMode</span> gst_debug_get_color_mode (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> +<p> +Changes the coloring mode for debug output. +</p> +<div class="variablelist"><table border="0" class="variablelist"> +<colgroup> +<col align="left" valign="top"> +<col> +</colgroup> +<tbody><tr> +<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> +<td>see <em class="parameter"><code>GstDebugColorMode</code></em> for possible values.</td> +</tr></tbody> +</table></div> +<p class="since">Since 1.2</p> +</div> +<hr> +<div class="refsect2"> <a name="gst-debug-set-default-threshold"></a><h3>gst_debug_set_default_threshold ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> gst_debug_set_default_threshold (<em class="parameter"><code><a class="link" href="gstreamer-GstInfo.html#GstDebugLevel" title="enum GstDebugLevel"><span class="type">GstDebugLevel</span></a> level</code></em>);</pre> <p> diff --git a/docs/gst/html/gstreamer-GstIterator.html b/docs/gst/html/gstreamer-GstIterator.html index fcf4a81..7ba95b2 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="idp20845248"></a><p class="title"><b>Example 9. Using an iterator</b></p> +<a name="idp21810720"></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> diff --git a/docs/gst/html/gstreamer-GstMessage.html b/docs/gst/html/gstreamer-GstMessage.html index c35a7e7..7684c25 100644 --- a/docs/gst/html/gstreamer-GstMessage.html +++ b/docs/gst/html/gstreamer-GstMessage.html @@ -219,6 +219,10 @@ const <a class="link" href="gstreamer-GstStructure.html#GstStructure" title="str <span class="returnvalue">void</span> <a class="link" href="gstreamer-GstMessage.html#gst-message-parse-reset-time" title="gst_message_parse_reset_time ()">gst_message_parse_reset_time</a> (<em class="parameter"><code><a class="link" href="gstreamer-GstMessage.html#GstMessage" title="struct GstMessage"><span class="type">GstMessage</span></a> *message</code></em>, <em class="parameter"><code><a class="link" href="GstClock.html#GstClockTime" title="GstClockTime"><span class="type">GstClockTime</span></a> *running_time</code></em>); <a class="link" href="gstreamer-GstMessage.html#GstMessage" title="struct GstMessage"><span class="returnvalue">GstMessage</span></a> * <a class="link" href="gstreamer-GstMessage.html#gst-message-new-stream-start" title="gst_message_new_stream_start ()">gst_message_new_stream_start</a> (<em class="parameter"><code><a class="link" href="GstObject.html" title="GstObject"><span class="type">GstObject</span></a> *src</code></em>); +<span class="returnvalue">void</span> <a class="link" href="gstreamer-GstMessage.html#gst-message-set-group-id" title="gst_message_set_group_id ()">gst_message_set_group_id</a> (<em class="parameter"><code><a class="link" href="gstreamer-GstMessage.html#GstMessage" title="struct GstMessage"><span class="type">GstMessage</span></a> *message</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> group_id</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-GstMessage.html#gst-message-parse-group-id" title="gst_message_parse_group_id ()">gst_message_parse_group_id</a> (<em class="parameter"><code><a class="link" href="gstreamer-GstMessage.html#GstMessage" title="struct GstMessage"><span class="type">GstMessage</span></a> *message</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> *group_id</code></em>); enum <a class="link" href="gstreamer-GstMessage.html#GstStructureChangeType" title="enum GstStructureChangeType">GstStructureChangeType</a>; <a class="link" href="gstreamer-GstMessage.html#GstMessage" title="struct GstMessage"><span class="returnvalue">GstMessage</span></a> * <a class="link" href="gstreamer-GstMessage.html#gst-message-new-structure-change" title="gst_message_new_structure_change ()">gst_message_new_structure_change</a> (<em class="parameter"><code><a class="link" href="GstObject.html" title="GstObject"><span class="type">GstObject</span></a> *src</code></em>, <em class="parameter"><code><a class="link" href="gstreamer-GstMessage.html#GstStructureChangeType" title="enum GstStructureChangeType"><span class="type">GstStructureChangeType</span></a> type</code></em>, @@ -284,7 +288,7 @@ The basic use pattern of posting a message on a <a class="link" href="GstBus.htm <p> </p> <div class="example"> -<a name="idp30142336"></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="idp31849440"></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> @@ -591,11 +595,13 @@ was updated. </tr> <tr> <td><p><a name="GST-MESSAGE-NEED-CONTEXT:CAPS"></a><span class="term"><code class="literal">GST_MESSAGE_NEED_CONTEXT</code></span></p></td> -<td></td> +<td>Message indicating that an element wants a specific context (Since 1.2) +</td> </tr> <tr> <td><p><a name="GST-MESSAGE-HAVE-CONTEXT:CAPS"></a><span class="term"><code class="literal">GST_MESSAGE_HAVE_CONTEXT</code></span></p></td> -<td></td> +<td>Message indicating that an element created a context (Since 1.2) +</td> </tr> <tr> <td><p><a name="GST-MESSAGE-ANY:CAPS"></a><span class="term"><code class="literal">GST_MESSAGE_ANY</code></span></p></td> @@ -3164,6 +3170,76 @@ MT safe. <span class="annotation">[<acronym title="Free data after the code is d </div> <hr> <div class="refsect2"> +<a name="gst-message-set-group-id"></a><h3>gst_message_set_group_id ()</h3> +<pre class="programlisting"><span class="returnvalue">void</span> gst_message_set_group_id (<em class="parameter"><code><a class="link" href="gstreamer-GstMessage.html#GstMessage" title="struct GstMessage"><span class="type">GstMessage</span></a> *message</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> group_id</code></em>);</pre> +<p> +Sets the group id on the stream-start message. +</p> +<p> +All streams that have the same group id are supposed to be played +together, i.e. all streams inside a container file should have the +same group id but different stream ids. The group id should change +each time the stream is started, resulting in different group ids +each time a file is played for example. +</p> +<p> +MT safe. +</p> +<div class="variablelist"><table border="0" class="variablelist"> +<colgroup> +<col align="left" valign="top"> +<col> +</colgroup> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>message</code></em> :</span></p></td> +<td>the message</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>group_id</code></em> :</span></p></td> +<td>the group id</td> +</tr> +</tbody> +</table></div> +<p class="since">Since 1.2</p> +</div> +<hr> +<div class="refsect2"> +<a name="gst-message-parse-group-id"></a><h3>gst_message_parse_group_id ()</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_message_parse_group_id (<em class="parameter"><code><a class="link" href="gstreamer-GstMessage.html#GstMessage" title="struct GstMessage"><span class="type">GstMessage</span></a> *message</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> *group_id</code></em>);</pre> +<p> +Extract the group from the STREAM_START message. +</p> +<div class="variablelist"><table border="0" class="variablelist"> +<colgroup> +<col align="left" valign="top"> +<col> +</colgroup> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>message</code></em> :</span></p></td> +<td>A valid <a class="link" href="gstreamer-GstMessage.html#GstMessage" title="struct GstMessage"><span class="type">GstMessage</span></a> of type GST_MESSAGE_STREAM_START.</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>group_id</code></em> :</span></p></td> +<td>Result location for the group id or +NULL. <span class="annotation">[<acronym title="Parameter for returning results. Default is transfer full."><span class="acronym">out</span></acronym>][<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span> +</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 message had a group id set, <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> otherwise +MT safe.</td> +</tr> +</tbody> +</table></div> +<p class="since">Since 1.2</p> +</div> +<hr> +<div class="refsect2"> <a name="GstStructureChangeType"></a><h3>enum GstStructureChangeType</h3> <pre class="programlisting">typedef enum { GST_STRUCTURE_CHANGE_TYPE_PAD_LINK = 0, @@ -3697,6 +3773,7 @@ MT safe. <span class="annotation">[<acronym title="Free data after the code is d </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -3722,6 +3799,7 @@ Add a new context type to <em class="parameter"><code>message</code></em>. </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -3747,6 +3825,7 @@ context-types array of the message's structure. </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -3779,6 +3858,7 @@ from <em class="parameter"><code>index</code></em>. </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -3812,6 +3892,7 @@ MT safe. <span class="annotation">[<acronym title="Free data after the code is d </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -3842,6 +3923,7 @@ context or NULL. <span class="annotation">[<acronym title="Parameter for returni </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> </div> <div class="refsect1"> diff --git a/docs/gst/html/gstreamer-GstQuery.html b/docs/gst/html/gstreamer-GstQuery.html index 4c13eca..5e80175 100644 --- a/docs/gst/html/gstreamer-GstQuery.html +++ b/docs/gst/html/gstreamer-GstQuery.html @@ -281,6 +281,8 @@ enum <a class="link" href="gstreamer-GstQuery.html#GstSchedulingF <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-GstQuery.html#gst-query-parse-nth-context-type" title="gst_query_parse_nth_context_type ()">gst_query_parse_nth_context_type</a> (<em class="parameter"><code><a class="link" href="gstreamer-GstQuery.html#GstQuery" title="struct GstQuery"><span class="type">GstQuery</span></a> *query</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> i</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> **context_type</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-GstQuery.html#gst-query-has-context-type" title="gst_query_has_context_type ()">gst_query_has_context_type</a> (<em class="parameter"><code><a class="link" href="gstreamer-GstQuery.html#GstQuery" title="struct GstQuery"><span class="type">GstQuery</span></a> *query</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> *context_type</code></em>); </pre> </div> <div class="refsect1"> @@ -301,7 +303,7 @@ The following example shows how to query the duration of a pipeline: <p> </p> <div class="example"> -<a name="idp39942192"></a><p class="title"><b>Example 12. Query duration on a pipeline</b></p> +<a name="idp42113008"></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> @@ -573,7 +575,8 @@ Standard predefined Query types </tr> <tr> <td><p><a name="GST-QUERY-CONTEXT:CAPS"></a><span class="term"><code class="literal">GST_QUERY_CONTEXT</code></span></p></td> -<td>query the pipeline-local context from downstream +<td>query the pipeline-local context from + downstream (since 1.2) </td> </tr> </tbody> @@ -2811,6 +2814,7 @@ Remove the allocation pool at <em class="parameter"><code>index</code></em> of t </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -2982,6 +2986,7 @@ Remove the allocation param at <em class="parameter"><code>index</code></em> of </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -3173,7 +3178,7 @@ The different scheduling flags. </tr> <tr> <td><p><a name="GST-SCHEDULING-FLAG-BANDWIDTH-LIMITED:CAPS"></a><span class="term"><code class="literal">GST_SCHEDULING_FLAG_BANDWIDTH_LIMITED</code></span></p></td> -<td>if bandwidth is limited and buffering possible +<td>if bandwidth is limited and buffering possible (since 1.2) </td> </tr> </tbody> @@ -3495,6 +3500,7 @@ Free-function: gst_query_unref </td> </tr></tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -3521,6 +3527,7 @@ Answer a context query by setting the requested context. </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -3548,6 +3555,7 @@ Get the context from the context <em class="parameter"><code>query</code></em>. </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -3565,7 +3573,7 @@ Add a new context type to <em class="parameter"><code>query</code></em>. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>query</code></em> :</span></p></td> -<td>a GST_QUERY_NEED_CONTEXT type query</td> +<td>a GST_QUERY_CONTEXT type query</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>context_type</code></em> :</span></p></td> @@ -3573,6 +3581,7 @@ Add a new context type to <em class="parameter"><code>query</code></em>. </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -3590,7 +3599,7 @@ context-types array of the query's structure. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>query</code></em> :</span></p></td> -<td>a GST_QUERY_NEED_CONTEXT type query</td> +<td>a GST_QUERY_CONTEXT type query</td> </tr> <tr> <td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td> @@ -3598,6 +3607,7 @@ context-types array of the query's structure. </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> </div> <hr> <div class="refsect2"> @@ -3606,7 +3616,7 @@ context-types array of the query's structure. <em class="parameter"><code><a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint"><span class="type">guint</span></a> i</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> **context_type</code></em>);</pre> <p> -Parse a context type from an existing GST_QUERY_NEED_CONTEXT query +Parse a context type from an existing GST_QUERY_CONTEXT query from <em class="parameter"><code>index</code></em>. </p> <div class="variablelist"><table border="0" class="variablelist"> @@ -3617,7 +3627,7 @@ from <em class="parameter"><code>index</code></em>. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>query</code></em> :</span></p></td> -<td>a GST_QUERY_NEED_CONTEXT type query</td> +<td>a GST_QUERY_CONTEXT type query</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>context_type</code></em> :</span></p></td> @@ -3630,6 +3640,38 @@ from <em class="parameter"><code>index</code></em>. </tr> </tbody> </table></div> +<p class="since">Since 1.2</p> +</div> +<hr> +<div class="refsect2"> +<a name="gst-query-has-context-type"></a><h3>gst_query_has_context_type ()</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_query_has_context_type (<em class="parameter"><code><a class="link" href="gstreamer-GstQuery.html#GstQuery" title="struct GstQuery"><span class="type">GstQuery</span></a> *query</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> *context_type</code></em>);</pre> +<p> +Check if <em class="parameter"><code>query</code></em> is asking for <em class="parameter"><code>context_type</code></em>. +</p> +<div class="variablelist"><table border="0" class="variablelist"> +<colgroup> +<col align="left" valign="top"> +<col> +</colgroup> +<tbody> +<tr> +<td><p><span class="term"><em class="parameter"><code>query</code></em> :</span></p></td> +<td>a GST_QUERY_CONTEXT type query</td> +</tr> +<tr> +<td><p><span class="term"><em class="parameter"><code>context_type</code></em> :</span></p></td> +<td>the context type</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 <em class="parameter"><code>context_type</code></em> is requested.</td> +</tr> +</tbody> +</table></div> +<p class="since">Since 1.2</p> </div> </div> <div class="refsect1"> diff --git a/docs/gst/html/gstreamer-GstTagList.html b/docs/gst/html/gstreamer-GstTagList.html index fa1c675..352ec0c 100644 --- a/docs/gst/html/gstreamer-GstTagList.html +++ b/docs/gst/html/gstreamer-GstTagList.html @@ -362,7 +362,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="idp45082624"></a><p class="title"><b>Table 1. merge mode</b></p> +<a name="idp46771472"></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-GstUtils.html b/docs/gst/html/gstreamer-GstUtils.html index 705af8e..208b342 100644 --- a/docs/gst/html/gstreamer-GstUtils.html +++ b/docs/gst/html/gstreamer-GstUtils.html @@ -160,6 +160,7 @@ <span class="returnvalue">guint32</span> <a class="link" href="gstreamer-GstUtils.html#gst-util-seqnum-next" title="gst_util_seqnum_next ()">gst_util_seqnum_next</a> (<em class="parameter"><code><span class="type">void</span></code></em>); <span class="returnvalue">gint32</span> <a class="link" href="gstreamer-GstUtils.html#gst-util-seqnum-compare" title="gst_util_seqnum_compare ()">gst_util_seqnum_compare</a> (<em class="parameter"><code><span class="type">guint32</span> s1</code></em>, <em class="parameter"><code><span class="type">guint32</span> s2</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-GstUtils.html#gst-util-group-id-next" title="gst_util_group_id_next ()">gst_util_group_id_next</a> (<em class="parameter"><code><span class="type">void</span></code></em>); <span class="returnvalue">void</span> <a class="link" href="gstreamer-GstUtils.html#gst-util-set-object-arg" title="gst_util_set_object_arg ()">gst_util_set_object_arg</a> (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</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> *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> *value</code></em>); @@ -1948,6 +1949,11 @@ positive number if <em class="parameter"><code>s1</code></em> is after <em class </div> <hr> <div class="refsect2"> +<a name="gst-util-group-id-next"></a><h3>gst_util_group_id_next ()</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_util_group_id_next (<em class="parameter"><code><span class="type">void</span></code></em>);</pre> +</div> +<hr> +<div class="refsect2"> <a name="gst-util-set-object-arg"></a><h3>gst_util_set_object_arg ()</h3> <pre class="programlisting"><span class="returnvalue">void</span> gst_util_set_object_arg (<em class="parameter"><code><a href="http://library.gnome.org/devel/gobject/unstable/gobject-The-Base-Object-Type.html#GObject"><span class="type">GObject</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> *name</code></em>, diff --git a/docs/gst/html/gstreamer-GstValue.html b/docs/gst/html/gstreamer-GstValue.html index 3867591..86e7122 100644 --- a/docs/gst/html/gstreamer-GstValue.html +++ b/docs/gst/html/gstreamer-GstValue.html @@ -581,7 +581,7 @@ Sets <em class="parameter"><code>value</code></em> to the bitmask specified by < <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td> -<td>a GValue initialized to <a class="link" href="gstreamer-GstValue.html#GST-TYPE-FRACTION:CAPS" title="GST_TYPE_FRACTION"><span class="type">GST_TYPE_FRACTION</span></a> +<td>a GValue initialized to <a class="link" href="gstreamer-GstValue.html#GST-TYPE-BITMASK:CAPS" title="GST_TYPE_BITMASK"><span class="type">GST_TYPE_BITMASK</span></a> </td> </tr> <tr> @@ -606,7 +606,7 @@ Gets the bitmask specified by <em class="parameter"><code>value</code></em>. <tbody> <tr> <td><p><span class="term"><em class="parameter"><code>value</code></em> :</span></p></td> -<td>a GValue initialized to <a class="link" href="gstreamer-GstValue.html#GST-TYPE-FRACTION:CAPS" title="GST_TYPE_FRACTION"><span class="type">GST_TYPE_FRACTION</span></a> +<td>a GValue initialized to <a class="link" href="gstreamer-GstValue.html#GST-TYPE-BITMASK:CAPS" title="GST_TYPE_BITMASK"><span class="type">GST_TYPE_BITMASK</span></a> </td> </tr> <tr> diff --git a/docs/gst/html/gstreamer-GstVersion.html b/docs/gst/html/gstreamer-GstVersion.html index ba3bf4c..4b6c21d 100644 --- a/docs/gst/html/gstreamer-GstVersion.html +++ b/docs/gst/html/gstreamer-GstVersion.html @@ -88,7 +88,7 @@ The minor version of GStreamer at compile time: <hr> <div class="refsect2"> <a name="GST-VERSION-MICRO:CAPS"></a><h3>GST_VERSION_MICRO</h3> -<pre class="programlisting">#define GST_VERSION_MICRO (2) +<pre class="programlisting">#define GST_VERSION_MICRO (3) </pre> <p> The micro version of GStreamer at compile time: diff --git a/docs/gst/html/index.html b/docs/gst/html/index.html index ec40ed2..3612f01 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 (1.1.2) + for GStreamer Core 1.0 (1.1.3) 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 38f7011..9d6b47c 100644 --- a/docs/gst/html/index.sgml +++ b/docs/gst/html/index.sgml @@ -918,6 +918,8 @@ <ANCHOR id="gst-event-parse-stream-start" href="gstreamer-1.0/gstreamer-GstEvent.html#gst-event-parse-stream-start"> <ANCHOR id="gst-event-set-stream-flags" href="gstreamer-1.0/gstreamer-GstEvent.html#gst-event-set-stream-flags"> <ANCHOR id="gst-event-parse-stream-flags" href="gstreamer-1.0/gstreamer-GstEvent.html#gst-event-parse-stream-flags"> +<ANCHOR id="gst-event-set-group-id" href="gstreamer-1.0/gstreamer-GstEvent.html#gst-event-set-group-id"> +<ANCHOR id="gst-event-parse-group-id" href="gstreamer-1.0/gstreamer-GstEvent.html#gst-event-parse-group-id"> <ANCHOR id="gst-event-new-segment" href="gstreamer-1.0/gstreamer-GstEvent.html#gst-event-new-segment"> <ANCHOR id="gst-event-parse-segment" href="gstreamer-1.0/gstreamer-GstEvent.html#gst-event-parse-segment"> <ANCHOR id="gst-event-copy-segment" href="gstreamer-1.0/gstreamer-GstEvent.html#gst-event-copy-segment"> @@ -1206,6 +1208,8 @@ <ANCHOR id="gst-message-new-reset-time" href="gstreamer-1.0/gstreamer-GstMessage.html#gst-message-new-reset-time"> <ANCHOR id="gst-message-parse-reset-time" href="gstreamer-1.0/gstreamer-GstMessage.html#gst-message-parse-reset-time"> <ANCHOR id="gst-message-new-stream-start" href="gstreamer-1.0/gstreamer-GstMessage.html#gst-message-new-stream-start"> +<ANCHOR id="gst-message-set-group-id" href="gstreamer-1.0/gstreamer-GstMessage.html#gst-message-set-group-id"> +<ANCHOR id="gst-message-parse-group-id" href="gstreamer-1.0/gstreamer-GstMessage.html#gst-message-parse-group-id"> <ANCHOR id="GstStructureChangeType" href="gstreamer-1.0/gstreamer-GstMessage.html#GstStructureChangeType"> <ANCHOR id="GST-STRUCTURE-CHANGE-TYPE-PAD-LINK:CAPS" href="gstreamer-1.0/gstreamer-GstMessage.html#GST-STRUCTURE-CHANGE-TYPE-PAD-LINK:CAPS"> <ANCHOR id="GST-STRUCTURE-CHANGE-TYPE-PAD-UNLINK:CAPS" href="gstreamer-1.0/gstreamer-GstMessage.html#GST-STRUCTURE-CHANGE-TYPE-PAD-UNLINK:CAPS"> @@ -1928,6 +1932,7 @@ <ANCHOR id="gst-query-add-context-type" href="gstreamer-1.0/gstreamer-GstQuery.html#gst-query-add-context-type"> <ANCHOR id="gst-query-get-n-context-types" href="gstreamer-1.0/gstreamer-GstQuery.html#gst-query-get-n-context-types"> <ANCHOR id="gst-query-parse-nth-context-type" href="gstreamer-1.0/gstreamer-GstQuery.html#gst-query-parse-nth-context-type"> +<ANCHOR id="gst-query-has-context-type" href="gstreamer-1.0/gstreamer-GstQuery.html#gst-query-has-context-type"> <ANCHOR id="gstreamer-GstQuery.see-also" href="gstreamer-1.0/gstreamer-GstQuery.html#gstreamer-GstQuery.see-also"> <ANCHOR id="GstRegistry" href="gstreamer-1.0/GstRegistry.html"> <ANCHOR id="GstRegistry.synopsis" href="gstreamer-1.0/GstRegistry.html#GstRegistry.synopsis"> @@ -2492,6 +2497,7 @@ <ANCHOR id="gst-util-fraction-compare" href="gstreamer-1.0/gstreamer-GstUtils.html#gst-util-fraction-compare"> <ANCHOR id="gst-util-seqnum-next" href="gstreamer-1.0/gstreamer-GstUtils.html#gst-util-seqnum-next"> <ANCHOR id="gst-util-seqnum-compare" href="gstreamer-1.0/gstreamer-GstUtils.html#gst-util-seqnum-compare"> +<ANCHOR id="gst-util-group-id-next" href="gstreamer-1.0/gstreamer-GstUtils.html#gst-util-group-id-next"> <ANCHOR id="gst-util-set-object-arg" href="gstreamer-1.0/gstreamer-GstUtils.html#gst-util-set-object-arg"> <ANCHOR id="gst-util-set-value-from-string" href="gstreamer-1.0/gstreamer-GstUtils.html#gst-util-set-value-from-string"> <ANCHOR id="gst-util-get-timestamp" href="gstreamer-1.0/gstreamer-GstUtils.html#gst-util-get-timestamp"> @@ -2665,7 +2671,10 @@ <ANCHOR id="gst-debug-set-active" href="gstreamer-1.0/gstreamer-GstInfo.html#gst-debug-set-active"> <ANCHOR id="gst-debug-is-active" href="gstreamer-1.0/gstreamer-GstInfo.html#gst-debug-is-active"> <ANCHOR id="gst-debug-set-colored" href="gstreamer-1.0/gstreamer-GstInfo.html#gst-debug-set-colored"> +<ANCHOR id="gst-debug-set-color-mode" href="gstreamer-1.0/gstreamer-GstInfo.html#gst-debug-set-color-mode"> +<ANCHOR id="gst-debug-set-color-mode-from-string" href="gstreamer-1.0/gstreamer-GstInfo.html#gst-debug-set-color-mode-from-string"> <ANCHOR id="gst-debug-is-colored" href="gstreamer-1.0/gstreamer-GstInfo.html#gst-debug-is-colored"> +<ANCHOR id="gst-debug-get-color-mode" href="gstreamer-1.0/gstreamer-GstInfo.html#gst-debug-get-color-mode"> <ANCHOR id="gst-debug-set-default-threshold" href="gstreamer-1.0/gstreamer-GstInfo.html#gst-debug-set-default-threshold"> <ANCHOR id="gst-debug-set-threshold-from-string" href="gstreamer-1.0/gstreamer-GstInfo.html#gst-debug-set-threshold-from-string"> <ANCHOR id="gst-debug-get-default-threshold" href="gstreamer-1.0/gstreamer-GstInfo.html#gst-debug-get-default-threshold"> diff --git a/docs/gst/running.xml b/docs/gst/running.xml index 5564a1b..d0b5d98 100644 --- a/docs/gst/running.xml +++ b/docs/gst/running.xml @@ -237,12 +237,93 @@ e.g. GST_DEBUG=*:WARNING,*audio*:LOG <para> Set this environment variable to any value ("1" typically) to switch off colouring in GST_DEBUG output. This has the same effect as specifying the -<option>--gst-debug-no-color</option> command line option to well-behaved -GStreamer applications (ie. those that pass command-line options correctly to -GStreamer). +<option>--gst-debug-no-color</option> or +<option>--gst-debug-color-mode</option>=off command line option to +well-behaved GStreamer applications (ie. those that pass command-line +options correctly to GStreamer). This is particularly useful to reduce the size of debug output and also allows for the output to be compressed much better than with colours turned on. </para> + <para> +Has the same effect as setting GST_DEBUG_COLOR_MODE environment variable to +"off". + </para> + +</formalpara> + +<formalpara id="GST_DEBUG_COLOR_MODE"> + <title><envar>GST_DEBUG_COLOR_MODE</envar></title> + + <para> +Set this environment variable to change log colouring in GST_DEBUG output. +Possible values: + <variablelist> + + <varlistentry> + <term><option>on</option></term> + <listitem> + <para> +Enables debug log output coloring. Uses default coloring method for current +platform. This is the default. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>off</option></term> + <listitem> + <para> +Disables debug log output coloring. This has the same effect as specifying the +<option>--gst-debug-color-mode</option>=off command line option to +well-behaved GStreamer applications (ie. those that pass command-line +options correctly to GStreamer). +This is particularly useful to reduce the size of debug output and also allows +for the output to be compressed much better than with colours turned on. + </para> + <para> +Has the same effect as setting GST_DEBUG_NO_COLOR environment variable to +any value. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>auto</option></term> + <listitem> + <para> +Same as <option>on</option>. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>disable</option></term> + <listitem> + <para> +Same as <option>off</option>. + </para> + </listitem> + </varlistentry> + + <varlistentry> + <term><option>unix</option></term> + <listitem> + <para> +Enables debug log output coloring and forces the use of UNIX termial codes +for coloring, even if this method is not normally used on current platform. +This has the same effect as specifying the +<option>--gst-debug-color-mode</option>=unix command line option to +well-behaved GStreamer applications (ie. those that pass command-line options +correctly to GStreamer). +This is particularly useful to dump debug output into a file on non-UNIX +platforms to be sent to developers who have viewers that support UNIX terminal +codes. + </para> + </listitem> + </varlistentry> + + </variablelist> + </para> </formalpara> diff --git a/docs/libs/Makefile.in b/docs/libs/Makefile.in index ef106d4..7d82c4c 100644 --- a/docs/libs/Makefile.in +++ b/docs/libs/Makefile.in @@ -279,6 +279,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -289,7 +290,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/docs/libs/html/GstAdapter.html b/docs/libs/html/GstAdapter.html index 08a3a36..c6b474f 100644 --- a/docs/libs/html/GstAdapter.html +++ b/docs/libs/html/GstAdapter.html @@ -541,9 +541,10 @@ Free-function: g_free <p> 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. +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. This function will always return a +buffer with a single memory region. </p> <p> Note that no assumptions should be made as to whether certain buffer diff --git a/docs/libs/html/GstBaseSrc.html b/docs/libs/html/GstBaseSrc.html index 5eddb03..0e55aba 100644 --- a/docs/libs/html/GstBaseSrc.html +++ b/docs/libs/html/GstBaseSrc.html @@ -248,7 +248,7 @@ should install a pad template in its class_init function, like so: <p> </p> <div class="refsect2"> -<a name="idp6538368"></a><h3>Controlled shutdown of live sources in applications</h3> +<a name="idp8682992"></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 diff --git a/docs/libs/html/GstBaseTransform.html b/docs/libs/html/GstBaseTransform.html index b52ccd1..284c835 100644 --- a/docs/libs/html/GstBaseTransform.html +++ b/docs/libs/html/GstBaseTransform.html @@ -118,7 +118,7 @@ It provides for: <p> </p> <div class="refsect2"> -<a name="idp6953552"></a><h3>Use Cases</h3> +<a name="idp6161552"></a><h3>Use Cases</h3> <p> </p> <div class="orderedlist"><ol class="orderedlist" type="1"> @@ -257,7 +257,7 @@ It provides for: </p> <hr> <div class="refsect2"> -<a name="idp5222304"></a><h3>Sub-class settable flags on GstBaseTransform</h3> +<a name="idp8707568"></a><h3>Sub-class settable flags on GstBaseTransform</h3> <p> </p> <div class="itemizedlist"><ul class="itemizedlist" style="list-style-type: disc; "> diff --git a/docs/libs/html/GstNetTimeProvider.html b/docs/libs/html/GstNetTimeProvider.html index 8d5ab30..8a320d7 100644 --- a/docs/libs/html/GstNetTimeProvider.html +++ b/docs/libs/html/GstNetTimeProvider.html @@ -119,8 +119,9 @@ Allows network clients to get the current time of <em class="parameter"><code>cl </tr> <tr> <td><p><span class="term"><em class="parameter"><code>address</code></em> :</span></p></td> -<td>an address to bind on as a dotted quad (xxx.xxx.xxx.xxx), IPv6 address, or NULL -to bind to all addresses</td> +<td>an address to bind on as a dotted quad +(xxx.xxx.xxx.xxx), IPv6 address, or NULL to bind to all addresses. <span class="annotation">[<acronym title="NULL is ok, both for passing and for returning."><span class="acronym">allow-none</span></acronym>]</span> +</td> </tr> <tr> <td><p><span class="term"><em class="parameter"><code>port</code></em> :</span></p></td> diff --git a/docs/libs/html/GstTestClock.html b/docs/libs/html/GstTestClock.html index 3305e55..bb25f9c 100644 --- a/docs/libs/html/GstTestClock.html +++ b/docs/libs/html/GstTestClock.html @@ -98,7 +98,7 @@ system time or any other external factors. <p> </p> <div class="example"> -<a name="idp10016464"></a><p class="title"><b>Example 1. Advancing the time of a <a class="link" href="GstTestClock.html" title="GstTestClock"><span class="type">GstTestClock</span></a></b></p> +<a name="idp7705408"></a><p class="title"><b>Example 1. Advancing the time of a <a class="link" href="GstTestClock.html" title="GstTestClock"><span class="type">GstTestClock</span></a></b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -188,7 +188,7 @@ clock notification. <p> </p> <div class="example"> -<a name="idp14901808"></a><p class="title"><b>Example 2. Demonstration of how to work with clock notifications and <a class="link" href="GstTestClock.html" title="GstTestClock"><span class="type">GstTestClock</span></a></b></p> +<a name="idp19110880"></a><p class="title"><b>Example 2. Demonstration of how to work with clock notifications and <a class="link" href="GstTestClock.html" title="GstTestClock"><span class="type">GstTestClock</span></a></b></p> <div class="example-contents"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> diff --git a/docs/libs/html/gstreamer-libs-1.0.devhelp2 b/docs/libs/html/gstreamer-libs-1.0.devhelp2 index cf343de..2ad224a 100644 --- a/docs/libs/html/gstreamer-libs-1.0.devhelp2 +++ b/docs/libs/html/gstreamer-libs-1.0.devhelp2 @@ -70,7 +70,7 @@ <keyword type="macro" name="GST_BASE_PARSE_LOST_SYNC()" link="gstreamer-libs-GstBaseParse.html#GST-BASE-PARSE-LOST-SYNC:CAPS"/> <keyword type="macro" name="GST_BASE_PARSE_SINK_PAD()" link="gstreamer-libs-GstBaseParse.html#GST-BASE-PARSE-SINK-PAD:CAPS"/> <keyword type="macro" name="GST_BASE_PARSE_SRC_PAD()" link="gstreamer-libs-GstBaseParse.html#GST-BASE-PARSE-SRC-PAD:CAPS"/> - <keyword type="" name="Controlled shutdown of live sources in applications" link="GstBaseSrc.html#idp6538368"/> + <keyword type="" name="Controlled shutdown of live sources in applications" link="GstBaseSrc.html#idp8682992"/> <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"/> @@ -137,8 +137,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#idp6953552"/> - <keyword type="" name="Sub-class settable flags on GstBaseTransform" link="GstBaseTransform.html#idp5222304"/> + <keyword type="" name="Use Cases" link="GstBaseTransform.html#idp6161552"/> + <keyword type="" name="Sub-class settable flags on GstBaseTransform" link="GstBaseTransform.html#idp8707568"/> <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"/> diff --git a/docs/libs/html/index.html b/docs/libs/html/index.html index ffb6236..944e554 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 (1.1.1.1) + for GStreamer Library 1.0 (1.1.2.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> diff --git a/docs/manual/Makefile.in b/docs/manual/Makefile.in index 5b2341f..6f24e2e 100644 --- a/docs/manual/Makefile.in +++ b/docs/manual/Makefile.in @@ -311,6 +311,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -321,7 +322,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/docs/manual/appendix-checklist.xml b/docs/manual/appendix-checklist.xml index 8022a5c..4c41957 100644 --- a/docs/manual/appendix-checklist.xml +++ b/docs/manual/appendix-checklist.xml @@ -114,6 +114,19 @@ </listitem> <listitem> <para> + <option>--gst-debug-color-mode=<replaceable>MODE</replaceable></option> + will change debug log coloring mode. <replaceable>MODE</replaceable> + can be one of the following: <option>on</option>, + <option>off</option>, <option>auto</option>, + <option>disable</option>, <option>unix</option>. + You can also set the GST_DEBUG_COLOR_MODE environment variable + if you want to change colored debug output permanently. Note that + if you are disabling color purely to avoid messing up your pager + output, try using <command>less -R</command>. + </para> + </listitem> + <listitem> + <para> <option>--gst-debug-disable</option> disables debugging altogether. </para> </listitem> diff --git a/docs/plugins/Makefile.in b/docs/plugins/Makefile.in index 9ff92bf..f5d4781 100644 --- a/docs/plugins/Makefile.in +++ b/docs/plugins/Makefile.in @@ -275,6 +275,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -285,7 +286,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/docs/plugins/html/ch01.html b/docs/plugins/html/ch01.html index 5052061..bef32aa 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><h1 class="title"> -<a name="idp182912"></a>gstreamer Elements</h1></div></div></div> +<a name="idp4207152"></a>gstreamer Elements</h1></div></div></div> <div class="toc"><dl class="toc"> <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 8b2ab65..2c64bf2 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><h1 class="title"> -<a name="idp4012672"></a>gstreamer Plugins</h1></div></div></div> +<a name="idp911920"></a>gstreamer Plugins</h1></div></div></div> <div class="toc"><dl class="toc"><dt> <span class="refentrytitle"><a href="gstreamer-plugins-plugin-coreelements.html">coreelements</a></span><span class="refpurpose">GStreamer core elements</span> </dt></dl></div> diff --git a/docs/plugins/html/gstreamer-plugins-1.0.devhelp2 b/docs/plugins/html/gstreamer-plugins-1.0.devhelp2 index e518b45..8c550c1 100644 --- a/docs/plugins/html/gstreamer-plugins-1.0.devhelp2 +++ b/docs/plugins/html/gstreamer-plugins-1.0.devhelp2 @@ -26,14 +26,14 @@ </sub> </chapters> <functions> - <keyword type="" name="Example launch line" link="gstreamer-plugins-capsfilter.html#idp7666560"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-capsfilter.html#idp6347936"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-capsfilter.html#idp81680"/> + <keyword type="" name="Example launch line" link="gstreamer-plugins-capsfilter.html#idp7887952"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-capsfilter.html#idp8034400"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-capsfilter.html#idp131440"/> <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#idp5045072"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-fakesrc.html#idp5047968"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-fakesrc.html#idp5055376"/> + <keyword type="" name="Example launch line" link="gstreamer-plugins-fakesrc.html#idp5706000"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-fakesrc.html#idp5708896"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-fakesrc.html#idp5716304"/> <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 "sizetype" property" link="gstreamer-plugins-fakesrc.html#GstFakeSrc--sizetype"/> <keyword type="property" name="The "sync" property" link="gstreamer-plugins-fakesrc.html#GstFakeSrc--sync"/> <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#idp9233600"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-fakesink.html#idp9235920"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-fakesink.html#idp9437216"/> + <keyword type="" name="Example launch line" link="gstreamer-plugins-fakesink.html#idp8381872"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-fakesink.html#idp8384192"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-fakesink.html#idp7141872"/> <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,34 +72,34 @@ <keyword type="property" name="The "state-error" property" link="gstreamer-plugins-fakesink.html#GstFakeSink--state-error"/> <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#idp9217136"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-fdsink.html#idp6943024"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-fdsink.html#idp9421888"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-fdsink.html#idp6475632"/> <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#idp5345808"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-fdsrc.html#idp5348672"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-fdsrc.html#idp6000224"/> + <keyword type="" name="Example launch line" link="gstreamer-plugins-fdsrc.html#idp5459456"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-fdsrc.html#idp5462320"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-fdsrc.html#idp6041920"/> <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#idp7888896"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-filesrc.html#idp6168016"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-filesrc.html#idp5971808"/> + <keyword type="" name="Example launch line" link="gstreamer-plugins-filesrc.html#idp7925344"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-filesrc.html#idp8082464"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-filesrc.html#idp9440320"/> <keyword type="struct" name="struct GstFileSrc" link="gstreamer-plugins-filesrc.html#GstFileSrc-struct"/> <keyword type="property" name="The "location" property" link="gstreamer-plugins-filesrc.html#GstFileSrc--location"/> - <keyword type="" name="Example launch line" link="gstreamer-plugins-filesink.html#idp8940544"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-filesink.html#idp8942816"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-filesink.html#idp8950224"/> + <keyword type="" name="Example launch line" link="gstreamer-plugins-filesink.html#idp6995184"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-filesink.html#idp6997456"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-filesink.html#idp7004864"/> <keyword type="struct" name="struct GstFileSink" link="gstreamer-plugins-filesink.html#GstFileSink-struct"/> <keyword type="property" name="The "append" property" link="gstreamer-plugins-filesink.html#GstFileSink--append"/> <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 "location" property" link="gstreamer-plugins-filesink.html#GstFileSink--location"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-funnel.html#idp5716912"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-funnel.html#idp8071488"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-funnel.html#idp6587840"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-funnel.html#idp5224496"/> <keyword type="struct" name="struct GstFunnel" link="gstreamer-plugins-funnel.html#GstFunnel-struct"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-identity.html#idp9885728"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-identity.html#idp9893184"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-identity.html#idp10311888"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-identity.html#idp10319344"/> <keyword type="struct" name="struct GstIdentity" link="gstreamer-plugins-identity.html#GstIdentity-struct"/> <keyword type="property" name="The "check-imperfect-offset" property" link="gstreamer-plugins-identity.html#GstIdentity--check-imperfect-offset"/> <keyword type="property" name="The "check-imperfect-timestamp" property" link="gstreamer-plugins-identity.html#GstIdentity--check-imperfect-timestamp"/> @@ -114,8 +114,8 @@ <keyword type="property" name="The "sleep-time" property" link="gstreamer-plugins-identity.html#GstIdentity--sleep-time"/> <keyword type="property" name="The "sync" property" link="gstreamer-plugins-identity.html#GstIdentity--sync"/> <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#idp9052048"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-input-selector.html#idp9059584"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-input-selector.html#idp7550672"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-input-selector.html#idp10175808"/> <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 "cache-buffers" property" link="gstreamer-plugins-input-selector.html#GstInputSelector--cache-buffers"/> @@ -123,9 +123,9 @@ <keyword type="property" name="The "sync-mode" property" link="gstreamer-plugins-input-selector.html#GstInputSelector--sync-mode"/> <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="" name="" link="gstreamer-plugins-multiqueue.html#idp10331488"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-multiqueue.html#idp10352992"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-multiqueue.html#idp10360448"/> + <keyword type="" name="" link="gstreamer-plugins-multiqueue.html#idp8767104"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-multiqueue.html#idp10515648"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-multiqueue.html#idp10523104"/> <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"/> @@ -139,14 +139,14 @@ <keyword type="property" name="The "use-buffering" property" link="gstreamer-plugins-multiqueue.html#GstMultiQueue--use-buffering"/> <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#idp6884992"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-output-selector.html#idp9588000"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-output-selector.html#idp9270160"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-output-selector.html#idp7113664"/> <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 "pad-negotiation-mode" property" link="gstreamer-plugins-output-selector.html#GstOutputSelector--pad-negotiation-mode"/> <keyword type="property" name="The "resend-latest" property" link="gstreamer-plugins-output-selector.html#GstOutputSelector--resend-latest"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-queue.html#idp10597232"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-queue.html#idp10604688"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-queue.html#idp10827456"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-queue.html#idp10834912"/> <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"/> @@ -165,8 +165,8 @@ <keyword type="signal" name="The "pushing" signal" link="gstreamer-plugins-queue.html#GstQueue-pushing"/> <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="" name="Element Information" link="gstreamer-plugins-queue2.html#idp10517952"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-queue2.html#idp10525360"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-queue2.html#idp11004080"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-queue2.html#idp11011488"/> <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"/> @@ -182,9 +182,9 @@ <keyword type="property" name="The "temp-template" property" link="gstreamer-plugins-queue2.html#GstQueue2--temp-template"/> <keyword type="property" name="The "use-buffering" property" link="gstreamer-plugins-queue2.html#GstQueue2--use-buffering"/> <keyword type="property" name="The "use-rate-estimate" property" link="gstreamer-plugins-queue2.html#GstQueue2--use-rate-estimate"/> - <keyword type="" name="Example launch line" link="gstreamer-plugins-tee.html#idp10011744"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-tee.html#idp10014192"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-tee.html#idp10021600"/> + <keyword type="" name="Example launch line" link="gstreamer-plugins-tee.html#idp10735280"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-tee.html#idp10737728"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-tee.html#idp10745136"/> <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 "alloc-pad" property" link="gstreamer-plugins-tee.html#GstTee--alloc-pad"/> @@ -193,15 +193,15 @@ <keyword type="property" name="The "num-src-pads" property" link="gstreamer-plugins-tee.html#GstTee--num-src-pads"/> <keyword type="property" name="The "pull-mode" property" link="gstreamer-plugins-tee.html#GstTee--pull-mode"/> <keyword type="property" name="The "silent" property" link="gstreamer-plugins-tee.html#GstTee--silent"/> - <keyword type="" name="Element Information" link="gstreamer-plugins-typefind.html#idp6540528"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-typefind.html#idp7614896"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-typefind.html#idp6507088"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-typefind.html#idp6514496"/> <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 "force-caps" property" link="gstreamer-plugins-typefind.html#GstTypeFindElement--force-caps"/> <keyword type="property" name="The "minimum" property" link="gstreamer-plugins-typefind.html#GstTypeFindElement--minimum"/> <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#idp9804192"/> - <keyword type="" name="Element Pads" link="gstreamer-plugins-valve.html#idp10088704"/> + <keyword type="" name="Element Information" link="gstreamer-plugins-valve.html#idp7993696"/> + <keyword type="" name="Element Pads" link="gstreamer-plugins-valve.html#idp9107888"/> <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/gstreamer-plugins-capsfilter.html b/docs/plugins/html/gstreamer-plugins-capsfilter.html index b076b7e..a0228fb 100644 --- a/docs/plugins/html/gstreamer-plugins-capsfilter.html +++ b/docs/plugins/html/gstreamer-plugins-capsfilter.html @@ -70,7 +70,7 @@ data format. <p> </p> <div class="refsect2"> -<a name="idp7666560"></a><h3>Example launch line</h3> +<a name="idp7887952"></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="idp6347936"></a><h3>Element Information</h3> +<a name="idp8034400"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -114,7 +114,7 @@ data format. </div> <hr> <div class="refsect2"> -<a name="idp81680"></a><h3>Element Pads</h3> +<a name="idp131440"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-fakesink.html b/docs/plugins/html/gstreamer-plugins-fakesink.html index 57b82c8..d67a309 100644 --- a/docs/plugins/html/gstreamer-plugins-fakesink.html +++ b/docs/plugins/html/gstreamer-plugins-fakesink.html @@ -86,7 +86,7 @@ Dummy sink that swallows everything. <p> </p> <div class="refsect2"> -<a name="idp9233600"></a><h3>Example launch line</h3> +<a name="idp8381872"></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="idp9235920"></a><h3>Element Information</h3> +<a name="idp8384192"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -130,7 +130,7 @@ Dummy sink that swallows everything. </div> <hr> <div class="refsect2"> -<a name="idp9437216"></a><h3>Element Pads</h3> +<a name="idp7141872"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-fakesrc.html b/docs/plugins/html/gstreamer-plugins-fakesrc.html index ec0ed31..183feb4 100644 --- a/docs/plugins/html/gstreamer-plugins-fakesrc.html +++ b/docs/plugins/html/gstreamer-plugins-fakesrc.html @@ -102,7 +102,7 @@ basic <span class="application">GStreamer</span> core functionality is: <p> </p> <div class="refsect2"> -<a name="idp5045072"></a><h3>Example launch line</h3> +<a name="idp5706000"></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="idp5047968"></a><h3>Element Information</h3> +<a name="idp5708896"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -150,7 +150,7 @@ Last reviewed on 2008-06-20 (0.10.21) </div> <hr> <div class="refsect2"> -<a name="idp5055376"></a><h3>Element Pads</h3> +<a name="idp5716304"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-fdsink.html b/docs/plugins/html/gstreamer-plugins-fdsink.html index 7551bb8..f0406a2 100644 --- a/docs/plugins/html/gstreamer-plugins-fdsink.html +++ b/docs/plugins/html/gstreamer-plugins-fdsink.html @@ -85,7 +85,7 @@ Last reviewed on 2006-04-28 (0.10.6) <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp9217136"></a><h3>Element Information</h3> +<a name="idp9421888"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -111,7 +111,7 @@ Last reviewed on 2006-04-28 (0.10.6) </div> <hr> <div class="refsect2"> -<a name="idp6943024"></a><h3>Element Pads</h3> +<a name="idp6475632"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-fdsrc.html b/docs/plugins/html/gstreamer-plugins-fdsrc.html index 12a855f..db703df 100644 --- a/docs/plugins/html/gstreamer-plugins-fdsrc.html +++ b/docs/plugins/html/gstreamer-plugins-fdsrc.html @@ -97,7 +97,7 @@ The message's structure contains one field: <p> </p> <div class="refsect2"> -<a name="idp5345808"></a><h3>Example launch line</h3> +<a name="idp5459456"></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="idp5348672"></a><h3>Element Information</h3> +<a name="idp5462320"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -145,7 +145,7 @@ Last reviewed on 2008-06-20 (0.10.21) </div> <hr> <div class="refsect2"> -<a name="idp6000224"></a><h3>Element Pads</h3> +<a name="idp6041920"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-filesink.html b/docs/plugins/html/gstreamer-plugins-filesink.html index 38efb42..5e1339b 100644 --- a/docs/plugins/html/gstreamer-plugins-filesink.html +++ b/docs/plugins/html/gstreamer-plugins-filesink.html @@ -80,7 +80,7 @@ Write incoming data to a file in the local file system. <p> </p> <div class="refsect2"> -<a name="idp8940544"></a><h3>Example launch line</h3> +<a name="idp6995184"></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="idp8942816"></a><h3>Element Information</h3> +<a name="idp6997456"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -124,7 +124,7 @@ Write incoming data to a file in the local file system. </div> <hr> <div class="refsect2"> -<a name="idp8950224"></a><h3>Element Pads</h3> +<a name="idp7004864"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-filesrc.html b/docs/plugins/html/gstreamer-plugins-filesrc.html index 6b476e4..3e61c1d 100644 --- a/docs/plugins/html/gstreamer-plugins-filesrc.html +++ b/docs/plugins/html/gstreamer-plugins-filesrc.html @@ -77,7 +77,7 @@ Read data from a file in the local file system. <p> </p> <div class="refsect2"> -<a name="idp7888896"></a><h3>Example launch line</h3> +<a name="idp7925344"></a><h3>Example launch line</h3> <div class="informalexample"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -95,7 +95,7 @@ Read data from a file in the local file system. <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp6168016"></a><h3>Element Information</h3> +<a name="idp8082464"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -121,7 +121,7 @@ Read data from a file in the local file system. </div> <hr> <div class="refsect2"> -<a name="idp5971808"></a><h3>Element Pads</h3> +<a name="idp9440320"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-funnel.html b/docs/plugins/html/gstreamer-plugins-funnel.html index 9c66787..b515f32 100644 --- a/docs/plugins/html/gstreamer-plugins-funnel.html +++ b/docs/plugins/html/gstreamer-plugins-funnel.html @@ -68,7 +68,7 @@ immediately when they arrive. <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp5716912"></a><h3>Element Information</h3> +<a name="idp6587840"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -94,7 +94,7 @@ immediately when they arrive. </div> <hr> <div class="refsect2"> -<a name="idp8071488"></a><h3>Element Pads</h3> +<a name="idp5224496"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-identity.html b/docs/plugins/html/gstreamer-plugins-identity.html index 95b9d2b..3bb5db5 100644 --- a/docs/plugins/html/gstreamer-plugins-identity.html +++ b/docs/plugins/html/gstreamer-plugins-identity.html @@ -89,7 +89,7 @@ useful diagnostic functions, such as offset and timestamp checking. <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp9885728"></a><h3>Element Information</h3> +<a name="idp10311888"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -115,7 +115,7 @@ useful diagnostic functions, such as offset and timestamp checking. </div> <hr> <div class="refsect2"> -<a name="idp9893184"></a><h3>Element Pads</h3> +<a name="idp10319344"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-input-selector.html b/docs/plugins/html/gstreamer-plugins-input-selector.html index 064fba1..4780b9c 100644 --- a/docs/plugins/html/gstreamer-plugins-input-selector.html +++ b/docs/plugins/html/gstreamer-plugins-input-selector.html @@ -103,7 +103,7 @@ properties, which users may find useful, namely: <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp9052048"></a><h3>Element Information</h3> +<a name="idp7550672"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -129,7 +129,7 @@ properties, which users may find useful, namely: </div> <hr> <div class="refsect2"> -<a name="idp9059584"></a><h3>Element Pads</h3> +<a name="idp10175808"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-multiqueue.html b/docs/plugins/html/gstreamer-plugins-multiqueue.html index ef0a35c..7ee14f2 100644 --- a/docs/plugins/html/gstreamer-plugins-multiqueue.html +++ b/docs/plugins/html/gstreamer-plugins-multiqueue.html @@ -83,7 +83,7 @@ <p> </p> <div class="refsect2"> -<a name="idp10331488"></a><p> +<a name="idp8767104"></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> @@ -173,7 +173,7 @@ Last reviewed on 2008-01-25 (0.10.17) <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp10352992"></a><h3>Element Information</h3> +<a name="idp10515648"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -199,7 +199,7 @@ Last reviewed on 2008-01-25 (0.10.17) </div> <hr> <div class="refsect2"> -<a name="idp10360448"></a><h3>Element Pads</h3> +<a name="idp10523104"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-output-selector.html b/docs/plugins/html/gstreamer-plugins-output-selector.html index 50b01de..e6d05a6 100644 --- a/docs/plugins/html/gstreamer-plugins-output-selector.html +++ b/docs/plugins/html/gstreamer-plugins-output-selector.html @@ -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="idp6884992"></a><h3>Element Information</h3> +<a name="idp9270160"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -96,7 +96,7 @@ Direct input stream to one out of N output pads. </div> <hr> <div class="refsect2"> -<a name="idp9588000"></a><h3>Element Pads</h3> +<a name="idp7113664"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-plugin-coreelements.html b/docs/plugins/html/gstreamer-plugins-plugin-coreelements.html index b2126fc..a0429ca 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="idp2843232"></a><h2>Plugin Information</h2> +<a name="idp7562880"></a><h2>Plugin Information</h2> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -41,7 +41,7 @@ </tr> <tr> <td><p><span class="term">version</span></p></td> -<td>1.1.2</td> +<td>1.1.3</td> </tr> <tr> <td><p><span class="term">run-time license</span></p></td> @@ -59,7 +59,7 @@ </table></div> </div> <div class="refsect1"> -<a name="idp7797440"></a><h2>Elements</h2> +<a name="idp9742224"></a><h2>Elements</h2> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-queue.html b/docs/plugins/html/gstreamer-plugins-queue.html index 0aac199..b0b4bff 100644 --- a/docs/plugins/html/gstreamer-plugins-queue.html +++ b/docs/plugins/html/gstreamer-plugins-queue.html @@ -123,7 +123,7 @@ up. Both signals are emitted from the context of the streaming thread. <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp10597232"></a><h3>Element Information</h3> +<a name="idp10827456"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -149,7 +149,7 @@ up. Both signals are emitted from the context of the streaming thread. </div> <hr> <div class="refsect2"> -<a name="idp10604688"></a><h3>Element Pads</h3> +<a name="idp10834912"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-queue2.html b/docs/plugins/html/gstreamer-plugins-queue2.html index f0e6c99..58dfdc5 100644 --- a/docs/plugins/html/gstreamer-plugins-queue2.html +++ b/docs/plugins/html/gstreamer-plugins-queue2.html @@ -110,7 +110,7 @@ Last reviewed on 2009-07-10 (0.10.24) <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp10517952"></a><h3>Element Information</h3> +<a name="idp11004080"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -136,7 +136,7 @@ Last reviewed on 2009-07-10 (0.10.24) </div> <hr> <div class="refsect2"> -<a name="idp10525360"></a><h3>Element Pads</h3> +<a name="idp11011488"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-tee.html b/docs/plugins/html/gstreamer-plugins-tee.html index 39f1de5..bcd6767 100644 --- a/docs/plugins/html/gstreamer-plugins-tee.html +++ b/docs/plugins/html/gstreamer-plugins-tee.html @@ -82,7 +82,7 @@ branch would stall the other branches. <p> </p> <div class="refsect2"> -<a name="idp10011744"></a><h3>Example launch line</h3> +<a name="idp10735280"></a><h3>Example launch line</h3> <div class="informalexample"> <table class="listing_frame" border="0" cellpadding="0" cellspacing="0"> <tbody> @@ -101,7 +101,7 @@ element. <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp10014192"></a><h3>Element Information</h3> +<a name="idp10737728"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -127,7 +127,7 @@ element. </div> <hr> <div class="refsect2"> -<a name="idp10021600"></a><h3>Element Pads</h3> +<a name="idp10745136"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-typefind.html b/docs/plugins/html/gstreamer-plugins-typefind.html index 52d58bf..502107c 100644 --- a/docs/plugins/html/gstreamer-plugins-typefind.html +++ b/docs/plugins/html/gstreamer-plugins-typefind.html @@ -89,7 +89,7 @@ Plugins can register custom typefinders by using <a href="http://gstreamer.freed <div class="refsynopsisdiv"> <h2>Synopsis</h2> <div class="refsect2"> -<a name="idp6540528"></a><h3>Element Information</h3> +<a name="idp6507088"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -115,7 +115,7 @@ Plugins can register custom typefinders by using <a href="http://gstreamer.freed </div> <hr> <div class="refsect2"> -<a name="idp7614896"></a><h3>Element Pads</h3> +<a name="idp6514496"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/gstreamer-plugins-valve.html b/docs/plugins/html/gstreamer-plugins-valve.html index 78bfdb3..b28e701 100644 --- a/docs/plugins/html/gstreamer-plugins-valve.html +++ b/docs/plugins/html/gstreamer-plugins-valve.html @@ -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="idp9804192"></a><h3>Element Information</h3> +<a name="idp7993696"></a><h3>Element Information</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> @@ -107,7 +107,7 @@ Documentation last reviewed on 2010-12-30 (0.10.31) </div> <hr> <div class="refsect2"> -<a name="idp10088704"></a><h3>Element Pads</h3> +<a name="idp9107888"></a><h3>Element Pads</h3> <div class="variablelist"><table border="0" class="variablelist"> <colgroup> <col align="left" valign="top"> diff --git a/docs/plugins/html/index.html b/docs/plugins/html/index.html index c01f266..3c83dfb 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 (1.1.2) + for GStreamer Core Plugins 1.0 (1.1.3) 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 98bd5df..c914df1 100644 --- a/docs/plugins/inspect/plugin-coreelements.xml +++ b/docs/plugins/inspect/plugin-coreelements.xml @@ -3,7 +3,7 @@ <description>GStreamer core elements</description> <filename>../../plugins/elements/.libs/libgstcoreelements.so</filename> <basename>libgstcoreelements.so</basename> - <version>1.1.2</version> + <version>1.1.3</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 6a8c025..23632f4 100644 --- a/docs/pwg/Makefile.in +++ b/docs/pwg/Makefile.in @@ -311,6 +311,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -321,7 +322,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/docs/slides/Makefile.in b/docs/slides/Makefile.in index 0c0b932..6252266 100644 --- a/docs/slides/Makefile.in +++ b/docs/slides/Makefile.in @@ -256,6 +256,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -266,7 +267,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/docs/xsl/Makefile.in b/docs/xsl/Makefile.in index 8b3ac27..fb1f690 100644 --- a/docs/xsl/Makefile.in +++ b/docs/xsl/Makefile.in @@ -256,6 +256,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -266,7 +267,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/gst/Makefile.in b/gst/Makefile.in index 7eb7607..f82da8d 100644 --- a/gst/Makefile.in +++ b/gst/Makefile.in @@ -483,6 +483,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -493,7 +494,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ @@ -176,6 +176,7 @@ enum ARG_DEBUG, ARG_DEBUG_DISABLE, ARG_DEBUG_NO_COLOR, + ARG_DEBUG_COLOR_MODE, ARG_DEBUG_HELP, #endif ARG_PLUGIN_SPEW, @@ -250,6 +251,11 @@ gst_init_get_option_group (void) {"gst-debug-no-color", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer) parse_goption_arg, N_("Disable colored debugging output"), NULL}, + {"gst-debug-color-mode", 0, 0, G_OPTION_ARG_CALLBACK, + (gpointer) parse_goption_arg, + N_("Changes coloring mode of the debug log. " + "Possible modes: off, on, disable, auto, unix"), + NULL}, {"gst-debug-disable", 0, G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, (gpointer) parse_goption_arg, N_("Disable debugging"), NULL}, #endif @@ -475,9 +481,13 @@ init_pre (GOptionContext * context, GOptionGroup * group, gpointer data, #ifndef GST_DISABLE_GST_DEBUG { const gchar *debug_list; + const gchar *color_mode; if (g_getenv ("GST_DEBUG_NO_COLOR") != NULL) - gst_debug_set_colored (FALSE); + gst_debug_set_color_mode (GST_DEBUG_COLOR_MODE_OFF); + color_mode = g_getenv ("GST_DEBUG_COLOR_MODE"); + if (color_mode) + gst_debug_set_color_mode_from_string (color_mode); debug_list = g_getenv ("GST_DEBUG"); if (debug_list) { @@ -743,9 +753,27 @@ gst_debug_help (void) g_print ("---------------------+--------+--------------------------------\n"); while (walk) { + gboolean on_unix; GstDebugCategory *cat = (GstDebugCategory *) walk->data; + GstDebugColorMode coloring = gst_debug_get_color_mode (); +#ifdef G_OS_UNIX + on_unix = TRUE; +#else + on_unix = FALSE; +#endif + + if (GST_DEBUG_COLOR_MODE_UNIX == coloring + || (on_unix && GST_DEBUG_COLOR_MODE_ON == coloring)) { + gchar *color = gst_debug_construct_term_color (cat->color); - if (gst_debug_is_colored ()) { + g_print ("%s%-20s\033[00m %1d %s %s%s\033[00m\n", + color, + gst_debug_category_get_name (cat), + gst_debug_category_get_threshold (cat), + gst_debug_level_get_name (gst_debug_category_get_threshold (cat)), + color, gst_debug_category_get_description (cat)); + g_free (color); + } else if (GST_DEBUG_COLOR_MODE_ON == coloring && !on_unix) { #ifdef G_OS_WIN32 gint color = gst_debug_construct_win_color (cat->color); const gint clear = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE; @@ -759,16 +787,6 @@ gst_debug_help (void) g_print ("%s", gst_debug_category_get_description (cat)); SetConsoleTextAttribute (GetStdHandle (STD_OUTPUT_HANDLE), clear); g_print ("\n"); -#else /* G_OS_WIN32 */ - gchar *color = gst_debug_construct_term_color (cat->color); - - g_print ("%s%-20s\033[00m %1d %s %s%s\033[00m\n", - color, - gst_debug_category_get_name (cat), - gst_debug_category_get_threshold (cat), - gst_debug_level_get_name (gst_debug_category_get_threshold (cat)), - color, gst_debug_category_get_description (cat)); - g_free (color); #endif /* G_OS_WIN32 */ } else { g_print ("%-20s %1d %s %s\n", gst_debug_category_get_name (cat), @@ -815,6 +833,9 @@ parse_one_option (gint opt, const gchar * arg, GError ** err) case ARG_DEBUG_NO_COLOR: gst_debug_set_colored (FALSE); break; + case ARG_DEBUG_COLOR_MODE: + gst_debug_set_color_mode_from_string (arg); + break; case ARG_DEBUG_DISABLE: gst_debug_set_active (FALSE); break; @@ -870,6 +891,7 @@ parse_goption_arg (const gchar * opt, "--gst-debug", ARG_DEBUG}, { "--gst-debug-disable", ARG_DEBUG_DISABLE}, { "--gst-debug-no-color", ARG_DEBUG_NO_COLOR}, { + "--gst-debug-color-mode", ARG_DEBUG_COLOR_MODE}, { "--gst-debug-help", ARG_DEBUG_HELP}, #endif { diff --git a/gst/gstbin.c b/gst/gstbin.c index cc4de10..6da31e8 100644 --- a/gst/gstbin.c +++ b/gst/gstbin.c @@ -1011,12 +1011,16 @@ is_eos (GstBin * bin, guint32 * seqnum) * * call with bin LOCK */ static gboolean -is_stream_start (GstBin * bin, guint32 * seqnum) +is_stream_start (GstBin * bin, guint32 * seqnum, gboolean * have_group_id, + guint * group_id) { gboolean result; - gint n_stream_start = 0; GList *walk, *msgs; + guint tmp_group_id; + gboolean first = TRUE, same_group_id = TRUE; + *have_group_id = TRUE; + *group_id = 0; result = TRUE; for (walk = bin->children; walk; walk = g_list_next (walk)) { GstElement *element; @@ -1029,7 +1033,18 @@ is_stream_start (GstBin * bin, guint32 * seqnum) GST_MESSAGE_STREAM_START))) { GST_DEBUG ("sink '%s' posted STREAM_START", GST_ELEMENT_NAME (element)); *seqnum = gst_message_get_seqnum (GST_MESSAGE_CAST (msgs->data)); - n_stream_start++; + if (gst_message_parse_group_id (GST_MESSAGE_CAST (msgs->data), + &tmp_group_id)) { + if (first) { + first = FALSE; + *group_id = tmp_group_id; + } else { + if (tmp_group_id != *group_id) + same_group_id = FALSE; + } + } else { + *have_group_id = FALSE; + } } else { GST_DEBUG ("sink '%s' did not post STREAM_START yet", GST_ELEMENT_NAME (element)); @@ -1039,6 +1054,14 @@ is_stream_start (GstBin * bin, guint32 * seqnum) } } + /* If all have a group_id we only consider this stream started + * if all group ids were the same and all sinks posted a stream-start + * message */ + if (*have_group_id) + return same_group_id && result; + /* otherwise consider this stream started after all sinks + * have reported stream-start for backward compatibility. + * FIXME 2.0: This should go away! */ return result; } @@ -3195,12 +3218,14 @@ bin_do_stream_start (GstBin * bin) { guint32 seqnum = 0; gboolean stream_start; + gboolean have_group_id = FALSE; + guint group_id = 0; GST_OBJECT_LOCK (bin); /* If all sinks are STREAM_START we forward the STREAM_START message * to the parent bin or application */ - stream_start = is_stream_start (bin, &seqnum); + stream_start = is_stream_start (bin, &seqnum, &have_group_id, &group_id); GST_OBJECT_UNLOCK (bin); if (stream_start) { @@ -3212,6 +3237,9 @@ bin_do_stream_start (GstBin * bin) tmessage = gst_message_new_stream_start (GST_OBJECT_CAST (bin)); gst_message_set_seqnum (tmessage, seqnum); + if (have_group_id) + gst_message_set_group_id (tmessage, group_id); + GST_DEBUG_OBJECT (bin, "all sinks posted STREAM_START, posting seqnum #%" G_GUINT32_FORMAT, seqnum); diff --git a/gst/gstbuffer.c b/gst/gstbuffer.c index 8212ec2..00358f3 100644 --- a/gst/gstbuffer.c +++ b/gst/gstbuffer.c @@ -2096,7 +2096,7 @@ gst_buffer_foreach_meta (GstBuffer * buffer, GstBufferForeachMetaFunc func, * Extracts a copy of at most @size bytes the data at @offset into a #GBytes. * @dest must be freed using g_free() when done. * - * Since: 3.2 + * Since: 1.2 */ void diff --git a/gst/gstcaps.c b/gst/gstcaps.c index 12c49eb..7e10a2a 100644 --- a/gst/gstcaps.c +++ b/gst/gstcaps.c @@ -624,6 +624,8 @@ gst_caps_append_structure (GstCaps * caps, GstStructure * structure) * * Appends @structure with @features to @caps. The structure is not copied; @caps * becomes the owner of @structure. + * + * Since: 1.2 */ void gst_caps_append_structure_full (GstCaps * caps, GstStructure * structure, @@ -714,6 +716,8 @@ gst_caps_merge_structure (GstCaps * caps, GstStructure * structure) * Appends @structure with @features to @caps if its not already expressed by @caps. * * Returns: (transfer full): the merged caps. + * + * Since: 1.2 */ GstCaps * gst_caps_merge_structure_full (GstCaps * caps, GstStructure * structure, @@ -834,6 +838,8 @@ gst_caps_get_structure (const GstCaps * caps, guint index) * * Returns: (transfer none): a pointer to the #GstCapsFeatures corresponding * to @index + * + * Since: 1.2 */ GstCapsFeatures * gst_caps_get_features (const GstCaps * caps, guint index) @@ -857,6 +863,8 @@ gst_caps_get_features (const GstCaps * caps, guint index) * @features: (allow-none) (transfer full): the #GstFeatures to set * * Sets the #GstCapsFeatures @features for the structure at @index. + * + * Since: 1.2 */ void gst_caps_set_features (GstCaps * caps, guint index, GstCapsFeatures * features) @@ -1250,6 +1258,8 @@ gst_caps_is_subset_structure (const GstCaps * caps, * for more information. * * Returns: %TRUE if @structure is a subset of @caps + * + * Since: 1.2 */ gboolean gst_caps_is_subset_structure_full (const GstCaps * caps, diff --git a/gst/gstclock.c b/gst/gstclock.c index 707f88b..f7ef07d 100644 --- a/gst/gstclock.c +++ b/gst/gstclock.c @@ -193,6 +193,36 @@ G_STMT_START { \ GST_OBJECT_UNLOCK (clock); \ } G_STMT_END; +typedef struct +{ + const gint ret; + const gchar *name; + GQuark quark; +} GstClockQuarks; + +static GstClockQuarks clock_quarks[] = { + {GST_CLOCK_OK, "ok", 0}, + {GST_CLOCK_EARLY, "early", 0}, + {GST_CLOCK_UNSCHEDULED, "unscheduled", 0}, + {GST_CLOCK_BUSY, "busy", 0}, + {GST_CLOCK_BADTIME, "bad-time", 0}, + {GST_CLOCK_ERROR, "error", 0}, + {GST_CLOCK_UNSUPPORTED, "unsupported", 0}, + {GST_CLOCK_DONE, "done", 0} +}; + +static const gchar * +gst_clock_return_get_name (GstClockReturn ret) +{ + gint i; + + for (i = 0; i < G_N_ELEMENTS (clock_quarks); i++) { + if (ret == clock_quarks[i].ret) + return clock_quarks[i].name; + } + return "unknown"; +} + static void gst_clock_dispose (GObject * object); static void gst_clock_finalize (GObject * object); @@ -512,7 +542,8 @@ gst_clock_id_wait (GstClockID id, GstClockTimeDiff * jitter) res = cclass->wait (clock, entry, jitter); GST_CAT_DEBUG_OBJECT (GST_CAT_CLOCK, clock, - "done waiting entry %p, res: %d", id, res); + "done waiting entry %p, res: %d (%s)", id, res, + gst_clock_return_get_name (res)); if (entry->type == GST_CLOCK_ENTRY_PERIODIC) entry->time = requested + entry->interval; diff --git a/gst/gstelement.c b/gst/gstelement.c index 587de1b..7ee52e3 100644 --- a/gst/gstelement.c +++ b/gst/gstelement.c @@ -3082,5 +3082,5 @@ gst_element_get_context (GstElement * element) context = gst_context_ref (element->context); GST_OBJECT_UNLOCK (element); - return context; + return context ? context : gst_context_new (); } diff --git a/gst/gstevent.c b/gst/gstevent.c index 0874471..f47c928 100644 --- a/gst/gstevent.c +++ b/gst/gstevent.c @@ -1474,6 +1474,57 @@ gst_event_parse_stream_flags (GstEvent * event, GstStreamFlags * flags) } /** + * gst_event_set_group_id: + * @event: a stream-start event + * @group_id: the group id to set + * + * All streams that have the same group id are supposed to be played + * together, i.e. all streams inside a container file should have the + * same group id but different stream ids. The group id should change + * each time the stream is started, resulting in different group ids + * each time a file is played for example. + * + * Use gst_util_group_id_next() to get a new group id. + * + * Since: 1.2 + */ +void +gst_event_set_group_id (GstEvent * event, guint group_id) +{ + g_return_if_fail (event != NULL); + g_return_if_fail (GST_EVENT_TYPE (event) == GST_EVENT_STREAM_START); + g_return_if_fail (gst_event_is_writable (event)); + + gst_structure_id_set (GST_EVENT_STRUCTURE (event), + GST_QUARK (GROUP_ID), G_TYPE_UINT, group_id, NULL); +} + +/** + * gst_event_parse_group_id: + * @event: a stream-start event + * @group_id: (out): address of variable where to store the group id + * + * Returns: %TRUE if a group id was set on the event and could be parsed, + * %FALSE otherwise. + * + * Since: 1.2 + */ +gboolean +gst_event_parse_group_id (GstEvent * event, guint * group_id) +{ + g_return_val_if_fail (event != NULL, FALSE); + g_return_val_if_fail (GST_EVENT_TYPE (event) == GST_EVENT_STREAM_START, + FALSE); + + if (group_id) { + return gst_structure_id_get (GST_EVENT_STRUCTURE (event), + GST_QUARK (GROUP_ID), G_TYPE_UINT, group_id, NULL); + } + + return TRUE; +} + +/** * gst_event_new_toc: * @toc: (transfer none): #GstToc structure. * @updated: whether @toc was updated or not. diff --git a/gst/gstevent.h b/gst/gstevent.h index 1c4104f..f4723ec 100644 --- a/gst/gstevent.h +++ b/gst/gstevent.h @@ -492,6 +492,9 @@ void gst_event_parse_stream_start (GstEvent *event, const gchar ** void gst_event_set_stream_flags (GstEvent *event, GstStreamFlags flags); void gst_event_parse_stream_flags (GstEvent *event, GstStreamFlags *flags); +void gst_event_set_group_id (GstEvent *event, guint group_id); +gboolean gst_event_parse_group_id (GstEvent *event, guint *group_id); + /* flush events */ GstEvent * gst_event_new_flush_start (void) G_GNUC_MALLOC; diff --git a/gst/gstinfo.c b/gst/gstinfo.c index 93cb188..4419817 100644 --- a/gst/gstinfo.c +++ b/gst/gstinfo.c @@ -263,7 +263,7 @@ static GSList *__log_functions = NULL; static gboolean pretty_tags = PRETTY_TAGS_DEFAULT; static volatile gint G_GNUC_MAY_ALIAS __default_level = GST_LEVEL_DEFAULT; -static volatile gint G_GNUC_MAY_ALIAS __use_color = 1; +static volatile gint G_GNUC_MAY_ALIAS __use_color = GST_DEBUG_COLOR_MODE_ON; static FILE *log_file; @@ -438,7 +438,7 @@ gst_debug_log (GstDebugCategory * category, GstDebugLevel level, va_end (var_args); } -#ifdef _MSC_VER +#ifdef G_OS_WIN32 /* based on g_basename(), which we can't use because it was deprecated */ static inline const gchar * gst_path_basename (const gchar * file_name) @@ -494,7 +494,7 @@ gst_debug_log_valist (GstDebugCategory * category, GstDebugLevel level, /* The predefined macro __FILE__ is always the exact path given to the * compiler with MSVC, which may or may not be the basename. We work * around it at runtime to improve the readability. */ -#ifdef _MSC_VER +#ifdef G_OS_WIN32 file = gst_path_basename (file); #endif @@ -868,10 +868,12 @@ gst_debug_construct_win_color (guint colorinfo) }; /* we draw black as white, as cmd.exe can only have black bg */ - if (colorinfo == 0) { - return ansi_to_win_fg[7]; + if ((colorinfo & (GST_DEBUG_FG_MASK | GST_DEBUG_BG_MASK)) == 0) { + color = ansi_to_win_fg[7]; + } + if (colorinfo & GST_DEBUG_UNDERLINE) { + color |= BACKGROUND_INTENSITY; } - if (colorinfo & GST_DEBUG_BOLD) { color |= FOREGROUND_INTENSITY; } @@ -898,7 +900,7 @@ gst_debug_construct_win_color (guint colorinfo) #define CAT_FMT "%20s %s:%d:%s:%s" #ifdef G_OS_WIN32 -static const guchar levelcolormap[GST_LEVEL_COUNT] = { +static const guchar levelcolormap_w32[GST_LEVEL_COUNT] = { /* GST_LEVEL_NONE */ FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE, /* GST_LEVEL_ERROR */ @@ -926,7 +928,7 @@ static const guchar available_colors[] = { FOREGROUND_BLUE, FOREGROUND_RED | FOREGROUND_BLUE, FOREGROUND_GREEN | FOREGROUND_BLUE, }; -#else +#endif /* G_OS_WIN32 */ static const gchar *levelcolormap[GST_LEVEL_COUNT] = { "\033[37m", /* GST_LEVEL_NONE */ "\033[31;01m", /* GST_LEVEL_ERROR */ @@ -939,7 +941,6 @@ static const gchar *levelcolormap[GST_LEVEL_COUNT] = { "\033[37m", /* placeholder for log level 8 */ "\033[37m" /* GST_LEVEL_MEMDUMP */ }; -#endif /** * gst_debug_log_default: @@ -970,13 +971,13 @@ gst_debug_log_default (GstDebugCategory * category, GstDebugLevel level, gint pid; GstClockTime elapsed; gchar *obj = NULL; - gboolean is_colored; + GstDebugColorMode color_mode; if (level > gst_debug_category_get_threshold (category)) return; pid = getpid (); - is_colored = gst_debug_is_colored (); + color_mode = gst_debug_get_color_mode (); if (object) { obj = gst_debug_print_object (object); @@ -987,65 +988,70 @@ gst_debug_log_default (GstDebugCategory * category, GstDebugLevel level, elapsed = GST_CLOCK_DIFF (_priv_gst_info_start_time, gst_util_get_timestamp ()); - if (is_colored) { -#ifndef G_OS_WIN32 - /* colors, non-windows */ - gchar *color = NULL; - const gchar *clear; - gchar pidcolor[10]; - const gchar *levelcolor; - - color = gst_debug_construct_term_color (gst_debug_category_get_color - (category)); - clear = "\033[00m"; - g_sprintf (pidcolor, "\033[3%1dm", pid % 6 + 31); - levelcolor = levelcolormap[level]; - -#define PRINT_FMT " %s"PID_FMT"%s "PTR_FMT" %s%s%s %s"CAT_FMT"%s %s\n" - fprintf (log_file, "%" GST_TIME_FORMAT PRINT_FMT, GST_TIME_ARGS (elapsed), - pidcolor, pid, clear, g_thread_self (), levelcolor, - gst_debug_level_get_name (level), clear, color, - gst_debug_category_get_name (category), file, line, function, obj, - clear, gst_debug_message_get (message)); - fflush (log_file); -#undef PRINT_FMT - g_free (color); -#else - /* colors, windows. We take a lock to keep colors and content together. + if (color_mode != GST_DEBUG_COLOR_MODE_OFF) { +#ifdef G_OS_WIN32 + /* We take a lock to keep colors and content together. * Maybe there is a better way but for now this will do the right * thing. */ static GMutex win_print_mutex; - const gint clear = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE; + g_mutex_lock (&win_print_mutex); + if (color_mode == GST_DEBUG_COLOR_MODE_UNIX) { +#endif + /* colors, non-windows */ + gchar *color = NULL; + const gchar *clear; + gchar pidcolor[10]; + const gchar *levelcolor; + + color = gst_debug_construct_term_color (gst_debug_category_get_color + (category)); + clear = "\033[00m"; + g_sprintf (pidcolor, "\033[3%1dm", pid % 6 + 31); + levelcolor = levelcolormap[level]; + +#define PRINT_FMT " %s"PID_FMT"%s "PTR_FMT" %s%s%s %s"CAT_FMT"%s %s\n" + fprintf (log_file, "%" GST_TIME_FORMAT PRINT_FMT, GST_TIME_ARGS (elapsed), + pidcolor, pid, clear, g_thread_self (), levelcolor, + gst_debug_level_get_name (level), clear, color, + gst_debug_category_get_name (category), file, line, function, obj, + clear, gst_debug_message_get (message)); + fflush (log_file); +#undef PRINT_FMT + g_free (color); +#ifdef G_OS_WIN32 + } else { + /* colors, windows. */ + const gint clear = FOREGROUND_RED | FOREGROUND_GREEN | FOREGROUND_BLUE; #define SET_COLOR(c) G_STMT_START { \ if (log_file == stderr) \ SetConsoleTextAttribute (GetStdHandle (STD_ERROR_HANDLE), (c)); \ } G_STMT_END - g_mutex_lock (&win_print_mutex); - /* timestamp */ - fprintf (log_file, "%" GST_TIME_FORMAT " ", GST_TIME_ARGS (elapsed)); - fflush (log_file); - /* pid */ - SET_COLOR (available_colors[pid % G_N_ELEMENTS (available_colors)]); - fprintf (log_file, PID_FMT, pid); - fflush (log_file); - /* thread */ - SET_COLOR (clear); - fprintf (log_file, " " PTR_FMT " ", g_thread_self ()); - fflush (log_file); - /* level */ - SET_COLOR (levelcolormap[level]); - fprintf (log_file, "%s ", gst_debug_level_get_name (level)); - fflush (log_file); - /* category */ - SET_COLOR (gst_debug_construct_win_color (gst_debug_category_get_color - (category))); - fprintf (log_file, CAT_FMT, gst_debug_category_get_name (category), - file, line, function, obj); - fflush (log_file); - /* message */ - SET_COLOR (clear); - fprintf (log_file, " %s\n", gst_debug_message_get (message)); - fflush (log_file); + /* timestamp */ + fprintf (log_file, "%" GST_TIME_FORMAT " ", GST_TIME_ARGS (elapsed)); + fflush (log_file); + /* pid */ + SET_COLOR (available_colors[pid % G_N_ELEMENTS (available_colors)]); + fprintf (log_file, PID_FMT, pid); + fflush (log_file); + /* thread */ + SET_COLOR (clear); + fprintf (log_file, " " PTR_FMT " ", g_thread_self ()); + fflush (log_file); + /* level */ + SET_COLOR (levelcolormap_w32[level]); + fprintf (log_file, "%s ", gst_debug_level_get_name (level)); + fflush (log_file); + /* category */ + SET_COLOR (gst_debug_construct_win_color (gst_debug_category_get_color + (category))); + fprintf (log_file, CAT_FMT, gst_debug_category_get_name (category), + file, line, function, obj); + fflush (log_file); + /* message */ + SET_COLOR (clear); + fprintf (log_file, " %s\n", gst_debug_message_get (message)); + fflush (log_file); + } g_mutex_unlock (&win_print_mutex); #endif } else { @@ -1246,13 +1252,55 @@ gst_debug_remove_log_function_by_data (gpointer data) * @colored: Whether to use colored output or not * * Sets or unsets the use of coloured debugging output. + * Same as gst_debug_set_color_mode () with the argument being + * being GST_DEBUG_COLOR_MODE_ON or GST_DEBUG_COLOR_MODE_OFF. * * This function may be called before gst_init(). */ void gst_debug_set_colored (gboolean colored) { - g_atomic_int_set (&__use_color, (gint) colored); + GstDebugColorMode new_mode; + new_mode = colored ? GST_DEBUG_COLOR_MODE_ON : GST_DEBUG_COLOR_MODE_OFF; + g_atomic_int_set (&__use_color, (gint) new_mode); +} + +/** + * gst_debug_set_color_mode: + * @mode: The coloring mode for debug output. See @GstDebugColorMode. + * + * Changes the coloring mode for debug output. + * + * This function may be called before gst_init(). + * + * Since: 1.2 + */ +void +gst_debug_set_color_mode (GstDebugColorMode mode) +{ + g_atomic_int_set (&__use_color, mode); +} + +/** + * gst_debug_set_color_mode_from_string: + * @mode: The coloring mode for debug output. One of the following: + * "on", "auto", "off", "disable", "unix". + * + * Changes the coloring mode for debug output. + * + * This function may be called before gst_init(). + * + * Since: 1.2 + */ +void +gst_debug_set_color_mode_from_string (const gchar * str) +{ + if ((strcmp (str, "on") == 0) || (strcmp (str, "auto") == 0)) + gst_debug_set_color_mode (GST_DEBUG_COLOR_MODE_ON); + else if ((strcmp (str, "off") == 0) || (strcmp (str, "disable") == 0)) + gst_debug_set_color_mode (GST_DEBUG_COLOR_MODE_OFF); + else if (strcmp (str, "unix") == 0) + gst_debug_set_color_mode (GST_DEBUG_COLOR_MODE_UNIX); } /** @@ -1265,7 +1313,23 @@ gst_debug_set_colored (gboolean colored) gboolean gst_debug_is_colored (void) { - return (gboolean) g_atomic_int_get (&__use_color); + GstDebugColorMode mode = g_atomic_int_get (&__use_color); + return (mode == GST_DEBUG_COLOR_MODE_UNIX || mode == GST_DEBUG_COLOR_MODE_ON); +} + +/** + * gst_debug_get_color_mode: + * + * Changes the coloring mode for debug output. + * + * Returns: see @GstDebugColorMode for possible values. + * + * Since: 1.2 + */ +GstDebugColorMode +gst_debug_get_color_mode (void) +{ + return g_atomic_int_get (&__use_color); } /** @@ -1653,9 +1717,15 @@ parse_debug_level (gchar * str, GstDebugLevel * level) /* works in place */ g_strstrip (str); - if (str[0] != '\0' && str[1] == '\0' - && str[0] >= '0' && str[0] < '0' + GST_LEVEL_COUNT) { - *level = (GstDebugLevel) (str[0] - '0'); + if (g_ascii_isdigit (str[0])) { + unsigned long l; + char *endptr; + l = strtoul (str, &endptr, 10); + if (endptr > str && endptr[0] == 0) { + *level = (GstDebugLevel) l; + } else { + return FALSE; + } } else if (strcmp (str, "ERROR") == 0) { *level = GST_LEVEL_ERROR; } else if (strncmp (str, "WARN", 4) == 0) { @@ -1936,12 +2006,28 @@ gst_debug_set_colored (gboolean colored) { } +void +gst_debug_set_color_mode (GstDebugColorMode mode) +{ +} + +void +gst_debug_set_color_mode_from_string (const gchar * str) +{ +} + gboolean gst_debug_is_colored (void) { return FALSE; } +GstDebugColorMode +gst_debug_get_color_mode (void) +{ + return GST_DEBUG_COLOR_MODE_OFF; +} + void gst_debug_set_threshold_from_string (const gchar * list, gboolean reset) { diff --git a/gst/gstinfo.h b/gst/gstinfo.h index 68f099b..46a81f0 100644 --- a/gst/gstinfo.h +++ b/gst/gstinfo.h @@ -159,6 +159,20 @@ typedef enum { GST_DEBUG_UNDERLINE = 0x0200 } GstDebugColorFlags; +/** + * GstDebugColorMode: + * @GST_DEBUG_COLOR_MODE_OFF: Do not use colors in logs. + * @GST_DEBUG_COLOR_MODE_ON: Paint logs in a platform-specific way. + * @GST_DEBUG_COLOR_MODE_UNIX: Paint logs with UNIX terminal color codes + * no matter what platform GStreamer is running on. + */ +typedef enum { + GST_DEBUG_COLOR_MODE_OFF = 0, + GST_DEBUG_COLOR_MODE_ON = 1, + GST_DEBUG_COLOR_MODE_UNIX = 2 +} GstDebugColorMode; + + #define GST_DEBUG_FG_MASK (0x000F) #define GST_DEBUG_BG_MASK (0x00F0) #define GST_DEBUG_FORMAT_MASK (0xFF00) @@ -339,7 +353,10 @@ void gst_debug_set_active (gboolean active); gboolean gst_debug_is_active (void); void gst_debug_set_colored (gboolean colored); +void gst_debug_set_color_mode (GstDebugColorMode mode); +void gst_debug_set_color_mode_from_string (const gchar * str); gboolean gst_debug_is_colored (void); +GstDebugColorMode gst_debug_get_color_mode (void); void gst_debug_set_default_threshold (GstDebugLevel level); GstDebugLevel gst_debug_get_default_threshold (void); @@ -1239,7 +1256,10 @@ GST_TRACE (const char *format, ...) #define gst_debug_set_active(active) G_STMT_START{ }G_STMT_END #define gst_debug_is_active() (FALSE) #define gst_debug_set_colored(colored) G_STMT_START{ }G_STMT_END +#define gst_debug_set_color_mode(mode) G_STMT_START{ }G_STMT_END +#define gst_debug_set_color_mode_from_string(mode) G_STMT_START{ }G_STMT_END #define gst_debug_is_colored() (FALSE) +#define gst_debug_get_color_mode() (GST_DEBUG_COLOR_MODE_OFF) #define gst_debug_set_default_threshold(level) G_STMT_START{ }G_STMT_END #define gst_debug_get_default_threshold() (GST_LEVEL_NONE) #define gst_debug_set_threshold_for_name(name,level) G_STMT_START{ }G_STMT_END diff --git a/gst/gstmessage.c b/gst/gstmessage.c index cb81bf7..7ed646b 100644 --- a/gst/gstmessage.c +++ b/gst/gstmessage.c @@ -2146,12 +2146,83 @@ GstMessage * gst_message_new_stream_start (GstObject * src) { GstMessage *message; + GstStructure *s; - message = gst_message_new_custom (GST_MESSAGE_STREAM_START, src, NULL); + s = gst_structure_new_id_empty (GST_QUARK (MESSAGE_STREAM_START)); + message = gst_message_new_custom (GST_MESSAGE_STREAM_START, src, s); return message; } + +/** + * gst_message_set_group_id: + * @message: the message + * @group_id: the group id + * + * Sets the group id on the stream-start message. + * + * All streams that have the same group id are supposed to be played + * together, i.e. all streams inside a container file should have the + * same group id but different stream ids. The group id should change + * each time the stream is started, resulting in different group ids + * each time a file is played for example. + * + * MT safe. + * + * Since: 1.2 + */ +void +gst_message_set_group_id (GstMessage * message, guint group_id) +{ + GstStructure *structure; + + g_return_if_fail (GST_IS_MESSAGE (message)); + g_return_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_STREAM_START); + g_return_if_fail (gst_message_is_writable (message)); + + structure = GST_MESSAGE_STRUCTURE (message); + gst_structure_id_set (structure, GST_QUARK (GROUP_ID), G_TYPE_UINT, group_id, + NULL); +} + +/** + * gst_message_parse_group_id: + * @message: A valid #GstMessage of type GST_MESSAGE_STREAM_START. + * @group_id: (out) (allow-none): Result location for the group id or + * NULL + * + * Extract the group from the STREAM_START message. + * + * Returns: %TRUE if the message had a group id set, %FALSE otherwise + * + * MT safe. + * + * Since: 1.2 + */ +gboolean +gst_message_parse_group_id (GstMessage * message, guint * group_id) +{ + GstStructure *structure; + const GValue *v; + + g_return_val_if_fail (GST_IS_MESSAGE (message), FALSE); + g_return_val_if_fail (GST_MESSAGE_TYPE (message) == GST_MESSAGE_STREAM_START, + FALSE); + + if (!group_id) + return TRUE; + + structure = GST_MESSAGE_STRUCTURE (message); + + v = gst_structure_id_get_value (structure, GST_QUARK (GROUP_ID)); + if (!v) + return FALSE; + + *group_id = g_value_get_uint (v); + return TRUE; +} + /** * gst_message_new_need_context: * @src: (transfer none): The object originating the message. @@ -2161,6 +2232,8 @@ gst_message_new_stream_start (GstObject * src) * Returns: (transfer full): The new need-context message. * * MT safe. + * + * Since: 1.2 */ GstMessage * gst_message_new_need_context (GstObject * src) @@ -2212,6 +2285,8 @@ free_array_string (gpointer ptr) * @context_type: a context type * * Add a new context type to @message. + * + * Since: 1.2 */ void gst_message_add_context_type (GstMessage * message, const gchar * context_type) @@ -2239,6 +2314,8 @@ gst_message_add_context_type (GstMessage * message, const gchar * context_type) * context-types array of the message's structure. * * Returns: the context-types array size as a #guint. + * + * Since: 1.2 */ guint gst_message_get_n_context_types (GstMessage * message) @@ -2265,6 +2342,8 @@ gst_message_get_n_context_types (GstMessage * message) * from @index. * * Returns: a #gboolean indicating if the parsing succeeded. + * + * Since: 1.2 */ gboolean gst_message_parse_nth_context_type (GstMessage * message, guint index, @@ -2298,6 +2377,8 @@ gst_message_parse_nth_context_type (GstMessage * message, guint index, * Returns: (transfer full): The new have-context message. * * MT safe. + * + * Since: 1.2 */ GstMessage * gst_message_new_have_context (GstObject * src, GstContext * context) @@ -2322,6 +2403,8 @@ gst_message_new_have_context (GstObject * src, GstContext * context) * Extract the context from the HAVE_CONTEXT message. * * MT safe. + * + * Since: 1.2 */ void gst_message_parse_have_context (GstMessage * message, GstContext ** context) diff --git a/gst/gstmessage.h b/gst/gstmessage.h index 802ee17..e359187 100644 --- a/gst/gstmessage.h +++ b/gst/gstmessage.h @@ -97,6 +97,8 @@ typedef struct _GstMessage GstMessage; * e.g. when using playbin in gapless playback mode, to get notified when * the next title actually starts playing (which will be some time after * the URI for the next title has been set). + * @GST_MESSAGE_NEED_CONTEXT: Message indicating that an element wants a specific context (Since 1.2) + * @GST_MESSAGE_HAVE_CONTEXT: Message indicating that an element created a context (Since 1.2) * @GST_MESSAGE_ANY: mask for all of the above messages. * * The different message types that are available. @@ -559,6 +561,9 @@ void gst_message_parse_reset_time (GstMessage *message, GstClockTi /* STREAM_START */ GstMessage * gst_message_new_stream_start (GstObject * src) G_GNUC_MALLOC; +void gst_message_set_group_id (GstMessage *message, guint group_id); +gboolean gst_message_parse_group_id (GstMessage *message, guint *group_id); + /* NEED_CONTEXT */ GstMessage * gst_message_new_need_context (GstObject * src) G_GNUC_MALLOC; void gst_message_add_context_type (GstMessage * message, const gchar * context_type); diff --git a/gst/gstpad.c b/gst/gstpad.c index e1f386a..3c3f484 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -1072,6 +1072,9 @@ gst_pad_activate_mode (GstPad * pad, GstPadMode mode, gboolean active) break; } + /* Mark pad as needing reconfiguration */ + if (active) + GST_OBJECT_FLAG_SET (pad, GST_PAD_FLAG_NEED_RECONFIGURE); pre_activate (pad, new); if (GST_PAD_ACTIVATEMODEFUNC (pad)) { @@ -1400,13 +1403,8 @@ gst_pad_needs_reconfigure (GstPad * pad) g_return_val_if_fail (GST_IS_PAD (pad), FALSE); GST_OBJECT_LOCK (pad); - if (GST_PAD_IS_FLUSHING (pad)) { - GST_DEBUG_OBJECT (pad, "pad is flushing"); - reconfigure = FALSE; - } else { - reconfigure = GST_PAD_NEEDS_RECONFIGURE (pad); - GST_DEBUG_OBJECT (pad, "peeking RECONFIGURE flag %d", reconfigure); - } + reconfigure = GST_PAD_NEEDS_RECONFIGURE (pad); + GST_DEBUG_OBJECT (pad, "peeking RECONFIGURE flag %d", reconfigure); GST_OBJECT_UNLOCK (pad); return reconfigure; @@ -1429,15 +1427,10 @@ gst_pad_check_reconfigure (GstPad * pad) g_return_val_if_fail (GST_IS_PAD (pad), FALSE); GST_OBJECT_LOCK (pad); - if (GST_PAD_IS_FLUSHING (pad)) { - GST_DEBUG_OBJECT (pad, "pad is flushing"); - reconfigure = FALSE; - } else { - reconfigure = GST_PAD_NEEDS_RECONFIGURE (pad); - if (reconfigure) { - GST_DEBUG_OBJECT (pad, "remove RECONFIGURE flag"); - GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_NEED_RECONFIGURE); - } + reconfigure = GST_PAD_NEEDS_RECONFIGURE (pad); + if (reconfigure) { + GST_DEBUG_OBJECT (pad, "remove RECONFIGURE flag"); + GST_OBJECT_FLAG_UNSET (pad, GST_PAD_FLAG_NEED_RECONFIGURE); } GST_OBJECT_UNLOCK (pad); diff --git a/gst/gstquark.c b/gst/gstquark.c index 6343726..b3b6214 100644 --- a/gst/gstquark.c +++ b/gst/gstquark.c @@ -67,7 +67,8 @@ static const gchar *_quark_strings[] = { "GstMessageToc", "GstEventTocGlobal", "GstEventTocCurrent", "GstEventSegmentDone", "GstEventStreamStart", "stream-id", "GstEventContext", "GstQueryContext", - "GstMessageNeedContext", "GstMessageHaveContext", "context", "context-types" + "GstMessageNeedContext", "GstMessageHaveContext", "context", "context-types", + "GstMessageStreamStart", "group-id" }; GQuark _priv_gst_quark_table[GST_QUARK_MAX]; diff --git a/gst/gstquark.h b/gst/gstquark.h index 1abc2ee..cfa7e3f 100644 --- a/gst/gstquark.h +++ b/gst/gstquark.h @@ -194,7 +194,9 @@ typedef enum _GstQuarkId GST_QUARK_MESSAGE_HAVE_CONTEXT = 165, GST_QUARK_CONTEXT = 166, GST_QUARK_CONTEXT_TYPES = 167, - GST_QUARK_MAX = 168 + GST_QUARK_MESSAGE_STREAM_START = 168, + GST_QUARK_GROUP_ID = 169, + GST_QUARK_MAX = 170 } GstQuarkId; extern GQuark _priv_gst_quark_table[GST_QUARK_MAX]; diff --git a/gst/gstquery.c b/gst/gstquery.c index d5f2962..31be0dc 100644 --- a/gst/gstquery.c +++ b/gst/gstquery.c @@ -1630,6 +1630,8 @@ gst_query_set_nth_allocation_pool (GstQuery * query, guint index, * @index: position in the allocation pool array to remove * * Remove the allocation pool at @index of the allocation pool array. + * + * Since: 1.2 */ void gst_query_remove_nth_allocation_pool (GstQuery * query, guint index) @@ -1972,6 +1974,8 @@ gst_query_set_nth_allocation_param (GstQuery * query, guint index, * @index: position in the allocation param array to remove * * Remove the allocation param at @index of the allocation param array. + * + * Since: 1.2 */ void gst_query_remove_nth_allocation_param (GstQuery * query, guint index) @@ -2440,6 +2444,8 @@ gst_query_new_drain (void) * Free-function: gst_query_unref * * Returns: (transfer full): a new #GstQuery + * + * Since: 1.2 */ GstQuery * gst_query_new_context (void) @@ -2459,6 +2465,8 @@ gst_query_new_context (void) * @context: the requested #GstContext * * Answer a context query by setting the requested context. + * + * Since: 1.2 */ void gst_query_set_context (GstQuery * query, GstContext * context) @@ -2480,18 +2488,24 @@ gst_query_set_context (GstQuery * query, GstContext * context) * * Get the context from the context @query. The context remains valid as long as * @query remains valid. + * + * Since: 1.2 */ void gst_query_parse_context (GstQuery * query, GstContext ** context) { GstStructure *structure; + const GValue *v; g_return_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_CONTEXT); g_return_if_fail (context != NULL); structure = GST_QUERY_STRUCTURE (query); - *context = g_value_get_boxed (gst_structure_id_get_value (structure, - GST_QUARK (CONTEXT))); + v = gst_structure_id_get_value (structure, GST_QUARK (CONTEXT)); + if (v) + *context = g_value_get_boxed (v); + else + *context = NULL; } static void @@ -2503,10 +2517,12 @@ free_array_string (gpointer ptr) /** * gst_query_add_context_type: - * @query: a GST_QUERY_NEED_CONTEXT type query + * @query: a GST_QUERY_CONTEXT type query * @context_type: a context type * * Add a new context type to @query. + * + * Since: 1.2 */ void gst_query_add_context_type (GstQuery * query, const gchar * context_type) @@ -2528,12 +2544,14 @@ gst_query_add_context_type (GstQuery * query, const gchar * context_type) /** * gst_query_get_n_context_types: - * @query: a GST_QUERY_NEED_CONTEXT type query + * @query: a GST_QUERY_CONTEXT type query * * Retrieve the number of values currently stored in the * context-types array of the query's structure. * * Returns: the context-types array size as a #guint. + * + * Since: 1.2 */ guint gst_query_get_n_context_types (GstQuery * query) @@ -2552,13 +2570,15 @@ gst_query_get_n_context_types (GstQuery * query) /** * gst_query_parse_nth_context_type: - * @query: a GST_QUERY_NEED_CONTEXT type query + * @query: a GST_QUERY_CONTEXT type query * @context_type: (out) (allow-none): the context type, or NULL * - * Parse a context type from an existing GST_QUERY_NEED_CONTEXT query + * Parse a context type from an existing GST_QUERY_CONTEXT query * from @index. * * Returns: a #gboolean indicating if the parsing succeeded. + * + * Since: 1.2 */ gboolean gst_query_parse_nth_context_type (GstQuery * query, guint index, @@ -2580,3 +2600,35 @@ gst_query_parse_nth_context_type (GstQuery * query, guint index, return TRUE; } + +/** + * gst_query_has_context_type: + * @query: a GST_QUERY_CONTEXT type query + * @context_type: the context type + * + * Check if @query is asking for @context_type. + * + * Returns: %TRUE if @context_type is requested. + * + * Since: 1.2 + */ +gboolean +gst_query_has_context_type (GstQuery * query, const gchar * context_type) +{ + guint i, n; + + g_return_val_if_fail (GST_QUERY_TYPE (query) == GST_QUERY_CONTEXT, FALSE); + g_return_val_if_fail (context_type != NULL, FALSE); + + n = gst_query_get_n_context_types (query); + for (i = 0; i < n; i++) { + const gchar *tmp; + + if (gst_query_parse_nth_context_type (query, i, &tmp) && + strcmp (tmp, context_type) == 0) + return TRUE; + } + + + return FALSE; +} diff --git a/gst/gstquery.h b/gst/gstquery.h index 57a9c06..97234d1 100644 --- a/gst/gstquery.h +++ b/gst/gstquery.h @@ -102,7 +102,8 @@ typedef enum { * @GST_QUERY_ACCEPT_CAPS: the accept caps query * @GST_QUERY_CAPS: the caps query * @GST_QUERY_DRAIN: wait till all serialized data is consumed downstream - * @GST_QUERY_CONTEXT: query the pipeline-local context from downstream + * @GST_QUERY_CONTEXT: query the pipeline-local context from + * downstream (since 1.2) * * Standard predefined Query types */ @@ -442,7 +443,7 @@ gboolean gst_query_find_allocation_meta (GstQuery *query, GType api * GstSchedulingFlags: * @GST_SCHEDULING_FLAG_SEEKABLE: if seeking is possible * @GST_SCHEDULING_FLAG_SEQUENTIAL: if sequential access is recommended - * @GST_SCHEDULING_FLAG_BANDWIDTH_LIMITED: if bandwidth is limited and buffering possible + * @GST_SCHEDULING_FLAG_BANDWIDTH_LIMITED: if bandwidth is limited and buffering possible (since 1.2) * * The different scheduling flags. */ @@ -487,6 +488,7 @@ GstQuery * gst_query_new_context (void) G_GNUC_MALLOC; void gst_query_add_context_type (GstQuery * query, const gchar * context_type); guint gst_query_get_n_context_types (GstQuery * query); gboolean gst_query_parse_nth_context_type (GstQuery * query, guint i, const gchar ** context_type); +gboolean gst_query_has_context_type (GstQuery * query, const gchar * context_type); void gst_query_set_context (GstQuery *query, GstContext *context); void gst_query_parse_context (GstQuery *query, GstContext **context); diff --git a/gst/gstutils.c b/gst/gstutils.c index 454c7fa..ece5abe 100644 --- a/gst/gstutils.c +++ b/gst/gstutils.c @@ -3752,3 +3752,20 @@ gst_pad_get_stream_id (GstPad * pad) return ret; } + +/** + * gst_util_group_id_next: + * + * Return a constantly incrementing group id. + * + * This function is used to generate a new group-id for the + * stream-start event. + * + * Returns: A constantly incrementing unsigned integer, which might + * overflow back to 0 at some point. */ +guint +gst_util_group_id_next (void) +{ + static gint counter = 0; + return g_atomic_int_add (&counter, 1); +} diff --git a/gst/gstutils.h b/gst/gstutils.h index 54b7e45..1530807 100644 --- a/gst/gstutils.h +++ b/gst/gstutils.h @@ -75,6 +75,7 @@ guint64 gst_util_uint64_scale_int_ceil (guint64 val, gint num, gint den guint32 gst_util_seqnum_next (void); gint32 gst_util_seqnum_compare (guint32 s1, guint32 s2); +guint gst_util_group_id_next (void); /** * GST_CALL_PARENT: diff --git a/gst/gstvalue.c b/gst/gstvalue.c index 094064f..c2885cd 100644 --- a/gst/gstvalue.c +++ b/gst/gstvalue.c @@ -3084,16 +3084,20 @@ gst_value_deserialize_enum (GValue * dest, const gchar * s) found = gst_iterator_find_custom (iter, (GCompareFunc) gst_value_deserialize_enum_iter_cmp, &res, (gpointer) s); - g_return_val_if_fail (found, FALSE); - format_def = g_value_get_pointer (&res); - g_return_val_if_fail (format_def != NULL, FALSE); - g_value_set_enum (dest, (gint) format_def->value); - g_value_unset (&res); + if (found) { + format_def = g_value_get_pointer (&res); + g_return_val_if_fail (format_def != NULL, FALSE); + g_value_set_enum (dest, (gint) format_def->value); + g_value_unset (&res); + } gst_iterator_free (iter); - return TRUE; + return found; } - g_return_val_if_fail (en, FALSE); + /* enum name/nick not found */ + if (en == NULL) + return FALSE; + g_value_set_enum (dest, en->value); return TRUE; } @@ -5678,7 +5682,7 @@ gst_value_lcopy_bitmask (const GValue * value, guint n_collect_values, /** * gst_value_set_bitmask: - * @value: a GValue initialized to #GST_TYPE_FRACTION + * @value: a GValue initialized to #GST_TYPE_BITMASK * @bitmask: the bitmask * * Sets @value to the bitmask specified by @bitmask. @@ -5693,7 +5697,7 @@ gst_value_set_bitmask (GValue * value, guint64 bitmask) /** * gst_value_get_bitmask: - * @value: a GValue initialized to #GST_TYPE_FRACTION + * @value: a GValue initialized to #GST_TYPE_BITMASK * * Gets the bitmask specified by @value. * diff --git a/gst/parse/Makefile.in b/gst/parse/Makefile.in index c09ba42..6be215a 100644 --- a/gst/parse/Makefile.in +++ b/gst/parse/Makefile.in @@ -315,6 +315,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -325,7 +326,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/gst/printf/Makefile.in b/gst/printf/Makefile.in index 16ab662..2d03d34 100644 --- a/gst/printf/Makefile.in +++ b/gst/printf/Makefile.in @@ -313,6 +313,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -323,7 +324,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/gstreamer.doap b/gstreamer.doap index a86bf98..d768b1e 100644 --- a/gstreamer.doap +++ b/gstreamer.doap @@ -40,6 +40,16 @@ hierarchy, and a set of media-agnostic core elements. <release> <Version> + <revision>1.1.3</revision> + <branch>1.1</branch> + <name></name> + <created>2013-07-29</created> + <file-release rdf:resource="http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.1.3.tar.xz" /> + </Version> + </release> + + <release> + <Version> <revision>1.1.2</revision> <branch>1.1</branch> <name></name> diff --git a/gstreamer.spec b/gstreamer.spec index d8aaaea..6e2e483 100644 --- a/gstreamer.spec +++ b/gstreamer.spec @@ -4,7 +4,7 @@ %define _glib2 2.32.0 Name: %{gstreamer} -Version: 1.1.2 +Version: 1.1.3 Release: 1 Summary: GStreamer streaming media framework runtime diff --git a/libs/Makefile.in b/libs/Makefile.in index bd7a5c8..a39f876 100644 --- a/libs/Makefile.in +++ b/libs/Makefile.in @@ -316,6 +316,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -326,7 +327,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/libs/gst/Makefile.in b/libs/gst/Makefile.in index 20ca40a..ebf67c0 100644 --- a/libs/gst/Makefile.in +++ b/libs/gst/Makefile.in @@ -315,6 +315,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -325,7 +326,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/libs/gst/base/Makefile.in b/libs/gst/base/Makefile.in index 9675a87..02e20ba 100644 --- a/libs/gst/base/Makefile.in +++ b/libs/gst/base/Makefile.in @@ -362,6 +362,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -372,7 +373,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/libs/gst/base/gstadapter.c b/libs/gst/base/gstadapter.c index 935fa20..4c3e730 100644 --- a/libs/gst/base/gstadapter.c +++ b/libs/gst/base/gstadapter.c @@ -709,15 +709,102 @@ gst_adapter_take (GstAdapter * adapter, gsize nbytes) } /** + * gst_adapter_take_buffer_fast: + * @adapter: a #GstAdapter + * @nbytes: the number of bytes to take + * + * Returns a #GstBuffer containing the first @nbytes of the @adapter. + * The returned bytes will be flushed from the adapter. This function + * is potentially more performant than gst_adapter_take_buffer() since + * it can reuse the memory in pushed buffers by subbuffering or + * merging. Unlike gst_adapter_take_buffer(), the returned buffer may + * be composed of multiple non-contiguous #GstMemory objects, no + * copies are made. + * + * Note that no assumptions should be made as to whether certain buffer + * flags such as the DISCONT flag are set on the returned buffer, or not. + * The caller needs to explicitly set or unset flags that should be set or + * unset. + * + * This function can return buffer up to the return value of + * gst_adapter_available() without making copies if possible. + * + * Caller owns a reference to the returned buffer. gst_buffer_unref() after + * usage. + * + * Free-function: gst_buffer_unref + * + * Returns: (transfer full): a #GstBuffer containing the first @nbytes of + * the adapter, or #NULL if @nbytes bytes are not available. + * gst_buffer_unref() when no longer needed. + * + * Since: 1.2 + */ + +GstBuffer * +gst_adapter_take_buffer_fast (GstAdapter * adapter, gsize nbytes) +{ + GstBuffer *buffer = NULL; + GstBuffer *cur; + GSList *item; + gsize skip; + gsize left = nbytes; + + g_return_val_if_fail (GST_IS_ADAPTER (adapter), NULL); + g_return_val_if_fail (nbytes > 0, NULL); + + GST_LOG_OBJECT (adapter, "taking buffer of %" G_GSIZE_FORMAT " bytes", + nbytes); + + /* we don't have enough data, return NULL. This is unlikely + * as one usually does an _available() first instead of grabbing a + * random size. */ + if (G_UNLIKELY (nbytes > adapter->size)) + return NULL; + + skip = adapter->skip; + cur = adapter->buflist->data; + + if (skip == 0 && gst_buffer_get_size (cur) == nbytes) { + GST_LOG_OBJECT (adapter, "providing buffer of %" G_GSIZE_FORMAT " bytes" + " as head buffer", nbytes); + buffer = gst_buffer_ref (cur); + goto done; + } + + for (item = adapter->buflist; item && left > 0; item = item->next) { + gsize size; + + cur = item->data; + size = MIN (gst_buffer_get_size (cur) - skip, left); + + GST_LOG_OBJECT (adapter, "appending %" G_GSIZE_FORMAT " bytes" + " via region copy", size); + if (buffer) + gst_buffer_copy_into (buffer, cur, GST_BUFFER_COPY_MEMORY, skip, size); + else + buffer = gst_buffer_copy_region (cur, GST_BUFFER_COPY_ALL, skip, size); + skip = 0; + left -= size; + } + +done: + gst_adapter_flush_unchecked (adapter, nbytes); + + return buffer; +} + +/** * gst_adapter_take_buffer: * @adapter: a #GstAdapter * @nbytes: the number of bytes to take * * Returns a #GstBuffer containing the first @nbytes bytes of the * @adapter. The returned bytes will be flushed from the adapter. - * This function is potentially more performant than gst_adapter_take() - * since it can reuse the memory in pushed buffers by subbuffering - * or merging. + * This function is potentially more performant than + * gst_adapter_take() since it can reuse the memory in pushed buffers + * by subbuffering or merging. This function will always return a + * buffer with a single memory region. * * Note that no assumptions should be made as to whether certain buffer * flags such as the DISCONT flag are set on the returned buffer, or not. diff --git a/libs/gst/base/gstadapter.h b/libs/gst/base/gstadapter.h index 9625a01..9683f3b 100644 --- a/libs/gst/base/gstadapter.h +++ b/libs/gst/base/gstadapter.h @@ -60,6 +60,7 @@ void gst_adapter_flush (GstAdapter *adapter, gs gpointer gst_adapter_take (GstAdapter *adapter, gsize nbytes); GstBuffer* gst_adapter_take_buffer (GstAdapter *adapter, gsize nbytes); GList* gst_adapter_take_list (GstAdapter *adapter, gsize nbytes); +GstBuffer * gst_adapter_take_buffer_fast (GstAdapter *adapter, gsize nbytes); gsize gst_adapter_available (GstAdapter *adapter); gsize gst_adapter_available_fast (GstAdapter *adapter); diff --git a/libs/gst/base/gstbaseparse.c b/libs/gst/base/gstbaseparse.c index 5152d03..a57fdc9 100644 --- a/libs/gst/base/gstbaseparse.c +++ b/libs/gst/base/gstbaseparse.c @@ -934,6 +934,7 @@ gst_base_parse_sink_event_default (GstBaseParse * parse, GstEvent * event) const GstSegment *in_segment; GstSegment out_segment; gint64 offset = 0, next_dts; + guint32 seqnum = gst_event_get_seqnum (event); gst_event_parse_segment (event, &in_segment); gst_segment_init (&out_segment, GST_FORMAT_TIME); @@ -989,6 +990,7 @@ gst_base_parse_sink_event_default (GstBaseParse * parse, GstEvent * event) gst_event_unref (event); event = gst_event_new_segment (&out_segment); + gst_event_set_seqnum (event, seqnum); GST_DEBUG_OBJECT (parse, "Converted incoming segment to TIME. %" GST_SEGMENT_FORMAT, in_segment); @@ -1003,6 +1005,7 @@ gst_base_parse_sink_event_default (GstBaseParse * parse, GstEvent * event) out_segment.time = 0; event = gst_event_new_segment (&out_segment); + gst_event_set_seqnum (event, seqnum); next_dts = 0; } else { @@ -3019,13 +3022,17 @@ gst_base_parse_loop (GstPad * pad) if (G_UNLIKELY (parse->priv->push_stream_start)) { gchar *stream_id; + GstEvent *event; stream_id = gst_pad_create_stream_id (parse->srcpad, GST_ELEMENT_CAST (parse), NULL); + event = gst_event_new_stream_start (stream_id); + gst_event_set_group_id (event, gst_util_group_id_next ()); + GST_DEBUG_OBJECT (parse, "Pushing STREAM_START"); - gst_pad_push_event (parse->srcpad, gst_event_new_stream_start (stream_id)); + gst_pad_push_event (parse->srcpad, event); parse->priv->push_stream_start = FALSE; g_free (stream_id); } @@ -3674,6 +3681,25 @@ gst_base_parse_src_query_default (GstBaseParse * parse, GstQuery * query) } break; } + case GST_QUERY_SEGMENT: + { + GstFormat format; + gint64 start, stop; + + format = parse->segment.format; + + start = + gst_segment_to_stream_time (&parse->segment, format, + parse->segment.start); + if ((stop = parse->segment.stop) == -1) + stop = parse->segment.duration; + else + stop = gst_segment_to_stream_time (&parse->segment, format, stop); + + gst_query_set_segment (query, parse->segment.rate, format, start, stop); + res = TRUE; + break; + } default: res = gst_pad_query_default (pad, GST_OBJECT_CAST (parse), query); break; @@ -3955,6 +3981,8 @@ gst_base_parse_handle_seek (GstBaseParse * parse, GstEvent * event) gint64 start, stop, seekpos, seekstop; GstSegment seeksegment = { 0, }; GstClockTime start_ts; + guint32 seqnum; + GstEvent *segment_event; /* try upstream first, unless we're driving the streaming thread ourselves */ if (parse->priv->pad_mode != GST_PAD_MODE_PULL) { @@ -3965,6 +3993,7 @@ gst_base_parse_handle_seek (GstBaseParse * parse, GstEvent * event) gst_event_parse_seek (event, &rate, &format, &flags, &start_type, &start, &stop_type, &stop); + seqnum = gst_event_get_seqnum (event); GST_DEBUG_OBJECT (parse, "seek to format %s, rate %f, " "start type %d at %" GST_TIME_FORMAT ", end type %d at %" @@ -4055,10 +4084,14 @@ gst_base_parse_handle_seek (GstBaseParse * parse, GstEvent * event) if (flush) { if (parse->srcpad) { + GstEvent *fevent = gst_event_new_flush_start (); GST_DEBUG_OBJECT (parse, "sending flush start"); - gst_pad_push_event (parse->srcpad, gst_event_new_flush_start ()); + + gst_event_set_seqnum (fevent, seqnum); + + gst_pad_push_event (parse->srcpad, gst_event_ref (fevent)); /* unlock upstream pull_range */ - gst_pad_push_event (parse->sinkpad, gst_event_new_flush_start ()); + gst_pad_push_event (parse->sinkpad, fevent); } } else { gst_pad_pause_task (parse->sinkpad); @@ -4077,9 +4110,11 @@ gst_base_parse_handle_seek (GstBaseParse * parse, GstEvent * event) /* prepare for streaming again */ if (flush) { + GstEvent *fevent = gst_event_new_flush_stop (TRUE); GST_DEBUG_OBJECT (parse, "sending flush stop"); - gst_pad_push_event (parse->srcpad, gst_event_new_flush_stop (TRUE)); - gst_pad_push_event (parse->sinkpad, gst_event_new_flush_stop (TRUE)); + gst_event_set_seqnum (fevent, seqnum); + gst_pad_push_event (parse->srcpad, gst_event_ref (fevent)); + gst_pad_push_event (parse->sinkpad, fevent); gst_base_parse_clear_queues (parse); } else { /* keep track of our position */ @@ -4092,9 +4127,10 @@ gst_base_parse_handle_seek (GstBaseParse * parse, GstEvent * event) /* store the newsegment event so it can be sent from the streaming thread. */ /* This will be sent later in _loop() */ parse->priv->pending_segment = TRUE; + segment_event = gst_event_new_segment (&parse->segment); + gst_event_set_seqnum (segment_event, seqnum); parse->priv->pending_events = - g_list_prepend (parse->priv->pending_events, - gst_event_new_segment (&parse->segment)); + g_list_prepend (parse->priv->pending_events, segment_event); GST_DEBUG_OBJECT (parse, "Created newseg format %d, " "start = %" GST_TIME_FORMAT ", stop = %" GST_TIME_FORMAT @@ -4158,6 +4194,7 @@ gst_base_parse_handle_seek (GstBaseParse * parse, GstEvent * event) seekstop = seekpos; new_event = gst_event_new_seek (rate, GST_FORMAT_BYTES, flags, GST_SEEK_TYPE_SET, seekpos, stop_type, seekstop); + gst_event_set_seqnum (new_event, seqnum); /* store segment info so its precise details can be reconstructed when * receiving newsegment; diff --git a/libs/gst/base/gstbasesink.c b/libs/gst/base/gstbasesink.c index 9e97550..64c0b77 100644 --- a/libs/gst/base/gstbasesink.c +++ b/libs/gst/base/gstbasesink.c @@ -3008,11 +3008,19 @@ gst_base_sink_default_event (GstBaseSink * basesink, GstEvent * event) { GstMessage *message; guint32 seqnum; + guint group_id; seqnum = gst_event_get_seqnum (event); GST_DEBUG_OBJECT (basesink, "Now posting STREAM_START (seqnum:%d)", seqnum); message = gst_message_new_stream_start (GST_OBJECT_CAST (basesink)); + if (gst_event_parse_group_id (event, &group_id)) { + gst_message_set_group_id (message, group_id); + } else { + GST_FIXME_OBJECT (basesink, "stream-start event without group-id. " + "Consider implementing group-id handling in the upstream " + "elements"); + } gst_message_set_seqnum (message, seqnum); gst_element_post_message (GST_ELEMENT_CAST (basesink), message); break; @@ -3290,11 +3298,13 @@ gst_base_sink_chain_unlocked (GstBaseSink * basesink, GstPad * pad, } if (bclass->prepare || bclass->prepare_list) { - gboolean late = FALSE; - gboolean do_sync = TRUE, stepped = FALSE, step_end = FALSE, syncable = TRUE; + gboolean do_sync = TRUE, stepped = FALSE, syncable = TRUE; GstClockTime sstart, sstop, rstart, rstop, rnext; GstStepInfo *current; + late = FALSE; + step_end = FALSE; + current = &priv->current_step; syncable = gst_base_sink_get_sync_times (basesink, obj, &sstart, &sstop, &rstart, @@ -4704,8 +4714,21 @@ default_element_query (GstElement * element, GstQuery * query) case GST_QUERY_SEGMENT: { if (basesink->pad_mode == GST_PAD_MODE_PULL) { - gst_query_set_segment (query, basesink->segment.rate, - GST_FORMAT_TIME, basesink->segment.start, basesink->segment.stop); + GstFormat format; + gint64 start, stop; + + format = basesink->segment.format; + + start = + gst_segment_to_stream_time (&basesink->segment, format, + basesink->segment.start); + if ((stop = basesink->segment.stop) == -1) + stop = basesink->segment.duration; + else + stop = gst_segment_to_stream_time (&basesink->segment, format, stop); + + gst_query_set_segment (query, basesink->segment.rate, format, start, + stop); res = TRUE; } else { res = gst_pad_peer_query (basesink->sinkpad, query); diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c index a692b6f..4f05845 100644 --- a/libs/gst/base/gstbasesrc.c +++ b/libs/gst/base/gstbasesrc.c @@ -840,14 +840,16 @@ gst_base_src_send_stream_start (GstBaseSrc * src) if (src->priv->stream_start_pending) { gchar *stream_id; + GstEvent *event; stream_id = gst_pad_create_stream_id (src->srcpad, GST_ELEMENT_CAST (src), NULL); GST_DEBUG_OBJECT (src, "Pushing STREAM_START"); - ret = - gst_pad_push_event (src->srcpad, - gst_event_new_stream_start (stream_id)); + event = gst_event_new_stream_start (stream_id); + gst_event_set_group_id (event, gst_util_group_id_next ()); + + ret = gst_pad_push_event (src->srcpad, event); src->priv->stream_start_pending = FALSE; g_free (stream_id); } @@ -1076,23 +1078,23 @@ gst_base_src_default_query (GstBaseSrc * src, GstQuery * query) } case GST_QUERY_SEGMENT: { + GstFormat format; gint64 start, stop; GST_OBJECT_LOCK (src); - /* no end segment configured, current duration then */ + + format = src->segment.format; + + start = + gst_segment_to_stream_time (&src->segment, format, + src->segment.start); if ((stop = src->segment.stop) == -1) stop = src->segment.duration; - start = src->segment.start; + else + stop = gst_segment_to_stream_time (&src->segment, format, stop); - /* adjust to stream time */ - if (src->segment.time != -1) { - start -= src->segment.time; - if (stop != -1) - stop -= src->segment.time; - } + gst_query_set_segment (query, src->segment.rate, format, start, stop); - gst_query_set_segment (query, src->segment.rate, src->segment.format, - start, stop); GST_OBJECT_UNLOCK (src); res = TRUE; break; @@ -2573,8 +2575,20 @@ gst_base_src_loop (GstPad * pad) src = GST_BASE_SRC (GST_OBJECT_PARENT (pad)); + /* Just leave immediately if we're flushing */ + GST_LIVE_LOCK (src); + if (G_UNLIKELY (src->priv->flushing || GST_PAD_IS_FLUSHING (pad))) + goto flushing; + GST_LIVE_UNLOCK (src); + gst_base_src_send_stream_start (src); + /* The stream-start event could've caused something to flush us */ + GST_LIVE_LOCK (src); + if (G_UNLIKELY (src->priv->flushing || GST_PAD_IS_FLUSHING (pad))) + goto flushing; + GST_LIVE_UNLOCK (src); + /* check if we need to renegotiate */ if (gst_pad_check_reconfigure (pad)) { if (!gst_base_src_negotiate (src)) { @@ -2588,7 +2602,7 @@ gst_base_src_loop (GstPad * pad) GST_LIVE_LOCK (src); - if (G_UNLIKELY (src->priv->flushing)) + if (G_UNLIKELY (src->priv->flushing || GST_PAD_IS_FLUSHING (pad))) goto flushing; blocksize = src->blocksize; diff --git a/libs/gst/check/Makefile.in b/libs/gst/check/Makefile.in index 07201ac..444a04c 100644 --- a/libs/gst/check/Makefile.in +++ b/libs/gst/check/Makefile.in @@ -395,6 +395,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -405,7 +406,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/libs/gst/check/libcheck/Makefile.in b/libs/gst/check/libcheck/Makefile.in index cb3bccc..17a95df 100644 --- a/libs/gst/check/libcheck/Makefile.in +++ b/libs/gst/check/libcheck/Makefile.in @@ -324,6 +324,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -334,7 +335,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/libs/gst/check/libcheck/check_print.c b/libs/gst/check/libcheck/check_print.c index f170d60..e29aa7b 100644 --- a/libs/gst/check/libcheck/check_print.c +++ b/libs/gst/check/libcheck/check_print.c @@ -106,6 +106,38 @@ tr_fprint (FILE * file, TestResult * tr, enum print_output print_mode) } } +static void +fprint_xml_esc (FILE * file, const char *str) +{ + for (; *str != '\0'; str++) { + + switch (*str) { + + /* handle special characters that must be escaped */ + case '"': + fputs (""", file); + break; + case '\'': + fputs ("'", file); + break; + case '<': + fputs ("<", file); + break; + case '>': + fputs (">", file); + break; + case '&': + fputs ("&", file); + break; + + /* regular characters, print as is */ + default: + fputc (*str, file); + break; + } + } +} + void tr_xmlprint (FILE * file, TestResult * tr, enum print_output print_mode CK_ATTRIBUTE_UNUSED) @@ -147,8 +179,12 @@ tr_xmlprint (FILE * file, TestResult * tr, fprintf (file, " <fn>%s:%d</fn>\n", file_name, tr->line); fprintf (file, " <id>%s</id>\n", tr->tname); fprintf (file, " <iteration>%d</iteration>\n", tr->iter); - fprintf (file, " <description>%s</description>\n", tr->tcname); - fprintf (file, " <message>%s</message>\n", tr->msg); + fprintf (file, " <description>"); + fprint_xml_esc (file, tr->tcname); + fprintf (file, "</description>\n"); + fprintf (file, " <message>"); + fprint_xml_esc (file, tr->msg); + fprintf (file, "</message>\n"); fprintf (file, " </test>\n"); if (slash != NULL) { diff --git a/libs/gst/controller/Makefile.in b/libs/gst/controller/Makefile.in index 72dae4a..5d28280 100644 --- a/libs/gst/controller/Makefile.in +++ b/libs/gst/controller/Makefile.in @@ -337,6 +337,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -347,7 +348,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/libs/gst/helpers/Makefile.in b/libs/gst/helpers/Makefile.in index f55da45..473a4ac 100644 --- a/libs/gst/helpers/Makefile.in +++ b/libs/gst/helpers/Makefile.in @@ -314,6 +314,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -324,7 +325,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/libs/gst/net/Makefile.in b/libs/gst/net/Makefile.in index 7083f0d..3cb8c26 100644 --- a/libs/gst/net/Makefile.in +++ b/libs/gst/net/Makefile.in @@ -335,6 +335,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -345,7 +346,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/libs/gst/net/gstnettimeprovider.c b/libs/gst/net/gstnettimeprovider.c index a31171d..202b6c7 100644 --- a/libs/gst/net/gstnettimeprovider.c +++ b/libs/gst/net/gstnettimeprovider.c @@ -394,8 +394,8 @@ gst_net_time_provider_stop (GstNetTimeProvider * self) /** * gst_net_time_provider_new: * @clock: a #GstClock to export over the network - * @address: an address to bind on as a dotted quad (xxx.xxx.xxx.xxx), IPv6 address, or NULL - * to bind to all addresses + * @address: (allow-none): an address to bind on as a dotted quad + * (xxx.xxx.xxx.xxx), IPv6 address, or NULL to bind to all addresses * @port: a port to bind on, or 0 to let the kernel choose * * Allows network clients to get the current time of @clock. diff --git a/m4/Makefile.in b/m4/Makefile.in index abc3070..5dd4c9e 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -256,6 +256,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -266,7 +267,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/pkgconfig/Makefile.in b/pkgconfig/Makefile.in index 1d45159..7d0b0d6 100644 --- a/pkgconfig/Makefile.in +++ b/pkgconfig/Makefile.in @@ -300,6 +300,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -310,7 +311,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/plugins/Makefile.in b/plugins/Makefile.in index ffdad8d..ebaf4fd 100644 --- a/plugins/Makefile.in +++ b/plugins/Makefile.in @@ -315,6 +315,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -325,7 +326,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/plugins/elements/Makefile.in b/plugins/elements/Makefile.in index a7dc786..14eab12 100644 --- a/plugins/elements/Makefile.in +++ b/plugins/elements/Makefile.in @@ -358,6 +358,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -368,7 +369,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/plugins/elements/gstinputselector.c b/plugins/elements/gstinputselector.c index 6fcda93..7eda5a2 100644 --- a/plugins/elements/gstinputselector.c +++ b/plugins/elements/gstinputselector.c @@ -461,7 +461,7 @@ gst_selector_pad_event (GstPad * pad, GstObject * parent, GstEvent * event) active_sinkpad = gst_input_selector_activate_sinkpad (sel, pad); GST_INPUT_SELECTOR_UNLOCK (sel); - if (prev_active_sinkpad != active_sinkpad && pad == active_sinkpad) { + if (prev_active_sinkpad != active_sinkpad) { if (prev_active_sinkpad) g_object_notify (G_OBJECT (prev_active_sinkpad), "active"); g_object_notify (G_OBJECT (active_sinkpad), "active"); @@ -477,6 +477,13 @@ gst_selector_pad_event (GstPad * pad, GstObject * parent, GstEvent * event) forward = (pad == active_sinkpad); switch (GST_EVENT_TYPE (event)) { + case GST_EVENT_STREAM_START:{ + guint group_id; + + if (!gst_event_parse_group_id (event, &group_id)) + sel->have_group_id = FALSE; + break; + } case GST_EVENT_FLUSH_START: /* Unblock the pad if it's waiting */ selpad->flushing = TRUE; @@ -756,6 +763,17 @@ forward_sticky_events (GstPad * sinkpad, GstEvent ** event, gpointer user_data) gst_event_set_seqnum (e, GST_SELECTOR_PAD_CAST (sinkpad)->segment_seqnum); gst_pad_push_event (sel->srcpad, e); + } else if (GST_EVENT_TYPE (*event) == GST_EVENT_STREAM_START + && !sel->have_group_id) { + GstEvent *tmp = + gst_pad_get_sticky_event (sel->srcpad, GST_EVENT_STREAM_START, 0); + + /* Only push stream-start once if not all our streams have a stream-id */ + if (!tmp) { + gst_pad_push_event (sel->srcpad, gst_event_ref (*event)); + } else { + gst_event_unref (tmp); + } } else { gst_pad_push_event (sel->srcpad, gst_event_ref (*event)); } @@ -1032,7 +1050,7 @@ gst_selector_pad_chain (GstPad * pad, GstObject * parent, GstBuffer * buf) GST_INPUT_SELECTOR_UNLOCK (sel); - if (prev_active_sinkpad != active_sinkpad && pad == active_sinkpad) { + if (prev_active_sinkpad != active_sinkpad) { if (prev_active_sinkpad) g_object_notify (G_OBJECT (prev_active_sinkpad), "active"); g_object_notify (G_OBJECT (active_sinkpad), "active"); @@ -1275,6 +1293,7 @@ gst_input_selector_init (GstInputSelector * sel) sel->active_sinkpad = NULL; sel->padcount = 0; sel->sync_streams = DEFAULT_SYNC_STREAMS; + sel->have_group_id = TRUE; g_mutex_init (&sel->lock); g_cond_init (&sel->cond); @@ -1699,10 +1718,10 @@ gst_input_selector_release_pad (GstElement * element, GstPad * pad) sel->active_sinkpad = NULL; } sel->n_pads--; + GST_INPUT_SELECTOR_UNLOCK (sel); gst_pad_set_active (pad, FALSE); gst_element_remove_pad (GST_ELEMENT (sel), pad); - GST_INPUT_SELECTOR_UNLOCK (sel); } static void @@ -1727,6 +1746,7 @@ gst_input_selector_reset (GstInputSelector * sel) selpad->tags = NULL; } } + sel->have_group_id = TRUE; GST_INPUT_SELECTOR_UNLOCK (sel); } diff --git a/plugins/elements/gstinputselector.h b/plugins/elements/gstinputselector.h index 57678f6..96c680f 100644 --- a/plugins/elements/gstinputselector.h +++ b/plugins/elements/gstinputselector.h @@ -72,6 +72,8 @@ struct _GstInputSelector { GstInputSelectorSyncMode sync_mode; gboolean cache_buffers; + gboolean have_group_id; + GMutex lock; GCond cond; gboolean blocked; diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c index 9e9209c..7a9cd5f 100644 --- a/plugins/elements/gstmultiqueue.c +++ b/plugins/elements/gstmultiqueue.c @@ -1614,17 +1614,30 @@ gst_multi_queue_sink_query (GstPad * pad, GstObject * parent, GstQuery * query) if (sq->srcresult != GST_FLOW_OK) goto out_flushing; - /* Get an unique incrementing id. */ - curid = g_atomic_int_add ((gint *) & mq->counter, 1); - - item = gst_multi_queue_mo_item_new ((GstMiniObject *) query, curid); - - GST_DEBUG_OBJECT (mq, - "SingleQueue %d : Enqueuing query %p of type %s with id %d", - sq->id, query, GST_QUERY_TYPE_NAME (query), curid); - res = gst_data_queue_push (sq->queue, (GstDataQueueItem *) item); - g_cond_wait (&sq->query_handled, &mq->qlock); - res = sq->last_query; + /* serialized events go in the queue. We need to be certain that we + * don't cause deadlocks waiting for the query return value. We check if + * the queue is empty (nothing is blocking downstream and the query can + * be pushed for sure) or we are not buffering. If we are buffering, + * the pipeline waits to unblock downstream until our queue fills up + * completely, which can not happen if we block on the query.. + * Therefore we only potentially block when we are not buffering. */ + if (!mq->use_buffering || gst_data_queue_is_empty (sq->queue)) { + /* Get an unique incrementing id. */ + curid = g_atomic_int_add ((gint *) & mq->counter, 1); + + item = gst_multi_queue_mo_item_new ((GstMiniObject *) query, curid); + + GST_DEBUG_OBJECT (mq, + "SingleQueue %d : Enqueuing query %p of type %s with id %d", + sq->id, query, GST_QUERY_TYPE_NAME (query), curid); + res = gst_data_queue_push (sq->queue, (GstDataQueueItem *) item); + g_cond_wait (&sq->query_handled, &mq->qlock); + res = sq->last_query; + } else { + GST_DEBUG_OBJECT (mq, "refusing query, we are buffering and the " + "queue is not empty"); + res = FALSE; + } GST_MULTI_QUEUE_MUTEX_UNLOCK (mq); } else { /* default handling */ diff --git a/plugins/elements/gsttypefindelement.c b/plugins/elements/gsttypefindelement.c index ebbb6e7..c298414 100644 --- a/plugins/elements/gsttypefindelement.c +++ b/plugins/elements/gsttypefindelement.c @@ -989,12 +989,15 @@ gst_type_find_element_loop (GstPad * pad) if (typefind->need_stream_start) { gchar *stream_id; + GstEvent *event; stream_id = gst_pad_create_stream_id (typefind->src, GST_ELEMENT_CAST (typefind), NULL); GST_DEBUG_OBJECT (typefind, "Pushing STREAM_START"); - gst_pad_push_event (typefind->src, gst_event_new_stream_start (stream_id)); + event = gst_event_new_stream_start (stream_id); + gst_event_set_group_id (event, gst_util_group_id_next ()); + gst_pad_push_event (typefind->src, event); typefind->need_stream_start = FALSE; g_free (stream_id); @@ -1085,7 +1088,7 @@ gst_type_find_element_loop (GstPad * pad) if (ret != GST_FLOW_OK) goto pause; - typefind->offset += 4096; + typefind->offset += gst_buffer_get_size (outbuf); ret = gst_pad_push (typefind->src, outbuf); if (ret != GST_FLOW_OK) Binary files differ@@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -47,6 +47,11 @@ msgstr "LYS" msgid "Disable colored debugging output" msgstr "Skakel gekleurde ontfout-afvoer af" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Skakel ontfouting af" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -44,6 +44,11 @@ msgstr "SİYAHI" msgid "Disable colored debugging output" msgstr "" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Xəta ayırmasını bağla" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -47,6 +47,11 @@ msgstr "СЬПІС" msgid "Disable colored debugging output" msgstr "Выключае каляровы вывад адладкі" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Выключае адладку" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -50,6 +50,11 @@ msgstr "СПИСЪК" msgid "Disable colored debugging output" msgstr "Спиране на оцветените съобщения за изчистване на грешки" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Спиране на съобщенията за изчистване на грешки" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -49,6 +49,11 @@ msgstr "LLISTA" msgid "Disable colored debugging output" msgstr "Inhabilita la sortida de depuració colorejada" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Inhabilita la depuració" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -50,6 +50,11 @@ msgstr "SEZNAM" msgid "Disable colored debugging output" msgstr "Zakázat obarvený ladicí výstup" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Zakázat ladění" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -54,6 +54,11 @@ msgstr "LISTE" msgid "Disable colored debugging output" msgstr "Déaktiver brug af farver ved fejlsøgnings uddata" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Déaktiver fejlsøgning" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -51,6 +51,11 @@ msgstr "LISTE" msgid "Disable colored debugging output" msgstr "Farbige Fehlerdiagnoseausgabe deaktivieren" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Fehlerdiagnose deaktivieren" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -50,6 +50,11 @@ msgstr "LIST" msgid "Disable colored debugging output" msgstr "Απενεργοποίηση έγχρωμων αποτελεσμάτων αποσφαλμάτωσης" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Απενεργοποίηση αποσφαλμάτωσης" diff --git a/po/en_GB.gmo b/po/en_GB.gmo Binary files differindex fac5b58..b9cbd0b 100644 --- a/po/en_GB.gmo +++ b/po/en_GB.gmo diff --git a/po/en_GB.po b/po/en_GB.po index e2659d4..57175f3 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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -45,6 +45,11 @@ msgstr "LIST" msgid "Disable colored debugging output" msgstr "Disable coloured debugging output" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Disable debugging" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -44,6 +44,11 @@ msgstr "LISTO" msgid "Disable colored debugging output" msgstr "" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Elŝalti sencimigon" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -49,6 +49,11 @@ msgstr "LISTA" msgid "Disable colored debugging output" msgstr "Desactivar la coloración de la salida depurada" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Desactivar depuración" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -51,6 +51,11 @@ msgstr "ZERRENDA" msgid "Disable colored debugging output" msgstr "Desgaitu koloreak arazketako irteeretan" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Desgaitu arazketa" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -53,6 +53,11 @@ msgstr "LUETTELO" msgid "Disable colored debugging output" msgstr "Ei väritettyjä vianetsintätietoja" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Ei vianetsintää" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -51,6 +51,11 @@ msgstr "LISTE" msgid "Disable colored debugging output" msgstr "Désactive la couleur dans la sortie de débogage" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Désactive le débogage" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -47,6 +47,11 @@ msgstr "LISTA" msgid "Disable colored debugging output" msgstr "Desactivar a coloración da saída depurada" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Desactivar depuración" diff --git a/po/gstreamer-1.0.pot b/po/gstreamer-1.0.pot index 9ee84a4..08b8c6d 100644 --- a/po/gstreamer-1.0.pot +++ b/po/gstreamer-1.0.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: gstreamer 1.1.2\n" +"Project-Id-Version: gstreamer 1.1.3\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/\n" -"POT-Creation-Date: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -17,88 +17,94 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: gst/gst.c:232 +#: gst/gst.c:233 msgid "Print the GStreamer version" msgstr "" -#: gst/gst.c:234 +#: gst/gst.c:235 msgid "Make all warnings fatal" msgstr "" -#: gst/gst.c:238 +#: gst/gst.c:239 msgid "Print available debug categories and exit" msgstr "" -#: gst/gst.c:242 +#: gst/gst.c:243 msgid "" "Default debug level from 1 (only error) to 5 (anything) or 0 for no output" msgstr "" -#: gst/gst.c:244 +#: gst/gst.c:245 msgid "LEVEL" msgstr "" -#: gst/gst.c:246 +#: gst/gst.c:247 msgid "" "Comma-separated list of category_name:level pairs to set specific levels for " "the individual categories. Example: GST_AUTOPLUG:5,GST_ELEMENT_*:3" msgstr "" -#: gst/gst.c:249 +#: gst/gst.c:250 msgid "LIST" msgstr "" -#: gst/gst.c:251 +#: gst/gst.c:252 msgid "Disable colored debugging output" msgstr "" -#: gst/gst.c:254 +#: gst/gst.c:256 +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + +#: gst/gst.c:260 msgid "Disable debugging" msgstr "" -#: gst/gst.c:258 +#: gst/gst.c:264 msgid "Enable verbose plugin loading diagnostics" msgstr "" -#: gst/gst.c:262 +#: gst/gst.c:268 msgid "Colon-separated paths containing plugins" msgstr "" -#: gst/gst.c:262 +#: gst/gst.c:268 msgid "PATHS" msgstr "" -#: gst/gst.c:265 +#: gst/gst.c:271 msgid "" "Comma-separated list of plugins to preload in addition to the list stored in " "environment variable GST_PLUGIN_PATH" msgstr "" -#: gst/gst.c:267 +#: gst/gst.c:273 msgid "PLUGINS" msgstr "" -#: gst/gst.c:270 +#: gst/gst.c:276 msgid "Disable trapping of segmentation faults during plugin loading" msgstr "" -#: gst/gst.c:275 +#: gst/gst.c:281 msgid "Disable updating the registry" msgstr "" -#: gst/gst.c:280 +#: gst/gst.c:286 msgid "Disable spawning a helper process while scanning the registry" msgstr "" -#: gst/gst.c:285 +#: gst/gst.c:291 msgid "GStreamer Options" msgstr "" -#: gst/gst.c:286 +#: gst/gst.c:292 msgid "Show GStreamer Options" msgstr "" -#: gst/gst.c:848 +#: gst/gst.c:869 msgid "Unknown option" msgstr "" @@ -1067,25 +1073,25 @@ msgstr "" msgid "A lot of buffers are being dropped." msgstr "" -#: libs/gst/base/gstbasesink.c:3255 +#: libs/gst/base/gstbasesink.c:3263 msgid "Internal data flow problem." msgstr "" -#: libs/gst/base/gstbasesink.c:3913 +#: libs/gst/base/gstbasesink.c:3923 msgid "Internal data stream error." msgstr "" -#: libs/gst/base/gstbasesink.c:3923 libs/gst/base/gstbasesrc.c:2811 -#: libs/gst/base/gstbasesrc.c:2820 plugins/elements/gstqueue.c:1276 +#: libs/gst/base/gstbasesink.c:3933 libs/gst/base/gstbasesrc.c:2825 +#: libs/gst/base/gstbasesrc.c:2834 plugins/elements/gstqueue.c:1276 #: plugins/elements/gstqueue2.c:2694 msgid "Internal data flow error." msgstr "" -#: libs/gst/base/gstbasesrc.c:2440 +#: libs/gst/base/gstbasesrc.c:2442 msgid "Internal clock error." msgstr "" -#: libs/gst/base/gstbasesrc.c:2468 +#: libs/gst/base/gstbasesrc.c:2470 msgid "Failed to map buffer." msgstr "" @@ -1184,7 +1190,7 @@ msgstr "" msgid "force caps without doing a typefind" msgstr "" -#: plugins/elements/gsttypefindelement.c:1035 +#: plugins/elements/gsttypefindelement.c:1038 msgid "Stream contains no data." msgstr "" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -49,6 +49,11 @@ msgstr "LISTA" msgid "Disable colored debugging output" msgstr "Színes hibakeresési kimenet letiltása" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Hibakeresés letiltása" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -48,6 +48,11 @@ msgstr "SENARAI" msgid "Disable colored debugging output" msgstr "Nonaktifkan keluaran awakutu berwarna" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Nonaktifkan awakutu" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -154,6 +154,11 @@ msgstr "ELENCO" msgid "Disable colored debugging output" msgstr "Disabilita output di debug colorato" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + # --gst-debug-disable msgid "Disable debugging" msgstr "Disabilita debug" 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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -44,6 +44,11 @@ msgstr "LIST" msgid "Disable colored debugging output" msgstr "デバッグ出力のカラー出力を無効にする" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "デバッグを無効にする" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -51,6 +51,11 @@ msgstr "SĄRAŠAS" msgid "Disable colored debugging output" msgstr "Išjungti spalvotą derinimo išvestį" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Išjungti derinimą" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -43,6 +43,11 @@ msgstr "LISTE" msgid "Disable colored debugging output" msgstr "Deaktiver farget feilsøkingsinformasjon" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Slå av feilsøking" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -53,6 +53,11 @@ msgstr "LIJST" msgid "Disable colored debugging output" msgstr "Kleuren uit zetten in debug-uitvoer" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Debugging uit zetten" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -49,6 +49,11 @@ msgstr "LISTA" msgid "Disable colored debugging output" msgstr "Wyłączenie kolorowanego wyjścia diagnostycznego" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Wyłączenie diagnostyki" diff --git a/po/pt_BR.gmo b/po/pt_BR.gmo Binary files differindex 7d09cad..d14140c 100644 --- a/po/pt_BR.gmo +++ b/po/pt_BR.gmo diff --git a/po/pt_BR.po b/po/pt_BR.po index 07e4770..3b43f49 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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -59,6 +59,11 @@ msgstr "LISTA" msgid "Disable colored debugging output" msgstr "Desabilitar saída de depuração colorida" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Desabilitar depuração" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -49,6 +49,11 @@ msgstr "LISTĂ" msgid "Disable colored debugging output" msgstr "Dezactivează afișarea în culori pentru depanare" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Dezactivează depanarea" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -52,6 +52,11 @@ msgstr "СПИСОК" msgid "Disable colored debugging output" msgstr "Отключить цветовую разметку при выводе отладочных сообщений" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Отключить отладку" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -90,6 +90,11 @@ msgstr "Urutonde" msgid "Disable colored debugging output" msgstr "Ibisohoka" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -54,6 +54,11 @@ msgstr "ZOZNAM" msgid "Disable colored debugging output" msgstr "Zakázať farebný ladiaci výstup" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Zakázať ladenie" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -55,6 +55,11 @@ msgstr "SEZNAM" msgid "Disable colored debugging output" msgstr "Onemogoči obarvani razhroščevalni izpis" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Onemogoči razhroščevanje" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -48,6 +48,11 @@ msgstr "LISTË" msgid "Disable colored debugging output" msgstr "Ç'aktivo output shumëngjyrësh të debug" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Ç'aktivo debug" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -51,6 +51,11 @@ msgstr "СПИСАК" msgid "Disable colored debugging output" msgstr "Искључује обојени излаз за уклањање грешака" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Искључује уклањање грешака" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -49,6 +49,11 @@ msgstr "LISTA" msgid "Disable colored debugging output" msgstr "Inaktivera färglagd felsökningsutmatning" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Inaktivera felsökning" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -46,6 +46,11 @@ msgstr "LİSTE" msgid "Disable colored debugging output" msgstr "Renkli hata ayıklama çıktısını kapat" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Hata ayıklamayı kapat" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -51,6 +51,11 @@ msgstr "СПИСОК" msgid "Disable colored debugging output" msgstr "Вимкнути оформлення кольором діагностичних повідомлень" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Вимкнути діагностику" @@ -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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -49,6 +49,11 @@ msgstr "DANH SÁCH" msgid "Disable colored debugging output" msgstr "Tắt xuất dữ liệu gỡ lỗi với màu" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "Tắt gỡ lỗi" diff --git a/po/zh_CN.gmo b/po/zh_CN.gmo Binary files differindex a1718b3..dab89b8 100644 --- a/po/zh_CN.gmo +++ b/po/zh_CN.gmo diff --git a/po/zh_CN.po b/po/zh_CN.po index bfd3665..1effb75 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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -45,6 +45,11 @@ msgstr "列表" msgid "Disable colored debugging output" msgstr "禁止彩色的调试信息输出" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "禁止调试" diff --git a/po/zh_TW.gmo b/po/zh_TW.gmo Binary files differindex 967e1c2..425580a 100644 --- a/po/zh_TW.gmo +++ b/po/zh_TW.gmo diff --git a/po/zh_TW.po b/po/zh_TW.po index e10b6d0..9affeb1 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: 2013-07-11 15:09+0200\n" +"POT-Creation-Date: 2013-07-29 13:29+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" @@ -46,6 +46,11 @@ msgstr "LIST" msgid "Disable colored debugging output" msgstr "偵錯結果不加上色彩" +msgid "" +"Changes coloring mode of the debug log. Possible modes: off, on, disable, " +"auto, unix" +msgstr "" + msgid "Disable debugging" msgstr "關閉偵錯功能" diff --git a/scripts/gst-uninstalled b/scripts/gst-uninstalled index 2a9d3bf..dd1ffa9 100755 --- a/scripts/gst-uninstalled +++ b/scripts/gst-uninstalled @@ -145,7 +145,7 @@ $GST/gstreamer/plugins\ :$GST/gnonlin/gnl/.libs\ :$GST/gst-openmax/omx/.libs\ :$GST/gst-omx/omx/.libs\ -:$GST/gst-plugins-gl/gst/.libs\ +:$GST/gst-plugins-gl/gst/gl/.libs\ :$GST/clutter-gst/clutter-gst/.libs\ :$GST/plugins\ :$GST/farsight2/gst\ diff --git a/tests/Makefile.in b/tests/Makefile.in index e2ee5ab..48a77a5 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -315,6 +315,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -325,7 +326,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tests/benchmarks/Makefile.in b/tests/benchmarks/Makefile.in index b011746..62b94da 100644 --- a/tests/benchmarks/Makefile.in +++ b/tests/benchmarks/Makefile.in @@ -356,6 +356,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -366,7 +367,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tests/check/Makefile.in b/tests/check/Makefile.in index 34b2ec4..577f160 100644 --- a/tests/check/Makefile.in +++ b/tests/check/Makefile.in @@ -1171,6 +1171,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -1181,7 +1182,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tests/check/gst/struct_arm.h b/tests/check/gst/struct_arm.h index db6ed90..7660266 100644 --- a/tests/check/gst/struct_arm.h +++ b/tests/check/gst/struct_arm.h @@ -12,7 +12,6 @@ GstCheckABIStruct list[] = { {"GstBusClass", sizeof (GstBusClass), 116}, {"GstBus", sizeof (GstBus), 88}, {"GstCaps", sizeof (GstCaps), 36}, - {"GstChildProxyInterface", sizeof (GstChildProxyInterface), 44}, {"GstClockClass", sizeof (GstClockClass), 132}, {"GstClockEntry", sizeof (GstClockEntry), 72}, {"GstClock", sizeof (GstClock), 88}, @@ -46,7 +45,6 @@ GstCheckABIStruct list[] = { {"GstPipelineClass", sizeof (GstPipelineClass), 308}, {"GstPipeline", sizeof (GstPipeline), 296}, {"GstPluginDesc", sizeof (GstPluginDesc), 60}, - {"GstPresetInterface", sizeof (GstPresetInterface), 56}, {"GstProxyPadClass", sizeof (GstProxyPadClass), 120}, {"GstProxyPad", sizeof (GstProxyPad), 312}, {"GstQuery", sizeof (GstQuery), 40}, @@ -59,15 +57,12 @@ GstCheckABIStruct list[] = { {"GstSystemClockClass", sizeof (GstSystemClockClass), 148}, {"GstSystemClock", sizeof (GstSystemClock), 112}, {"GstTagList", sizeof (GstTagList), 36}, - {"GstTagSetterInterface", sizeof (GstTagSetterInterface), 8}, {"GstTaskClass", sizeof (GstTaskClass), 112}, {"GstTask", sizeof (GstTask), 128}, {"GstTaskPoolClass", sizeof (GstTaskPoolClass), 124}, {"GstTaskPool", sizeof (GstTaskPool), 88}, {"GstTimedValue", sizeof (GstTimedValue), 16}, - {"GstTocSetterInterface", sizeof (GstTocSetterInterface), 8}, {"GstTypeFind", sizeof (GstTypeFind), 32}, - {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 24}, {"GstValueTable", sizeof (GstValueTable), 32}, {NULL, 0, 0} }; diff --git a/tests/check/gst/struct_hppa.h b/tests/check/gst/struct_hppa.h index b7a2952..5794580 100644 --- a/tests/check/gst/struct_hppa.h +++ b/tests/check/gst/struct_hppa.h @@ -11,7 +11,6 @@ static GstCheckABIStruct list[] = { {"GstBusClass", sizeof (GstBusClass), 232}, {"GstBus", sizeof (GstBus), 128}, {"GstCaps", sizeof (GstCaps), 64}, - {"GstChildProxyInterface", sizeof (GstChildProxyInterface), 88}, {"GstClockClass", sizeof (GstClockClass), 264}, {"GstClockEntry", sizeof (GstClockEntry), 112}, {"GstClock", sizeof (GstClock), 128}, @@ -45,7 +44,6 @@ static GstCheckABIStruct list[] = { {"GstPipelineClass", sizeof (GstPipelineClass), 608}, {"GstPipeline", sizeof (GstPipeline), 440}, {"GstPluginDesc", sizeof (GstPluginDesc), 112}, - {"GstPresetInterface", sizeof (GstPresetInterface), 112}, {"GstProxyPadClass", sizeof (GstProxyPadClass), 240}, {"GstProxyPad", sizeof (GstProxyPad), 528}, {"GstQuery", sizeof (GstQuery), 72}, @@ -58,15 +56,12 @@ static GstCheckABIStruct list[] = { {"GstSystemClockClass", sizeof (GstSystemClockClass), 296}, {"GstSystemClock", sizeof (GstSystemClock), 168}, {"GstTagList", sizeof (GstTagList), 64,}, - {"GstTagSetterInterface", sizeof (GstTagSetterInterface), 16}, {"GstTaskClass", sizeof (GstTaskClass), 224}, {"GstTask", sizeof (GstTask), 200}, {"GstTaskPoolClass", sizeof (GstTaskPoolClass), 248}, {"GstTaskPool", sizeof (GstTaskPool), 128}, {"GstTimedValue", sizeof (GstTimedValue), 16}, - {"GstTocSetterInterface", sizeof (GstTocSetterInterface), 16}, {"GstTypeFind", sizeof (GstTypeFind), 64}, - {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 48}, {"GstValueTable", sizeof (GstValueTable), 64}, {NULL, 0, 0} }; diff --git a/tests/check/gst/struct_i386.h b/tests/check/gst/struct_i386.h index 372685a..33363e6 100644 --- a/tests/check/gst/struct_i386.h +++ b/tests/check/gst/struct_i386.h @@ -11,7 +11,6 @@ static GstCheckABIStruct list[] = { {"GstBusClass", sizeof (GstBusClass), 116}, {"GstBus", sizeof (GstBus), 76}, {"GstCaps", sizeof (GstCaps), 36}, - {"GstChildProxyInterface", sizeof (GstChildProxyInterface), 44}, {"GstClockClass", sizeof (GstClockClass), 132}, {"GstClockEntry", sizeof (GstClockEntry), 68}, {"GstClock", sizeof (GstClock), 76}, @@ -45,7 +44,6 @@ static GstCheckABIStruct list[] = { {"GstPipelineClass", sizeof (GstPipelineClass), 308}, {"GstPipeline", sizeof (GstPipeline), 272}, {"GstPluginDesc", sizeof (GstPluginDesc), 60}, - {"GstPresetInterface", sizeof (GstPresetInterface), 56}, {"GstProxyPadClass", sizeof (GstProxyPadClass), 120}, {"GstProxyPad", sizeof (GstProxyPad), 292}, {"GstQuery", sizeof (GstQuery), 40}, @@ -58,15 +56,12 @@ static GstCheckABIStruct list[] = { {"GstSystemClockClass", sizeof (GstSystemClockClass), 148}, {"GstSystemClock", sizeof (GstSystemClock), 96}, {"GstTagList", sizeof (GstTagList), 36}, - {"GstTagSetterInterface", sizeof (GstTagSetterInterface), 8}, {"GstTaskClass", sizeof (GstTaskClass), 112}, {"GstTask", sizeof (GstTask), 116}, {"GstTaskPoolClass", sizeof (GstTaskPoolClass), 124}, {"GstTaskPool", sizeof (GstTaskPool), 76}, {"GstTimedValue", sizeof (GstTimedValue), 16}, - {"GstTocSetterInterface", sizeof (GstTocSetterInterface), 8}, {"GstTypeFind", sizeof (GstTypeFind), 32}, - {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 24}, {"GstValueTable", sizeof (GstValueTable), 32}, {NULL, 0, 0} }; diff --git a/tests/check/gst/struct_ppc32.h b/tests/check/gst/struct_ppc32.h index fc7a571..91c0386 100644 --- a/tests/check/gst/struct_ppc32.h +++ b/tests/check/gst/struct_ppc32.h @@ -11,7 +11,6 @@ static GstCheckABIStruct list[] = { {"GstBusClass", sizeof (GstBusClass), 116}, {"GstBus", sizeof (GstBus), 88}, {"GstCaps", sizeof (GstCaps), 36}, - {"GstChildProxyInterface", sizeof (GstChildProxyInterface), 44}, {"GstClockClass", sizeof (GstClockClass), 132}, {"GstClockEntry", sizeof (GstClockEntry), 72}, {"GstClock", sizeof (GstClock), 88}, @@ -45,7 +44,6 @@ static GstCheckABIStruct list[] = { {"GstPipelineClass", sizeof (GstPipelineClass), 308}, {"GstPipeline", sizeof (GstPipeline), 296}, {"GstPluginDesc", sizeof (GstPluginDesc), 60}, - {"GstPresetInterface", sizeof (GstPresetInterface), 56}, {"GstProxyPadClass", sizeof (GstProxyPadClass), 120}, {"GstProxyPad", sizeof (GstProxyPad), 312}, {"GstQuery", sizeof (GstQuery), 40}, @@ -58,15 +56,12 @@ static GstCheckABIStruct list[] = { {"GstSystemClockClass", sizeof (GstSystemClockClass), 148}, {"GstSystemClock", sizeof (GstSystemClock), 112}, {"GstTagList", sizeof (GstTagList), 36}, - {"GstTagSetterInterface", sizeof (GstTagSetterInterface), 8}, {"GstTaskClass", sizeof (GstTaskClass), 112}, {"GstTask", sizeof (GstTask), 128}, {"GstTaskPoolClass", sizeof (GstTaskPoolClass), 124}, {"GstTaskPool", sizeof (GstTaskPool), 88}, {"GstTimedValue", sizeof (GstTimedValue), 16}, - {"GstTocSetterInterface", sizeof (GstTocSetterInterface), 8}, {"GstTypeFind", sizeof (GstTypeFind), 32}, - {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 24}, {"GstValueTable", sizeof (GstValueTable), 32}, {NULL, 0, 0} }; diff --git a/tests/check/gst/struct_ppc64.h b/tests/check/gst/struct_ppc64.h index b7a2952..5794580 100644 --- a/tests/check/gst/struct_ppc64.h +++ b/tests/check/gst/struct_ppc64.h @@ -11,7 +11,6 @@ static GstCheckABIStruct list[] = { {"GstBusClass", sizeof (GstBusClass), 232}, {"GstBus", sizeof (GstBus), 128}, {"GstCaps", sizeof (GstCaps), 64}, - {"GstChildProxyInterface", sizeof (GstChildProxyInterface), 88}, {"GstClockClass", sizeof (GstClockClass), 264}, {"GstClockEntry", sizeof (GstClockEntry), 112}, {"GstClock", sizeof (GstClock), 128}, @@ -45,7 +44,6 @@ static GstCheckABIStruct list[] = { {"GstPipelineClass", sizeof (GstPipelineClass), 608}, {"GstPipeline", sizeof (GstPipeline), 440}, {"GstPluginDesc", sizeof (GstPluginDesc), 112}, - {"GstPresetInterface", sizeof (GstPresetInterface), 112}, {"GstProxyPadClass", sizeof (GstProxyPadClass), 240}, {"GstProxyPad", sizeof (GstProxyPad), 528}, {"GstQuery", sizeof (GstQuery), 72}, @@ -58,15 +56,12 @@ static GstCheckABIStruct list[] = { {"GstSystemClockClass", sizeof (GstSystemClockClass), 296}, {"GstSystemClock", sizeof (GstSystemClock), 168}, {"GstTagList", sizeof (GstTagList), 64,}, - {"GstTagSetterInterface", sizeof (GstTagSetterInterface), 16}, {"GstTaskClass", sizeof (GstTaskClass), 224}, {"GstTask", sizeof (GstTask), 200}, {"GstTaskPoolClass", sizeof (GstTaskPoolClass), 248}, {"GstTaskPool", sizeof (GstTaskPool), 128}, {"GstTimedValue", sizeof (GstTimedValue), 16}, - {"GstTocSetterInterface", sizeof (GstTocSetterInterface), 16}, {"GstTypeFind", sizeof (GstTypeFind), 64}, - {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 48}, {"GstValueTable", sizeof (GstValueTable), 64}, {NULL, 0, 0} }; diff --git a/tests/check/gst/struct_sparc.h b/tests/check/gst/struct_sparc.h index b7a2952..5794580 100644 --- a/tests/check/gst/struct_sparc.h +++ b/tests/check/gst/struct_sparc.h @@ -11,7 +11,6 @@ static GstCheckABIStruct list[] = { {"GstBusClass", sizeof (GstBusClass), 232}, {"GstBus", sizeof (GstBus), 128}, {"GstCaps", sizeof (GstCaps), 64}, - {"GstChildProxyInterface", sizeof (GstChildProxyInterface), 88}, {"GstClockClass", sizeof (GstClockClass), 264}, {"GstClockEntry", sizeof (GstClockEntry), 112}, {"GstClock", sizeof (GstClock), 128}, @@ -45,7 +44,6 @@ static GstCheckABIStruct list[] = { {"GstPipelineClass", sizeof (GstPipelineClass), 608}, {"GstPipeline", sizeof (GstPipeline), 440}, {"GstPluginDesc", sizeof (GstPluginDesc), 112}, - {"GstPresetInterface", sizeof (GstPresetInterface), 112}, {"GstProxyPadClass", sizeof (GstProxyPadClass), 240}, {"GstProxyPad", sizeof (GstProxyPad), 528}, {"GstQuery", sizeof (GstQuery), 72}, @@ -58,15 +56,12 @@ static GstCheckABIStruct list[] = { {"GstSystemClockClass", sizeof (GstSystemClockClass), 296}, {"GstSystemClock", sizeof (GstSystemClock), 168}, {"GstTagList", sizeof (GstTagList), 64,}, - {"GstTagSetterInterface", sizeof (GstTagSetterInterface), 16}, {"GstTaskClass", sizeof (GstTaskClass), 224}, {"GstTask", sizeof (GstTask), 200}, {"GstTaskPoolClass", sizeof (GstTaskPoolClass), 248}, {"GstTaskPool", sizeof (GstTaskPool), 128}, {"GstTimedValue", sizeof (GstTimedValue), 16}, - {"GstTocSetterInterface", sizeof (GstTocSetterInterface), 16}, {"GstTypeFind", sizeof (GstTypeFind), 64}, - {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 48}, {"GstValueTable", sizeof (GstValueTable), 64}, {NULL, 0, 0} }; diff --git a/tests/check/gst/struct_x86_64.h b/tests/check/gst/struct_x86_64.h index b7a2952..5794580 100644 --- a/tests/check/gst/struct_x86_64.h +++ b/tests/check/gst/struct_x86_64.h @@ -11,7 +11,6 @@ static GstCheckABIStruct list[] = { {"GstBusClass", sizeof (GstBusClass), 232}, {"GstBus", sizeof (GstBus), 128}, {"GstCaps", sizeof (GstCaps), 64}, - {"GstChildProxyInterface", sizeof (GstChildProxyInterface), 88}, {"GstClockClass", sizeof (GstClockClass), 264}, {"GstClockEntry", sizeof (GstClockEntry), 112}, {"GstClock", sizeof (GstClock), 128}, @@ -45,7 +44,6 @@ static GstCheckABIStruct list[] = { {"GstPipelineClass", sizeof (GstPipelineClass), 608}, {"GstPipeline", sizeof (GstPipeline), 440}, {"GstPluginDesc", sizeof (GstPluginDesc), 112}, - {"GstPresetInterface", sizeof (GstPresetInterface), 112}, {"GstProxyPadClass", sizeof (GstProxyPadClass), 240}, {"GstProxyPad", sizeof (GstProxyPad), 528}, {"GstQuery", sizeof (GstQuery), 72}, @@ -58,15 +56,12 @@ static GstCheckABIStruct list[] = { {"GstSystemClockClass", sizeof (GstSystemClockClass), 296}, {"GstSystemClock", sizeof (GstSystemClock), 168}, {"GstTagList", sizeof (GstTagList), 64,}, - {"GstTagSetterInterface", sizeof (GstTagSetterInterface), 16}, {"GstTaskClass", sizeof (GstTaskClass), 224}, {"GstTask", sizeof (GstTask), 200}, {"GstTaskPoolClass", sizeof (GstTaskPoolClass), 248}, {"GstTaskPool", sizeof (GstTaskPool), 128}, {"GstTimedValue", sizeof (GstTimedValue), 16}, - {"GstTocSetterInterface", sizeof (GstTocSetterInterface), 16}, {"GstTypeFind", sizeof (GstTypeFind), 64}, - {"GstURIHandlerInterface", sizeof (GstURIHandlerInterface), 48}, {"GstValueTable", sizeof (GstValueTable), 64}, {NULL, 0, 0} }; diff --git a/tests/check/libs/adapter.c b/tests/check/libs/adapter.c index df740f9..a99c8e0 100644 --- a/tests/check/libs/adapter.c +++ b/tests/check/libs/adapter.c @@ -834,6 +834,70 @@ GST_START_TEST (test_merge) GST_END_TEST; +GST_START_TEST (test_take_buffer_fast) +{ + GstAdapter *adapter; + GstBuffer *buffer; + + adapter = gst_adapter_new (); + fail_if (adapter == NULL); + + buffer = gst_buffer_new_and_alloc (5); + fail_if (buffer == NULL); + gst_adapter_push (adapter, buffer); + + buffer = gst_buffer_new_and_alloc (10); + fail_if (buffer == NULL); + gst_adapter_push (adapter, buffer); + + buffer = gst_buffer_new_and_alloc (15); + fail_if (buffer == NULL); + gst_adapter_push (adapter, buffer); + + fail_unless (gst_adapter_available (adapter) == 30); + + buffer = gst_adapter_take_buffer_fast (adapter, 30); + fail_unless (gst_adapter_available (adapter) == 0); + fail_unless (gst_buffer_n_memory (buffer) == 3); + fail_unless (gst_buffer_get_sizes_range (buffer, 0, 1, NULL, NULL) == 5); + fail_unless (gst_buffer_get_sizes_range (buffer, 1, 1, NULL, NULL) == 10); + fail_unless (gst_buffer_get_sizes_range (buffer, 2, 1, NULL, NULL) == 15); + gst_buffer_unref (buffer); + + fail_unless (gst_adapter_available (adapter) == 0); + + buffer = gst_buffer_new_and_alloc (10); + fail_if (buffer == NULL); + gst_adapter_push (adapter, buffer); + + buffer = gst_buffer_new_and_alloc (20); + fail_if (buffer == NULL); + gst_adapter_push (adapter, buffer); + + gst_adapter_flush (adapter, 2); + fail_unless (gst_adapter_available (adapter) == 28); + + buffer = gst_adapter_take_buffer_fast (adapter, 10); + fail_unless (gst_buffer_n_memory (buffer) == 2); + fail_unless (gst_buffer_get_sizes_range (buffer, 0, 1, NULL, NULL) == 8); + fail_unless (gst_buffer_get_sizes_range (buffer, 1, 1, NULL, NULL) == 2); + fail_unless (gst_adapter_available (adapter) == 18); + gst_buffer_unref (buffer); + + buffer = gst_adapter_take_buffer_fast (adapter, 8); + fail_unless (gst_buffer_n_memory (buffer) == 1); + fail_unless (gst_buffer_get_size (buffer) == 8); + fail_unless (gst_adapter_available (adapter) == 10); + gst_buffer_unref (buffer); + + gst_adapter_clear (adapter); + fail_unless (gst_adapter_available (adapter) == 0); + + g_object_unref (adapter); +} + +GST_END_TEST; + static Suite * gst_adapter_suite (void) { @@ -853,6 +917,7 @@ gst_adapter_suite (void) tcase_add_test (tc_chain, test_scan); tcase_add_test (tc_chain, test_take_list); tcase_add_test (tc_chain, test_merge); + tcase_add_test (tc_chain, test_take_buffer_fast); return s; } diff --git a/tests/examples/Makefile.in b/tests/examples/Makefile.in index cd5d232..2c60d86 100644 --- a/tests/examples/Makefile.in +++ b/tests/examples/Makefile.in @@ -321,6 +321,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -331,7 +332,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tests/examples/adapter/Makefile.in b/tests/examples/adapter/Makefile.in index f5edcc8..e1ea73b 100644 --- a/tests/examples/adapter/Makefile.in +++ b/tests/examples/adapter/Makefile.in @@ -312,6 +312,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -322,7 +323,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tests/examples/controller/Makefile.in b/tests/examples/controller/Makefile.in index 94ed384..45172cd 100644 --- a/tests/examples/controller/Makefile.in +++ b/tests/examples/controller/Makefile.in @@ -321,6 +321,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -331,7 +332,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tests/examples/helloworld/Makefile.in b/tests/examples/helloworld/Makefile.in index 5294d8b..9ef9699 100644 --- a/tests/examples/helloworld/Makefile.in +++ b/tests/examples/helloworld/Makefile.in @@ -311,6 +311,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -321,7 +322,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tests/examples/launch/Makefile.in b/tests/examples/launch/Makefile.in index 39c4e09..9d7460b 100644 --- a/tests/examples/launch/Makefile.in +++ b/tests/examples/launch/Makefile.in @@ -312,6 +312,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -322,7 +323,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tests/examples/manual/Makefile.in b/tests/examples/manual/Makefile.in index 631082a..61e577f 100644 --- a/tests/examples/manual/Makefile.in +++ b/tests/examples/manual/Makefile.in @@ -671,6 +671,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -681,7 +682,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tests/examples/memory/Makefile.in b/tests/examples/memory/Makefile.in index 12672d1..ba23e2a 100644 --- a/tests/examples/memory/Makefile.in +++ b/tests/examples/memory/Makefile.in @@ -313,6 +313,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -323,7 +324,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tests/examples/metadata/Makefile.in b/tests/examples/metadata/Makefile.in index 5a470a8..0b435ad 100644 --- a/tests/examples/metadata/Makefile.in +++ b/tests/examples/metadata/Makefile.in @@ -311,6 +311,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -321,7 +322,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tests/examples/queue/Makefile.in b/tests/examples/queue/Makefile.in index a9d7dca..2c47296 100644 --- a/tests/examples/queue/Makefile.in +++ b/tests/examples/queue/Makefile.in @@ -311,6 +311,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -321,7 +322,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tests/examples/stepping/Makefile.in b/tests/examples/stepping/Makefile.in index 37f3398..4aba65e 100644 --- a/tests/examples/stepping/Makefile.in +++ b/tests/examples/stepping/Makefile.in @@ -311,6 +311,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -321,7 +322,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tests/examples/streams/Makefile.in b/tests/examples/streams/Makefile.in index b106c81..1d8c9fc 100644 --- a/tests/examples/streams/Makefile.in +++ b/tests/examples/streams/Makefile.in @@ -320,6 +320,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -330,7 +331,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tests/examples/typefind/Makefile.in b/tests/examples/typefind/Makefile.in index 97dc803..35fc69f 100644 --- a/tests/examples/typefind/Makefile.in +++ b/tests/examples/typefind/Makefile.in @@ -311,6 +311,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -321,7 +322,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in index d0bb5d8..d3fc0f8 100644 --- a/tests/misc/Makefile.in +++ b/tests/misc/Makefile.in @@ -256,6 +256,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -266,7 +267,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tools/Makefile.in b/tools/Makefile.in index c79e667..5332ca3 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -376,6 +376,7 @@ GTKDOC_DEPS_CFLAGS = @GTKDOC_DEPS_CFLAGS@ GTKDOC_DEPS_LIBS = @GTKDOC_DEPS_LIBS@ GTKDOC_MKPDF = @GTKDOC_MKPDF@ GTKDOC_REBASE = @GTKDOC_REBASE@ +HAVE_DOCBOOK2HTML = @HAVE_DOCBOOK2HTML@ HAVE_DOCBOOK2PS = @HAVE_DOCBOOK2PS@ HAVE_DVIPS = @HAVE_DVIPS@ HAVE_EPSTOPDF = @HAVE_EPSTOPDF@ @@ -386,7 +387,6 @@ HAVE_PNGTOPNM = @HAVE_PNGTOPNM@ HAVE_PNMTOPS = @HAVE_PNMTOPS@ HAVE_PS2PDF = @HAVE_PS2PDF@ HAVE_XMLLINT = @HAVE_XMLLINT@ -HAVE_XSLTPROC = @HAVE_XSLTPROC@ HOST_CPU = @HOST_CPU@ HTML_DIR = @HTML_DIR@ INSTALL = @INSTALL@ diff --git a/tools/gst-launch.1.in b/tools/gst-launch.1.in index 13eadb3..aaf29f7 100644 --- a/tools/gst-launch.1.in +++ b/tools/gst-launch.1.in @@ -101,6 +101,16 @@ ANSI escape sequences. Using this option causes \fIGStreamer\fP to print messages without color. Setting the \fBGST_DEBUG_NO_COLOR\fR environment variable will achieve the same thing. .TP 8 +.B \-\-gst\-debug\-color\-mode +\fIGStreamer\fP normally prints debugging messages so that the +messages are color-coded when printed to a terminal that handles +ANSI escape sequences (on *nix), or uses W32 console API to color the +messages printed into a console (on W32). Using this option causes +\fIGStreamer\fP to print messages without color ('off' or 'disable'), +print messages with default colors ('on' or 'auto'), or print messages +using ANSI escape sequences for coloring ('unix'). Setting the +\fBGST_DEBUG_COLOR_MODE\fR environment variable will achieve the same thing. +.TP 8 .B \-\-gst\-debug\-disable Disables debugging. .TP 8 diff --git a/tools/gst-plot-timeline.py b/tools/gst-plot-timeline.py index c2a30b5..e52e265 100755 --- a/tools/gst-plot-timeline.py +++ b/tools/gst-plot-timeline.py @@ -2,7 +2,7 @@ # # based on plot-timeline.py by Federico Mena-Quintero <federico at ximian dotcom> # example: -# GST_DEBUG_NO_COLOR=1 GST_DEBUG="*:3" gst-launch-1.0 2>debug.log audiotestsrc num-buffers=10 ! audioconvert ! alsasink +# GST_DEBUG_COLOR_MODE=off GST_DEBUG="*:3" gst-launch-1.0 2>debug.log audiotestsrc num-buffers=10 ! audioconvert ! alsasink # gst-plot-timeline.py debug.log --output=debug.png import math @@ -271,7 +271,7 @@ def main(args): return 1 if len(args) != 1: - print 'Please specify only one input filename, which is an debug log taken with "GST_DEBUG_NO_COLOR=1 GST_DEBUG=XXX <application>"' + print 'Please specify only one input filename, which is an debug log taken with "GST_DEBUG_COLOR_MODE=off GST_DEBUG=XXX <application>"' return 1 in_filename = args[0] diff --git a/win32/common/config.h b/win32/common/config.h index b0fe69d..1818c19 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 "2013-07-11" +#define GST_PACKAGE_RELEASE_DATETIME "2013-07-29" /* Define if static plugins should be built */ #undef GST_PLUGIN_BUILD_STATIC @@ -357,7 +357,7 @@ #define PACKAGE_NAME "GStreamer" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GStreamer 1.1.2" +#define PACKAGE_STRING "GStreamer 1.1.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "gstreamer" @@ -366,7 +366,7 @@ #undef PACKAGE_URL /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.1.2" +#define PACKAGE_VERSION "1.1.3" /* directory where plugins are located */ #ifdef _DEBUG @@ -404,7 +404,7 @@ #undef USE_POISONING /* Version number of package */ -#define VERSION "1.1.2" +#define VERSION "1.1.3" /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel). */ diff --git a/win32/common/gstenumtypes.c b/win32/common/gstenumtypes.c index 9a54a03..508a9cd 100644 --- a/win32/common/gstenumtypes.c +++ b/win32/common/gstenumtypes.c @@ -755,6 +755,25 @@ gst_debug_color_flags_get_type (void) return (GType) id; } +GType +gst_debug_color_mode_get_type (void) +{ + static gsize id = 0; + static const GEnumValue values[] = { + {C_ENUM (GST_DEBUG_COLOR_MODE_OFF), "GST_DEBUG_COLOR_MODE_OFF", "off"}, + {C_ENUM (GST_DEBUG_COLOR_MODE_ON), "GST_DEBUG_COLOR_MODE_ON", "on"}, + {C_ENUM (GST_DEBUG_COLOR_MODE_UNIX), "GST_DEBUG_COLOR_MODE_UNIX", "unix"}, + {0, NULL, NULL} + }; + + if (g_once_init_enter (&id)) { + GType tmp = g_enum_register_static ("GstDebugColorMode", values); + g_once_init_leave (&id, tmp); + } + + return (GType) id; +} + /* enumerations from "gstiterator.h" */ GType gst_iterator_result_get_type (void) diff --git a/win32/common/gstenumtypes.h b/win32/common/gstenumtypes.h index d015fa0..b10187f 100644 --- a/win32/common/gstenumtypes.h +++ b/win32/common/gstenumtypes.h @@ -93,6 +93,8 @@ GType gst_debug_level_get_type (void); #define GST_TYPE_DEBUG_LEVEL (gst_debug_level_get_type()) GType gst_debug_color_flags_get_type (void); #define GST_TYPE_DEBUG_COLOR_FLAGS (gst_debug_color_flags_get_type()) +GType gst_debug_color_mode_get_type (void); +#define GST_TYPE_DEBUG_COLOR_MODE (gst_debug_color_mode_get_type()) /* enumerations from "gstiterator.h" */ GType gst_iterator_result_get_type (void); diff --git a/win32/common/gstversion.h b/win32/common/gstversion.h index 81a4eab..4991109 100644 --- a/win32/common/gstversion.h +++ b/win32/common/gstversion.h @@ -57,7 +57,7 @@ G_BEGIN_DECLS * * The micro version of GStreamer at compile time: */ -#define GST_VERSION_MICRO (2) +#define GST_VERSION_MICRO (3) /** * GST_VERSION_NANO: * diff --git a/win32/common/libgstbase.def b/win32/common/libgstbase.def index 7044ad5..09a13ab 100644 --- a/win32/common/libgstbase.def +++ b/win32/common/libgstbase.def @@ -16,6 +16,7 @@ EXPORTS gst_adapter_push gst_adapter_take gst_adapter_take_buffer + gst_adapter_take_buffer_fast gst_adapter_take_list gst_adapter_unmap gst_base_parse_add_index_entry diff --git a/win32/common/libgstreamer.def b/win32/common/libgstreamer.def index 4f89ad1..55a3616 100644 --- a/win32/common/libgstreamer.def +++ b/win32/common/libgstreamer.def @@ -358,9 +358,11 @@ EXPORTS gst_debug_category_reset_threshold gst_debug_category_set_threshold gst_debug_color_flags_get_type + gst_debug_color_mode_get_type gst_debug_construct_term_color gst_debug_construct_win_color gst_debug_get_all_categories + gst_debug_get_color_mode gst_debug_get_default_threshold gst_debug_graph_details_get_type gst_debug_is_active @@ -375,6 +377,8 @@ EXPORTS gst_debug_remove_log_function gst_debug_remove_log_function_by_data gst_debug_set_active + gst_debug_set_color_mode + gst_debug_set_color_mode_from_string gst_debug_set_colored gst_debug_set_default_threshold gst_debug_set_threshold_for_name @@ -499,6 +503,7 @@ EXPORTS gst_event_parse_context gst_event_parse_flush_stop gst_event_parse_gap + gst_event_parse_group_id gst_event_parse_latency gst_event_parse_qos gst_event_parse_seek @@ -511,6 +516,7 @@ EXPORTS gst_event_parse_tag gst_event_parse_toc gst_event_parse_toc_select + gst_event_set_group_id gst_event_set_seqnum gst_event_set_stream_flags gst_event_type_flags_get_type @@ -629,6 +635,7 @@ EXPORTS gst_message_parse_clock_lost gst_message_parse_clock_provide gst_message_parse_error + gst_message_parse_group_id gst_message_parse_have_context gst_message_parse_info gst_message_parse_new_clock @@ -650,6 +657,7 @@ EXPORTS gst_message_parse_toc gst_message_parse_warning gst_message_set_buffering_stats + gst_message_set_group_id gst_message_set_qos_stats gst_message_set_qos_values gst_message_set_seqnum @@ -922,6 +930,7 @@ EXPORTS gst_query_get_n_scheduling_modes gst_query_get_structure gst_query_get_type + gst_query_has_context_type gst_query_has_scheduling_mode gst_query_has_scheduling_mode_with_flags gst_query_new_accept_caps @@ -1286,6 +1295,7 @@ EXPORTS gst_util_get_timestamp gst_util_greatest_common_divisor gst_util_greatest_common_divisor_int64 + gst_util_group_id_next gst_util_guint64_to_gdouble gst_util_seqnum_compare gst_util_seqnum_next |