Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mediastreamer2
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
External Wiki
External Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
BC
public
mediastreamer2
Commits
4993792f
Commit
4993792f
authored
Apr 02, 2012
by
Pierre-Eric Pelloux-Prayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Split linux GL rendering to a new filter (GLXVideo)
parent
780bf4e6
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
405 additions
and
229 deletions
+405
-229
acinclude.m4
acinclude.m4
+4
-2
allfilters.h
include/mediastreamer2/allfilters.h
+2
-1
Makefile.am
src/Makefile.am
+1
-1
glxvideo.c
src/glxvideo.c
+374
-0
opengles_display.c
src/opengles_display.c
+3
-0
shaders.h
src/shaders.h
+3
-1
videostream.c
src/videostream.c
+3
-1
x11video.c
src/x11video.c
+15
-223
No files found.
acinclude.m4
View file @
4993792f
...
...
@@ -184,7 +184,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
fi
fi
AC_ARG_ENABLE(gl,
[ --enable-gl Enable GL rendering support],
[ --enable-gl Enable GL rendering support
(require glx and glew)
],
[case "${enableval}" in
yes) enable_gl=true ;;
no) enable_gl=false ;;
...
...
@@ -199,6 +199,8 @@ AC_DEFUN([MS_CHECK_VIDEO],[
if test "$enable_gl" = "false" ; then
AC_MSG_ERROR([No GL/GLX API found. Please install GL and GLX headers.])
fi
AC_CHECK_HEADERS(X11/Xlib.h)
AC_CHECK_HEADERS(GL/glew.h)
fi
fi
...
...
@@ -259,7 +261,7 @@ AC_DEFUN([MS_CHECK_VIDEO],[
LIBS="$LIBS -framework AVFoundation -framework CoreVideo -framework CoreMedia"
fi
if test "$enable_gl" = "true"; then
VIDEO_LIBS="$VIDEO_LIBS -lGL"
VIDEO_LIBS="$VIDEO_LIBS -lGL
-lGLEW
"
VIDEO_CFLAGS="$VIDEO_CFLAGS $SDL_CFLAGS -DHAVE_GL"
fi
if test "$enable_xv" = "true"; then
...
...
include/mediastreamer2/allfilters.h
View file @
4993792f
...
...
@@ -132,7 +132,8 @@ typedef enum MSFilterId{
MS_AAL2_G726_16_DEC_ID
,
MS_L16_ENC_ID
,
MS_L16_DEC_ID
,
MS_OSX_GL_DISPLAY_ID
MS_OSX_GL_DISPLAY_ID
,
MS_GLXVIDEO_ID
}
MSFilterId
;
...
...
src/Makefile.am
View file @
4993792f
...
...
@@ -172,7 +172,7 @@ libmediastreamer_la_SOURCES+=x11video.c
endif
if
BUILD_X11_GL
libmediastreamer_la_SOURCES
+=
x11
video.c opengles_display.c shaders.c
libmediastreamer_la_SOURCES
+=
glx
video.c opengles_display.c shaders.c
endif
libmediastreamer_la_SOURCES
+=
rfc2429.h
\
...
...
src/glxvideo.c
0 → 100644
View file @
4993792f
This diff is collapsed.
Click to expand it.
src/opengles_display.c
View file @
4993792f
...
...
@@ -326,6 +326,9 @@ static void check_GL_errors(const char* context) {
static
bool_t
load_shaders
(
GLuint
*
program
,
GLint
*
uniforms
)
{
#include "yuv2rgb.vs.h"
#include "yuv2rgb.fs.h"
yuv2rgb_fs_len
=
yuv2rgb_fs_len
;
yuv2rgb_vs_len
=
yuv2rgb_vs_len
;
GLuint
vertShader
,
fragShader
;
*
program
=
glCreateProgram
();
...
...
src/shaders.h
View file @
4993792f
...
...
@@ -19,9 +19,11 @@
#elif defined(__APPLE__)
#import <OpenGL/OpenGL.h>
#include <OpenGL/gl.h>
#el
se
#el
if defined( ANDROID )
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
#else
#include <GL/glew.h>
#endif
/* Shader Utilities */
...
...
src/videostream.c
View file @
4993792f
...
...
@@ -187,7 +187,9 @@ static void choose_display_name(VideoStream *stream){
stream
->
display_name
=
ms_strdup
(
"MSAndroidDisplay"
);
#elif __APPLE__ && !defined(__ios)
stream
->
display_name
=
ms_strdup
(
"MSOSXGLDisplay"
);
#elif defined (HAVE_XV) || defined (HAVE_GL)
#elif defined(HAVE_GL)
stream
->
display_name
=
ms_strdup
(
"MSGLXVideo"
);
#elif defined (HAVE_XV)
stream
->
display_name
=
ms_strdup
(
"MSX11Video"
);
#elif defined(__ios)
stream
->
display_name
=
ms_strdup
(
"IOSDisplay"
);
...
...
src/x11video.c
View file @
4993792f
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment