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

407 commits

Author SHA1 Message Date
Nicolas Dufresne
f935b2c547 glsink: Enable sync meta on pools we offer 
As the upload is asynchronous, we need to enable the sync meta to
gain correct rendering. The buffer pool receiver don't know about
that.
 2015-08-15 15:55:08 +02:00
Nicolas Dufresne
ea484fb968 glimagesink: Move overlay rendering after video rendering 
This is mostly cosmetic, but heoretically it reduces the amount of
required object in the context at one point. It also avoids potential
conflicts.
 2015-08-15 15:55:08 +02:00
Matthew Waters
b38f107bd3 glimagesink: take into account non 1/1 par for navigation 
The current code was ignoring the par/dar aspect when transforming
from window coordinates to stream coordinates resulting in incorrect
coordinates being sent upstream in the navigation events.
 2015-08-12 00:25:35 +02:00
Matthew Waters
b7777b9181 gl: use gles2 shaders everywhere 
This effectively limits a glfilter subclass to be > GL(ES) 2.0.
rather than a possible GL 1.4.
 2015-08-10 16:38:32 +02:00
Lubosz Sarnecki
80d77aa0a5 gltransformation: implement pivot point for rotation and scale 
https://bugzilla.gnome.org/show_bug.cgi?id=744763

Add a pivot vector for setting the origin of rotations and scales.

With the pivot point the rotation and scale operations can have
different origins. This adds the ability to rotate around different points.
Currently the default (0, 0) pivot point is possible,
a rotation around the center, and zooming into and out of the center.

With an pivot point this is optional.
I defined the following image coordinates for the pivot point:

	 (-1,1) ------------------------- (1,1)
		|			|
		|			|
		|			|
		|	  (0,0)		|
		|			|
		|			|
		|			|
	(-1,-1) ------------------------- (1,-1)

Example:

	Rotate the video at the bottom left corner

	gst-launch-1.0 videotestsrc \
			! gltransformation \
		 		scale-x=0.5 \
				scale-y=0.5 \
				rotation-z=25.0 \
				pivot-x=-1.0 \
				pivot-y=-1.0 \
			! glimagesink

The pivot-z option defines the pivot point in 3D space.
This only affects rotation, since we have no Z data to scale.
With this option a video can be rotated around a point in 3D space.

Example:

	Rotate around point behind the video:

    	gst-launch-1.0 videotestsrc \
			! gltransformation \
				rotation-x=10.0 \
				pivot-z=-4.0 \
			! glimagesink
 2015-08-08 16:32:53 -04:00
Matthew Waters
374cd2a570 glvideomixer: swap control binding proxy 
The ref_object and object parameters were the wrong way around.

For the typical use case where an application is setting a
GstControlBinding on the returned ghost pad:
1. our control binding would be removed when the new one was set
2. sync_values calls were not being forwarded from the internal
   pad to the ghost pad.

If an application attempts to perform other control binding
operations (get_* family of functions) on the internal pad, they
will also be forwarded to the ghost pad where a possible
GstControlBinding will provide the necessary values.
 2015-08-03 20:08:52 +10:00
Luis de Bethencourt
22baf364fe gstglfilterbin: remove unused variable 
res is set multiple times but never used or returned. Removing it.
 2015-07-30 11:12:26 +01:00
Luis de Bethencourt
82a2b43bdd glstereomix: remove redundant initialization 
v is initialized in the for loop init, no need to do it twice. Removing
first initialization.
 2015-07-29 17:49:01 +01:00
Julien Isorce
fb6457e90a caopengllayersink: remove unused label context_creation_error 
Build error introduced by commit
5457e55f25

https://bugzilla.gnome.org/show_bug.cgi?id=750310
 2015-07-24 00:02:32 +01:00
Tim-Philipp Müller
2992ff98e5 glimagesink: fix allocation meta structure leak 
gst_query_add_allocation_meta() does not take ownership
of the structure, for some reason.

CID 1312135
 2015-07-23 11:23:41 +01:00
Olivier Crête
6edf8dbaa6 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
 2015-07-22 20:59:50 -04:00
Nicolas Dufresne
4f4aedecf3 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
 2015-07-22 17:00:25 -04:00
Nicolas Dufresne
17788157a1 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
 2015-07-22 13:17:18 -04:00
