mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-01 14:11:15 +00:00
Code Issues 1 Projects Releases Wiki Activity
148 commits 44 branches 1509 tags 472 MiB
Commit graph

148 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastian Dröge
f4451b764f videoaggregator: Revert the last commit and handle resolutions differences properly 
This is about converting the format, not about converting any widths and
heights. Subclasses are expected to handler different resolutions themselves,
like the videomixers already do properly.
 2014-10-01 17:18:05 +03:00
Sebastian Dröge
30f6b63c3d videoaggregator: GstVideoConverter currently can't rescale and will assert 
Leads to ugly assertions instead of properly erroring out:
CRITICAL **: gst_video_converter_new: assertion 'in_info->width == out_info->width' failed
 2014-10-01 17:11:16 +03:00
Matthew Waters
65ed8ecf07 glvideomixer: update element documentation 2014-09-30 20:39:36 +10:00
Matthew Waters
62a430ad21 videoaggregator: don't create converters when the subclass doesn't want them 
fixes a critical with glvideomixer after
35bd1969f9

CRITICAL **: gst_video_converter_new: assertion 'in_info->width == out_info->width' failed
 2014-09-28 16:58:42 +10:00
Matthew Waters
bc399a0403 glvideomixer: fix blending with low-alpha sources 
We also need to apply the blend paramaters to the alpha channel otherwise
the output of the blend will appear black at low alpha values (< 0.2).
 2014-09-26 01:59:43 +10:00
Wim Taymans
e4dd599a55 video: use video lib conversion code instead of copy 2014-09-24 16:55:49 +02:00
Matthew Waters
e0476bf014 glvideomixer: skip input frames with an alpha of 0 2014-09-24 14:31:19 +10:00
Matthew Waters
e0459f1b65 gl: download whenever we have sysmem capsfeatures 
Otherwise we could pass on a RGBA formatted buffer and downstream would
misinterpret that as some other video format.

Fixes pipelines of the form

    gleffects ! tee ! xvimagesink
 2014-09-24 13:16:30 +10:00
Matthew Waters
03c21f78b6 glupload: provide the output buffer that is rendered into 
Allows callers to properly reference count the buffers used for
rendering.

Fixes a redraw race in glimagesink where the previous buffer
(the one used for redraw operations) is freed as soon as the next
buffer is uploaded.

1. glimagesink uploads in _prepare() to texture n
1.1 glupload holds buffer n
2. glimagesink _render()s texture n
3. glimagesink uploads texture n+1
3.1 glupload free previous buffer which deletes texture n
3.2 glupload holds buffer n+1
4. glwindow resize/expose
5. glimagesink redraws with texture n

The race is that the buffer n (the one used for redrawing) is freed as soon as
the buffer n+1 arrives.  There could be any amount of time and number of
redraws between this event and when buffer n+1 is actually rendered and thus
replaces buffer n as the redraw source.

https://bugzilla.gnome.org/show_bug.cgi?id=736740
 2014-09-21 21:36:49 +10:00
Sanjay NM
a45a5f0101 gl: Removed unreachable break, unused variable 
https://bugzilla.gnome.org/show_bug.cgi?id=736957
 2014-09-19 21:48:14 +10:00
Ognyan Tonchev
0dbce9c6ab glmixer: do not leak pool in error cases 
https://bugzilla.gnome.org/show_bug.cgi?id=736729
 2014-09-16 12:48:01 +03:00
Matthew Waters
7a0155e735 glmixer: unref the GstGLUpload in the pad if freed while running 
Dynamic pipelines that get and release the sink pads will finalize
the pad without going through gst_gl_mixer_stop() which is where the
upload object is usually freed.  Don't leak objects in such case.
 2014-08-19 17:01:36 +10:00
Wang Xin-yu (王昕宇)
51b23bbff7 glvideomixer: avoid gl resource race condition between different thread 
https://bugzilla.gnome.org/show_bug.cgi?id=734830
 2014-08-19 17:00:58 +10:00
Matthew Waters
a555c32f30 glvideomixer: don't clobber unnecessary GstVideoInfo fields 
otherwise we might clobber other important fields such as the frame rate.
 2014-08-19 14:44:29 +10:00
Matthew Waters
3fe5412357 glvideomixer: get the attribute from the correct shader 2014-08-19 14:43:42 +10:00
Matthew Waters
4b1bf9b52a videoaggregator: push the caps event as soon as we receive it 
Along with the required mandatory dependent events.

Some elements need to perform an allocation query inside
::negotiated_caps().  Without the caps event being sent prior,
downstream elements will be unable to answer and will return
an error.

https://bugzilla.gnome.org/show_bug.cgi?id=732662
 2014-08-11 23:36:27 +10:00
Tim-Philipp Müller
0ab1136f4e opengl: update element docs for 1.x 2014-08-10 18:07:28 +01:00
Sebastian Rasmussen
bc15905c45 videoaggregator: Unref allowed caps after usage 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=734522
 2014-08-10 11:55:09 +01:00
Matthew Waters
5cddc44b0a glvideomixer: add a background property 
That's compatible with the compositor/videomixer property

https://bugzilla.gnome.org/show_bug.cgi?id=731954
 2014-08-07 19:21:02 +10:00
Wang Xin-yu (王昕宇)
e9bf900d33 gl: fix multi gl object leaks 
1. fix FBO leaks in decide_allocation
2. fix texture leaks in decide_allocation and reset
3. fix texture leaks in FBO incomplete error path
 2014-07-24 11:46:56 +10:00
Sebastian Dröge
8c7916d4ec gl: Move GstGLMixer to the plugin for now 
It depends on GstAggregator and we don't want to install headers
for that yet.

