Wim Taymans
007a00cd1b
Merge branch 'master' into 0.11
...
Conflicts:
configure.ac
2012-03-22 10:45:06 +01:00
Stefan Sauer
cc445664c8
docs: fix function name and typo
2012-03-12 23:08:45 +01:00
Sebastian Dröge
a8dcb63616
libs: Fix some merge mistakes
2012-03-01 14:51:26 +01:00
Sebastian Dröge
99a8cd1048
Merge branch 'master' into 0.11
...
Conflicts:
libs/gst/base/gstcollectpads2.c
libs/gst/check/gstconsistencychecker.c
2012-03-01 14:43:01 +01:00
Stefan Sauer
9fd063e404
collectpads2: add more logging
2012-02-28 20:36:59 +01:00
Tim-Philipp Müller
1fbcc71dbd
Merge remote-tracking branch 'origin/master' into 0.11
...
Conflicts:
NEWS
RELEASE
configure.ac
docs/plugins/gstreamer-plugins.hierarchy
docs/plugins/inspect/plugin-coreelements.xml
libs/gst/base/gstcollectpads.c
libs/gst/base/gstcollectpads2.c
plugins/elements/gstfdsink.c
win32/common/config.h
win32/common/gstenumtypes.c
win32/common/gstversion.h
2012-02-27 00:08:39 +00:00
Stefan Sauer
daa5cae78b
collectpads2: rescue the annotation from collectpads
2012-02-26 23:11:23 +01:00
Stefan Sauer
b9a6b3fc6e
collectpads2: move "MT save" tags to doc body
...
It is not useful to have "MT safe" tags randomly in body, returns or since paragraphs.
2012-02-26 22:57:02 +01:00
Wim Taymans
7ab1d62c24
GST_FLOW_WRONG_STATE -> GST_FLOW_FLUSHING
2012-02-08 16:18:04 +01:00
Sebastian Dröge
753a1125dd
Merge branch 'master' into 0.11
...
Conflicts:
libs/gst/base/gstcollectpads2.c
libs/gst/base/gstcollectpads2.h
2012-01-27 15:09:35 +01:00
Sebastian Dröge
9945b2cd88
collectpads2: Move private fields from the public structs to private structs
...
Fixes bug #668764 .
2012-01-27 15:03:46 +01:00
Sebastian Dröge
34b01da26c
collectpads2: Drop the stream-start and stream-config events by default
2012-01-27 10:46:02 +01:00
Sebastian Dröge
de576f8163
collectpads2: Don't forward CAPS event automatically
2012-01-26 10:45:45 +01:00
Sebastian Dröge
6b9280b18c
collectpads2: Fix handling of the event function and document it
...
The event function is supposed to forward/drop the event in any case
now and takes ownership of the event.
2012-01-26 10:45:45 +01:00
Wim Taymans
252327f87a
Update for new gthread API
2012-01-19 09:27:04 +01:00
Wim Taymans
bc1974e962
GST_FLOW_UNEXPECTED -> GST_FLOW_EOS
2012-01-03 15:25:31 +01:00
Tim-Philipp Müller
b193d03c8a
collectpads2: fix up compilation after merge
2011-12-25 12:13:57 +00:00
Tim-Philipp Müller
f6a4af20b2
Merge remote-tracking branch 'origin/master' into 0.11
...
Conflicts:
libs/gst/base/gstbasetransform.c
libs/gst/controller/gstinterpolationcontrolsource.c
libs/gst/controller/gstlfocontrolsource.c
plugins/elements/gstfilesrc.c
Dit not merge controller or basetransform changes.
2011-12-25 11:58:12 +00:00
Mark Nauwelaerts
28e9d735bb
collectpads2: add convenience clipping function
...
... which also converts to running time; useful for typical muxer.
2011-12-19 17:45:25 +01:00
Mark Nauwelaerts
eb79c0a835
collectpads2: delay collecting buffer if a pad newly set waiting
...
... as commented; make code correspond to it (again).
2011-12-15 16:51:49 +01:00
Tim-Philipp Müller
a1daf846f3
Merge remote-tracking branch 'origin/master' into 0.11
...
Conflicts:
gst/gstobject.h
libs/gst/check/gstcheck.h
libs/gst/controller/gstcontroller.c
plugins/elements/gstidentity.c
tools/gst-xmlinspect.c
2011-12-04 15:38:09 +00:00
Tim-Philipp Müller
2666450864
Suppress deprecation warnings in selected files, for g_static_rec_mutex_* mostly
...
GStaticRecMutex is part of our API/ABI, not much we can do here in 0.10.
2011-12-04 14:38:26 +00:00
Tim-Philipp Müller
5889260d5a
Work around deprecated thread API in glib master
...
Add private replacements for deprecated functions such as
g_mutex_new(), g_mutex_free(), g_cond_new() etc., mostly
to avoid the deprecation warnings. We can't change most of
these in 0.10 because they're part of our API and ABI.
2011-12-04 13:35:38 +00:00
Wim Taymans
612b1fbb14
pad: add parent to other functions
...
Add parent to chain, chain_list, getrange and event functions.
2011-11-17 12:40:45 +01:00
Wim Taymans
b8e1506b08
Merge branch 'master' into 0.11
2011-10-28 11:33:44 +02:00
Wim Taymans
f2102d386f
coolectpads2: port to 0.11
2011-10-28 11:30:57 +02:00
Sebastian Dröge
1eb3380973
collectpads2: Fix refcount handling if a buffer was dropped due to clipping
2011-10-28 10:54:19 +02:00
Sebastian Dröge
2f100e86f6
collectpads2: Merge the clip and prepare_buffer function into one
2011-10-28 10:38:24 +02:00
Sebastian Dröge
415f3dd808
collectpads2: Merge clipping API from old collectpads
2011-10-28 10:38:24 +02:00
Mark Nauwelaerts
ce88f417b1
collectpads2: avoid hanging in case of sparse newsegment events
...
... in the extent that a non-waiting pad (so indicated by newsegment)
turns out to provide the best buffer, which is then forced to waiting
for book-keeping purposes, but that should only be temporary.
See bug #415754 .
2011-10-28 09:39:00 +02:00
Sebastian Dröge
2a13275985
collectpads2: Use G_DEFINE_TYPE instead of GST_BOILERPLATE
2011-10-28 09:38:35 +02:00
Sebastian Dröge
6f231f89d6
base: Add collectpads2
...
This handles muxing of sparse/subtitle streams and has
lots of cleanup. Still missing is special support for
live streams but this can be added later without breaking
API/ABI.
Based on the version from the videomixer plugin.
https://bugzilla.gnome.org/show_bug.cgi?id=415754
2011-10-28 09:36:06 +02:00