mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-09-20 02:50:16 +00:00
Code Issues 1 Projects Releases Wiki Activity
20445 commits 44 branches 1508 tags 384 MiB
Commit graph

43 commits

Author SHA1 Message Date
Matthew Waters
ceec4ad873 glvideomixer: implement glBlendFunc and glBlendEquation 
Allows more blending options than just A over B

e.g. frame comparisons are now possible.
  glvideomixer name=m
    sink_0::zorder=0
    sink_1::zorder=1
    sink_1::blend-equation-rgb={subtract,reverse-subtract}
    sink_1::blend-function-src-rgb=src-color
    sink_1::blend-function-dst-rgb=dst-color
  ! glimagesinkelement
  videotestsrc pattern=checkers-4 ! m.sink_0
  videotestsrc pattern=checkers-8 ! m.sink_1
 2016-01-13 12:00:03 +11:00
Nirbheek Chauhan
4977ec1189 glvideomixer: Proxy the ignore-eos videoaggregator property as well 
Identical to how the z-order property is proxied
 2015-10-06 16:57:53 +01: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
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
Olivier Crête
81b9d1531d glvideomixer, glmixer: Add description and klass 2015-07-03 12:28:47 -04: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
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
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
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
Sebastian Dröge
21413ff3fc Revert "Revert "glvideomixer: implement with glmixerbin"" 
This reverts commit b4bd11f2f3.
 2015-05-06 15:43:32 +02:00
Matthew Waters
b4bd11f2f3 Revert "glvideomixer: implement with glmixerbin" 
This reverts commit 0fb56738a1.
 2015-04-30 11:26:33 +10:00
Edward Hervey
90028d68fe glvideomixer: Don't use context if not present 
Avoids assertions at runtime
 2015-03-31 16:31:18 +02:00
Matthew Waters
34485c9976 gl: get the context from basemixer/basefilter 2015-03-13 12:30:20 +00:00
Matthew Waters
0fb56738a1 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
39e6f621b3 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
Tim-Philipp Müller
4e6f8a76f0 glmixer, glvideomixer: update for GstAggregatorPadForeachFunc change 2014-12-30 19:43:43 +00:00
Nirbheek Chauhan
888b531940 glvideomixer: Point to compositor for the pad properties documentation 2014-12-27 11:05:17 +00:00
Matthew Waters
f021549294 gl: fixup vao and vbo usage for legacy GL 2014-12-11 19:41:23 +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
45ac7be402 glvideomixer: add support for gl3 2014-11-28 09:14:25 +11:00
Matthew Waters
f0caf04ad6 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
Matthew Waters
d1360ef2c7 glvideomixer: update element documentation 2014-09-30 20:39:36 +10:00
Matthew Waters
acb21cdb83 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
9f953f297f glvideomixer: skip input frames with an alpha of 0 2014-09-24 14:31:19 +10:00
Matthew Waters
0b0c116327 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
510a016c88 glvideomixer: get the attribute from the correct shader 2014-08-19 14:43:42 +10:00
Tim-Philipp Müller
c81a2d1c6c opengl: update element docs for 1.x 2014-08-10 18:07:28 +01:00
Matthew Waters
dab074899e 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
Julien Isorce
6f45d00a9b gl: enable glvideomixer on GLES2 2014-06-25 06:55:11 +01:00
Matthew Waters
c37ace1844 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
4c02c4f004 glvideomixer: don't clobber already allocated shader 2014-06-25 10:19:42 +10:00
Thibault Saunier
d516c951e7 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
4ce8b409cc 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
e00815a586 glvideomixer: silence incorrect number of arguments in format warning 2014-06-15 15:18:46 +10:00
Matthew Waters
d01d259024 glvideomixer: wire up the alpha pad property 2014-06-15 13:59:07 +10:00
Matthew Waters
b7f1015359 glvideomixer: support input frame scaling 2014-06-15 13:44:04 +10:00
Matthew Waters
5a6bef5c59 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
4b5068f5dd gl: test for frame NULLness before dereferencing it 
Coverity 1195172, 1195171
 2014-04-08 16:25:51 +01:00
Matthew Waters
98c486025a gl: fix array initialization 2014-04-02 23:05:11 +11:00
Matthew Waters
5b0da41038 gl: fix assignment of temporary variables 2014-04-02 22:43:41 +11:00
Matthew Waters
4bdf5f336a move gl elements to ext subdirectory 2014-03-16 11:23:16 +01:00
Renamed from gst/gl/gstglvideomixer.c (Browse further)