https://bugzilla.gnome.org/show_bug.cgi?id=732207
 2014-07-11 09:41:05 +02:00
Thibault Saunier
4e60b291f8 videoaggregator: Fix some more the locking logic in update_src_caps 
We need the GST_OBJECT_LOCK only to iterate the sinkpads, nothing else.

https://bugzilla.gnome.org/show_bug.cgi?id=732750
 2014-07-06 23:36:10 +02:00
Tim-Philipp Müller
27ad5ef8d6 videoaggregator: fix broken locking in update_src_caps function 
We would unlock an already-unlocked mutex that we never re-locked.

https://bugzilla.gnome.org/show_bug.cgi?id=732750
 2014-07-06 22:16:48 +01:00
Vincent Penquerc'h
771ed7e429 videoaggregator: reset QoS on segment event 
https://bugzilla.gnome.org/show_bug.cgi?id=732540
 2014-07-01 16:35:42 +01:00
Sebastian Dröge
97cf5acb20 badvideo: Rename videoconvert functions to prevent conflicts with static linking 
https://bugzilla.gnome.org/show_bug.cgi?id=728443
 2014-06-28 17:03:19 +02:00
Thiago Santos
5d0564eb4e compositor: tests: Fix pad leak 
Remember to unref requested pad
 2014-06-28 09:44:22 -03:00
Matthew Waters
b1c00adfd7 videoaggregator: fix a refcount error when keeping the buffer 
We take a ref on the pad's buffer at the beginning so we need to
unref when we are done in all cases.
 2014-06-27 00:14:03 +10:00
Julien Isorce
b0a0974ea7 gl: enable glvideomixer on GLES2 2014-06-25 06:55:11 +01:00
Matthew Waters
7f2000a7a5 glvideomixer: bas output width/height on the pad properties 
Allows automatic negotiation of the size in the following case:
gst-launch-1.0 glvideomixer name=m sink_0::xpos=0 sink_1::xpos=320 ! glimagesink \
    videotestsrc ! m. \
    videotestsrc pattern=1 ! m.

https://bugzilla.gnome.org/show_bug.cgi?id=731878
 2014-06-25 12:00:34 +10:00
Matthew Waters
0646c33970 glvideomixer: don't clobber already allocated shader 2014-06-25 10:19:42 +10:00
Edward Hervey
6c4be30245 compositor: Fix Makefile CFLAGS/LIBADD ordering 
We want to use the libraries from -bad if/when present
 2014-06-24 08:01:21 +02:00
Matthew Waters
fe79c90fc1 videoaggregator: don't clobber already heap allocated video frame 
CID # 1223440
 2014-06-23 22:40:23 +10:00
Matthew Waters
5ae625a333 videoaggregator: fix up the parent chaining for dispose and finalize 2014-06-23 22:36:23 +10:00
Sebastian Dröge
776b461eff Release 1.3.3 2014-06-22 19:22:28 +02:00
Thibault Saunier
6be7e91e4a libs:video: Properly declare APIs as UNSTABLE 2014-06-21 17:02:50 +02:00
Thibault Saunier
9e0c81cb62 libs: videoaggregato: Do not import videoconvert.h in gstvideoaggregatorpad.h 
+ Add a Private structure to the GstVideoAggregatorPad
+ Add some padding
 2014-06-20 22:14:25 +02:00
Thibault Saunier
1f1283b4d8 gl:glvideomixer: Add the Compositor in the element metadata class 
So it is possible to pick one compositing element from the registry
 2014-06-20 19:53:33 +02:00
Mathieu Duponchelle
75c71741a2 compositor: Add a new compositor based on the new GstVideoAggregator base class 
It is a replacement for videomixer with a similare API

Co-Authored by: Thibault Saunier <tsaunier@gnome.org>

https://bugzilla.gnome.org/show_bug.cgi?id=731919
 2014-06-20 19:53:33 +02:00
Thibault Saunier
59a7205ae0 gl: Port glmixer to the GstVideoAggregator baseclass 
https://bugzilla.gnome.org/show_bug.cgi?id=731921
 2014-06-20 19:53:33 +02:00
Mathieu Duponchelle
a7289ae606 videoaggregator: Create a new GstVideoAggregator baseclass 
This base class has been added to a newly created libgstbadvideo library

Co-Authored by: Thibault Saunier <tsaunier@gnome.org>

https://bugzilla.gnome.org/show_bug.cgi?id=731918
 2014-06-20 19:53:33 +02:00
Matthew Waters
b1a11258b1 glvideomixer: silence incorrect number of arguments in format warning 2014-06-15 15:18:46 +10:00
Matthew Waters
fabdcd1dfc glvideomixer: wire up the alpha pad property 2014-06-15 13:59:07 +10:00
Matthew Waters
ec7df9773f glvideomixer: support input frame scaling 2014-06-15 13:44:04 +10:00
Matthew Waters
e3a48cb9d6 glvideomixer: add positioning of input streams 
https://bugzilla.gnome.org/show_bug.cgi?id=729798
 2014-06-15 12:28:45 +10:00
Vincent Penquerc'h
c2fbe354c1 gl: test for frame NULLness before dereferencing it 
Coverity 1195172, 1195171
 2014-04-08 16:25:51 +01:00
Matthew Waters
58206849b5 gl: fix array initialization 2014-04-02 23:05:11 +11:00
Matthew Waters
665cc2ba21 gl: fix assignment of temporary variables 2014-04-02 22:43:41 +11:00
Matthew Waters
32621be708 move gl elements to ext subdirectory 2014-03-16 11:23:16 +01:00