mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 10:41:04 +00:00
Code Issues 1 Projects Releases Wiki Activity
14619 commits 44 branches 1509 tags 387 MiB
Commit graph

273 commits

Author SHA1 Message Date
Mathieu Duponchelle
5223868caa videomixer: Set a reference to mix->current_caps as the QUERY_CAPS result. 2013-05-30 15:36:48 -04:00
Nicolas Dufresne
cd30a81ee3 videomixer: Maintain z-order when new pad are added 
https://bugzilla.gnome.org/show_bug.cgi?id=701109
 2013-05-27 22:43:25 -04:00
Thibault Saunier
7a3df1ab31 videomixer: Always handle flush_stop_pending atomically 
It is not protected with the COLLECT_PADS_STREAM_LOCK anymore
 2013-05-25 12:20:08 -04:00
Thibault Saunier
608bd3e2db videomixer: Do not take COLLECT_PADS_STREAM_LOCK when unnecessary 
Collectpad takes the lock itself when receiving serialized events
and we should not take it for not serialized ones
 2013-05-25 11:03:31 -04:00
Nicolas Dufresne
d8c5e31657 videomixer: Don't hold stream-lock while pushing non-serialized events 
https://bugzilla.gnome.org/show_bug.cgi?id=700868
 2013-05-23 09:20:04 -04:00
Nicolas Dufresne
a7e0f251ca videomixer: Don't hold object lock while sending events 
https://bugzilla.gnome.org/show_bug.cgi?id=700868
 2013-05-23 09:20:04 -04:00
Thibault Saunier
18ef4f18d0 videomixer: Send a reconfigure event upstream if sinkpad caps are not usable 
https://bugzilla.gnome.org/show_bug.cgi?id=684237
 2013-05-21 12:15:36 -04:00
Mathieu Duponchelle
2d3910fc79 videomixer: When all sinkpads are eos, update output segment stop and forward it 
https://bugzilla.gnome.org/show_bug.cgi?id=699793
 2013-05-20 21:06:56 +02:00
Mathieu Duponchelle
521c9a7b5d videomixer: Don't reset the output segment on flush stop 
Only init it when getting from READY to PAUSED, and change it on seek events.

https://bugzilla.gnome.org/show_bug.cgi?id=699793
 2013-05-20 21:03:03 +02:00
Thibault Saunier
86b106091c videomixer: Send caps event from the streaming thread 
This way we avoid races in caps negotiation and we make sure
that the caps are sent after stream-start.

https://bugzilla.gnome.org/show_bug.cgi?id=684237
 2013-05-19 09:28:04 -04:00
Thibault Saunier
718f9004d0 videomixer: Do not send flush_stop when receiving a seek 
There is no reason to send a flush-stop when receiving a seek event.
In the case of a flushing seek, we could eventually want to, but in
the code path were we check if the seek is "flushing", we have the
following comment that makes sense:

"we can't send FLUSH_STOP here since upstream could start pushing data
after we unlock mix->collect.
We set flush_stop_pending to TRUE instead and send FLUSH_STOP after
forwarding the seek upstream or from gst_videomixer_collected,
whichever happens first."

https://bugzilla.gnome.org/show_bug.cgi?id=684237
 2013-05-19 09:28:04 -04:00
Thibault Saunier
85b6852deb videomixer2: Protect flush_stop_pending with the collectpad stream lock 
And make sure to expect a flush-stop after a flush-start

https://bugzilla.gnome.org/show_bug.cgi?id=684237
 2013-05-19 09:28:04 -04:00
Sebastian Dröge
3110b7cc31 Revert "videomixer2: Take into account new segments" 
This reverts commit 84ae670ab4.

Actually this is not how it is supposed to work. videomixer
creates a [0,-1] segment and then puts frames of the different
streams there based on their running times in their own segments.
 2013-05-09 16:26:19 +02:00
Mathieu Duponchelle
84ae670ab4 videomixer2: Take into account new segments 
Also forward the event downstream on the next opportunity.

https://bugzilla.gnome.org/show_bug.cgi?id=699793
 2013-05-09 16:18:54 +02:00
Sebastian Dröge
1588cda9a1 videomixer2: Send stream-start before caps event 
https://bugzilla.gnome.org/show_bug.cgi?id=699895
 2013-05-08 16:02:46 +02:00
