summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorJulien Isorce <julien.isorce@gmail.com>2009-10-23 01:11:27 +0200
committerJulien Isorce <julien.isorce@gmail.com>2009-10-23 01:21:17 +0200
commitf19251cf4f450a827b0779b699be6e135a737e08 (patch)
tree9e40bacd5290d086c2134544c390a7269fc3a73f /win32
parente31c9c1f2692f91eade44ebde28dbe38c55db62a (diff)
glmixer: add a glmixer base element
glmixer can be seen as a glfilter except it handles N requested sink pads. Each sink pad and the src pad are video/x-raw-gl. glmixer is responsible for managing different framerates from inputs. It uses OpenGL context sharing. It means that each input is in its own OpenGL context shared together and shared with the OpenGL context of the ouput gl chain. Also add a glmosaic which is an example of implementation of glmixer. For now glmosaic is a cube but it will be fixed in the next commits. For now the glmixer has some weird behaviours in some configurations but it will be improved in the next commits. The autotools builds is temporarly broken since those changes have been made on win32.
Diffstat (limited to 'win32')
-rw-r--r--win32/vs9/libgstopengl.vcproj24
1 files changed, 22 insertions, 2 deletions
diff --git a/win32/vs9/libgstopengl.vcproj b/win32/vs9/libgstopengl.vcproj
index 100d932..a285a49 100644
--- a/win32/vs9/libgstopengl.vcproj
+++ b/win32/vs9/libgstopengl.vcproj
@@ -62,7 +62,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="gstreamer.lib gstbase.lib gstinterfaces.lib gstvideo.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib png12.lib z.lib opengl32.lib glu32.lib glew32.lib glew32s.lib winmm.lib"
+ AdditionalDependencies="gstreamer.lib gstbase.lib gstinterfaces.lib gstvideo.lib gstcontroller.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib png12.lib z.lib opengl32.lib glu32.lib glew32.lib glew32s.lib winmm.lib"
LinkIncremental="2"
AdditionalLibraryDirectories="C:\gstreamer\lib;..\..\..\glib\lib;..\..\..\glew\lib"
GenerateDebugInformation="true"
@@ -138,7 +138,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="gstreamer.lib gstbase.lib gstinterfaces.lib gstvideo.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib png12.lib z.lib opengl32.lib glu32.lib glew32.lib glew32s.lib winmm.lib"
+ AdditionalDependencies="gstreamer.lib gstbase.lib gstinterfaces.lib gstvideo.lib gstcontroller.lib glib-2.0.lib gmodule-2.0.lib gobject-2.0.lib gthread-2.0.lib png12.lib z.lib opengl32.lib glu32.lib glew32.lib glew32s.lib winmm.lib"
LinkIncremental="1"
AdditionalLibraryDirectories="C:\gstreamer\lib;..\..\..\glib\lib;..\..\..\glew\lib"
GenerateDebugInformation="true"
@@ -201,6 +201,10 @@
>
</File>
<File
+ RelativePath="..\..\gst-libs\gst\gl\gstglmixer.c"
+ >
+ </File>
+ <File
RelativePath="..\..\gst-libs\gst\gl\gstglshader.c"
>
</File>
@@ -265,6 +269,10 @@
>
</File>
<File
+ RelativePath="..\..\gst\gl\gstglmosaic.c"
+ >
+ </File>
+ <File
RelativePath="..\..\gst\gl\gstgloverlay.c"
>
</File>
@@ -375,6 +383,14 @@
>
</File>
<File
+ RelativePath="..\..\gst-libs\gst\gl\gstglmixer.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\gst-libs\gst\gl\gstglmixerpad.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gst-libs\gst\gl\gstglshader.h"
>
</File>
@@ -427,6 +443,10 @@
>
</File>
<File
+ RelativePath="..\..\gst\gl\gstglmosaic.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gst\gl\gstgltestsrc.h"
>
</File>