mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-08 13:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity
15872 commits 44 branches 1507 tags 445 MiB
Commit graph

320 commits

Author SHA1 Message Date
Arnaud Vrac ef5823cc9b basetextoverlay: just forward the seek event to sink pads like other events 
https://bugzilla.gnome.org/show_bug.cgi?id=735844
 2014-09-05 11:08:04 +03:00
Nicola Murino 501a295fa1 basetextoverlay: remove unneeded cairo transparence setting 
he code here:

http://cgit.freedesktop.org/gstreamer/gst-plugins-base/tree/ext/pango/gstbasetextoverlay.c#n1554

should make transparent the box that contains the text, I think this code is
not correct, it should be:

if (overlay->want_shading) {
    double alpha = overlay->shading_value / 255.0;
    cairo_paint_with_alpha (cr, alpha);
  }

however I think this code could be removed, we already do a shaded background,
why shade the box behind the text with cairo too? only one shading is needed so
we must shade with cairo or with methods like these:

http://cgit.freedesktop.org/gstreamer/gst-plugins-base/tree/ext/pango/gstbasetextoverlay.c#n1642

not both

https://bugzilla.gnome.org/show_bug.cgi?id=736028
 2014-09-04 14:13:55 +03:00
Nicola Murino ad16f15ee4 basetextoverlay: Make shading_value a property 
https://bugzilla.gnome.org/show_bug.cgi?id=735879
 2014-09-04 11:17:55 +03:00
Thiago Santos a65b307349 basetextoverlay: properly fallback to non-overlay caps 
When downstream claims to accept the overlay meta but fails to
provide it in the allocation query, properly fallback to setting
a new caps without the overlay meta as that is not going to be used.

Only do this if the original caps doesn't have the overlay already,
otherwise there isn't much that can be done.

https://bugzilla.gnome.org/show_bug.cgi?id=735800
 2014-09-01 15:23:09 -03:00
Sebastian Dröge e783a366cb textoverlay: Don't hold any mutexes while calling negotiate 
It's not done in any other code calling negotiate and will cause deadlocks
as it is sending events and queries in the pipeline.

Specifically this pipeline was deadlocking:
gst-launch-1.0 videotestsrc ! textoverlay ! textoverlay ! fakesink
 2014-09-01 12:28:24 +03:00
Tim-Philipp Müller 5fc94da399 textoverlay: remove code that can't be reached 
If this code could ever be reached, it would leak
memory (CID 1231978), but gst_caps_get_features()
never returns NULL, so that can't happen.
 2014-08-29 19:18:55 +01:00
Thiago Santos 6bf3356967 basetextoverlay: fix caps negotiation filter 2014-08-13 11:22:52 -03:00
Thiago Santos a080c0ebbf basetextoverlay: rework caps negotiation 
Make textoverlay negotiate caps more correctly.

1) Check what caps we received in the video-sink
2) If it already has the overlay meta -> use it directly
3) If it doesn't, textoverlay try adding the overlay meta and using it,
   if downstream doesn't support it, just use what is received in the
   video-sink
4) Check if the allocation query also supports the meta to enable
   really using it

Before it wasn't really doing renegotiation of any kind, just
re-checking if it should use the overlay meta or not

Also had to update the caps in the test as memory:SystemMemory seems
to be required when you use a caps feature otherwise intersection/subset
checks will fail.

https://bugzilla.gnome.org/show_bug.cgi?id=733916
 2014-08-11 11:40:44 -03:00
Thiago Santos c20e044ef0 basetextoverlay: always intersect with the filter caps 
Avoids returning values that upstream can't produce

https://bugzilla.gnome.org/show_bug.cgi?id=733916
 2014-08-11 10:30:58 -03:00
Thibault Saunier 7f9aac386f pango: Do not try to add a feature to a caps features ANY 
It does not makes sense and asserts
 2014-05-11 00:12:30 +02:00
Sebastian Dröge 3e2a693ca9 pango: Make static caps actually static to fix a memory leak 2014-04-15 13:57:08 +02:00
Josep Torra 40c2d3c088 textrender: push segment event after caps event 
Fixes warning "Sticky event misordering, got 'segment' before 'caps'".
 2014-04-11 10:43:39 +02:00