Mathieu Duponchelle
6b153ce385 videomixer: send stream-start event. 2013-04-25 16:09:34 -03:00
Olivier Crête
24bb263d54 videomixer: Don't unref query, we don't own it 
Fixes double-unref bug. Bug found by Youness Alaoui
 2013-04-16 19:29:48 -04:00
Sebastian Dröge
b0b0557c48 gst: Add better support for static plugins 2013-04-15 15:54:11 +02:00
Tim 'mithro' Ansell
3a5d17e852 videomixer2: avoid caps leak 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=693307
 2013-02-07 11:40:35 +01:00
Matthew Waters
b9151a9c28 videomixer: fix eos timestamp check 
fixes hang in videotestsrc num-buffers=20 ! videomixer ! fakesink

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=692935
 2013-01-31 16:45:38 +01:00
Tim-Philipp Müller
230cf41cc9 Fix FSF address 
https://bugzilla.gnome.org/show_bug.cgi?id=687520
 2012-11-04 00:07:18 +00:00
Douglas Bagnall
0b898ab911 videoconvert: Compare y offset with height, not width, when testing for overlap 
This could have prevented images showing that should have when the
source height is greater than its width.

When width exceeds height, as is common, it probably only caused a
miniscule amount of unnecessary work.  I haven't tested.
 2012-11-02 09:29:30 +01:00
Douglas Bagnall
e3c77ba709 videomixer: get height via GST_VIDEO_FRAME_HEIGHT, not _WIDTH 
https://bugzilla.gnome.org/show_bug.cgi?id=687330
 2012-11-01 13:03:44 +00:00
Youness Alaoui
13328bc129 videomixer2: Fix race condition where a src setcaps is ignored 
If both pads receive data at the same time, they will both get their
sink_setcaps called which will call the src_setcaps, but there is
a race condition where the second one might not be called.
Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=683842
 2012-10-19 12:10:31 +02:00
Tim-Philipp Müller
f5e0321dfc videomixer: clear video frame more correctly 
Make sure not to touch memory that doesn't belong to
our frame, we might be one part of a side-by-side 3D
frame, or in a picture-in-picture scenario.
 2012-09-26 09:28:59 +01:00
Tim-Philipp Müller
626e0258e3 videomixer: fix warnings when using transparent background 
gst_video_frame_map() increases the refcount, which makes
the buffer not writable any more technically, so calling
gst_buffer_memset() on it will cause nasty warnings.

Unit test disabled because it very rarely (for me)
fails, possibly negotiation-related.

https://bugzilla.gnome.org/show_bug.cgi?id=684398
 2012-09-25 23:31:34 +01:00
Edward Hervey
ac9394de29 videomixer: Fix leak 2012-09-25 14:18:35 +02:00
Mark Nauwelaerts
eda9c8b3cf videomixer: init videoinfo 
... to prevent random bogus caps fields.
 2012-09-18 12:15:17 +02:00
Mark Nauwelaerts
8c28a60eee videomixer: chain up to collectpads query function 2012-09-18 12:15:17 +02:00
Nicolas Dufresne
76da367ecd videomixer: Don't let GstCollectPad shadow custom sink pad query func 
In the current implementation, the custom pad query function is not called.
This patch, set that query function on the GstCollectPads to avoid this
shadowing.

See https://bugzilla.gnome.org/show_bug.cgi?id=684237
 2012-09-18 12:14:43 +02:00
Stefan Sauer
f874922e1c collectpads: remove gst_collect_pads_add_pad_full 
Rename gst_collect_pads_add_pad_full() to gst_collect_pads_add_pad() and fix all
invocations.
 2012-09-12 21:05:44 +02:00
Youness Alaoui
c3d619be67 videomixer2: Adding nv12 and nv21 support 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=683841
 2012-09-12 10:46:22 +02:00
Tim-Philipp Müller
e4cb67fad8 docs: gst-launch-0.11 -> gst-launch-1.0 2012-08-27 21:20:29 +01:00
Michael Rubinstein
6ea5d31456 videomixer: fix endianness check on systems where non-glib endianness defines are not set 
On Windows LITTLE_ENDIAN without the G_ in was not defined,  so the
test comes out wrong.
 2012-08-24 19:45:11 +01:00
