mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 20:51:13 +00:00
Code Issues 1 Projects Releases Wiki Activity
19683 commits 44 branches 1509 tags 442 MiB
Commit graph

795 commits

Author SHA1 Message Date
Julien Isorce
884e68c713 gl: use gst_gl_display_create_context in more elements. 
glbasefilter, glbasemixer and gltestsrc.

https://bugzilla.gnome.org/show_bug.cgi?id=750310
 2015-07-21 11:37:21 +01:00
Olivier Crête
50d5d0a161 glvideomixer, glmixer: Add description and klass 2015-07-03 12:28:47 -04:00
Nicolas Dufresne
1c66a33c56 gl: Don't leak pool if set_config failed 2015-07-02 09:40:05 -04:00
Jan Schmidt
92aacf5760 gl: Add glviewconvert, glstereomix and glstereosplit elements 
Conversion elements for transforming multiview/stereoscopic video

https://bugzilla.gnome.org/show_bug.cgi?id=611157
 2015-06-19 01:49:33 +10:00
Matthew Waters
acd6b876db glmixerbin: implement proper dynamic pad removal 
https://bugzilla.gnome.org/show_bug.cgi?id=750881
 2015-06-13 18:47:13 +10:00
Sebastian Dröge
2014cb4aa7 gl: Use gst_object_ref_sink() for gl{filter,mixer,src}bin too 2015-06-11 15:22:04 +02:00
Thiago Santos
e9f055f95b Fix a common typo: retreive -> retrieve 
Seems to have been copy pasted around a few places
 2015-06-05 09:43:35 -03:00
Sebastian Dröge
a3b806de4e compositor/glvideomixer: Don't calculate PAR/DAR with unset GstVideoInfos 
Otherwise we divide by zero.
 2015-05-21 16:24:48 +03:00
Matthew Waters
012e636e4e compositor/glvideomixer: fix up par handling 
We were using the wrong formula

https://bugzilla.gnome.org/show_bug.cgi?id=749634
 2015-05-21 01:04:38 +10:00
Matthew Waters
7e5123cd90 gl: remove useless gl{En,Dis}able (GL_TEXTURE_*) calls 
We are using shaders everywhere and so they are not needed
 2015-05-14 16:42:09 +10:00
Matthew Waters
930742dd5a gl: element buffers are part of vao state 
Use them as such.  They are also required for GL3 core profile support
with glDrawElements on OS X.
 2015-05-14 14:58:07 +10:00
Matthew Waters
d3d7498878 gl: don't deadlock on context creation failure 
https://bugzilla.gnome.org/show_bug.cgi?id=749284
 2015-05-13 23:56:48 +10:00
Sebastian Dröge
e6859acff2 glmixerbin: Don't unref pad templates 
Otherwise we unref the reference that is owned by the element class.
 2015-05-13 15:42:50 +03:00
Matthew Waters
7b48ab14e1 glvideomixer: implement par handling 
We were previously ignoring it completely
 2015-05-13 17:44:08 +10:00
Matthew Waters
2362ee8bee glvideomixer: don't upload the vertex data every frame 
Add the missing cache tracking statement.
 2015-05-13 17:44:04 +10:00
Sebastian Dröge
fa6dbaeb6c glmixer: Implement GstVideoAggregator::find_best_format() 
Without this, we will fixate weird pixel-aspect-ratios like 1/2147483647. But
in the end, all the negotiation code in videoaggregator needs a big cleanup
and videoaggregator needs to get rid of the software-mixer specific things
everywhere.
 2015-05-11 16:34:26 +03:00
Sebastian Dröge
ee275a167d Revert "gl: readd glupload/download onto element pads" 
This reverts commit 87d8270f30.
 2015-05-06 15:46:49 +02:00
Sebastian Dröge
824bb6acf8 Revert "Revert "glvideomixer: implement with glmixerbin"" 
This reverts commit b4bd11f2f3.
 2015-05-06 15:43:32 +02:00
