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
David Schleef
b83cd99aeb
videomixer: liboil to orc conversion
2010-06-08 17:25:35 -07:00
Sebastian Dröge
f16ed4a91c
gst: Don't use GST_DEBUG_FUNCPTR for GObject vfuncs
2010-06-06 17:52:40 +02:00
Edward Hervey
2ff87c0fb9
videomixer: if we're not linked downstream, we can do any format
...
Stupid me, assuming _get_allowed_caps() would actually return the
pad templates if there was no peer.
2010-06-04 11:44:09 +02:00
Edward Hervey
d72a2fb6da
videomixer: Don't return caps in get_caps() that will be rejected
...
This commit basically puts _get_caps() in sync with accept_caps().
If we don't have a master pad OR the master pad caps aren't negotiated
then we just return the downstream allowed caps.
If we have a master pad with negotiated caps, we return those caps
with a free range of width/height/framerate
2010-06-03 19:01:14 +02:00
Edward Hervey
59dcdc37a0
videomixer: filter caps returned from downstream with our pad template.
2010-06-01 20:45:29 +02:00
Edward Hervey
01abf5b94e
videomixer: Implement sinkpad GetCapsFunction.
...
This allows returning only the formats, width, height, framerate
and pixel-aspect-ratio that downstream can support.
https://bugzilla.gnome.org/show_bug.cgi?id=620148
2010-06-01 12:42:10 +02:00
Sebastian Dröge
f5bca501e5
videomixer: Don't mix input with different pixel aspect ratios
...
Fixes bug #618530 .
2010-06-01 11:21:29 +02:00
Sebastian Dröge
85c6b9b712
videomixer: Make selection of a sinkpad number threadsafe
2010-05-05 19:35:48 +02:00
Sebastian Dröge
6dd3edd0f7
videomixer: Add support for YUY2, YVYU, UYVY
2010-04-29 19:28:22 +02:00
Sebastian Dröge
bd0b307a74
videomixer: Add support for Y444, Y42B, Y41B and YV12
2010-04-29 19:28:22 +02:00
Sebastian Dröge
5a530b19e8
videomixer: Fix byte order for MMX ARGB/AYUV color filling
...
Fixes bug #616409 .
2010-04-22 13:30:55 +02:00
Sebastian Dröge
a27856e6b8
videomixer: Fix AYUV checker/color filling
2010-04-21 17:53:49 +02:00
Sebastian Dröge
3f88dce350
videomixer: Add i387 floating point registers to the clobbered registers list
...
They are the same as the mm0-mm7 MMX registers and will be overwritten
by the assembly code if gcc doesn't know about the MMX registers.
Note: They're all added to the list of clobbered registers in all cases
and not only when __MMX__ is not defined just to make sure that no other
bugs happen with this code just because some compiler version gets things
wrong.
Fixes bug #614466 .
2010-04-19 16:57:19 +02:00
Sebastian Dröge
fe4ff4f324
videomixer: Add support for ABGR and RGBA
...
Now all 4 ARGB variants are supported by videomixer.
2010-03-20 17:32:48 +01:00
Tim-Philipp Müller
073201b329
build: Makefile.am cleanups
...
Mostly add $(GST_BASE_CFLAGS) where it was missing, but also fix up
order of flags and libs if needed (see docs/random/moving-plugins).
2010-03-18 21:34:24 +00:00
Benjamin Otte
1055aaa9cb
Add -Wredundant-decls warning flag
...
Also fix compile issues
2010-03-17 19:35:10 +01:00
Benjamin Otte
3342b1679e
Add -Wmissing-declarations -Wmissing-prototypes warning flags
...
And fix all the warnings.
2010-03-17 18:23:28 +01:00
Alessandro Decina
49b2a94644
Make sure FLUSH_STOP is sent so not to leave downstream flushing.
2010-02-24 02:05:49 +01:00
Wim Taymans
caec8d9837
videomixer: fix timestamp problems
...
When the pad with the highest framerate goes EOS, instead of not timestamping
output buffers, intepollate timestamps and durations from the last seen ones.
Fixes #608026
2010-02-12 13:53:57 +01:00
Sebastian Dröge
41b17ec2a7
videomixer: Fix assembly register constraints
...
Fixes bug #608209 .
2010-01-27 16:35:10 +01:00
Stefan Kost
404e673ac0
videomixer: use 'q' constraint instead of 'r'
...
This avoids the "bad register name `%dil'" compilation errors on 32bit where
because of 'r' gcc puts the value in a general purpose register and then tries
to access the lower part as %dil/%sil which is not existing on 32bit. 'q' requests
a-d registers
2010-01-13 16:48:46 +02:00
Sebastian Dröge
daa52708b3
videomixer: Implement basic QoS
...
This drops frames if they're too late anyway before blending and all
that starts but QoS events are not forwarded upstream. In the future
the QoS events should be transformed somehow and forwarded upstream.
2010-01-11 19:32:35 +01:00
Sebastian Dröge
6158f401a1
videomixer: Add MMX implementations for I420 and all non-alpha RGB formats
2010-01-11 18:37:45 +01:00
Sebastian Dröge
2950262186
videomixer: Refactor processing functions
...
This allows easier plugging of optimized processing functions
in the future, like for SSE or AltiVec.
2010-01-11 18:37:44 +01:00
Wim Taymans
362785df88
videomixer: optimize blend code some more
...
Use more efficient formula that uses less multiplies.
Reduce the amount of scalar code, use MMX to calculate the desired
alpha value.
Unroll and handle 2 pixels in one iteration for improved pairing.
2009-12-25 12:38:45 +01:00
Wim Taymans
4f9ded7742
videomixer: scale and clamp
...
Scale and clamp to the max alpha values.
2009-12-24 22:59:09 +01:00
Wim Taymans
3c0f18d765
videomixer: some trivial cleanups
2009-12-24 21:45:12 +01:00
Sebastian Dröge
3ac6f5e48b
videomixer: Fix assembly compilation on x86
...
Fixes bug #604814 .
2009-12-17 18:14:55 +01:00
Sebastian Dröge
0a0f7ecc16
videomixer: Use movzbl instead of movzxb for moving one byte to a l register
...
For some reason latest gcc/binutils accept movzxb here while
movzbl would be correct and is the only thing accepted by older
gcc/binutils.
Fixes bug #604679 .
2009-12-16 10:50:32 +01:00
Sebastian Dröge
9e45038d8d
videomixer: src/dest are input and output of the AYUV blending MMX assembler
2009-12-16 06:59:01 +01:00
Sebastian Dröge
061ededa36
videomixer: Add MMX implementations of the AYUV blending and color filling functions
...
This provides a 20% speedup for blending and 100% for color filling.
The blending can probably be optimized even more.
2009-12-15 12:30:21 +01:00
Sebastian Dröge
66d3ac8fb7
videomixer: Dequeue current buffer on FLUSH_STOP and don't unref NULL buffers
...
... NULL buffers shouldn't really happen anymore when popping the
buffer from GstCollectPads but better check for this and print a warning.
2009-12-12 16:55:13 +01:00
Sebastian Dröge
760eaf7b2a
videomixer: Fix stupid mistake in last commit
2009-12-11 13:11:12 +01:00
Sebastian Dröge
089d9d9dba
videomixer: Don't do floating point math in the inner processing loop for I420 blending
2009-12-11 12:36:42 +01:00
Sebastian Dröge
6f51dfba95
videomixer: Remove wrong comments, copied from the I420 blend function
2009-12-10 10:48:49 +01:00
Sebastian Dröge
93089ef445
videomixer: The queued duration is a signed integer
...
...and it will really be negative sometimes.
2009-12-09 21:15:07 +01:00
Sebastian Dröge
7418dee253
videomixer: Only pop buffers from collectpads after they're fully consumed
...
This decreases latency and memory usage because new buffers are only
accepted by collectpads if there's no queued buffer.
2009-12-09 21:03:57 +01:00
Sebastian Dröge
b0f8978fd8
videomixer: Use gst_util_uint64_scale_int() for fps to seconds per frame calculations
2009-12-09 16:15:09 +01:00
Tim-Philipp Müller
0506545b04
videomixer: fix up Makefile some more
...
Remove CFLAGS from LIBADD and make order of the various CFLAGS and
LIBS at least consistent with each other.
2009-09-22 11:02:02 +01:00
Brian Cameron
341be447a6
videomixer: Add $(GST_PLUGINS_BASE_LIBS) to LDFLAGS for linking libgstvideo
...
Fixes bug #595897 .
2009-09-22 08:09:39 +02:00
Sebastian Dröge
91ad86c0f9
videomixer: Random cleanup
2009-07-10 19:54:25 +02:00
Sebastian Dröge
f19ef7eada
videomixer: Send queries to the master pad by default instead of all pads
2009-07-10 19:54:13 +02:00
Sebastian Dröge
0bf61ecfaf
videomixer: Add RGB, BGR, xRGB, RGBx, xBGR, BGRx support
2009-07-10 19:35:49 +02:00
Sebastian Dröge
bbcb4f8f15
videomixer: Clean up debugging a bit
2009-07-10 17:43:07 +02:00
Sebastian Dröge
0775db4455
videomixer: Remove some redundant checks and error out immediately if not negotiated
...
Also stop leaking the output buffer in some error cases.
2009-07-10 17:33:40 +02:00
Sebastian Dröge
4ccd9c92ae
videomixer: Remove the calculate_frame_size() function and use libgstvideo instead
2009-07-10 17:23:03 +02:00
Edward Hervey
34c97c0c6f
videomixer: Remove unused link/unlink pad methods
2009-07-10 14:37:16 +02:00
Edward Hervey
b02949faeb
videomixer: I420 mode: Add fast path for 0.0 and 1.0 alpha
...
If the source alpha is 0.0, we take nothing.
If the source alpha is 1.0, we overwrite everything.
2009-07-10 14:37:13 +02:00
Edward Hervey
3c88249d48
videomixer: I420 blending : Fix main algorithm.
...
When blending a source layer with an alpha of 'a' on top of another
destination layer we take the sum of:
* 'a' percent of the source layer
* (100 - 'a') percent of the destination layer (the remainder)
2009-07-10 14:37:10 +02:00
Edward Hervey
ace4cb2295
videomixer: Make debugging category global to all the code.
2009-07-10 14:37:07 +02:00
Edward Hervey
3ebf5e9a2a
videomixer: improve readability of debugging statements.
2009-07-10 14:37:04 +02:00
Sebastian Dröge
356972740a
videomixer: Make checker pattern lookup table constant
2009-07-08 18:19:45 +02:00