Lubosz Sarnecki
b155f5d73e gloverlaycompositor: Create own shader object 
Make gloverlaycompositor independent of the shader used in the sink.

https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2015-07-22 13:16:39 -04:00
Nicolas Dufresne
e8c31619c4 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
 2015-07-22 13:07:58 -04:00
Julien Isorce
5457e55f25 caopengllayersink: use gst_gl_display_create_context 
https://bugzilla.gnome.org/show_bug.cgi?id=750310
 2015-07-21 14:55:35 +01:00
Julien Isorce
6fc5b18138 glstereosplit: use gst_gl_display_create_context 
Also unlock the lock on error.

https://bugzilla.gnome.org/show_bug.cgi?id=750310
 2015-07-21 14:55:11 +01:00
Julien Isorce
57f389d9ce 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
Lubosz Sarnecki
2b7542400c glimagesink: Send reconfigure event when window size changes 
https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2015-07-20 14:41:12 -04:00
Lubosz Sarnecki
2fb862b34f 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
 2015-07-20 14:41:12 -04:00
Lubosz Sarnecki
a7d1b7fcad glimagesinkbin: Add GstVideoOverlayCompositionMeta caps features 
https://bugzilla.gnome.org/show_bug.cgi?id=745107
 2015-07-20 14:41:12 -04:00
Lubosz Sarnecki
778ad10518 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
 2015-07-20 14:41:11 -04:00
Matthew Waters
0aaf9db1df glcolorconvertelement: propagate failure to convert buffer upstream 
Rather than just silently continuing
 2015-07-18 16:32:15 +10:00
Nicolas Dufresne
04beac6e0f 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.
 2015-07-16 17:05:36 -04:00
Matthew Waters
d5a39896dc download: only start a download transfer for sysmem caps features 2015-07-07 22:38:08 +10:00
Matthew Waters
2b9dddbafe 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
 2015-07-07 15:32:13 +10:00
Matthew Waters
26df88cd24 gl: consolidate egl header includes to egl-only headers 
They may conflict with other headers.
 2015-07-07 13:12:49 +10:00
Olivier Crête
81b9d1531d glvideomixer, glmixer: Add description and klass 2015-07-03 12:28:47 -04:00
Nicolas Dufresne
fe283a9aeb gl: Don't leak pool if set_config failed 2015-07-02 09:40:05 -04:00
Vineeth TM
8ec2e0ad62 glimagesink: use g_clear_error instead of g_error_free 
replace g_error_free with g_clear_error, as it internally
checks if error variable is valid or not.

https://bugzilla.gnome.org/show_bug.cgi?id=751823
 2015-07-02 11:34:10 +01:00
Luis de Bethencourt
be664ae40d gl: add missing break 
gst_gl_view_convert_element_set_property() is missing a break at the end
of the PROP_OUTPUT_DOWNMIX_MODE case. Adding it.

CID #1308949
 2015-06-29 16:10:50 +01:00
Nicolas Dufresne
11150e3bea glimagesink: Don't leak pool 
gst_query_add_allocation_pool is transfer none. Also unref
if there was a configuration error.
 2015-06-26 14:59:15 -04:00
Julien Isorce
66d833fcf2 gldisplay: add gst_gl_display_create_context 
It also emits a create-context signal so that an application
can provide an external GstGLContext backend.

https://bugzilla.gnome.org/show_bug.cgi?id=750310
 2015-06-19 13:10:30 +01:00
Julien Isorce
5b003b68ca Revert "gl: add GstGLContextGPUProcess backend" 
This reverts commit b377112ee3.
 2015-06-19 13:08:49 +01:00
Jan Schmidt
b973f9473e glimagesink: Remove duplicate, useless line of code 2015-06-19 14:37:24 +10:00
Nicolas Dufresne
c2b49fa732 opengl: glstero* are only built with full OpenGL 
Don't try to register the elements unless they are built.
 2015-06-18 22:11:05 -04:00
Jan Schmidt
eefdb2ed86 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
Jan Schmidt
00d6fe9068 glimagesink: Support multiview/stereoscopic video 
Support video with multiview info in the caps, transform
it to mono anaglyph by default, but allow for configuring
other output modes and handoff to the app via
the draw signal.

https://bugzilla.gnome.org/show_bug.cgi?id=611157
 2015-06-19 01:49:33 +10:00