Matthew Waters
2c7c82d748 gl: readd glupload/download onto element pads 
Allows insertion of gl elements into non-gl pipelines without converter
(upload/download) elements.

https://bugzilla.gnome.org/show_bug.cgi?id=743974
 2015-04-30 11:26:33 +10:00
Matthew Waters
a9fc9344a3 Revert "glvideomixer: implement with glmixerbin" 
This reverts commit 0fb56738a1.
 2015-04-30 11:26:33 +10:00
Matthew Waters
993e682a4b glupload: provide the sink template caps that could be used 
https://bugzilla.gnome.org/show_bug.cgi?id=746399
 2015-04-28 20:13:48 +10:00
Matthew Waters
8930bf7c07 gl: unref display/other-context in the correct place 
Otherwise state changes from PLAYING->READY->PAUSED will cause there to
to be no display configured on the element.

https://bugzilla.gnome.org/show_bug.cgi?id=748405
 2015-04-27 15:20:56 +10:00
Vineeth T M
52a40dfc48 glmixer: Possible null pointer dereference 
While printing error message when context fails, error variable is not being used anymore
so it will lead to null pointer dereference

https://bugzilla.gnome.org/show_bug.cgi?id=748287
 2015-04-22 22:33:28 +10:00
Matthew Waters
66a5cad6c1 gldisplay: synchronize the searching and creation of GstGLContext's 
Ootherwise we could end up with multiple elements in different chains
each creating a context.  Fixes context creation with glvideomixer.
 2015-04-21 12:55:24 +10:00
Guillaume Desmottes
9827138061 glmixer: fix caps leak in gst_gl_mixer_pad_sink_getcaps() 
Caps refcounting was all wrong in this function. Rewrote it and add some
comments to make it clearer.

Fix caps leaks with the
validate.file.glvideomixer.simple.play_15s.synchronized scenario.

https://bugzilla.gnome.org/show_bug.cgi?id=747915

Signed-off-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 2015-04-20 09:05:11 +01:00
Guillaume Desmottes
516dc5e302 glmixer: unref owned caps when finalizing the mixer 
Fix a caps leak with the
validate.file.glvideomixer.simple.play_15s.synchronized scenario.

https://bugzilla.gnome.org/show_bug.cgi?id=747915

Signed-off-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 2015-04-17 14:28:37 +01:00
Guillaume Desmottes
293d6a7ebe glmixer: pass the proper free function to frames and buffers array 
'array_buffers' contain borrowed GstBuffer and so shouldn't have a free
function. 'frames' is the one containing GstGLMixerFrameData and so should use
_free_glmixer_frame_data as free function.

Fix GstGLMixerFrameData leaks with the
validate.file.glvideomixer.simple.play_15s.synchronized scenario.

https://bugzilla.gnome.org/show_bug.cgi?id=747913

Signed-off-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
 2015-04-17 14:28:25 +01:00
Sebastian Dröge
78a1841c86 gl: Remove some empty ::finalize() implementations 2015-04-17 14:09:47 +02:00
Edward Hervey
9a73ffcef3 glvideomixer: Don't use context if not present 
Avoids assertions at runtime
 2015-03-31 16:31:18 +02:00
Matthew Waters
875e5c0320 glsyncmeta: make context to wait and set sync explicit 
otherwise we may wait on a sync object in same context by accident
 2015-03-14 16:53:46 +00:00
Matthew Waters
4c72910825 gl: get the context from basemixer/basefilter 2015-03-13 12:30:20 +00:00
Matthew Waters
b0ee70e77a gl: retreive the gldisplay/app gl context as soon as possible 
fixes the usage of gst_gl_display_filter_gl_api
 2015-03-13 12:30:20 +00:00
Matthew Waters
f19b8f7665 gl: store the list of contexts within gldisplay 
Removes the reliance on the allocation query to propogate GL contexts.

Allows thread safely getting a context for the a specific thread.
 2015-03-12 16:45:51 +00:00
Matthew Waters
acd9a252c0 glvideomixer: implement with glmixerbin 
The relevant properties are forwarded to/from the containing bin
and sink pads.
 2015-03-12 16:45:51 +00:00
