mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

[083/906] finish to implement the glfilter: example : gst-launch-0.10 videotestsrc num_buffers = 100 ! glgraphicmaker ! glfiltercube ! glimagesink

Browse source 
git-svn-id: svn://svn.wobow.com/GStreamer_playground/gst-plugins-gl@495 93df14bb-0f41-7a43-8087-d3e2a2f0e464
This commit is contained in:
Julien Isorce 2008-06-07 21:56:00 +00:00 committed by Tim-Philipp Müller
parent f580bb77f4
commit dc4119eafe
4 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gst-libs/gst/gl/gstglbuffer.c
View file

@ -47,6 +47,7 @@ gst_gl_buffer_init (GstGLBuffer* buffer, gpointer g_class)
buffer->texture = 0; buffer->texture = 0;
buffer->texture_u = 0; buffer->texture_u = 0;
buffer->texture_v = 0; buffer->texture_v = 0;
buffer->textureGL = 0;
buffer->width = 0; buffer->width = 0;
buffer->height = 0; buffer->height = 0;
} }

1
gst-libs/gst/gl/gstglbuffer.h
View file

@ -45,6 +45,7 @@ struct _GstGLBuffer {
GLuint texture; GLuint texture;
GLuint texture_u; GLuint texture_u;
GLuint texture_v; GLuint texture_v;
GLuint textureGL;
gint width; gint width;
gint height; gint height;

33
gst-libs/gst/gl/gstgldisplay.c
View file

@ -130,6 +130,10 @@ gst_gl_display_init (GstGLDisplay *display, GstGLDisplayClass *klass)
display->rejectedDepthBuffer = 0; display->rejectedDepthBuffer = 0;
display->rejectedTextureFBO = 0; display->rejectedTextureFBO = 0;
display->displayedTexture = 0;
display->displayedTextureWidth = 0;
display->displayedTextureHeight = 0;
display->requestedTexture = 0; display->requestedTexture = 0;
display->requestedTexture_u = 0; display->requestedTexture_u = 0;
display->requestedTexture_v = 0; display->requestedTexture_v = 0;
@ -213,8 +217,8 @@ gst_gl_display_init (GstGLDisplay *display, GstGLDisplayClass *klass)
"void main(void) {\n" "void main(void) {\n"
" float r,g,b,y,u,v;\n" " float r,g,b,y,u,v;\n"
" vec2 nxy=gl_TexCoord[0].xy;\n" " vec2 nxy=gl_TexCoord[0].xy;\n"
" y=texture2DRect(Ytex,nxy).r;\n" " y=texture2DRect(Ytex,nxy*0.5).r;\n"
" u=texture2DRect(Utex,nxy*0.5).r;\n" " u=texture2DRect(Utex,nxy).r;\n"
" v=texture2DRect(Vtex,nxy*0.5).r;\n" " v=texture2DRect(Vtex,nxy*0.5).r;\n"
" y=1.1643*(y-0.0625);\n" " y=1.1643*(y-0.0625);\n"
" u=u-0.5;\n" " u=u-0.5;\n"
@ -1175,7 +1179,7 @@ gst_gl_display_textureRequested (GstGLDisplay * display, GstVideoFormat video_fo
void void
gst_gl_display_textureChanged (GstGLDisplay* display, GstVideoFormat video_format, gst_gl_display_textureChanged (GstGLDisplay* display, GstVideoFormat video_format,
GLuint texture, GLuint texture_u, GLuint texture_v, GLuint texture, GLuint texture_u, GLuint texture_v,
gint width, gint height, gpointer data) gint width, gint height, gpointer data, GLuint* outputTexture)
{ {
gst_gl_display_lock (display); gst_gl_display_lock (display);
display->candidateTexture = texture; display->candidateTexture = texture;
@ -1187,6 +1191,9 @@ gst_gl_display_textureChanged (GstGLDisplay* display, GstVideoFormat video_forma
display->candidateData = data; display->candidateData = data;
gst_gl_display_postMessage (GST_GL_DISPLAY_ACTION_CHANGE, display); gst_gl_display_postMessage (GST_GL_DISPLAY_ACTION_CHANGE, display);
g_cond_wait (display->cond_fill, display->mutex); g_cond_wait (display->cond_fill, display->mutex);
//Here texture width and height are always the same than the fbo
if (outputTexture)
*outputTexture = display->textureFBO;
gst_gl_display_unlock (display); gst_gl_display_unlock (display);
} }
@ -1223,12 +1230,18 @@ gst_gl_display_videoChanged (GstGLDisplay* display, GstVideoFormat video_format,
/* Called by gst_gl elements */ /* Called by gst_gl elements */
gboolean gboolean
gst_gl_display_postRedisplay (GstGLDisplay* display) gst_gl_display_postRedisplay (GstGLDisplay* display, GLuint texture, gint width , gint height)
{ {
gboolean isAlive = TRUE; gboolean isAlive = TRUE;
gst_gl_display_lock (display); gst_gl_display_lock (display);
isAlive = display->isAlive; isAlive = display->isAlive;
if (texture)
{
display->displayedTexture = texture;
display->displayedTextureWidth = width;
display->displayedTextureHeight = height;
}
gst_gl_display_postMessage (GST_GL_DISPLAY_ACTION_REDISPLAY, display); gst_gl_display_postMessage (GST_GL_DISPLAY_ACTION_REDISPLAY, display);
gst_gl_display_unlock (display); gst_gl_display_unlock (display);
@ -1390,8 +1403,8 @@ void gst_gl_display_draw(void)
if (display->clientDrawCallback) if (display->clientDrawCallback)
{ {
gboolean doRedisplay = gboolean doRedisplay =
display->clientDrawCallback(display->textureFBO, display->clientDrawCallback(display->displayedTexture,
display->textureFBOWidth, display->textureFBOHeight); display->displayedTextureWidth, display->displayedTextureHeight);
glFlush(); glFlush();
glutSwapBuffers(); glutSwapBuffers();
@ -1408,17 +1421,17 @@ void gst_gl_display_draw(void)
glMatrixMode (GL_PROJECTION); glMatrixMode (GL_PROJECTION);
glLoadIdentity (); glLoadIdentity ();
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, display->textureFBO); glBindTexture (GL_TEXTURE_RECTANGLE_ARB, display->displayedTexture);
glEnable (GL_TEXTURE_RECTANGLE_ARB); glEnable (GL_TEXTURE_RECTANGLE_ARB);
glBegin (GL_QUADS); glBegin (GL_QUADS);
glTexCoord2i (display->textureFBOWidth, 0); glTexCoord2i (display->displayedTextureWidth, 0);
glVertex2f (1.0f, 1.0f); glVertex2f (1.0f, 1.0f);
glTexCoord2i (0, 0); glTexCoord2i (0, 0);
glVertex2f (-1.0f, 1.0f); glVertex2f (-1.0f, 1.0f);
glTexCoord2i (0, display->textureFBOHeight); glTexCoord2i (0, display->displayedTextureHeight);
glVertex2f (-1.0f, -1.0f); glVertex2f (-1.0f, -1.0f);
glTexCoord2i (display->textureFBOWidth, display->textureFBOHeight); glTexCoord2i (display->displayedTextureWidth, display->displayedTextureHeight);
glVertex2f (1.0f, -1.0f); glVertex2f (1.0f, -1.0f);
glEnd (); glEnd ();

9
gst-libs/gst/gl/gstgldisplay.h
View file

@ -139,6 +139,11 @@ struct _GstGLDisplay {
GLuint rejectedDepthBuffer; GLuint rejectedDepthBuffer;
GLuint rejectedTextureFBO; GLuint rejectedTextureFBO;
//displayed texture
GLuint displayedTexture;
GLuint displayedTextureWidth;
GLuint displayedTextureHeight;
GLuint requestedTexture; GLuint requestedTexture;
GLuint requestedTexture_u; GLuint requestedTexture_u;
GLuint requestedTexture_v; GLuint requestedTexture_v;
@ -232,13 +237,13 @@ void gst_gl_display_textureRequested (GstGLDisplay* display, GstVideoFormat form
guint* texture_u, guint* texture_v); guint* texture_u, guint* texture_v);
void gst_gl_display_textureChanged (GstGLDisplay* display, GstVideoFormat video_format, void gst_gl_display_textureChanged (GstGLDisplay* display, GstVideoFormat video_format,
GLuint texture, GLuint texture_u, GLuint texture_v, GLuint texture, GLuint texture_u, GLuint texture_v,
gint width, gint height, gpointer data); gint width, gint height, gpointer data, GLuint* outputTexture);
void gst_gl_display_clearTexture (GstGLDisplay* display, guint texture, void gst_gl_display_clearTexture (GstGLDisplay* display, guint texture,
guint texture_u, guint texture_v); guint texture_u, guint texture_v);
void gst_gl_display_videoChanged (GstGLDisplay* display, GstVideoFormat video_format, void gst_gl_display_videoChanged (GstGLDisplay* display, GstVideoFormat video_format,
gpointer data); gpointer data);
gboolean gst_gl_display_postRedisplay (GstGLDisplay* display); gboolean gst_gl_display_postRedisplay (GstGLDisplay* display, GLuint texture, gint width, gint height);
void gst_gl_display_requestFBO (GstGLDisplay* display, gint width, gint height, void gst_gl_display_requestFBO (GstGLDisplay* display, gint width, gint height,
guint* fbo, guint* depthbuffer, guint* texture); guint* fbo, guint* depthbuffer, guint* texture);
void gst_gl_display_useFBO (GstGLDisplay* display, gint textureFBOWidth, gint textureFBOheight, void gst_gl_display_useFBO (GstGLDisplay* display, gint textureFBOWidth, gint textureFBOheight,