mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 09:40:37 +00:00
Code Issues 1 Projects Releases Wiki Activity

[203/906] use opengl for pixbuf resizing in glpixbufoverlay, start to work on properties

Browse source
This commit is contained in:
Filippo Argiolas 2008-08-20 10:02:02 +02:00 committed by Matthew Waters
parent 52a7e2dc6b
commit 7c2662d7e9
1 changed files with 48 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
gst/gl/gstglpixbufoverlay.c
View file

@ -41,7 +41,10 @@ struct _GstGLPixbufOverlay
gboolean pbuf_has_changed; gboolean pbuf_has_changed;
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
gfloat width, height;
GLuint pbuftexture; GLuint pbuftexture;
// gboolean stretch;
}; };
struct _GstGLPixbufOverlayClass struct _GstGLPixbufOverlayClass
@ -82,8 +85,8 @@ enum
{ {
PROP_0, PROP_0,
PROP_LOCATION, PROP_LOCATION,
// PROP_STRETCH,
/* future properties? */ /* future properties? */
/* PROP_STRETCH, */
/* PROP_WIDTH, */ /* PROP_WIDTH, */
/* PROP_HEIGHT, */ /* PROP_HEIGHT, */
/* PROP_XPOS, */ /* PROP_XPOS, */
@ -136,6 +139,14 @@ gst_gl_pixbufoverlay_class_init (GstGLPixbufOverlayClass * klass)
"Location of the image", "Location of the image",
"Location of the image", "Location of the image",
NULL, G_PARAM_READWRITE)); NULL, G_PARAM_READWRITE));
/*
g_object_class_install_property (gobject_class,
PROP_STRETCH,
g_param_spec_boolean ("stretch",
"Stretch the image to texture size",
"Stretch the image to fit video texture size",
TRUE, G_PARAM_READWRITE));
*/
} }
void void
@ -143,6 +154,9 @@ gst_gl_pixbufoverlay_draw_texture (GstGLPixbufOverlay * pixbufoverlay, GLuint te
{ {
GstGLFilter *filter = GST_GL_FILTER (pixbufoverlay); GstGLFilter *filter = GST_GL_FILTER (pixbufoverlay);
gfloat width = (gfloat) filter->width;
gfloat height = (gfloat) filter->height;
glActiveTexture (GL_TEXTURE0); glActiveTexture (GL_TEXTURE0);
glEnable (GL_TEXTURE_RECTANGLE_ARB); glEnable (GL_TEXTURE_RECTANGLE_ARB);
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex); glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex);
@ -151,17 +165,22 @@ gst_gl_pixbufoverlay_draw_texture (GstGLPixbufOverlay * pixbufoverlay, GLuint te
glTexCoord2f (0.0, 0.0); glTexCoord2f (0.0, 0.0);
glVertex2f (-1.0, -1.0); glVertex2f (-1.0, -1.0);
glTexCoord2f ((gfloat)filter->width, 0.0); glTexCoord2f (width, 0.0);
glVertex2f (1.0, -1.0); glVertex2f (1.0, -1.0);
glTexCoord2f ((gfloat)filter->width, (gfloat)filter->height); glTexCoord2f (width, height);
glVertex2f (1.0, 1.0); glVertex2f (1.0, 1.0);
glTexCoord2f (0.0, (gfloat)filter->height); glTexCoord2f (0.0, height);
glVertex2f (-1.0, 1.0); glVertex2f (-1.0, 1.0);
glEnd (); glEnd ();
if (pixbufoverlay->pbuftexture == 0) return; if (pixbufoverlay->pbuftexture == 0) return;
// if (pixbufoverlay->stretch) {
width = pixbufoverlay->width;
height = pixbufoverlay->height;
// }
glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND); glEnable(GL_BLEND);
@ -172,11 +191,11 @@ gst_gl_pixbufoverlay_draw_texture (GstGLPixbufOverlay * pixbufoverlay, GLuint te
glTexCoord2f (0.0, 0.0); glTexCoord2f (0.0, 0.0);
glVertex2f (-1.0, -1.0); glVertex2f (-1.0, -1.0);
glTexCoord2f ((gfloat)filter->width, 0.0); glTexCoord2f (width, 0.0);
glVertex2f (1.0, -1.0); glVertex2f (1.0, -1.0);
glTexCoord2f ((gfloat)filter->width, (gfloat)filter->height); glTexCoord2f (width, height);
glVertex2f (1.0, 1.0); glVertex2f (1.0, 1.0);
glTexCoord2f (0.0, (gfloat)filter->height); glTexCoord2f (0.0, height);
glVertex2f (-1.0, 1.0); glVertex2f (-1.0, 1.0);
glEnd (); glEnd ();
@ -192,6 +211,10 @@ gst_gl_pixbufoverlay_init (GstGLPixbufOverlay * pixbufoverlay,
pixbufoverlay->location = NULL; pixbufoverlay->location = NULL;
pixbufoverlay->pixbuf = NULL; pixbufoverlay->pixbuf = NULL;
pixbufoverlay->pbuftexture = 0; pixbufoverlay->pbuftexture = 0;
pixbufoverlay->pbuftexture = 0;
pixbufoverlay->width = 0;
pixbufoverlay->height = 0;
// pixbufoverlay->stretch = TRUE;
pixbufoverlay->pbuf_has_changed = FALSE; pixbufoverlay->pbuf_has_changed = FALSE;
} }
@ -213,6 +236,10 @@ gst_gl_pixbufoverlay_set_property (GObject * object, guint prop_id,
pixbufoverlay->pbuf_has_changed = TRUE; pixbufoverlay->pbuf_has_changed = TRUE;
pixbufoverlay->location = g_value_dup_string (value); pixbufoverlay->location = g_value_dup_string (value);
break; break;
/* case PROP_STRETCH:
pixbufoverlay->stretch = g_value_get_boolean (value);
break;
*/
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -229,6 +256,10 @@ gst_gl_pixbufoverlay_get_property (GObject * object, guint prop_id,
case PROP_LOCATION: case PROP_LOCATION:
g_value_set_string (value, pixbufoverlay->location); g_value_set_string (value, pixbufoverlay->location);
break; break;
/* case PROP_STRETCH:
g_value_set_boolean (value, pixbufoverlay->stretch);
break;
*/
default: default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break; break;
@ -255,13 +286,12 @@ gst_gl_pixbufoverlay_callback (gint width, gint height, guint texture, gpointer
static void init_pixbuf_texture (GstGLDisplay *display, gpointer data) static void init_pixbuf_texture (GstGLDisplay *display, gpointer data)
{ {
GstGLPixbufOverlay *pixbufoverlay = GST_GL_PIXBUFOVERLAY (data); GstGLPixbufOverlay *pixbufoverlay = GST_GL_PIXBUFOVERLAY (data);
GstGLFilter *filter = GST_GL_FILTER (data);
glDeleteTextures (1, &pixbufoverlay->pbuftexture); glDeleteTextures (1, &pixbufoverlay->pbuftexture);
glGenTextures (1, &pixbufoverlay->pbuftexture); glGenTextures (1, &pixbufoverlay->pbuftexture);
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, pixbufoverlay->pbuftexture); glBindTexture (GL_TEXTURE_RECTANGLE_ARB, pixbufoverlay->pbuftexture);
glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA, glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA,
filter->width, filter->height, 0, pixbufoverlay->width, pixbufoverlay->height, 0,
gdk_pixbuf_get_has_alpha (pixbufoverlay->pixbuf) ? GL_RGBA : GL_RGB, gdk_pixbuf_get_has_alpha (pixbufoverlay->pixbuf) ? GL_RGBA : GL_RGB,
GL_UNSIGNED_BYTE, gdk_pixbuf_get_pixels (pixbufoverlay->pixbuf)); GL_UNSIGNED_BYTE, gdk_pixbuf_get_pixels (pixbufoverlay->pixbuf));
} }
@ -271,28 +301,22 @@ gst_gl_pixbufoverlay_filter (GstGLFilter* filter, GstGLBuffer* inbuf,
GstGLBuffer* outbuf) GstGLBuffer* outbuf)
{ {
GstGLPixbufOverlay* pixbufoverlay = GST_GL_PIXBUFOVERLAY(filter); GstGLPixbufOverlay* pixbufoverlay = GST_GL_PIXBUFOVERLAY(filter);
GdkPixbuf *pixbuf;
GError *error = NULL; GError *error = NULL;
if (pixbufoverlay->pbuf_has_changed && (pixbufoverlay->location != NULL)) { if (pixbufoverlay->pbuf_has_changed && (pixbufoverlay->location != NULL)) {
pixbuf = gdk_pixbuf_new_from_file (pixbufoverlay->location, &error); pixbufoverlay->pixbuf = gdk_pixbuf_new_from_file (pixbufoverlay->location, &error);
if (pixbuf) { if (pixbufoverlay->pixbuf != NULL) {
pixbufoverlay->pixbuf = gdk_pixbuf_scale_simple (pixbuf, pixbufoverlay->width = (gfloat) gdk_pixbuf_get_width (pixbufoverlay->pixbuf);
filter->width, pixbufoverlay->height = (gfloat) gdk_pixbuf_get_height (pixbufoverlay->pixbuf);
filter->height, gst_gl_display_thread_add (filter->display, init_pixbuf_texture, pixbufoverlay);
GDK_INTERP_BILINEAR); gdk_pixbuf_unref (pixbufoverlay->pixbuf);
gdk_pixbuf_unref (pixbuf);
if (pixbufoverlay->pixbuf != NULL) {
gst_gl_display_thread_add (filter->display, init_pixbuf_texture, pixbufoverlay);
gdk_pixbuf_unref (pixbufoverlay->pixbuf);
}
} else { } else {
if (error != NULL && error->message != NULL) if (error != NULL && error->message != NULL)
g_warning ("unable to load %s: %s", pixbufoverlay->location, error->message); g_warning ("unable to load %s: %s", pixbufoverlay->location, error->message);
} }
pixbufoverlay->pbuf_has_changed = FALSE; pixbufoverlay->pbuf_has_changed = FALSE;
} }
gst_gl_filter_render_to_target (filter, inbuf->texture, outbuf->texture, gst_gl_filter_render_to_target (filter, inbuf->texture, outbuf->texture,
gst_gl_pixbufoverlay_callback, pixbufoverlay); gst_gl_pixbufoverlay_callback, pixbufoverlay);