Matthew Waters
b6cf2d9f21 glmixer: remove usage of upload/download objects 2015-03-12 16:45:51 +00:00
Matthew Waters
bf7409b831 gl: new glmixerbin element 2015-03-12 16:45:51 +00:00
Matthew Waters
d175b0be59 gl: add a new glbasemixer class below glmixer 
It deals with propagating the gl display/contexts throughout the
application/pipeline
 2015-03-12 16:45:50 +00:00
Nicolas Dufresne
f433695b5d glmixer: Don't share our downstream pool with upstream 
Pool cannot have multiple owner. This can lead to spurious
pool was flushing error.

https://bugzilla.gnome.org/show_bug.cgi?id=74570
 2015-03-06 20:12:09 -05:00
Sebastian Dröge
f153b9ee59 gl: Remove format info in glcolorconvert's transform_caps function instead of on every caller 
... and let glmixer actually transform the caps it is supposed to transform
instead of inventing new caps.
 2015-03-06 18:53:13 +01:00
Matthew Waters
bae0d5755a gl: remove the egl caps from the src pads 
we don't actually support producing EGLImage buffers anywhere.
 2015-02-03 15:30:08 +11:00
Matthew Waters
47feb5e011 glupload/download/convert: provide transform_caps functions 
Allows finer grain decisions about formats and features at each
stage of the pipeline.
Also provide propose_allocation for glupload besed on the supported
methods.
 2015-02-03 14:32:55 +11:00
Alessandro Decina
4860e179fa gl: initial support for texture targets other than GL_TEXTURE_2D 
Make GstGLMemory hold the texture target (tex_target) the texture it represents
(tex_id) is bound to. Modify gst_gl_memory_wrapped_texture and
gst_gl_download_perform_with_data to take the texture target as an argument.

This change is needed to support wrapping textures created outside libgstgl,
which might be bound to a target other than GL_TEXTURE_2D. For example on OSX
textures coming from VideoToolbox have target GL_TEXTURE_RECTANGLE.

With this change we still keep (and sometimes imply) GL_TEXTURE_2D as the
target of textures created with libgstgl.

API: modify GstGLMemory
API: modify gst_gl_memory_wrapped_texture
API: gst_gl_download_perform_with_data
 2015-01-30 00:34:08 +11:00
Matthew Waters
95a98d1d05 glvideomixer: don't upload if alpha <= 0 
Implemented using a upload_buffer vfunc within GstGLMixer allowing
NULL uploaded buffers.
 2015-01-15 09:50:02 +11:00
Matthew Waters
bd04b36280 gl: split glcolorconvert usage from glupload 
the separation allows the transfer operation to occur in a separate
thread/time which may increase performance in specific circumstances.
 2015-01-14 22:22:13 +11:00
Tim-Philipp Müller
13af5efb07 glmixer, glvideomixer: update for GstAggregatorPadForeachFunc change 2014-12-30 19:43:43 +00:00
Tim-Philipp Müller
6ad57a882a glmixer: update for aggregator start/stop vfunc change 2014-12-30 19:26:47 +00:00
Nirbheek Chauhan
6351c0becc glvideomixer: Point to compositor for the pad properties documentation 2014-12-27 11:05:17 +00:00
Matthew Waters
85febbbafb gl: fixup vao and vbo usage for legacy GL 2014-12-11 19:41:23 +11:00
Matthew Waters
c90f7001b1 gldisplay: implement runtime GL api filtering 
Needed so that the pipeline/application can limit the choice of GL api
to what it supports
 2014-11-28 09:14:26 +11:00
Matthew Waters
8f86923b00 gl: add a sync meta for synchronizing across GL contexts 
A context can create a GLsync object that can be waited on in order
to ensure that GL resources created in one context are able to be
used in another shared context without any chance of reading invalid
data.

This meta would be placed on buffers that are known to cross from
one context to another.  The receiving element would then wait
on the sync object to ensure that the data to be used is complete.
 2014-11-28 09:14:25 +11:00
