mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

[157/906] move thread_do_upload_make from thread_do_upload to thread_init_upload

Browse source
This commit is contained in:
Julien Isorce 2008-08-13 17:59:09 +02:00 committed by Matthew Waters
parent d0203c1172
commit fd192ec957
5 changed files with 154 additions and 150 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -170,7 +170,7 @@ gst_gl_display_init (GstGLDisplay *display, GstGLDisplayClass *klass)
display->upload_height = 0; display->upload_height = 0;
display->upload_video_format = 0; display->upload_video_format = 0;
display->colorspace_conversion = GST_GL_DISPLAY_CONVERSION_MESA; display->colorspace_conversion = GST_GL_DISPLAY_CONVERSION_MESA;
display->upload_data_with = 0; display->upload_data_width = 0;
display->upload_data_height = 0; display->upload_data_height = 0;
display->upload_data = NULL; display->upload_data = NULL;
@ -1139,6 +1139,9 @@ gst_gl_display_thread_init_upload (GstGLDisplay *display)
g_assert_not_reached (); g_assert_not_reached ();
} }
//alloc texture (related to upload) memory only on time
gst_gl_display_thread_do_upload_make (display);
g_cond_signal (display->cond_init_upload); g_cond_signal (display->cond_init_upload);
} }
@ -1149,8 +1152,6 @@ gst_gl_display_thread_do_upload (GstGLDisplay *display)
{ {
glutSetWindow (display->glutWinId); glutSetWindow (display->glutWinId);
//FIXME:call upload_make function in thread_init_upload instead of calling it here
gst_gl_display_thread_do_upload_make (display);
gst_gl_display_thread_do_upload_fill (display); gst_gl_display_thread_do_upload_fill (display);
gst_gl_display_thread_do_upload_draw (display); gst_gl_display_thread_do_upload_draw (display);
@ -2001,12 +2002,15 @@ gst_gl_display_del_texture (GstGLDisplay* display, GLuint texture, GLint width,
/* Called by the first gl element of a video/x-raw-gl flow */ /* Called by the first gl element of a video/x-raw-gl flow */
void void
gst_gl_display_init_upload (GstGLDisplay* display, GstVideoFormat video_format, gst_gl_display_init_upload (GstGLDisplay* display, GstVideoFormat video_format,
guint gl_width, guint gl_height) guint gl_width, guint gl_height,
gint video_width, gint video_height)
{ {
gst_gl_display_lock (display); gst_gl_display_lock (display);
display->upload_video_format = video_format; display->upload_video_format = video_format;
display->upload_width = gl_width; display->upload_width = gl_width;
display->upload_height = gl_height; display->upload_height = gl_height;
display->upload_data_width = video_width;
display->upload_data_height = video_height;
gst_gl_display_post_message (GST_GL_DISPLAY_ACTION_INIT_UPLOAD, display); gst_gl_display_post_message (GST_GL_DISPLAY_ACTION_INIT_UPLOAD, display);
g_cond_wait (display->cond_init_upload, display->mutex); g_cond_wait (display->cond_init_upload, display->mutex);
gst_gl_display_unlock (display); gst_gl_display_unlock (display);
@ -2026,7 +2030,7 @@ gst_gl_display_do_upload (GstGLDisplay *display, GLuint texture,
if (isAlive) if (isAlive)
{ {
display->upload_outtex = texture; display->upload_outtex = texture;
display->upload_data_with = data_width; display->upload_data_width = data_width;
display->upload_data_height = data_height; display->upload_data_height = data_height;
display->upload_data = data; display->upload_data = data;
gst_gl_display_post_message (GST_GL_DISPLAY_ACTION_DO_UPLOAD, display); gst_gl_display_post_message (GST_GL_DISPLAY_ACTION_DO_UPLOAD, display);
@ -2225,12 +2229,9 @@ gst_gl_display_set_client_draw_callback (GstGLDisplay * display, CDCB cb)
/* called by gst_gl_display_thread_do_upload (in the gl thread) */ /* called by gst_gl_display_thread_do_upload (in the gl thread) */
void gst_gl_display_thread_do_upload_make (GstGLDisplay *display) void gst_gl_display_thread_do_upload_make (GstGLDisplay *display)
{ {
gint width = display->upload_data_with; gint width = display->upload_data_width;
gint height = display->upload_data_height; gint height = display->upload_data_height;
//FIXME:remove the next check then call this function in thread_init_upload
if (display->upload_intex == 0)
{
glGenTextures (1, &display->upload_intex); glGenTextures (1, &display->upload_intex);
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, display->upload_intex); glBindTexture (GL_TEXTURE_RECTANGLE_ARB, display->upload_intex);
@ -2260,25 +2261,25 @@ void gst_gl_display_thread_do_upload_make (GstGLDisplay *display)
{ {
case GST_GL_DISPLAY_CONVERSION_GLSL: case GST_GL_DISPLAY_CONVERSION_GLSL:
case GST_GL_DISPLAY_CONVERSION_MATRIX: case GST_GL_DISPLAY_CONVERSION_MATRIX:
glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_LUMINANCE_ALPHA, glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_LUMINANCE_ALPHA,
width, height, width, height,
0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, NULL); 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, NULL);
if (display->upload_intex_u == 0) { if (display->upload_intex_u == 0) {
glGenTextures (1, &display->upload_intex_u); glGenTextures (1, &display->upload_intex_u);
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, display->upload_intex_u); glBindTexture (GL_TEXTURE_RECTANGLE_ARB, display->upload_intex_u);
glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8,
width, height, width, height,
0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL); 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
} }
break; break;
case GST_GL_DISPLAY_CONVERSION_MESA: case GST_GL_DISPLAY_CONVERSION_MESA:
glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_YCBCR_MESA, glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_YCBCR_MESA,
width, height, width, height,
0, GL_YCBCR_MESA, GL_UNSIGNED_SHORT_8_8_MESA, NULL); 0, GL_YCBCR_MESA, GL_UNSIGNED_SHORT_8_8_MESA, NULL);
break; break;
default: default:
g_assert_not_reached (); g_assert_not_reached ();
} }
break; break;
case GST_VIDEO_FORMAT_UYVY: case GST_VIDEO_FORMAT_UYVY:
@ -2286,24 +2287,24 @@ void gst_gl_display_thread_do_upload_make (GstGLDisplay *display)
{ {
case GST_GL_DISPLAY_CONVERSION_GLSL: case GST_GL_DISPLAY_CONVERSION_GLSL:
case GST_GL_DISPLAY_CONVERSION_MATRIX: case GST_GL_DISPLAY_CONVERSION_MATRIX:
glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_LUMINANCE_ALPHA, glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_LUMINANCE_ALPHA,
width, height, width, height,
0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, NULL); 0, GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, NULL);
if (display->upload_intex_u == 0) { if (display->upload_intex_u == 0) {
glGenTextures (1, &display->upload_intex_u); glGenTextures (1, &display->upload_intex_u);
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, display->upload_intex_u); glBindTexture (GL_TEXTURE_RECTANGLE_ARB, display->upload_intex_u);
glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8, glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_RGBA8,
width, height, width, height,
0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL); 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, NULL);
break; break;
} }
case GST_GL_DISPLAY_CONVERSION_MESA: case GST_GL_DISPLAY_CONVERSION_MESA:
glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_YCBCR_MESA, glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_YCBCR_MESA,
width, height, width, height,
0, GL_YCBCR_MESA, GL_UNSIGNED_SHORT_8_8_MESA, NULL); 0, GL_YCBCR_MESA, GL_UNSIGNED_SHORT_8_8_MESA, NULL);
break; break;
default: default:
g_assert_not_reached (); g_assert_not_reached ();
} }
break; break;
@ -2314,18 +2315,18 @@ void gst_gl_display_thread_do_upload_make (GstGLDisplay *display)
0, GL_LUMINANCE, GL_UNSIGNED_BYTE, NULL); 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, NULL);
if (display->upload_intex_u == 0) { if (display->upload_intex_u == 0) {
glGenTextures (1, &display->upload_intex_u); glGenTextures (1, &display->upload_intex_u);
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, display->upload_intex_u); glBindTexture (GL_TEXTURE_RECTANGLE_ARB, display->upload_intex_u);
glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_LUMINANCE, glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_LUMINANCE,
GST_ROUND_UP_2 (width) / 2, GST_ROUND_UP_2 (width) / 2,
GST_ROUND_UP_2 (height) / 2, GST_ROUND_UP_2 (height) / 2,
0, GL_LUMINANCE, GL_UNSIGNED_BYTE, NULL); 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, NULL);
} }
if (display->upload_intex_v == 0) { if (display->upload_intex_v == 0) {
glGenTextures (1, &display->upload_intex_v); glGenTextures (1, &display->upload_intex_v);
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, display->upload_intex_v); glBindTexture (GL_TEXTURE_RECTANGLE_ARB, display->upload_intex_v);
glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_LUMINANCE, glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0, GL_LUMINANCE,
GST_ROUND_UP_2 (width) / 2, GST_ROUND_UP_2 (width) / 2,
GST_ROUND_UP_2 (height) / 2, GST_ROUND_UP_2 (height) / 2,
0, GL_LUMINANCE, GL_UNSIGNED_BYTE, NULL); 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, NULL);
@ -2335,7 +2336,6 @@ void gst_gl_display_thread_do_upload_make (GstGLDisplay *display)
default: default:
g_assert_not_reached (); g_assert_not_reached ();
} }
}
} }
@ -2343,7 +2343,7 @@ void gst_gl_display_thread_do_upload_make (GstGLDisplay *display)
void void
gst_gl_display_thread_do_upload_fill (GstGLDisplay *display) gst_gl_display_thread_do_upload_fill (GstGLDisplay *display)
{ {
gint width = display->upload_data_with; gint width = display->upload_data_width;
gint height = display->upload_data_height; gint height = display->upload_data_height;
gpointer data = display->upload_data; gpointer data = display->upload_data;
@ -2615,13 +2615,13 @@ gst_gl_display_thread_do_upload_draw (GstGLDisplay *display)
}//end switch display->currentVideo_format }//end switch display->currentVideo_format
glBegin (GL_QUADS); glBegin (GL_QUADS);
glTexCoord2i (display->upload_data_with, 0); glTexCoord2i (display->upload_data_width, 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->upload_data_height); glTexCoord2i (0, display->upload_data_height);
glVertex2f (-1.0f, 1.0f); glVertex2f (-1.0f, 1.0f);
glTexCoord2i (display->upload_data_with, display->upload_data_height); glTexCoord2i (display->upload_data_width, display->upload_data_height);
glVertex2f (1.0f, 1.0f); glVertex2f (1.0f, 1.0f);
glEnd (); glEnd ();

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

@ -175,7 +175,7 @@ struct _GstGLDisplay {
GLuint upload_height; GLuint upload_height;
GstVideoFormat upload_video_format; GstVideoFormat upload_video_format;
GstGLDisplayConversion colorspace_conversion; GstGLDisplayConversion colorspace_conversion;
gint upload_data_with; gint upload_data_width;
gint upload_data_height; gint upload_data_height;
gpointer upload_data; gpointer upload_data;
@ -278,7 +278,8 @@ void gst_gl_display_gen_texture (GstGLDisplay* display, GLuint* pTexture, GLint
void gst_gl_display_del_texture (GstGLDisplay* display, GLuint texture, GLint width, GLint height); void gst_gl_display_del_texture (GstGLDisplay* display, GLuint texture, GLint width, GLint height);
void gst_gl_display_init_upload (GstGLDisplay* display, GstVideoFormat video_format, void gst_gl_display_init_upload (GstGLDisplay* display, GstVideoFormat video_format,
guint gl_width, guint gl_height); guint gl_width, guint gl_height,
gint video_width, gint video_height);
gboolean gst_gl_display_do_upload (GstGLDisplay* display, GLuint texture, gboolean gst_gl_display_do_upload (GstGLDisplay* display, GLuint texture,
gint data_width, gint data_height, gint data_width, gint data_height,
gpointer data); gpointer data);

3
gst/gl/gstglcolorscale.c
View file

@ -396,7 +396,8 @@ gst_gl_colorscale_set_caps (GstBaseTransform* bt, GstCaps* incaps,
//blocking call, init colorspace conversion if needed //blocking call, init colorspace conversion if needed
gst_gl_display_init_upload (colorscale->display, colorscale->input_video_format, gst_gl_display_init_upload (colorscale->display, colorscale->input_video_format,
colorscale->output_video_width, colorscale->output_video_height); colorscale->output_video_width, colorscale->output_video_height,
colorscale->input_video_width, colorscale->input_video_height);
//blocking call, init colorspace conversion if needed //blocking call, init colorspace conversion if needed
gst_gl_display_init_download (colorscale->display, colorscale->output_video_format, gst_gl_display_init_download (colorscale->display, colorscale->output_video_format,

1
gst/gl/gstglimagesink.c
View file

@ -467,6 +467,7 @@ gst_glimage_sink_render (GstBaseSink* bsink, GstBuffer* buf)
//init colorspace conversion if needed //init colorspace conversion if needed
gst_gl_display_init_upload (glimage_sink->display, glimage_sink->format, gst_gl_display_init_upload (glimage_sink->display, glimage_sink->format,
glimage_sink->width, glimage_sink->height,
glimage_sink->width, glimage_sink->height); glimage_sink->width, glimage_sink->height);
gst_gl_display_set_client_reshape_callback (glimage_sink->display, gst_gl_display_set_client_reshape_callback (glimage_sink->display,

3
gst/gl/gstglupload.c
View file

@ -403,7 +403,8 @@ gst_gl_upload_set_caps (GstBaseTransform* bt, GstCaps* incaps,
//init colorspace conversion if needed //init colorspace conversion if needed
gst_gl_display_init_upload (upload->display, upload->video_format, gst_gl_display_init_upload (upload->display, upload->video_format,
upload->gl_width, upload->gl_height); upload->gl_width, upload->gl_height,
upload->video_width, upload->video_height);
return ret; return ret;
} }