Tim-Philipp Müller
29c266ccff
Merge remote-tracking branch 'origin/master' into 0.11
...
Conflicts:
common
docs/libs/gst-plugins-base-libs.types
ext/pango/gsttextoverlay.c
ext/vorbis/gstvorbisdec.c
gst/playback/gstplaysink.c
gst/playback/gstplaysinkconvertbin.c
sys/ximage/ximagesink.c
sys/xvimage/xvimagesink.c
2012-03-08 20:31:34 +00:00
Jonathan Matthew
bc1fb43408
discoverer: don't change result for missing plugin errors
...
https://bugzilla.gnome.org/show_bug.cgi?id=671047
2012-03-03 13:50:34 +00:00
Wim Taymans
e44dd9db8f
Merge branch 'master' into 0.11
...
Conflicts:
gst-libs/gst/audio/gstaudioencoder.c
gst-libs/gst/pbutils/gstdiscoverer.c
2012-02-16 14:23:28 +01:00
Tim-Philipp Müller
e40ea30972
discoverer: try harder to obtain a duration if we don't get one right away
...
If we don't get a duration right away, set the pipeline to playing
and sleep a bit, then try again. This is ugly, but the least worst
we can do right now. The alternative would be to make parsers etc.
return some bogus duration estimate even after only having pushed
a single frame, for example.
Fixes discoverer showing 0 durations for some mp3 and aac files
(e.g. soweto-adts.aac).
2012-02-14 19:36:43 +00:00
Tim-Philipp Müller
24749aa2db
discoverer: mark GError argument of "discovered" signal with STATIC_SCOPE
...
So the error is passed to the callback as is without a copy being made.
2012-02-01 19:34:22 +00:00
Tim-Philipp Müller
ef75dd6e90
discoverer: use G_TYPE_ERROR instead of GST_TYPE_G_ERROR
2012-01-22 01:47:14 +00:00
Tim-Philipp Müller
68785cc2e7
discoverer: fix up for GstTagList != GstStructure
2012-01-12 23:25:22 +00:00
Tim-Philipp Müller
0461ed2ada
Merge remote-tracking branch 'origin/master' into 0.11
...
Conflicts:
gst-libs/gst/pbutils/gstdiscoverer-types.c
gst-libs/gst/pbutils/gstdiscoverer.c
tests/check/Makefile.am
2012-01-12 23:21:17 +00:00
Vincent Penquerc'h
ab7e72ad70
discoverer: fix structure leak
...
I hit the 'misc' one, but let's also make sure the topology
one get freed as well, though I do not know if this can happen
twice.
2012-01-12 14:27:25 +00:00
Vincent Penquerc'h
96e40584ce
discoverer: fix caps and discoverer object ref leaks
2012-01-11 12:16:28 +00:00
Vincent Penquerc'h
9ab18d7a68
discoverer: add a few consts where appropriate
2012-01-11 11:55:59 +00:00
Vincent Penquerc'h
7ad6431837
discoverer: fix pad leak
2012-01-11 11:55:36 +00:00
Tim-Philipp Müller
b155e094ed
discoverer: use GST_TYPE_TAG_LIST for tag lists
...
They may not be structures in 0.11/1.0.
2012-01-10 18:29:22 +00:00
Tim-Philipp Müller
5f20af6ce5
discoverer: fix potential tag list leaks
...
Not that I have ever seen these in practice, but if they
can't happen we may just as well just assign the new tag
list. Merge properly to be on the safe side, and also
avoid a useless tag list copy in the normal case where
there is no tag list yet.
2012-01-10 18:29:21 +00:00
Tim-Philipp Müller
b794f78d26
discoverer: fix potential caps leak
...
in last else chunk.
2012-01-10 18:29:21 +00:00
Sebastian Dröge
dc8984d76c
Merge branch 'master' into 0.11
...
Conflicts:
gst-libs/gst/app/gstappsrc.c
gst-libs/gst/audio/multichannel.h
gst-libs/gst/video/videooverlay.c
gst/playback/gstplaysink.c
gst/playback/gststreamsynchronizer.c
tests/check/Makefile.am
win32/common/libgstvideo.def
2012-01-10 13:15:12 +01:00
Tim-Philipp Müller
1031fedaf0
discoverer: make is_subtitle_caps thread-safe
2012-01-07 19:39:42 +00:00
Tim-Philipp Müller
fb6d09055a
Merge remote-tracking branch 'origin/master' into 0.11
...
Conflicts:
ext/alsa/gstalsadeviceprobe.c
ext/alsa/gstalsamixer.c
ext/pango/gsttextoverlay.c
ext/pango/gsttextoverlay.h
gst-libs/gst/audio/gstaudiobasesink.c
gst-libs/gst/audio/gstaudioringbuffer.c
gst-libs/gst/audio/gstaudiosrc.c
gst-libs/gst/video/Makefile.am
gst-libs/gst/video/video.c
gst/encoding/gststreamcombiner.c
gst/encoding/gststreamsplitter.c
gst/playback/gstplaybasebin.c
gst/playback/gststreamsynchronizer.c
gst/playback/gstsubtitleoverlay.c
gst/playback/gsturidecodebin.c
sys/xvimage/xvimagesink.c
tests/examples/Makefile.am
win32/common/libgstvideo.def
Video overlay composition disabled for now, needs
porting to buffer meta.
2011-12-08 01:19:03 +00:00
Tim-Philipp Müller
0d98aa25b8
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'll change these
over to the new API once we depend on glib >= 2.32.
Replace g_thread_create() with g_thread_try_new().
2011-12-04 17:16:30 +00:00
Tim-Philipp Müller
177525f89f
Merge remote-tracking branch 'origin/master' into 0.11
...
Conflicts:
gst-libs/gst/netbuffer/gstnetbuffer.c
gst/ffmpegcolorspace/avcodec.h
gst/ffmpegcolorspace/gstffmpegcodecmap.c
gst/ffmpegcolorspace/imgconvert.c
gst/ffmpegcolorspace/imgconvert_template.h
gst/ffmpegcolorspace/mem.c
gst/playback/README
gst/playback/gstplaybasebin.c
gst/playback/gstplaybasebin.h
gst/playback/gstplaybin.c
sys/v4l/v4lmjpegsrc_calls.c
sys/v4l/videodev_mjpeg.h
tests/check/elements/gnomevfssink.c
2011-12-02 11:10:17 +00:00
Piotr Fusik
14644457b0
various: typo fixes
...
Fix typos in code and docs. Fixes. #658984
2011-12-02 12:03:27 +01:00
Wim Taymans
7402d3a3d2
update for _get_caps() -> _query_caps()
2011-11-15 18:04:17 +01:00
Wim Taymans
308f6301a8
update for pad probe api changes
2011-11-08 11:08:21 +01:00
Wim Taymans
616e9b706e
fix for new pad probe types
...
Restore the previous behaviour by only blocking downstream items and not
upstream events.
2011-11-07 17:10:48 +01:00
Wim Taymans
5bdfd6d899
structure: fix for api update
2011-11-02 09:04:27 +01:00
Tim-Philipp Müller
b52c5819fb
Update for pad API changes
...
GstProbeType, GstProbeReturn and GstActivateMode -> GstPad*
2011-11-01 00:34:28 +00:00
Edward Hervey
8268a7a20e
discoverer: Only call gst_video_info_from_caps on raw video
2011-10-11 17:42:35 +02:00
Wim Taymans
dc2b00adb8
pbutils: port to new API
2011-08-29 11:38:01 +02:00
Wim Taymans
e1287b97ab
Merge branch 'master' into 0.11
...
Conflicts:
ext/ogg/gstoggmux.c
gst-libs/gst/audio/audio.c
gst-libs/gst/audio/audio.h
gst-libs/gst/audio/multichannel.h
gst-libs/gst/pbutils/Makefile.am
gst-libs/gst/pbutils/gstdiscoverer.c
gst/playback/gstplaysinkaudioconvert.c
gst/playback/gstplaysinkvideoconvert.c
win32/common/libgstaudio.def
2011-08-29 11:37:36 +02:00
Tim-Philipp Müller
67a12c9c72
pbutils: don't depend on libgstvideo just to parse some caps
...
Let's extract those ints and fractions ourselves and not depend
on libgstvideo.
2011-08-27 14:57:41 +01:00
Vincent Penquerc'h
921b92ce06
discoverer: retrieve audio track language from tags too
...
https://bugzilla.gnome.org/show_bug.cgi?id=657257
2011-08-26 10:05:51 +02:00
Vincent Penquerc'h
e51cbc136b
discoverer: consider subtitles as raw
...
Otherwise, discoverer will generated an "inner" codec
where there can be a tranformation (eg, kate -> DVD SPU,
and various ->text/x-pango-markup).
https://bugzilla.gnome.org/show_bug.cgi?id=639055
2011-08-26 10:05:51 +02:00
Vincent Penquerc'h
143a620701
discoverer: add application/x-kate to subtitles caps
...
https://bugzilla.gnome.org/show_bug.cgi?id=639055
2011-08-26 10:05:50 +02:00
Vincent Penquerc'h
8438bc038a
discoverer: get language from other tags if we did not get it already
...
https://bugzilla.gnome.org/show_bug.cgi?id=639055
2011-08-26 10:05:50 +02:00
Vincent Penquerc'h
4b5bfb1fd4
discoverer: add subtitles API
...
https://bugzilla.gnome.org/show_bug.cgi?id=639055
2011-08-26 10:05:50 +02:00
Wim Taymans
e904c529e3
fix for _negotiated_caps() change
2011-08-15 12:18:15 +02:00
Tim-Philipp Müller
3d25fe33ea
gst-libs: update for query API changes
2011-07-27 01:16:08 +01:00
Edward Hervey
c49bc45b1b
discoverer: decodebin2 is dead, long live decodebin
2011-07-15 12:32:25 +02:00
Wim Taymans
f372ec1f54
Merge branch 'master' into 0.11
...
Conflicts:
configure.ac
docs/plugins/inspect/plugin-gnomevfs.xml
2011-06-21 17:57:56 +02:00
Edward Hervey
b2b1a7be1b
discoverer: Allow GError* argument to be NULL
...
This is how other methods taking GError* arguments behave.
Fixes #652838
2011-06-18 11:16:19 +02:00
Wim Taymans
6a254de438
video: port to new API
...
Add support for palette again.
Rewrite setup code for videoconvert using the new video methods.
2011-06-17 15:39:50 +02:00
Wim Taymans
c88ee10c9b
Merge branch 'master' into 0.11
...
Conflicts:
ext/theora/gsttheoraenc.c
2011-06-06 16:27:12 +02:00
David Schleef
0778efcfde
discoverer: fix c99-ism
2011-06-04 12:27:47 -07:00
Wim Taymans
f91c753959
probes: port to new API for blocking and probes
2011-06-01 19:34:54 +02:00
Sebastian Dröge
318ed07598
Revert "-base_port to new query API"
...
This reverts commit c9f4e0676b
.
2011-05-17 11:25:31 +02:00
Sebastian Dröge
2987ad9358
discoverer: Update for the new gst_pad_get_caps() signature
2011-05-16 15:35:40 +02:00
Wim Taymans
c9f4e0676b
-base_port to new query API
2011-05-10 18:39:07 +02:00
Wim Taymans
556afdef97
message: don't acces the structure directly
2011-05-10 13:35:49 +02:00
Wim Taymans
95f7fd8edf
Merge branch 'master' into 0.11-fdo
2011-03-15 11:11:56 +01:00
Arun Raghavan
9ffb8859d7
discoverer: Don't wait for subtitle streams to preroll
...
Subtitle streams being parse can cause the pipeline to wait indefinitely
to PREROLL. This makes subtitle streams got to PAUSED even if no data is
available. This should not be a cause for concern as we don't expect to
get much data for subtitle streams other than language tags from the
container.
https://bugzilla.gnome.org/show_bug.cgi?id=632291
2011-03-08 23:02:18 +05:30
Wim Taymans
b967bf531b
pbutils: use GObject as the base class
...
We can't subclass miniobject so use GObject as the base class,
2011-02-28 11:50:03 +01:00
Arun Raghavan
8fc424bcbf
discoverer: Chain dispose() up to parent class
2011-02-22 13:49:12 +01:00
Arun Raghavan
8d2b69384a
discoverer: Keep a ref for the async timeout callback
...
This makes sure we maintain a ref on the discoverer object while the
async timeout callback is alive to prevent a potential crash if the
object is freed while the callback is pending.
https://bugzilla.gnome.org/show_bug.cgi?id=641706
2011-02-22 13:49:12 +01:00
Arun Raghavan
40c4fe8fbe
discoverer: Use g_signal_connect_object instead of g_signal_connect
...
We want to make sure the discoverer object passed to the various
callbacks doesn't become invalid if a callback is pending and the object
is free'd in the mean time.
https://bugzilla.gnome.org/show_bug.cgi?id=641706
2011-02-22 13:49:12 +01:00
Stefan Kost
7e06d35250
discoverer: don't leak parent tags
2011-02-16 12:01:03 +02:00
Stefan Kost
c201ff3de3
discoverer: improve logging (and reindent)
...
Add more logging for the tag merging and use the _OBJECT flavour more.
2011-02-16 12:01:03 +02:00
Arun Raghavan
e9ff48376b
discoverer: Use nominal bitrate if bitrate tag is unavailable
...
If the bitrate tag is unavailable, this falls back to the nominal
bitrate tag instead, if that is present.
https://bugzilla.gnome.org/show_bug.cgi?id=641860
2011-02-10 09:58:34 +02:00
Arun Raghavan
6ac2e5d384
discoverer: Drop new stream tags once preroll is done
...
This makes sure we do not touch the stream taglist once the pipeline has
been prerolled. Adding of stream tags happens in the pad event probe
which runs in a different thread from discoverer stream processing, so
modifying the tag list while discoverer might be processing it can
sometimes cause a crash.
https://bugzilla.gnome.org/show_bug.cgi?id=639778
2011-01-17 23:50:45 +00:00
Arun Raghavan
65a298fdee
discoverer: Validate timeouts before processing them
...
This avoids a race where the timeout callback is scheduled to run but we
get sufficient information to finish discovery before actually getting
around to executing the callback. See the documentation of
g_source_is_destroyed() for more details.
https://bugzilla.gnome.org/show_bug.cgi?id=639730
2011-01-17 23:50:45 +00:00
Arun Raghavan
e730ce71dc
discoverer: Make sure we call _stop() before being freed
...
This ensures that everything is properly cleaned up before the
GstDiscoverer object is freed. Specifically, it makes sure that we've
removed the async timeout callback before freeing the object to avoid a
potential crash later on.
https://bugzilla.gnome.org/show_bug.cgi?id=639755
2011-01-17 23:50:45 +00:00
Arun Raghavan
19d4a5ab4d
discoverer: Documentation updates
...
Some cosmetic changes and expands on some bits of the documentation to
make it more newbie-friendly.
2011-01-06 15:33:14 +01:00
Edward Hervey
9f6bcdd5ee
pbutils: More gtk-doc annotations
2010-12-21 18:52:04 +01:00
Edward Hervey
76afffd55f
gstdiscoverer: Don't leak tags
2010-12-19 13:45:01 +01:00
Stefan Kost
4e8956c9f1
discoverer: query seekability
...
Besides the duration we can also query the seekability of a stream. Use the new
API in the gst-discoverer tool.
API: gst_discoverer_info_get_seekable
2010-12-13 17:03:25 +02:00
Stefan Kost
ecb164675d
docs: fix wrong use of Since: keyword
2010-12-08 12:11:23 +02:00
Tim-Philipp Müller
78f33715ff
libs: use GLib 2.22 API unconditionally
2010-12-04 14:45:58 +00:00
Arun Raghavan
5cb8b39c2c
discoverer: Fix a gtk-doc gobject-introspection annotation
...
gst_discoverer_discover_uri() expects the caller to unref the returned
GstDiscovererInfo object. The corresponding gtk-doc annotation was not
updated to reflect this.
2010-11-08 11:44:28 +00:00
Edward Hervey
65cfcffbc0
discoverer: Get pad caps if we can't get negotiated caps
...
Better provide something than nothing
https://bugzilla.gnome.org/show_bug.cgi?id=632988
2010-10-24 16:19:09 +02:00
Tim-Philipp Müller
45ae532162
pbutils: make marshaller private
...
There's no reason to make the marshaller public API. Don't install
pbutils-marshal.h header file and use prefix that makes sure the
symbol doesn't get exported.
2010-10-15 19:58:04 +01:00
Tim-Philipp Müller
beae0db284
docs: improve gst_discoverer_new() docs a bit
2010-10-15 17:23:44 +01:00
Tim-Philipp Müller
b5f6f4873b
discoverer: private structs need to padding
2010-10-15 16:43:41 +01:00
Edward Hervey
a356bb268d
pbutils: rename gstdiscoverer-private.h to pbutils-private.h
2010-10-08 15:27:44 +02:00
Edward Hervey
6ecbdab1fe
discoverer: Fixup DiscovererResult handling
...
This was a leftover from the changes from a flag to an enum
2010-09-22 12:57:22 +02:00
Edward Hervey
3912e59488
discoverer: We don't need the signals from the queues
2010-09-22 12:10:24 +02:00
Stefan Kost
784d7be363
discoverer: fix docs
...
While the doc parser allows for certain variation, it is a good idea to not
use random characters here and there, but try to stick to the little markup
syntax there is.
2010-09-20 21:04:48 +03:00
Edward Hervey
f2d522670e
discoverer: Fix debug statement.
...
Fixes build on macosx
2010-09-20 16:45:32 +02:00
Edward Hervey
30b3cf8823
pbutils: New Discoverer utility
...
Fixes #625944
2010-09-20 13:11:42 +02:00