Matthew Waters
ad77f0392f glvideomixer: add support for gl3 2014-11-28 09:14:25 +11:00
Thibault Saunier
8cc214fdb8 videoaggregator: Expose vmethods to set converters and prepare/clean frames 
This gives more flexibility to the subclasses and permits to remove the
GstVideoAggregatorClass->disable_frame_conversion ugly API.

WARNING: This breaks the API as it removes the disable_frame_conversion
field

API:
  + GstVideoAggregatorClass->find_best_format
  + GstVideoAggregatorPadClass->set_format
  + GstVideoAggregatorPadClass->prepare_frame
  + GstVideoAggregatorPadClass->clean_frame

  - GstVideoAggregatorClass->disable_frame_conversion

https://bugzilla.gnome.org/show_bug.cgi?id=740768
 2014-11-27 19:10:58 +01:00
Matthew Waters
c337aab991 glupload: rearchitecture for non GLMemory inputs/outputs 
Allows other memory types to be implemented/returned/used by the caller.
 2014-11-23 17:13:36 +11:00
Matthew Waters
d28854a625 glmixer: add read-only context property 2014-11-17 18:50:04 +11:00
Matthew Waters
f9c8268247 gl: remove the width/height fields from the caps to support frame resizing 
It was previously only occuring with sysmem caps features

https://bugzilla.gnome.org/show_bug.cgi?id=739334
 2014-11-11 14:23:55 +11:00
Matthew Waters
83c34503af glmixer: advertise support for changing input caps mid-stream 
https://bugzilla.gnome.org/show_bug.cgi?id=739334
 2014-10-31 21:29:25 +11:00
Matthew Waters
eb11906f01 glmixer: don't get the current caps from GstVideoInfo for the srcpad 
It's missing the caps features needed.
 2014-10-30 23:08:00 +11:00
Wang Xin-yu (王昕宇)
b151f564c2 glmixer:fix incorrect parameter passed to handle_set_context 2014-10-29 20:43:31 +11:00
Matthew Waters
33584480b5 glmixer: override the caps query in order to 'convert' capsfeatures 
Otherwise, it is only possible for the sink pads and the src pads to
have the exact same caps features.  We can convert from any feature
to another feature so support that.
 2014-10-24 00:35:22 +11:00
Matthew Waters
6687d39734 glmixer: override the accept caps query in order to 'convert' capsfeatures 
Otherwise, it is only possible for the sink pads and the src pads to
have the exact same caps features.  We can convert from any feature
to another feature so support that.
 2014-10-23 23:58:33 +11:00
Matthew Waters
340542edc7 gl: propogate other-context using GstContext 2014-10-23 23:58:33 +11:00
Matthew Waters
be214eac0f glmixer: fixup eglimage include path 2014-10-21 06:04:10 +11:00
Matthew Waters
7b4db67f6c glbufferpool: add the GstVideoGLTextureUploadMeta buffer pool option 2014-10-21 02:00:09 +11:00
Matthew Waters
8bf2acba1d videoaggregator: operate on caps rather than video info 
Otherwise the CapsFeatures will be lost along with the possibility
of multiple output types and formats.

https://bugzilla.gnome.org/show_bug.cgi?id=738129
 2014-10-21 01:14:36 +11:00
Sebastian Dröge
318b55e3ae glmixer: Call the pad's parent class finalize method 2014-10-13 13:27:55 +02:00
Sebastian Dröge
21275caae5 glmixer: Only finalize the other context in finalize() 
Otherwise we change a value of a property when going to READY state,
which is unexpected behaviour.
 2014-10-13 13:27:11 +02:00
Sebastian Dröge
a92ffca745 glmixer: Add other-context property 2014-10-13 11:57:22 +02:00
Matthew Waters
65ed8ecf07 glvideomixer: update element documentation 2014-09-30 20:39:36 +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
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
Tim-Philipp Müller
0ab1136f4e opengl: update element docs for 1.x 2014-08-10 18:07:28 +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
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
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
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
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