Sebastian Dröge
6f74b2afb7 gst: Set alignment at the correct place of GstAllocationParams 2012-08-08 17:41:31 +02:00
Tim-Philipp Müller
0e6b66a2a0 gst: update disted orc files 2012-08-08 15:10:37 +01:00
Wim Taymans
f44808338f videomixer: prefix orc functions with video_mixer_orc_ 2012-07-24 09:17:09 +02:00
Stefan Sauer
ea17c457f9 childproxy: update api use 2012-06-11 18:24:20 +02:00
Tim-Philipp Müller
2d249dcc29 videomixer: change sink pad template name from sink_%d to sink_%u 2012-05-01 18:58:03 +01:00
Mark Nauwelaerts
67e168aef4 collectpads2: rename to collectpads 2012-04-17 15:14:27 +02:00
Mark Nauwelaerts
04b4d30f2c misc: chain up to collectpads event handler 2012-04-16 16:37:49 +02:00
Sebastian Dröge
4784e83938 Release 0.11.90 2012-04-12 10:27:31 +02:00
Tim-Philipp Müller
e09ae5736d Use new gst_element_class_set_static_metadata() 2012-04-10 00:51:41 +01:00
Sebastian Dröge
aa2cd462da gst: Update for GST_PLUGIN_DEFINE() API changes 2012-04-05 17:36:38 +02:00
Sebastian Dröge
5cdd49bf25 gst: Update versioning 2012-04-04 14:37:47 +02:00
Wim Taymans
068ee88862 update for child proxy api change 2012-03-31 15:43:49 +02:00
Wim Taymans
ecaea36c3d update for memory api changes 2012-03-15 13:36:17 +01:00
Wim Taymans
a32d944a38 fix for caps api changes 2012-03-11 19:06:37 +01:00
Wim Taymans
9095f455d5 videomixer2: remove pad event function 
We use the one from collectpads
 2012-01-26 19:49:14 +01:00
Wim Taymans
33ae3fe047 videomixer: more fixes 2012-01-26 18:51:30 +01:00
Wim Taymans
85a96b3703 videomixer: make videomixer work somewhat 2012-01-26 18:43:06 +01:00
Wim Taymans
df260a2ec6 videomixer: port to 0.11 
It builds and gst-inspect-0.11 works.. otherwise untested
 2012-01-26 18:16:58 +01:00
Sebastian Dröge
d45d3ac721 videomixer2: Update for the new collectpads2 event handling API 2012-01-26 10:44:28 +01:00
Wim Taymans
8331bd7e10 videomixer: some more porting 2012-01-25 18:40:03 +01:00
Wim Taymans
3f1bccbb17 videomixer: port blend function 2012-01-25 18:02:13 +01:00
Wim Taymans
1584806634 port to new gthread API 2012-01-19 11:33:53 +01:00
Sebastian Dröge
93e3ed5a86 Merge branch 'master' into 0.11 
Conflicts:
	ext/cairo/gsttextoverlay.c
	ext/pulse/pulseaudiosink.c
	gst/audioparsers/gstaacparse.c
	gst/avi/gstavimux.c
	gst/flv/gstflvmux.c
	gst/interleave/interleave.c
	gst/isomp4/gstqtmux.c
	gst/matroska/matroska-demux.c
	gst/matroska/matroska-mux.c
	gst/matroska/matroska-mux.h
	gst/matroska/matroska-read-common.c
	gst/multifile/gstmultifilesink.c
	gst/multipart/multipartmux.c
	gst/shapewipe/gstshapewipe.c
	gst/smpte/gstsmpte.c
	gst/udp/gstmultiudpsink.c
	gst/videobox/gstvideobox.c
	gst/videocrop/gstaspectratiocrop.c
	gst/videomixer/videomixer.c
	gst/videomixer/videomixer2.c
	gst/wavparse/gstwavparse.c
	po/ja.po
	po/lv.po
	po/sr.po
	tests/check/Makefile.am
	tests/check/elements/qtmux.c
	tests/check/elements/rgvolume.c
 2012-01-10 14:32:32 +01:00
Sebastian Dröge
4cdacf4ca9 videomixer: Remove videomixer and register videomixer2 as videomixer 2012-01-09 14:53:27 +01:00
Wim Taymans
47a1da9076 GST_FLOW_UNEXPECTED -> GST_FLOW_EOS 2012-01-04 10:01:48 +01:00
Tim-Philipp Müller
b8b8454bcb 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 for most of these.
 2011-12-12 09:46:27 +00:00
