mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-10 19:31:12 +00:00
Code Issues 1 Projects Releases Wiki Activity
20663 commits 44 branches 1509 tags 463 MiB
Commit graph

161 commits

Author SHA1 Message Date
Sebastian Dröge
541c3049dc Revert "Revert "glimagesink: add pixel-aspect-ratio property on the bin"" 
This reverts commit d96e43b034.
 2015-05-06 15:47:27 +02:00
Sebastian Dröge
8c28a51ee1 Revert "Revert "glimagesink: forward ALL the properties on the bin"" 
This reverts commit 59fb0f830f.
 2015-05-06 15:47:20 +02:00
Sebastian Dröge
35d5c648c6 Revert "Revert "glimagesink: implement as a bin"" 
This reverts commit be938f92d9.
 2015-05-06 15:47:04 +02:00
Sebastian Dröge
53c79cbf86 Revert "gl: readd glupload/download onto element pads" 
This reverts commit 87d8270f30.
 2015-05-06 15:46:49 +02:00
Matthew Waters
8ef4b12ab8 glimagesink: handle the local_context query 
so that upstream elements can get the GL context from glimagesink
 2015-05-04 23:44:17 +10:00
Matthew Waters
87d8270f30 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
be938f92d9 Revert "glimagesink: implement as a bin" 
This reverts commit 8a0017e21d.
 2015-04-30 11:26:33 +10:00
Matthew Waters
59fb0f830f Revert "glimagesink: forward ALL the properties on the bin" 
This reverts commit 4be45e5f30.
 2015-04-30 11:26:32 +10:00
Matthew Waters
d96e43b034 Revert "glimagesink: add pixel-aspect-ratio property on the bin" 
This reverts commit 2ba6bb9b93.
 2015-04-30 11:26:32 +10:00
Jan Schmidt
ff12434b9f glimagesink: Cache caps for passing to the client draw call 
Don't convert the GstVideoInfo to caps on every draw call,
just cache the caps and pass them into the GstSample.
 2015-04-29 02:52:40 +10:00
Matthieu Bouron
17d3a75583 glimagesink: Use gst_pad_get_pad_template_caps in ::get_caps() 2015-04-28 20:14:07 +10:00
Matthieu Bouron
4ca63b01ab glimagesink: Remove unused stop function 2015-04-27 18:27:48 +10:00
Matthew Waters
05109be4a0 glimagesink: unref the pool in the correct place 
Otherwise we could hold a pool to a context that is never going to be used.

https://bugzilla.gnome.org/show_bug.cgi?id=748405
 2015-04-27 18:21:01 +10:00
Matthew Waters
bd940327ef 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
Matthew Waters
b216629941 glimagesink: balance change_state display ref/unref 
the display was being unreffed on the incorrect state change causing
invalid state when changing from PLAYING/PAUSED->READY->PAUSED/PLAYING.
 2015-04-24 17:16:18 +10:00
Matthew Waters
6cb6d8f9e8 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
Sebastian Dröge
25561db099 glimagesink: Disconnect mouse/key event signal handlers from window when shutting down context 2015-04-06 20:28:22 -07:00
Sebastian Dröge
a72e204eae glimagesink: Guard against disconnecting invalid signal ids 2015-04-06 20:24:06 -07:00
Nicola Murino
0719c8c766 glimagesink: fix caps leak 
https://bugzilla.gnome.org/show_bug.cgi?id=746541
 2015-03-21 16:52:08 +00:00
Julien Isorce
f8fca66fb9 glimagesink: keep window invisible when sharing output 
https://bugzilla.gnome.org/show_bug.cgi?id=739681
 2015-03-14 17:56:39 +00:00
Julien Isorce
0150255a46 glimagesink: provide GstSample in client-draw signal 
Instead of prividing texture and size directly.
And apply changes to examples.

https://bugzilla.gnome.org/show_bug.cgi?id=739681
 2015-03-14 17:56:21 +00:00
Matthew Waters
fa61e8e4ce 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
Nicolas Dufresne
ac89e53173 glimagesink: Add NULL check in error case 
Other context may be NULL if something went wrong. Avoid trying to unref
a NULL pointer.
 2015-03-14 12:58:22 +00:00
Matthew Waters
2ba6bb9b93 glimagesink: add pixel-aspect-ratio property on the bin 2015-03-13 12:43:13 +00:00
Matthew Waters
4be45e5f30 glimagesink: forward ALL the properties on the bin 2015-03-13 12:30:20 +00:00
Matthew Waters
91b7642c48 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
ef0bd30c87 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
2f2470488b glimagesink: unset the current shader after rendering 
fixes gltestsrc ! glimagesink when gltestsrc doesn't use a shader
 2015-03-12 16:45:51 +00:00
