mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 07:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity
1552 commits 44 branches 1510 tags 487 MiB
Commit graph

1552 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Waters
9587eb477d glcontext: pass display to implentation's _new() 
This allows the context to fail creation based on incompatible
display type's. e.g. glx context with an wayland display handle.

https://bugzilla.gnome.org/show_bug.cgi?id=752743
 2017-12-09 19:32:06 +00:00
Julien Isorce
738ed418ad gl: support cgl, egl and glx within a same build 
On osx, with the same build,
gst-launch-1.0 videotestsrc ! glimagesink works with:

GST_GL_PLATFORM=egl GST_GL_WINDOW=x11 GST_GL_API=gles2
GST_GL_PLATFORM=egl GST_GL_WINDOW=x11 GST_GL_API=opengl

GST_GL_PLATFORM=glx GST_GL_WINDOW=x11 GST_GL_API=opengl

GST_GL_PLATFORM=cgl GST_GL_WINDOW=cocoa GST_GL_API=opengl
GST_GL_PLATFORM=cgl GST_GL_WINDOW=cocoa GST_GL_API=opengl3

https://bugzilla.gnome.org/show_bug.cgi?id=752743
 2017-12-09 19:32:06 +00:00
Jan Schmidt
3bacd64bf1 glupload: Check that caps contain desired caps features 
Use 'contains' checks instead of equality checks on caps features
to allow for uploading when caps also contain GstVideoOverlayComposition
meta.

https://bugzilla.gnome.org/show_bug.cgi?id=752912
 2017-12-09 19:32:06 +00:00
Julien Isorce
ac469a0d28 gl: move GL_NUM_EXTENSIONS definition after gl.h 
https://bugzilla.gnome.org/show_bug.cgi?id=752743
 2017-12-09 19:32:06 +00:00
Julien Isorce
485ad4f5c1 caopengllayersink: remove unused label context_creation_error 
Build error introduced by commit
5457e55f25

https://bugzilla.gnome.org/show_bug.cgi?id=750310
 2017-12-09 19:32:06 +00:00
Tim-Philipp Müller
0a2f2426b0 glimagesink: fix allocation meta structure leak 
gst_query_add_allocation_meta() does not take ownership
of the structure, for some reason.

CID 1312135
 2017-12-09 19:32:06 +00:00
Luis de Bethencourt
1eeeadb24e glupload: fix memory leak 
GstCapsFeatures need to be freed with gst_caps_features_free() after use.

CID #1312136, CID #1312136
 2017-12-09 19:32:06 +00:00
Olivier Crête
f59948c5c0 glvideomixer: Add GstControlBinding proxy 
This is used to proxy GstControlBinding to the pad on the
parent object. This avoid having to sync the values in the proxy pad,
this is too early if you have a queue between the pad and the actual
aggregation operation.

https://bugzilla.gnome.org/show_bug.cgi?id=734060
 2017-12-09 19:32:06 +00:00
Nicolas Dufresne
4cf2d84315 glupload: Forward composition meta even without params 
When the sink does not know the window size (e.g not created yet)
it will not add any param to the the composition meta. This is no
reason not to forward this meta API. Fixes issue where it could not
attach until we resize the window.

https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:06 +00:00
Nicolas Dufresne
df7bcb6ba7 gloverlaycompositor: Keep memory pointer alive 
Keep the composition memory pointer alive while it's being
wrapped inside a GstGLMemory object.

https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:06 +00:00
Nicolas Dufresne
8884aeba87 gloverlaycompositor: Pass buffer stride 
The overlay pixel buffer stride was not given back
to the GL image.

https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:06 +00:00
Nicolas Dufresne
b0546f9bfa gloverlaycompositor: Hide GstCompsitionOverlay object 
This object is only used inside the compositor and does not
need to be expose in libgstgl API.

https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:06 +00:00
Nicolas Dufresne
9caaf9eb63 libgstgl: Makefile style fix 2017-12-09 19:32:06 +00:00
Nicolas Dufresne
1812c19291 composition-overlay: Positions are relative to texture 
The coordinate are relative to the texture dimension and not
the window dimension now. There is no need to pass the window
dimension or to update the overlay if the dimension changes.

https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:06 +00:00
Lubosz Sarnecki
8abd2bbe35 gloverlaycompositor: Create own shader object 
Make gloverlaycompositor independent of the shader used in the sink.