Adrien Schwartzentruber a9d98c57a4 pango: demote debug WARNING to LOG for variable framerate video input 
No need why we need to warn about that, it's perfectly allowed.

https://bugzilla.gnome.org/show_bug.cgi?id=725837
 2014-03-06 17:51:11 +00:00
Matthieu Bouron ed8e7d4275 pango: basetextoverlay: handle video/x-raw(ANY) if downstream supports the GstVideoOverlayCompositionMeta API 
https://bugzilla.gnome.org/show_bug.cgi?id=721953
 2014-03-05 20:38:53 +01:00
Thiago Santos ec7724c095 basetextoverlay: use correct segment for text 
video time uses the 'segment' and the text time should use
the 'text_segment'.

If different segments are used for video and text it would
lead to out of sync video/subtitles.
 2014-02-07 02:14:52 -03:00
Tim-Philipp Müller 448c006b02 textoverlay: don't leak GAP events 2014-01-10 11:17:04 +00:00
Tim-Philipp Müller b1ff48c1a1 docs: remove old 0.10 Since markers 
They're just confusing.
 2013-11-16 16:10:07 +00:00
Edward Hervey 9dd0e6cccc ext/gst: Ensure default query/event handlers are used 
And in some cases, just remove our implementation that does nothing
 2013-07-26 16:08:35 +02:00
Tim-Philipp Müller f9befdecfe textrender: actually fixate output caps when fixating output caps 2013-05-02 23:41:02 +01:00
Sebastian Dröge 948a4a3632 gst: Add better support for static plugins 2013-04-15 15:52:58 +02:00
Tim-Philipp Müller 8e4934820f pango: use new GST_VIDEO_OVERLAY_COMPOSITION_BLEND_FORMATS define 
https://bugzilla.gnome.org/show_bug.cgi?id=665751
 2013-02-19 12:54:40 +00:00
Jan Schmidt fb102419c7 pango: 3rd time's the charm. Fix attribute list handling. 
Really really fix attribute list handling by taking a
copy of the original attributes that pango_attr_list_filter
can mutate, but keep the original around intact to restore
later.
 2013-02-08 00:05:24 +11:00
Jan Schmidt bc42d382e2 pango: Don't modify the original attributes list. 
Take a copy of the original attributes list instead of just
a ref, since pango_attr_list_filter can remove elements from it.
 2013-02-07 23:45:26 +11:00
Jan Schmidt 2528baf2c2 pango: Remove extra pango_attr_list_copy() from basetextoverlay 
Fixes a per-buffer memory leak of the attribute list.
 2013-02-07 23:06:57 +11:00
Tim-Philipp Müller 76c0cca765 textoverlay: minor clean-up 
Remove some macros that aren't needed any more.
 2012-12-22 21:19:51 +00:00
Tim-Philipp Müller df8e7f14a8 textoverlay: support shaded background for A420 format 
https://bugzilla.gnome.org/show_bug.cgi?id=687817
 2012-12-22 21:18:11 +00:00
Tim-Philipp Müller ba255fbac6 textoverlay: implement background shading for IYU1 
https://bugzilla.gnome.org/show_bug.cgi?id=687817
 2012-11-07 13:59:53 +00:00
Tim-Philipp Müller bd578c1dd4 textoverlay: also draw shaded backgrounds for RGB and BGR 
https://bugzilla.gnome.org/show_bug.cgi?id=687817
 2012-11-07 13:25:13 +00:00
Tim-Philipp Müller caad241432 textoverlay: we can do YVU9 as well 2012-11-07 11:36:42 +00:00
Tim-Philipp Müller 16350b7d66 textoverlay: don't advertise 10-16-bit formats we can't blend text onto yet 
We can't blend stuff on top of video formats that unpack into
ARGB64 or AYUV64 yet, so don't advertise them in our template caps.
 2012-11-07 11:32:50 +00:00
Tim-Philipp Müller e3bb068392 textoverlay: fix up names of old gray formats 
Y800 -> GRAY8, Y16 -> GRAY16_{LE,BE}
 2012-11-07 09:46:50 +00:00
Tim-Philipp Müller 74343165e1 textoverlay: draw shaded background for some more video formats 
https://bugzilla.gnome.org/show_bug.cgi?id=687817
 2012-11-07 09:41:13 +00:00