Matthew Waters
8a0017e21d glimagesink: implement as a bin 
glupload ! glcolorconvert ! sink

Some properties are manually forwarded.  The rest are available using
GstChildProxy.

The two signals are forwarded as well.
 2015-03-12 16:45:50 +00:00
Nicolas Dufresne
fb4d769425 glimagesink: Only cache pool, don't manage it 
GLImage does not use any kind of internal pool. There was some
remaining code and comment stating that it was managing the
pool, and it was in fact setting the active state when doing
to ready state.

* Only create the pool if requested and in propose_allocation
* Cache the pool to avoid reallocation on spurious reconfigure
* Don't try to deactivate the pool (we don't own it)

https://bugzilla.gnome.org/show_bug.cgi?id=745705
 2015-03-06 19:25:16 -05:00
Sebastian Dröge
b81823e7db 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
Xavier Claessens
e25f4f1a60 glimagesink: cosmetic cleanup 
https://bugzilla.gnome.org/show_bug.cgi?id=745105
 2015-02-24 15:22:34 -05:00
Edward Hervey
43464aa204 glimagesink: Fix debug statement 2015-02-12 17:34:10 +01:00
Edward Hervey
638f99a37a glimagesink: Sprinkle more debug 2015-02-12 15:57:55 +01:00
Matthew Waters
4f15cc8d3c glimagesink: log the converted caps 2015-02-05 11:07:19 +11:00
Matthew Waters
e7a10a2d44 glcolorconvert: put GstGLSyncMeta on output buffers 
allows thread safely using the provided output buffer in a separate
thread
 2015-02-03 14:32:55 +11:00
Matthew Waters
c06715bde6 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
Matthew Waters
c827d1f804 glimagesink: clobber the alpha channel by default 
this can be disabled with the ignore-alpha property
 2015-01-30 15:54:05 +11:00
Matthew Waters
6cf97eb221 glwindow: make showing a window explicit 
Also fixes the cgl context always displaying a window to render to for
every GstGLContextCocoa created
 2015-01-29 22:26:37 +11:00
Matthew Waters
ab48bb6f0f glwindow: remove width/height from _draw() 
Depending on the platform, it was only ever implemented to 1) set a
default surface size, 2) resize based on the video frame or 3) nothing.
Instead, provide a set_preferred_size () that elements/applications
can use to request a certain size which may be ignored for
videooverlay/other cases.
 2015-01-23 16:11:31 +11:00
Nicola Murino
907e02cfa9 glimagesink: fix memleak 
https://bugzilla.gnome.org/show_bug.cgi?id=743142
 2015-01-19 14:33:02 +11:00
Matthew Waters
d5c3693791 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
Matthew Waters
f021549294 gl: fixup vao and vbo usage for legacy GL 2014-12-11 19:41:23 +11:00
Matthew Waters
6361df77e8 glimagesink: properly handle the !opengl3 case 
https://bugzilla.gnome.org/show_bug.cgi?id=740012
 2014-11-30 00:44:46 +11:00
Matthew Waters
3c1e77eb31 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
6bd1150ca8 gl: remove the use of glu 2014-11-28 09:14:26 +11:00
Matthew Waters
f2af65ee2d 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
f0d2346c52 glimagesink: use vbo's and vao's for gl3 2014-11-28 09:14:25 +11:00
Matthew Waters
a7ce611970 glimagesink: only attempt a resize when the window has already resized 
fixes a black startup screen on wayland
 2014-11-27 13:03:21 +11:00
Matthew Waters
810d38c29f 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
Vineeth T M
47f3a1954e glimagesink: critical error while seek playback-test(stop state) 
If we seek when media is in stop state, playback-test gives
critical error, since context of glimagesink is destroyed during stop.
But since context is not present, we need not handle send_event in glimagesink
Hence adding a condition to check if context is valid.

https://bugzilla.gnome.org/show_bug.cgi?id=740305
 2014-11-20 15:39:42 +11:00
Matthew Waters
5c48440c9a glimagesink: don't set the upload to NULL on the drain query 
https://bugzilla.gnome.org/show_bug.cgi?id=732694
 2014-11-12 11:44:43 +11:00
Julien Isorce
004a414b4a glimagesink: release stored buffers on drain query 
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=732694
 2014-11-12 00:08:04 +00:00
Alessandro Decina
7d48fe1c1e glimagesink: don't make gst_glimage_sink_handle_events call _ensure_gl_setup 
gst_glimage_sink_handle_events can be called from the overlay interface and from
the main thread before GL is setup. Before this change, that would call
_ensure_gl_setup() and deadlock on OSX.

Change things so that it's always safe to call gst_glimage_sink_handle_events()
without stuff deadlocking.
 2014-11-07 00:22:09 +01:00