https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:06 +00:00
Nicolas Dufresne
1fae4b199a glimagesink: Properly handle compsositor life time 
Should be created in READY_TO_PAUSED, not PAUSED_TO_PLAYING.
Should be cleared in PAUSED_TO_READY.

https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:06 +00:00
Julien Isorce
32ddcf102c caopengllayersink: use gst_gl_display_create_context 
https://bugzilla.gnome.org/show_bug.cgi?id=750310
 2017-12-09 19:32:06 +00:00
Julien Isorce
6e7dc76b56 glstereosplit: use gst_gl_display_create_context 
Also unlock the lock on error.

https://bugzilla.gnome.org/show_bug.cgi?id=750310
 2017-12-09 19:32:06 +00:00
Luis de Bethencourt
3199b1b4a8 gloverlaycompositor: for loop initial declarations are only allowed in C99 mode 
Fixes compiler warnings
 2017-12-09 19:32:06 +00:00
Julien Isorce
f068020645 gl: use gst_gl_display_create_context in more elements. 
glbasefilter, glbasemixer and gltestsrc.

https://bugzilla.gnome.org/show_bug.cgi?id=750310
 2017-12-09 19:32:06 +00:00
Matthew Waters
11f058b1ca gl/build: fix typo in _HEADERS resulting in installing the wrong file 
/usr/include/gstreamer-1.0/gst/gl/gl.h:51:43: fatal error:
    gst/gl/gstgloverlaycompositor.h: No such file or directory
 2017-12-09 19:32:06 +00:00
Matthew Waters
41aeadc36e glcolorconvert: add RGB to NV12/NV21 conversion 2017-12-09 19:32:06 +00:00
Lubosz Sarnecki
91d4cfe2b0 glimagesink: Send reconfigure event when window size changes 
https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:06 +00:00
Lubosz Sarnecki
052b0a1caf glimagesinkbin: Add allocation query for GstVideoOverlayComposition 
Adds an GST_VIDEO_OVERLAY_COMPOSITION_META_API_TYPE query to glupload
and glimagesink.  Detects the query from the downstream elements, so
it is executed only when downstream supports the overlay API.

This makes pipelines with textoverlay ! glupload ! gldownload ! xvimagesink possible.
Uses allocation meta struct for passing the window size upstream.

https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:06 +00:00
Lubosz Sarnecki
26e6be8fad glcolorconvert: Apply GstVideoOverlayCompositionMeta buffer to converted buffer 
Since glcolorconvert creates a new GstBuffer,
without the GstVideoOverlayCompositionMeta data,
it needs to be copied to not be dropped.

https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:06 +00:00
Lubosz Sarnecki
076d0517c8 glupload: Detect overlay meta buffers correctly 
https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:06 +00:00
Lubosz Sarnecki
dc47e6d3c0 glimagesinkbin: Add GstVideoOverlayCompositionMeta caps features 
https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:06 +00:00
Lubosz Sarnecki
1c0ddbd9a8 glimagesink: Upload and draw overlays with GstGLOverlayCompositor 
Receives the GstOverlayComposition buffer in the glimagesink and draws them.

https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:06 +00:00
Lubosz Sarnecki
4d010efea1 gloverlaycompositor: Add GstGLOverlayCompositor class 
Manages the GstGLCompositionOverlay objects,
caches already uploaded overlays and draws them.

https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:06 +00:00
Lubosz Sarnecki
170ac41a87 glcompositionoverlay: Add compatibility for GL contexts without glGenVertexArrays 
https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:06 +00:00
Lubosz Sarnecki
279c2b07b4 glcompositionoverlay: Add class for managing GstVideoOverlayCompositionOverlay buffers 
Add a class to store and manage the OpenGL texture,
vertex buffer and GstVideoOverlayRectangle.
Transforms overlay coordinate space to vertex buffer space with aspect ratios in mind.

= Example Pipelines =

Simple pipeline

gst-launch-1.0 videotestsrc ! \
  textoverlay text="Hello World" font-desc="sans bold 30" ! \
  glimagesink

Display 3 static overlays at different positions

gst-launch-1.0 videotestsrc ! \
  textoverlay text="text1" valignment="top" font-desc="sans bold 30" ! \
  textoverlay text="text2" halignment="right" font-desc="sans bold 30" ! \
  textoverlay text="text3" halignment="left" font-desc="sans bold 30" ! \
  glimagesink

Display subtitle file over testsrc