Tim-Philipp Müller bedbfd0091 textoverlay: clamp shaded background box coordinates in one place 2012-11-07 09:41:13 +00:00
Tim-Philipp Müller 4aace8e0eb textoverlay: move background shading into separate function 2012-11-07 09:41:13 +00:00
Tim-Philipp Müller a53f0f382e textoverlay: don't abort if we don't know how to paint shaded background for a format 
It's not a very nice thing to do.

https://bugzilla.gnome.org/show_bug.cgi?id=687666
 2012-11-06 23:44:01 +00:00
Sreerenj Balachandran 6cbcca0bc5 textoverlay: forward allocation queries on video sink pad instead of discarding them 
This allows the upstream elements to use the allocation parameters
or pools from the downstream elements like videosink.

https://bugzilla.gnome.org/show_bug.cgi?id=687459
 2012-11-05 13:27:56 +00:00
Tim-Philipp Müller 5f59b4f7ee Fix FSF address 
https://bugzilla.gnome.org/show_bug.cgi?id=687520
 2012-11-03 23:05:09 +00:00
Tim-Philipp Müller 3138c4e696 pango: avoid unnecessary pango attribute list copy 
We just want to keep it alive, not modify it, so a
simple ref should be enough.

https://bugzilla.gnome.org/show_bug.cgi?id=686841
 2012-10-25 17:16:58 +01:00
Jihyun Cho 2e0174e13c pango: delete foreground color in shadow text 
This makes colored text have gray drop shadows
instead of colored ones, which looks much better.

https://bugzilla.gnome.org/show_bug.cgi?id=686841
 2012-10-25 17:16:58 +01:00
Sebastian Dröge 3c1041d5eb Revert "gst: Add better support for static plugins" 
This reverts commit d2d79e3bc2,
which was accidentially pushed.
 2012-10-24 13:26:26 +02:00
Sebastian Dröge d2d79e3bc2 gst: Add better support for static plugins 2012-10-24 12:10:44 +02:00
Sebastian Dröge c4fb8d1e69 basetextoverlay: Correctly handle empty text buffers 2012-09-27 12:41:28 +02:00
Sebastian Dröge b19944d1e4 gst: Update for link/unlink function API change 2012-09-17 13:24:52 +02:00
Mark Nauwelaerts 36e78af5bf pango: add missing break 2012-09-05 15:14:05 +02:00
Mark Nauwelaerts b3545604c0 pango: handle GAP event to update text position 2012-09-05 12:02:32 +02:00
Tim-Philipp Müller 7c2e7b1a4f text/plain + text/x-pango-markup -> text/x-raw 2012-09-02 02:45:41 +01:00
Mark Nauwelaerts 8db0cc4350 pango: adjust to modified video overlay composition API 2012-08-30 12:12:39 +02:00
Tim-Philipp Müller 96faac2891 pango: fix bad unref and crashes with multiple text overlays 
gst_element_class_get_pad_template() does not return a ref,
so we mustn't unref the template returned. Fixes crashes
when switching back and forth between different types of
subtitle streams.
 2012-08-21 22:51:38 +01:00
Mark Nauwelaerts 3ecad525b7 pango: adjust to modified video overlay composition API 2012-07-17 18:08:11 +02:00
Tim-Philipp Müller a654ba5b85 pango: remove deprecated valign and halign properties 
Replaced by valignment and halignment (enum-based now rather than strings).
 2012-07-06 12:34:46 +01:00
Wim Taymans 177fd005ab update for query api changes 2012-07-06 11:23:48 +02:00
Mark Nauwelaerts 4761e6d6ab pango: query downstream for video overlay composition meta support 2012-07-03 14:35:25 +02:00
Mark Nauwelaerts aa6295744b pango: adjust to modified overlay composition API 2012-07-03 14:35:25 +02:00
Tim-Philipp Müller 1396f804be pango: only map video buffer memory if actually needed 
No need to map the video buffer if we're just going to attach
the meta; but if we map, we should do so in READWRITE mode.
 2012-07-02 19:23:47 +01:00