Matthew Waters
890de823e6 glimagesink: add missing handle-events/ignore-alpha property to the bin 2015-06-15 22:44:31 +10:00
Matthew Waters
4796cef882 glmixerbin: implement proper dynamic pad removal 
https://bugzilla.gnome.org/show_bug.cgi?id=750881
 2015-06-13 18:47:13 +10:00
Nicolas Dufresne
c72213ff8b glimagesink: Don't do pool caching 
We now know that pool caching can cause renegotiation issues
when an element in the pipeline change from passthrough to not
passthrough. As it's not needed, don't cache existing pools.

https://bugzilla.gnome.org/show_bug.cgi?id=748344
 2015-06-12 20:14:37 -04:00
Matthew Waters
c3a47c910d glmemory: separate pbo transfer from texture transfers 
When supported, the potentially longer pbo upload/download can be
initiated before the texture upload/download, potentially increasing
throughput.
 2015-06-12 16:59:20 +10:00
Matthew Waters
cd2669fad1 gl: move basesink properties from glimagesinkbin to glsinkbin 2015-06-12 00:34:58 +10:00
Sebastian Dröge
e8a97877b4 gl: Use gst_object_ref_sink() for gl{filter,mixer,src}bin too 2015-06-11 15:22:04 +02:00
Sebastian Dröge
c1b43742bf glsinkbin: Use gst_object_ref_sink() for consistency with the video-sink property on playbin 2015-06-11 15:17:55 +02:00
Thiago Santos
045bfa10fe Fix a common typo: retreive -> retrieve 
Seems to have been copy pasted around a few places
 2015-06-05 09:43:35 -03:00
Matthew Waters
d914cc6e72 gl: consolidate internal_rgba_format into glmemory 
Expose some useful value format conversion functions available in
GstGLMemory.
 2015-06-02 16:33:44 +10:00
Matthew Waters
fac0cdc7ac glwindow: handle gst_video_overlay_set_render_rectangle 2015-05-31 16:04:13 +10:00
Julien Isorce
b377112ee3 gl: add GstGLContextGPUProcess backend 
It builds its GL vtable from a proc address provided
by the application.
 2015-05-27 17:22:40 +01:00
Julien Isorce
ba5bf50d5f gl: add and use gst_gl_internal_format_rgba 
Previously when compiling GstGL with both GL and GLES2,
GL_RGBA8 was picked from GL/gl.h. But a clash may happen at
runtime when one is selecting GLES2.

gst_gl_internal_format_rgba allows to check at runtime
if it should use GL_RGBA or GL_RGBA8.
 2015-05-27 17:20:05 +01:00
Luis de Bethencourt
666a80236c gleffects: 'for' loop initial declaration 
'for' loop initial declarations are not allowed in C89, moving the declarations
to before the 'for' loops.
 2015-05-27 13:05:15 +01:00
Xavier Claessens
2bb01f9601 gloverlay: fix a leak 
https://bugzilla.gnome.org/show_bug.cgi?id=749846
 2015-05-26 16:49:55 -04:00
Xavier Claessens
53cd9e3e0e gloverlay: properly handle errors while loading file 
Post an error on the bus if anything bad happens while reading
and parsing the image file.

https://bugzilla.gnome.org/show_bug.cgi?id=749846
 2015-05-26 16:49:55 -04:00
Xavier Claessens
02b2c2edf6 gloverlay: remove unused type_file field 
https://bugzilla.gnome.org/show_bug.cgi?id=749846
 2015-05-26 16:49:55 -04:00
Matthew Waters
db9e0cf5c7 gleffects: properly initialize the shaders across contexts implementing multiple API's 2015-05-26 12:50:58 +10:00
Matthew Waters
cb482f13be gleffects_laplacian: fix shader compilation in gl3/gles2 
https://bugzilla.gnome.org/show_bug.cgi?id=748393
 2015-05-26 12:50:58 +10:00
Matthew Waters
9dcefacb3d gltransformation: fix DrawElements call for element array buffers 
https://bugzilla.gnome.org/show_bug.cgi?id=749734
 2015-05-25 17:39:08 +10:00
Sebastian Dröge
3230e51993 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
d1419afef1 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
8157574d0f caopengllayersink: static const the indices array 
the contents will never change anyway.
 2015-05-20 00:56:44 +10:00