Tim-Philipp Müller
66f6e12888 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.
 2011-12-12 09:46:27 +00:00
Vincent Penquerc'h
c0e101e93f various: fix pad template leaks 
https://bugzilla.gnome.org/show_bug.cgi?id=662664
 2011-11-28 13:30:27 +00:00
Stefan Sauer
8643d1caaf collectpads: port API changes 2011-11-17 08:44:45 +01:00
Stefan Sauer
fb162c8eb4 controller: port to new controller location and api 2011-11-04 20:15:48 +01:00
Wim Taymans
a95acb7122 make %u in all request pad templates 2011-11-04 11:58:22 +01:00
Sebastian Dröge
c603bf9891 videomixer2: Use the clip function instead of the prepare_buffer function 2011-10-28 10:40:36 +02:00
Sebastian Dröge
ae07ebedc9 videomixer2: Use collectpads2 from core 2011-10-28 09:36:17 +02:00
Arun Raghavan
cc7aeb3f33 videomixer2: Fix a leak 
Buffers weren't being unref'ed in one case inside, causing memory usage
to blow up.
 2011-10-14 13:10:49 +05:30
Arun Raghavan
4d3ee9005c videomixer2: Fix incorrect gst_buffer_replace() call 
This got exposed when gst_buffer_replace() was changed from a macro to a
function.
 2011-10-13 16:59:50 +05:30
Tim-Philipp Müller
9be707d54d gst: update disted orc backup code 2011-04-16 18:49:27 +01:00
Robert Swain
e757793b21 videomixer: Fix argb/rgba overlay orc code 
Remove some redundant operations (convubw) and use the correct variable,
t2, in the orc_overlay_bgra function.
 2011-04-16 13:00:49 +01:00
Robert Swain
fd6ac6aa8a videomixer: address unused but set variables 
GCC 4.6.x spits warnings about variables that are set but unused. Such
variables have been removed in blend, collectpads2 and videomixer2.
 2011-04-16 12:52:49 +01:00
Thibault Saunier
b541208b77 android: Make it ready for androgenizer 
Remove the android/ top dir
Fixe the Makefile.am to be androgenized

To build gstreamer for android we are now using androgenizer which generates the needed Android.mk files.
Androgenizer can be found here: http://git.collabora.co.uk/?p=user/derek/androgenizer.git
 2011-04-11 01:20:11 +02:00
Alessandro Decina
30ce2680dc videomixer: update orc dist files 2011-04-04 17:39:04 +02:00
Sebastian Dröge
ce66aea7b0 videomixer[2]: Use orc_memset() instead of memset() 2011-04-01 11:35:26 +02:00
Lane Brooks
ef5ac986f1 videomixer: Add transparent background option for alpha channel formats 2011-04-01 11:35:26 +02:00
Lane Brooks
69b5aedc58 videomixer2: Add transparent background option for alpha channel formats 
This option allows the videomixer2 element to output a valid alpha
channel when the inputs contain a valid alpha channel. This allows
mixing to occur in multiple stages serially.

The following pipeline shows an example of such a pipeline:

gst-launch videotestsrc background-color=0x000000 pattern=ball ! video/x-raw-yuv,format=\(fourcc\)AYUV ! videomixer2 background=transparent name=mix1 ! videomixer2 name=mix2 ! ffmpegcolorspace ! autovideosink  videotestsrc ! video/x-raw-yuv,format=\(fourcc\)AYUV ! mix2.

The first videotestsrc in this pipeline creates a moving ball on a
transparent background. It is then passed to the first videomixer2.
Previously, this videomixer2 would have forced the alpha channel to
1.0 and given a background of checker, black, or white to the
stream. With this patch, however, you can now specify the background
as transparent, and the alpha channel of the input will be
preserved. This allows for further mixing downstream, as is shown in
the above pipeline where the a second videomixer2 is used to mix in a
background of an smpte videotestsrc. So the result is a ball hovering
over the smpte test source. This could, of course, have been
accomplished with a single mixer element, but staged mixing is useful
when it is not convenient to mix all video at once (e.g. a pipeline
where a foreground and background bin exist and are mixed at the final
output, but the foreground bin needs an internal mixer to create
transitions between clips).