Tim-Philipp Müller 52056653be pango: pass pre-multiplied alpha to overlay composition directly 
We now support pre-multiplied alpha in the overlay composition API,
and can avoid multiple conversions if the the overlay also supports
pre-multiplied alpha. We should probably also have mapped the
buffer as READWRITE when unpremultiplying.
 2012-07-02 19:23:04 +01:00
Tim-Philipp Müller c09512ee99 pango: remove support for video/x-surface again which is 0.10 stuff 
This needs to be done and can be done differently/properly in 0.11.
 2012-06-28 23:15:34 +01:00
Mark Nauwelaerts 0325a3bdae pango: use ported GstVideoOverlayComposition functionality 
Based on commits by Thibault Saunier <thibault.saunier@collabora.co.uk>
 2012-06-28 18:16:25 +02:00
Sebastian Dröge 233622437f elements: Use gst_pad_set_caps() instead of manual event fiddling 2012-06-08 15:51:06 +02:00
Andre Moreira Magalhaes (andrunko) bac5fd4c6a textoverlay: Use an external lock 
Conflicts:

	ext/pango/gsttextoverlay.c
	ext/pango/gsttextoverlay.h
 2012-05-29 11:53:08 +02:00
Tim-Philipp Müller 3c6a3ad629 Use new gst_element_class_set_static_metadata() 2012-04-10 00:45:16 +01:00
Sebastian Dröge ad42b16375 gst: Update for GST_PLUGIN_DEFINE() API change 2012-04-05 15:11:05 +02:00
Sebastian Dröge 65307dd132 gst: Update versioning 2012-04-04 14:55:15 +02:00
Mark Nauwelaerts 68300bde0b pango: plug rare buffer leak 2012-04-03 18:31:27 +02:00
Wim Taymans 897e8730e8 testoverlay: fix object and caps leak 2012-03-27 15:44:14 +02:00
Wim Taymans 25137962ad fix for caps API changes 2012-03-11 19:04:41 +01:00
Tim-Philipp Müller 0b17c3747a pango: re-port pangocairo deprecation and compiler warning fixes from 0.10 
Wasn't applied because that code is in the new private base class.
 2012-03-08 20:54:49 +00:00
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
Sebastian Dröge 93e7bb6759 pango: Fix 'implicit conversion from enumeration type 'GstTextOverlayLineAlign' to different enumeration type 'PangoAlignment'' compiler warning 2012-03-06 13:11:16 +01:00
Oleksij Rempel (Alexey Fisher) 0c2f2a64c5 pango: don't use deprecated pango_cairo_font_map_create_context() 
https://bugzilla.gnome.org/show_bug.cgi?id=671300
 2012-03-04 18:32:32 +00:00
Wim Taymans a75e9102c5 GST_FLOW_WRONG_STATE -> GST_FLOW_FLUSHING 2012-02-08 15:17:49 +01:00
Wim Taymans fcdc385aa1 port to new map API 2012-01-25 12:30:53 +01:00
Tim-Philipp Müller fa0464cd7a pango: port to new GLib threading API 2012-01-18 17:21:02 +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
Idar Tollefsen 580b6b2b69 pango: changes includes from brackets to quotes for local files 
https://bugzilla.gnome.org/show_bug.cgi?id=667316
 2012-01-05 10:52:14 +00:00
Thibault Saunier 785e006de9 textoverlay: unpremultiply text image 
The GstVideoOverlayComposition only supports unpremultiplied ARGB
(for now anyway, support for pre-multiplied alpha is planned.)
 2011-12-05 15:37:04 +00:00
Thibault Saunier cbcf1e0b46 textoverlay: Attach OverlayComposition to buffers when needed 
Add video/x-surface support in the caps
We should then attach it whenever the sink supports it, but this
is working for the time being
 2011-12-05 15:37:04 +00:00
Thibault Saunier 2a687b6dfb textoverlay: Make the text_image data a buffer 
This way we won't free data that would be attached to some buffer.
 2011-12-05 15:37:03 +00:00
Thibault Saunier a741c0cf11 textoverlay: Sync the caps with the new supported formats 
Thanks to the use of the new video composition library, we gain support to
more colospaces and formats, let's state it.
 2011-12-05 15:37:03 +00:00