Matthew Waters
057130b93d caopengllayersink: correctly use the sync meta across multiple contexts 
1. Set the sync point after the (possible) upload has occured
2. Wait in the correct GL context (the draw context)

Note: We don't add the GL sync meta to the input buffer as it's not
writable and a copy would be expensive.

Similar to the change with the same name for glimagesink
 2015-05-20 00:36:48 +10:00
Matthew Waters
49c4d0850d caopengllayersink: update for GL3 element array buffer usage 
fixes blank output
 2015-05-20 00:36:48 +10:00
Matthew Waters
6a2d12bf47 glimagesink: correctly use the sync meta across multiple contexts 
1. Set the sync point after the (possible) upload has occured
2. Wait in the correct GL context (the draw context)

Note: We don't add the GL sync meta to the input buffer as it's not
writable and a copy would be expensive.
 2015-05-20 00:36:48 +10:00
Matthew Waters
c6abd1632f glimagesink: free the vertex buffer when done 
fixes a memory leak
 2015-05-14 21:21:01 +10:00
Matthew Waters
0870e8785e 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
1f89d1dce2 glimagesink: cleanup properties 
remove unused "display-name"
ensure defaults between the bin/element are the same
 2015-05-14 15:10:59 +10:00
Matthew Waters
a852146624 gleffects: only try the GL2 shader init path if we have a GL2 context 2015-05-14 14:58:07 +10:00
Matthew Waters
7f7a9dd3ec 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
1853e455ac 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
5f6bddf719 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
725c1147bc glvideomixer: implement par handling 
We were previously ignoring it completely
 2015-05-13 17:44:08 +10:00
Matthew Waters
21a6cfcc18 glvideomixer: don't upload the vertex data every frame 
Add the missing cache tracking statement.
 2015-05-13 17:44:04 +10:00
Nicolas Dufresne
f01d47d0f2 gluploadelement: Remove uneeded header and defines 2015-05-12 16:36:58 -04:00
Nicolas Dufresne
df3d415906 gltestsrc: Use default get_caps implementation 
The custom code is wrong as it ignores the templates, which leads to
missing fields in the result. Instead, simply use the default get_caps
implementation which does it correctly (get the template, intersect
with filter and return).

https://bugzilla.gnome.org/show_bug.cgi?id=749237
 2015-05-11 15:02:02 -04:00
Sebastian Dröge
b8941efc4a 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
Matthew Waters
628d8d9599 gl: demote upload/convert/download elements to none 
Copy paste error
 2015-05-11 22:58:45 +10:00
Matthew Waters
bd1a0cfec2 gl: expose internal glvideomixerelement\ 
We might want more control over the exact pipeline
Also reduces overhead
 2015-05-11 22:58:45 +10:00
Matthew Waters
d2a6e8a92e gl: expose internal glimagesinkelement 
We might want more control over the exact pipeline.
Also reduces overhead.
 2015-05-11 22:58:37 +10:00
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
Sebastian Dröge
21413ff3fc Revert "Revert "glvideomixer: implement with glmixerbin"" 
This reverts commit b4bd11f2f3.
 2015-05-06 15:43:32 +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
b4bd11f2f3 Revert "glvideomixer: implement with glmixerbin" 
This reverts commit 0fb56738a1.
 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
Matthew Waters
0b7f65bbc3 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
Matthieu Bouron
e765a9bb00 glfiltercube: Don't initialize multiple shaders on renegotiation 2015-04-27 14:52:37 +02: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
Matthieu Bouron
c6ec145a95 gltransformation: Unref shader in ::stop() 2015-04-27 10:16:24 +02: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
Sebastian Dröge
e7aa25ca6f glfilter: De-camelcase onInitFBO() vfunc 2015-04-26 21:42:03 +02:00
Sebastian Dröge
c638477c48 glfilter: Remove onStart/onStop vfuncs, and unused onReset() 
onStart/onStop are just duplicates of the basetransform ones, onReset
was never called but was used everywhere when stop should've been used.
 2015-04-26 21:39:06 +02:00
Lubosz Sarnecki
51daa8b9e2 gltransformation: don't initialize multiple shaders on renegotiation 
https://bugzilla.gnome.org/show_bug.cgi?id=748407

* delete shader if one exists
* set it to NULL after unrefing
 2015-04-26 21:23:16 +02:00