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

[205/906] use a GHash table instead of a GData for the texture pool

Browse source
This commit is contained in:
Julien Isorce 2008-08-21 11:12:42 +02:00 committed by Matthew Waters
parent bf17388f63
commit b1007f02cb
2 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,7 @@ void gst_gl_display_on_draw (void);
void gst_gl_display_on_close (void); void gst_gl_display_on_close (void);
void gst_gl_display_glgen_texture (GstGLDisplay* display, GLuint* pTexture, GLint width, GLint height); void gst_gl_display_glgen_texture (GstGLDisplay* display, GLuint* pTexture, GLint width, GLint height);
void gst_gl_display_gldel_texture (GstGLDisplay* display, GLuint* pTexture, GLint width, GLint height); void gst_gl_display_gldel_texture (GstGLDisplay* display, GLuint* pTexture, GLint width, GLint height);
void gst_gl_display_destroynotify_func_pool (gpointer data); gboolean gst_gl_display_texture_pool_func_clean (gpointer key, gpointer value, gpointer data);
void gst_gl_display_check_framebuffer_status (void); void gst_gl_display_check_framebuffer_status (void);
/* To not make gst_gl_display_thread_do_upload /* To not make gst_gl_display_thread_do_upload
@ -119,7 +119,7 @@ gst_gl_display_init (GstGLDisplay *display, GstGLDisplayClass *klass)
display->win_ypos = 0; display->win_ypos = 0;
display->visible = FALSE; display->visible = FALSE;
display->isAlive = TRUE; display->isAlive = TRUE;
g_datalist_init (&display->texture_pool); display->texture_pool = g_hash_table_new (g_str_hash, g_str_equal);
//conditions //conditions
display->cond_create_context = g_cond_new (); display->cond_create_context = g_cond_new ();
@ -374,7 +374,9 @@ gst_gl_display_finalize (GObject* object)
gst_gl_display_unlock (display); gst_gl_display_unlock (display);
if (display->texture_pool) { if (display->texture_pool) {
g_datalist_init (&display->texture_pool); //texture pool is empty after destroying the gl context
g_assert (g_hash_table_size (display->texture_pool) == 0);
g_hash_table_unref (display->texture_pool);
display->texture_pool = NULL; display->texture_pool = NULL;
} }
if (display->title) { if (display->title) {
@ -462,7 +464,7 @@ gst_gl_display_finalize (GObject* object)
g_print ("gl thread joined\n"); g_print ("gl thread joined\n");
gst_gl_display_gl_thread = NULL; gst_gl_display_gl_thread = NULL;
g_async_queue_unref (gst_gl_display_messageQueue); g_async_queue_unref (gst_gl_display_messageQueue);
g_hash_table_unref (gst_gl_display_map); g_hash_table_unref (gst_gl_display_map);
gst_gl_display_map = NULL; gst_gl_display_map = NULL;
} }
} }
@ -524,7 +526,7 @@ gst_gl_display_thread_loop (void)
gst_gl_display_thread_dispatch_action (msg); gst_gl_display_thread_dispatch_action (msg);
} }
} }
else GST_DEBUG ("timeout reached in idle func\n"); else g_print ("timeout reached in idle func\n");
} }
@ -682,7 +684,7 @@ gst_gl_display_thread_create_context (GstGLDisplay *display)
err = glewInit(); err = glewInit();
if (err != GLEW_OK) if (err != GLEW_OK)
{ {
GST_DEBUG ("Error: %s", glewGetErrorString(err)); g_print ("Error: %s\n", glewGetErrorString(err));
display->isAlive = FALSE; display->isAlive = FALSE;
} }
else else
@ -726,7 +728,7 @@ gst_gl_display_thread_create_context (GstGLDisplay *display)
//check glut id validity //check glut id validity
g_assert (glutGetWindow() == glutWinId); g_assert (glutGetWindow() == glutWinId);
GST_DEBUG ("Context %d initialized", display->glutWinId); g_print ("Context %d initialized\n", display->glutWinId);
//release display constructor //release display constructor
g_cond_signal (display->cond_create_context); g_cond_signal (display->cond_create_context);
@ -848,7 +850,8 @@ gst_gl_display_thread_destroy_context (GstGLDisplay *display)
} }
//clean up the texture pool //clean up the texture pool
g_datalist_clear (&display->texture_pool); g_hash_table_foreach_remove (display->texture_pool, gst_gl_display_texture_pool_func_clean,
NULL);
g_hash_table_remove (gst_gl_display_map, GINT_TO_POINTER (display->glutWinId)); g_hash_table_remove (gst_gl_display_map, GINT_TO_POINTER (display->glutWinId));
g_print ("Context %d destroyed\n", display->glutWinId); g_print ("Context %d destroyed\n", display->glutWinId);
@ -1718,7 +1721,7 @@ void gst_gl_display_on_close (void)
//glutGetWindow return 0 if no windows exists, then g_hash_table_lookup return NULL //glutGetWindow return 0 if no windows exists, then g_hash_table_lookup return NULL
if (display == NULL) return; if (display == NULL) return;
GST_DEBUG ("on close"); g_print ("on close\n");
gst_gl_display_lock (display); gst_gl_display_lock (display);
display->isAlive = FALSE; display->isAlive = FALSE;
@ -1738,7 +1741,7 @@ gst_gl_display_glgen_texture (GstGLDisplay* display, GLuint* pTexture, GLint wid
GQueue* sub_texture_pool = NULL; GQueue* sub_texture_pool = NULL;
sprintf (string_size, "%dx%d", width, height); sprintf (string_size, "%dx%d", width, height);
sub_texture_pool = g_datalist_get_data(&display->texture_pool, string_size); sub_texture_pool = g_hash_table_lookup (display->texture_pool, string_size);
//if the size is known //if the size is known
if (sub_texture_pool) if (sub_texture_pool)
{ {
@ -1797,13 +1800,15 @@ gst_gl_display_gldel_texture (GstGLDisplay* display, GLuint* pTexture, GLint wid
GstGLDisplayTex* tex = NULL; GstGLDisplayTex* tex = NULL;
sprintf (string_size, "%dx%d", width, height); sprintf (string_size, "%dx%d", width, height);
sub_texture_pool = g_datalist_get_data(&display->texture_pool, string_size); sub_texture_pool = g_hash_table_lookup (display->texture_pool, string_size);
//if the size is known //if the size is known
if (!sub_texture_pool) if (!sub_texture_pool)
{ {
sub_texture_pool = g_queue_new (); sub_texture_pool = g_queue_new ();
g_datalist_set_data_full(&display->texture_pool, string_size, g_hash_table_insert (display->texture_pool, string_size, sub_texture_pool);
sub_texture_pool, gst_gl_display_destroynotify_func_pool);
g_print ("texture pool insert: %s\n", string_size);
g_print ("texture pool size: %d\n", g_hash_table_size (display->texture_pool));
} }
//contruct a sub texture pool element //contruct a sub texture pool element
@ -1816,17 +1821,21 @@ gst_gl_display_gldel_texture (GstGLDisplay* display, GLuint* pTexture, GLint wid
} }
/* call when a sub texture pool is removed from the data list */ /* call when a sub texture pool is removed from the texture pool (ghash table) */
void gst_gl_display_destroynotify_func_pool (gpointer data) gboolean gst_gl_display_texture_pool_func_clean (gpointer key, gpointer value, gpointer data)
{ {
GQueue* sub_texture_pool = (GQueue*) data; GQueue* sub_texture_pool = (GQueue*) value;
while (g_queue_get_length (sub_texture_pool)) while (g_queue_get_length (sub_texture_pool) > 0)
{ {
GstGLDisplayTex* tex = g_queue_pop_head (sub_texture_pool); GstGLDisplayTex* tex = g_queue_pop_head (sub_texture_pool);
glDeleteTextures (1, &tex->texture); glDeleteTextures (1, &tex->texture);
g_free (tex); g_free (tex);
} }
g_queue_free (sub_texture_pool);
return TRUE;
} }

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

@ -120,7 +120,7 @@ struct _GstGLDisplay {
gint win_ypos; gint win_ypos;
gboolean visible; gboolean visible;
gboolean isAlive; gboolean isAlive;
GData* texture_pool; GHashTable* texture_pool;
//conditions //conditions
GCond* cond_create_context; GCond* cond_create_context;