Fixes bug #639994.
 2011-04-01 11:35:26 +02:00
Edward Hervey
6e1c701502 Revert "Check that collectpads exists before removing pad" 
This reverts commit 8e6b876e76.

Depends on a core commit that was reverted
 2011-02-21 12:25:19 +01:00
David Schleef
8e6b876e76 Check that collectpads exists before removing pad 
The core now calls release pad from finalize, at which point
the collectpads might have already been freed.
 2011-02-20 23:46:01 -08:00
David Schleef
e9d4710cc8 Update generated orc code 2010-10-15 14:02:57 -07:00
Tim-Philipp Müller
4451718eff videomixer2: pre-register pad class properly with g_type_class_ref 
Fix code to match the comment. Also, there's no need to register the
background enum type again, this is already done via install_property.
 2010-09-23 21:22:45 +01:00
Stefan Kost
1c47115b8e videmixer: add a example showing how to use the child properties 
Show how to position and set the alpho of the videos on gst-launch.
 2010-09-06 09:57:57 +03:00
David Schleef
85aed94676 videomixer: orc_init() doesn't need to be called 
There's no need to call orc_init() unless you're using the Orc
API directly.  All code created by orcc is guaranteed to work
without calling orc_init().
 2010-09-05 18:45:21 -07:00
Thiago Santos
de8fda9cc2 videomixer2: Fail when caps are incompatible 
Do not forget to return false when caps are incompatible.
 2010-09-05 22:34:36 -03:00
Thiago Santos
8435529073 videomixer: Only init orc if it is available 
Put some ifdef around orc_init to prevent build errors
 2010-09-05 20:56:52 -03:00
David Schleef
294d5c48da update disted Orc files 2010-09-04 11:43:21 -07:00
Sebastian Dröge
e79742205c videomixer2: Add documentation and add to the docs 2010-09-04 14:55:43 +02:00
Sebastian Dröge
bcfd60a8d2 videomixer2: Add videomixer2 element 
This is based on collectpads2 and is synchronizing
all streams based on the running time.

New features compared to old videomixer:
 * Synchronizing frames on the running time
 * Improved and simplified negotiation
 * Full QoS support
 * Variable framerate support

Fixes bug #626048, #624905.
 2010-09-04 14:52:11 +02:00
Sebastian Dröge
77c7f5fdcd videomixer: Update disted ORC files 2010-09-04 14:52:09 +02:00
Sebastian Dröge
6da14d0c41 videomixer: Optimize ARGB blending and implement BGRA blending with orc 
This now means, that we have absolutely no handwritten assembly anymore
in videomixer and it's also faster now when using SSE.
 2010-09-04 14:52:09 +02:00
David Schleef
7cfa519547 videomixer: Add orc implementation for blending 
videomixer: Add orc implementation for blending
 2010-09-04 14:52:08 +02:00
David Schleef
1ace738c3a videomixer: Fix example pipelines 
videomixer: Fix example pipelines
 2010-09-04 14:52:08 +02:00
Tim-Philipp Müller
b26897dd84 Release 0.10.25 2010-09-02 23:44:19 +01:00
Sebastian Dröge
9e981f6c2d 0.10.24.4 pre-release 2010-08-21 21:41:36 +02:00
Sebastian Dröge
19c8226c6d videomixer: Fix pipeline in the documentation 
Make sure that we have the same color format on all streams, i.e. AYUV

Fixes bug #625452.
 2010-08-06 19:24:56 +02:00
Sebastian Dröge
fc00857c82 videomixer: Move debug categories into the source files and add debug category for the blend functions 2010-08-04 19:43:08 +02:00
Sebastian Dröge
38124ef5e5 videomixer: Only reset QoS information and send a NEWSEGMENT event downstream for NEWSEGMENT events on the master pad 2010-07-21 10:23:30 +02:00
Tim-Philipp Müller
240dec038c gst: update orc files 2010-06-26 18:41:49 +01:00
Sebastian Dröge
e84136ba03 videomixer: Port most blending related functions to orc 
Only remaining MMX implementation is the ARGB/BGRA/AYUV blending
for which we first need the orc compositing opcodes.
 2010-06-10 22:46:00 +02:00
Sebastian Dröge
e87802efdd videomixer: Replace some tabs by spaces 2010-06-10 22:46:00 +02:00