Alessandro Decina
b60fe0271f glimagesink: fix possible deadlock on osx 
Remove gst_glimage_sink_handle_events call in gst_glimage_sink_init. It was
unnecessary and when the element was instantiated from the main thread, caused a
deadlock in OSX creating the context (thread).
 2014-11-07 00:22:09 +01:00
Matthew Waters
7e62c790d2 glimagesink: clamp the resize width/height to >= 1 to avoid a GL error 2014-11-07 10:03:08 +11:00
Lubosz Sarnecki
6702811e14 glimagesink: implement gst_video_overlay_handle_events 
https://bugzilla.gnome.org/show_bug.cgi?id=736035
 2014-11-06 16:04:11 +11:00
Matthew Waters
0537cbfa5b glimagesink: resize the viewport correctly on a caps change 
with force-aspect-ratio=true, if the width or height changed, the
viewport wasn't being updated to respect the new video width and height
until a resize occured.
 2014-10-31 21:29:26 +11:00
Lubosz Sarnecki
27da1e5aaf satisfy gst-indent 2014-10-29 23:42:54 +11:00
Matthew Waters
e40d70c69a gl: propogate other-context using GstContext 2014-10-23 23:58:33 +11:00
Sebastian Dröge
302034ac4c glimagesink: 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:28:57 +02:00
Sebastian Dröge
d8a262a589 glimagesink: Don't leak other-context 2014-10-13 11:57:22 +02:00
Matthew Waters
5b8d7a443e 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
a1ae26acbd gl: Removed unreachable break, unused variable 
https://bugzilla.gnome.org/show_bug.cgi?id=736957
 2014-09-19 21:48:14 +10:00
Sebastian Dröge
e4b084acd9 glimagesink: Add missing break to switch 
CID 1232801
 2014-08-28 16:42:30 +03:00
Lubosz Sarnecki
ddaaff3376 glimagesink: expose context 
* expose context in draw / reshape callbacks
* add context property

https://bugzilla.gnome.org/show_bug.cgi?id=734482
 2014-08-21 17:38:57 +10:00
Matthew Waters
c6706adfcc glimagesink: unref the window on navigation event 
plugs a memory leak
 2014-08-19 14:24:02 +10:00
Tim-Philipp Müller
c81a2d1c6c opengl: update element docs for 1.x 2014-08-10 18:07:28 +01:00
Vasilis Liaskovitis
4dacc4ba55 GstGLWindow, GstGLImagesink, x11: Scale navigation events on resized windows 
If window is resized, GstStructure pointer values have to be rescaled to
original geometry. A get_surface_dimensions GLWindow class method is added for
this purpose and used in the navigation send_event function.

https://bugzilla.gnome.org/show_bug.cgi?id=703486
 2014-08-07 13:55:02 +10:00
Matthew Waters
707cb58004 gl: document GST_GL_* environment variables 
https://bugzilla.gnome.org/show_bug.cgi?id=733245
 2014-08-01 16:43:47 +10:00
Matthew Waters
13960f0043 glimagesink: keep the uploaded buffer around on successful redisplay 
We might need it later to perform a redisplay.  GstGLUpload will take
of releasing the previous buffer when it receives a new buffer.

https://bugzilla.gnome.org/show_bug.cgi?id=733726
 2014-07-29 13:25:22 +10:00
Matthew Waters
13c63154b0 glimagesink: silence gsignal warning 
instance '0xblah' has no handler with id '13'
 2014-07-27 13:27:10 +10:00
Matthew Waters
5291ba37d9 glimagesink: remove extra argument from debug call 2014-07-24 13:05:00 +10:00
Vasilis Liaskovitis
90a4444609 glimagesink: Add navigation interface and callbacks for GstGLWindow mouse/key signals 
https://bugzilla.gnome.org/show_bug.cgi?id=703486
 2014-07-24 12:48:57 +10:00
Nicolas Dufresne
ab29217726 glimagesink: Keep aspect ratio by default 
The expected default behaviour for video sink is to maintain the
aspect ratio. Fix the default value to reflect this. The property
default was already TRUE, but the value was not initially TRUE.
 2014-07-09 15:03:53 -04:00
Sebastian Dröge
a84320be50 glimagesink: Chain up to the parent class' finalize function 2014-06-29 22:26:47 +02:00
Sebastian Dröge
f068b64285 glimagesink: Make sure to always unref the display 
Even if we didn't create a context yet.
 2014-06-29 22:25:43 +02:00
Matthew Waters
2ed84ac40f glimagesink: replace pointer properties with signals 
Based on patch by Mathieu Duponchelle <mathieu.duponchelle@epitech.eu>