gst-launch-1.0 videotestsrc ! \
  textoverlay name=foo filesrc location=foo.srt ! subparse ! queue ! foo. foo. ! \
  glimagesink

https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:05 +00:00
Lubosz Sarnecki
eb618aaac7 glupload: Move debug init to top of the file 
https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2017-12-09 19:32:05 +00:00
Matthew Waters
1b4f99856f glmemory: check for pbo availability before attempting pbo download 
https://bugzilla.gnome.org/show_bug.cgi?id=751165
 2017-12-09 19:32:05 +00:00
Matthew Waters
66407b9877 glcontext: fix get_current_gl_api on x11/nvidia drivers 
They require to get_proc_address some functions through the
platform specific {glX,egl}GetProcAddress rather than the default
GL library symbol lookup.
 2017-12-09 19:32:05 +00:00
Matthew Waters
cfa9b94045 glcontext: consolidate get_proc_address function definition 
Pass the GstGLAPI directly.
 2017-12-09 19:32:05 +00:00
Matthew Waters
36408736c0 glcolorconvertelement: propagate failure to convert buffer upstream 
Rather than just silently continuing
 2017-12-09 19:32:05 +00:00
Matthew Waters
3343e2dccd glcontext/glx: try creating a context with the highest version 
nvidia drivers return the exact version in glGstString (GL_VERSION)
we request on creation so start with the highest known version and
work our way down.
 2017-12-09 19:32:05 +00:00
Matthew Waters
78957c45c2 glcontext: track sharedness with a cookie 
The previous approach of traversing the other_context weak ref tree was
1. Less performant
2. Incorrect for context destruction removing a link in the tree

Example of 2:
c1 = context_create (NULL)
c2 = context_create (c1)
c3 = context_create (c2)
context_can_share (c1, c3) == TRUE
context_destroy (c2)
unref (c2)
context_can_share (c1, c3) returns FALSE when it should be TRUE!

This does not remove the restriction that context sharedness can only
be tracked between GstGLContext's.
 2017-12-09 19:32:05 +00:00
Matthew Waters
2df7e0f9de glcontext: use the debug object variant for completeness 2017-12-09 19:32:05 +00:00
Nicolas Dufresne
5f38bcf905 uploadelement: Protect against NULL pointer 
I notice that if you stop the pipeline during a renegotiation
the upload may be NULL while an allocation query is being run.
In that scenario, returning FALSE to the allocation query is the
best thing.
 2017-12-09 19:32:05 +00:00
Matthew Waters
5043800a1d glupload: memcpy on raw data upload 
Anything else requires keeping track of the GstVideoFrame mapping
across possible multiple buffers to ensure correct data pointer
usage.
 2017-12-09 19:32:05 +00:00
Matthew Waters
841380e022 glbasebuffer: add some debug and zero the data pointers on init 2017-12-09 19:32:05 +00:00
Sebastian Dröge
cff2d74cd4 gl/eagl: Don't call anything synchronously from the main thread 
This will deadlock if the main thread is the one who creates the GstGLContext.
All things we call from the main thread should be possible from any thread.

https://bugzilla.gnome.org/show_bug.cgi?id=751101
 2017-12-09 19:32:05 +00:00
Matthew Waters
b7a3b54b2a download: only start a download transfer for sysmem caps features 2017-12-09 19:32:05 +00:00
Hyunjun Ko
f67eb2571d glsyncmeta: transform func: return FALSE if not supported or failed 
https://bugzilla.gnome.org/show_bug.cgi?id=751778
 2017-12-09 19:32:05 +00:00
Matthew Waters
6a7bb242f9 android: add missing egl.h include 2017-12-09 19:32:05 +00:00
Matthew Waters
e4af6201c0 gltransformation: correct vao usage 
keep the vao bound after uploading the new vertex data

fixes a mesa GL error "no vertex array object bound" on caps changes
 2017-12-09 19:32:05 +00:00
Matthew Waters
afcb6aa1da gl: consolidate egl header includes to egl-only headers 
They may conflict with other headers.
 2017-12-09 19:32:05 +00:00
Olivier Crête
1c99bc92ca glvideomixer, glmixer: Add description and klass 2017-12-09 19:32:05 +00:00
Julien Isorce
9b1eb32c49 gl: initialize output params to 0 before calling gl functions 
The client side API of the Chromium's GPU Process has asserts
in debug mode that check that output params are initialized to 0.
 2017-12-09 19:32:05 +00:00