Thibault Saunier a018c187a0 textoverlay: Make use of the new video blending utility 2011-12-05 15:37: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
Vincent Penquerc'h 96374054ac various: fix pad template leaks 
https://bugzilla.gnome.org/show_bug.cgi?id=662664
 2011-11-28 13:09:02 +00:00
Wim Taymans e302833e65 add parent to pad functions 2011-11-17 12:48:25 +01:00
Wim Taymans 2202511e77 add parent to query function 2011-11-16 17:25:17 +01:00
Wim Taymans 026ec68f75 _peer_get_caps() -> _peer_query_caps() 2011-11-15 18:04:17 +01:00
Wim Taymans 7402d3a3d2 update for _get_caps() -> _query_caps() 2011-11-15 18:04:17 +01:00
Wim Taymans ab9ffa93f5 change getcaps to query 
Add sink and src event functions in rtpbasepayload
Add query vmethod to rtpbasepayload.
 2011-11-15 18:04:16 +01:00
Wim Taymans 671131a83a update for removed fixate functions 2011-11-10 11:02:12 +01:00
Vincent Penquerc'h 51426a3b2d textoverlay: continue processing text when silent 
This prevents playback wegding when text buffers are
left to pile up.

https://bugzilla.gnome.org/show_bug.cgi?id=662829
 2011-11-08 12:02:49 +00:00
Tim-Philipp Müller d7fc45f42e docs: fix up some Since: markers 2011-11-07 23:05:44 +00:00
Stefan Sauer 0019bcaa47 controller: port to new location and api changes 2011-11-04 20:14:54 +01:00
Wim Taymans f1088ed647 update for UNEXPECTED -> EOS flowreturn 2011-10-10 11:39:52 +02:00
Vincent Penquerc'h 15dc839467 textoverlay: add YV12 support 
Basically the same as I420, just with chroma planes swapped.

https://bugzilla.gnome.org/show_bug.cgi?id=660604
 2011-10-01 19:18:02 +01:00
Edward Hervey 17bfba09f1 Merge branch 'master' into 0.11 
Conflicts:
	ext/ogg/gstoggdemux.c
	ext/pango/gsttextoverlay.c
	gst-libs/gst/audio/gstaudioencoder.c
	gst-libs/gst/audio/gstbaseaudiosrc.c
	gst/playback/gstsubtitleoverlay.c
	gst/videorate/gstvideorate.c
 2011-09-23 18:27:11 +02:00
Sebastian Dröge d094913a61 textoverlay: Protect against accessing the NULL parent of the pads during shutdown 
Fixes bug #658901.
 2011-09-19 09:34:08 +02:00
Vincent Penquerc'h 7d3858a14d textoverlay: fix text buffer leak 
Make sure to always unref the input text buffer.

Reported by bcxa.sz@gmail.com.

https://bugzilla.gnome.org/show_bug.cgi?id=657049
 2011-08-22 10:48:06 +01:00
Wim Taymans 33467d9629 Merge branch 'master' into 0.11 
Conflicts:
	configure.ac
	ext/pango/gsttextoverlay.c
	ext/theora/gsttheoradec.c
	gst/adder/gstadder.c
	gst/adder/gstadder.h
	gst/audioresample/gstaudioresample.c
	gst/encoding/gstencodebin.c
	gst/playback/gstdecodebin.c
	gst/playback/gstdecodebin2.c
	tests/check/elements/decodebin2.c
	tests/check/elements/playbin-compressed.c
	win32/common/libgsttag.def
 2011-08-16 18:01:14 +02:00
Josep Torra 5629ed74b3 Fix debug statements 
Fixes build on MacOSX

Signed-off-by: Edward Hervey <edward.hervey@collabora.co.uk>
 2011-08-10 11:15:41 +02:00
Stefan Sauer 2db389f775 textoverlay: improve the example 
Mentioned that this is not ment to be used with subtitles and suggest alternatives.
 2011-07-25 12:04:48 +02:00
Stefan Sauer 5d5ab90e51 textoverlay: add example for feeding from stdin 2011-07-23 14:22:03 +02:00
Stefan Sauer 0667b1adf5 textoverlay: keep untimestamped textbuffer until next one 
Instead of discarding untimestamped text-buffers immeditely after rendering,
keep them until we receive the next text buffer.
Fixes #654959
 2011-07-23 14:04:14 +02:00