https://bugzilla.gnome.org/show_bug.cgi?id=704507
 2014-06-12 12:18:23 +10:00
Matthieu Bouron
dac4816823 glimagesink: improve state change debug message 2014-06-03 14:08:34 +10:00
Matthew Waters
5eb4934750 glimagesink: unref the old buffer outside the lock 
it could very well deadlock

https://bugzilla.gnome.org/show_bug.cgi?id=723529
 2014-05-30 11:46:00 +10:00
Matthew Waters
1cb7e22b98 Revert "[880/906] glimagesink: remove unused stored_buffer field" 
This reverts commit af3a68db7d.

Conflicts:
	ext/gl/gstglimagesink.c

https://bugzilla.gnome.org/show_bug.cgi?id=723529
 2014-05-30 11:35:04 +10:00
Matthew Waters
da35876537 glfeature: remove GST_GL_API_GLES3 
instead check the gl version using gst_gl_context_check_gl_version()
 2014-05-30 10:29:37 +10:00
Matthew Waters
6ce3b82efe gl/upload: add GstGLUploadMeta object 
That simply deals with the provider aspect of GstVideoGLTextureUploadMeta.
 2014-05-28 14:41:35 +10:00
Julien Isorce
6c92286c6e glimagesink: make it actually honor show-preroll-frame property 
https://bugzilla.gnome.org/show_bug.cgi?id=730802
 2014-05-27 11:28:27 +01:00
Matthew Waters
37c08c58c5 gl/eglimage: add eglimage context feature 
Allows us to selectively use EGLImages only when available

https://bugzilla.gnome.org/show_bug.cgi?id=728234
 2014-05-20 23:37:52 +10:00
Sebastian Dröge
8070b4e043 glimagesink: Check if context creation failed before trying to use it 
Otherwise we will cause assertions everywhere by passing NULL to functions
and eventually crash when dereferencing a NULL pointer.

https://bugzilla.gnome.org/show_bug.cgi?id=730069
 2014-05-19 12:25:51 +02:00
Matthew Waters
a49a371710 gl/upload: implement lazy init 
Rename init_format to set_format
 2014-05-08 15:33:43 +10:00
Matthew Waters
a27589629d gl: advertise GstGLMemory usage in the caps as capsfeatures 
https://bugzilla.gnome.org/show_bug.cgi?id=729658
 2014-05-07 21:48:57 +10:00
Matthew Waters
6f4fd70867 gl/sink: make sure we always initialize the upload object 
https://bugzilla.gnome.org/show_bug.cgi?id=729542
 2014-05-07 09:12:23 +10:00
Matthew Waters
dfc6745143 gl: use the bufferpool's upload when available 
Avoids duplicating GL resources

https://bugzilla.gnome.org/show_bug.cgi?id=728872
 2014-05-02 15:59:28 +10:00
Julien Isorce
a20f17e29c glimagesink: use new helper function to avoid duplicating default shader text 2014-04-30 15:35:49 +01:00
Julien Isorce
3db1e3e1ed gl: fails glimagesink when shader compilation went wrong 
Those shaders are fixed and very simple so it should not fail
but it's worth to handle a such case.
 2014-04-24 16:57:01 +01:00
Julien Isorce
673b813ab3 gl: call glClearColor before glClear 2014-04-24 16:57:01 +01:00
Sebastian Dröge
e50f264411 glimagesink: Use the pixel-aspect-ratio adjusted width/height when centering the frame in the display area 
Makes sure we actually keep the display aspect ratio
 2014-04-23 11:10:28 +02:00
Sebastian Dröge
ebab5b0a43 glimagesink: By default keep the display aspect ratio 
Also the default for the pixel-aspect-ratio should be 1/1, not 0/1.
 2014-04-23 10:58:12 +02:00
Sebastian Dröge
89d2bb75d6 glimagesink: Call gst_object_unref() on the GstGL GObjects again 
While they're plain GObjects it does not hurt to call gst_object_unref()
on them and potentially allows to debug reference leaks a bit easier.
 2014-04-23 10:24:55 +02:00
Sebastian Dröge
38ebfb2da8 glimagesink: If creating a context or upload failed, destroy it 
Fixes deadlocks in error cases when later code assumes the broken
context is actually usable.

https://bugzilla.gnome.org/show_bug.cgi?id=728761
 2014-04-23 10:00:48 +02:00
Vincent Penquerc'h
467d9267a2 gl: a couple spelling/grammar fixes 2014-04-21 13:23:46 +01:00
Vincent Penquerc'h
7a3e141204 gl: guard against using a NULL window pointer 
Coverity 1195145
 2014-04-21 13:23:46 +01:00
Matthew Waters
364b01aca9 glimagesink: remove unused texture 2014-04-13 22:16:45 +10:00