mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-30 13:41:48 +00:00
[114/906] git-svn-id: svn://svn.wobow.com/GStreamer_playground/gst-plugins-gl@555 93df14bb-0f41-7a43-8087-d3e2a2f0e464
This commit is contained in:
Julien Isorce
Tim-Philipp Müller
parent
a903f96e15
commit
a192d39638
4 changed files with 963 additions and 900 deletions
|
|
@ -29,8 +29,8 @@ static GObjectClass* gst_gl_buffer_parent_class;
|
|||
static void
|
||||
gst_gl_buffer_finalize (GstGLBuffer* buffer)
|
||||
{
|
||||
//wait clear textures end, blocking call
|
||||
gst_gl_display_clearTexture (buffer->display, buffer->texture);
|
||||
//blocking call, put the texture in the pool
|
||||
gst_gl_display_del_texture (buffer->display, buffer->texture);
|
||||
|
||||
g_object_unref (buffer->display);
|
||||
|
||||
|
|
@ -99,8 +99,8 @@ gst_gl_buffer_new (GstGLDisplay* display,
|
|||
//the one attached to the upload FBO
|
||||
GST_BUFFER_SIZE (gl_buffer) = gst_gl_buffer_get_size (gl_width, gl_height);
|
||||
|
||||
//blocking call, request a texture and attach it to the upload FBO
|
||||
gst_gl_display_prepare_texture (gl_buffer->display, &gl_buffer->texture) ;
|
||||
//blocking call, generate a texture using the pool
|
||||
gst_gl_display_gen_texture (gl_buffer->display, &gl_buffer->texture) ;
|
||||
|
||||
return gl_buffer;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -41,7 +41,7 @@
|
|||
typedef struct _GstGLDisplay GstGLDisplay;
|
||||
typedef struct _GstGLDisplayClass GstGLDisplayClass;
|
||||
|
||||
//Color space conversion metthod
|
||||
//Color space conversion method
|
||||
typedef enum {
|
||||
GST_GL_DISPLAY_CONVERSION_GLSL, //ARB_fragment_shade
|
||||
GST_GL_DISPLAY_CONVERSION_MATRIX, //ARB_imaging
|
||||
|
|
@ -51,23 +51,23 @@ typedef enum {
|
|||
|
||||
//Message type
|
||||
typedef enum {
|
||||
GST_GL_DISPLAY_ACTION_CREATE,
|
||||
GST_GL_DISPLAY_ACTION_DESTROY,
|
||||
GST_GL_DISPLAY_ACTION_VISIBLE,
|
||||
GST_GL_DISPLAY_ACTION_RESHAPE,
|
||||
GST_GL_DISPLAY_ACTION_INIT_UPLOAD,
|
||||
GST_GL_DISPLAY_ACTION_PREPARE,
|
||||
GST_GL_DISPLAY_ACTION_CHANGE,
|
||||
GST_GL_DISPLAY_ACTION_CLEAR,
|
||||
GST_GL_DISPLAY_ACTION_VIDEO,
|
||||
GST_GL_DISPLAY_ACTION_REDISPLAY,
|
||||
GST_GL_DISPLAY_ACTION_GENFBO,
|
||||
GST_GL_DISPLAY_ACTION_DELFBO,
|
||||
GST_GL_DISPLAY_ACTION_USEFBO,
|
||||
GST_GL_DISPLAY_ACTION_USEFBO2,
|
||||
GST_GL_DISPLAY_ACTION_CREATE_CONTEXT,
|
||||
GST_GL_DISPLAY_ACTION_DESTROY_CONTEXT,
|
||||
GST_GL_DISPLAY_ACTION_VISIBLE_CONTEXT,
|
||||
GST_GL_DISPLAY_ACTION_RESIZE_CONTEXT,
|
||||
GST_GL_DISPLAY_ACTION_REDISPLAY_CONTEXT,
|
||||
GST_GL_DISPLAY_ACTION_GEN_TEXTURE,
|
||||
GST_GL_DISPLAY_ACTION_DEL_TEXTURE,
|
||||
GST_GL_DISPLAY_ACTION_INIT_UPLOAD,
|
||||
GST_GL_DISPLAY_ACTION_DO_UPLOAD,
|
||||
GST_GL_DISPLAY_ACTION_INIT_DOWNLOAD,
|
||||
GST_GL_DISPLAY_ACTION_GENSHADER,
|
||||
GST_GL_DISPLAY_ACTION_DELSHADER
|
||||
GST_GL_DISPLAY_ACTION_DO_DOWNLOAD,
|
||||
GST_GL_DISPLAY_ACTION_GEN_FBO,
|
||||
GST_GL_DISPLAY_ACTION_USE_FBO,
|
||||
GST_GL_DISPLAY_ACTION_USE_FBO2,
|
||||
GST_GL_DISPLAY_ACTION_DEL_FBO,
|
||||
GST_GL_DISPLAY_ACTION_GEN_SHADER,
|
||||
GST_GL_DISPLAY_ACTION_DEL_SHADER
|
||||
|
||||
} GstGLDisplayAction;
|
||||
|
||||
|
|
@ -101,21 +101,23 @@ struct _GstGLDisplay {
|
|||
|
||||
GQueue* texturePool;
|
||||
|
||||
//conditions
|
||||
GCond* cond_create_context;
|
||||
GCond* cond_destroy_context;
|
||||
GCond* cond_gen_texture;
|
||||
GCond* cond_del_texture;
|
||||
GCond* cond_init_upload;
|
||||
GCond* cond_make;
|
||||
GCond* cond_fill;
|
||||
GCond* cond_clear;
|
||||
GCond* cond_video;
|
||||
GCond* cond_generateFBO;
|
||||
GCond* cond_useFBO;
|
||||
GCond* cond_useFBO2;
|
||||
GCond* cond_destroyFBO;
|
||||
GCond* cond_do_upload;
|
||||
GCond* cond_init_download;
|
||||
GCond* cond_initShader;
|
||||
GCond* cond_destroyShader;
|
||||
GCond* cond_do_download;
|
||||
GCond* cond_gen_fbo;
|
||||
GCond* cond_use_fbo;
|
||||
GCond* cond_use_fbo_2;
|
||||
GCond* cond_del_fbo;
|
||||
GCond* cond_gen_shader;
|
||||
GCond* cond_del_shader;
|
||||
|
||||
GCond* cond_create;
|
||||
GCond* cond_destroy;
|
||||
|
||||
gint glutWinId;
|
||||
gulong winId;
|
||||
GString* title;
|
||||
|
|
@ -239,42 +241,49 @@ GType gst_gl_display_get_type (void);
|
|||
//------------------------------------------------------------
|
||||
//-------------------- Public declarations ------------------
|
||||
//------------------------------------------------------------
|
||||
GstGLDisplay *gst_gl_display_new (void);
|
||||
void gst_gl_display_init_gl_context (GstGLDisplay* display,
|
||||
GLint x, GLint y,
|
||||
GLint width, GLint height,
|
||||
gulong winId,
|
||||
gboolean visible);
|
||||
void gst_gl_display_setClientReshapeCallback (GstGLDisplay* display, CRCB cb);
|
||||
void gst_gl_display_setClientDrawCallback (GstGLDisplay* display, CDCB cb);
|
||||
void gst_gl_display_setVisibleWindow (GstGLDisplay* display, gboolean visible);
|
||||
void gst_gl_display_resizeWindow (GstGLDisplay* display, gint width, gint height);
|
||||
GstGLDisplay* gst_gl_display_new (void);
|
||||
|
||||
void gst_gl_display_create_context (GstGLDisplay* display,
|
||||
GLint x, GLint y,
|
||||
GLint width, GLint height,
|
||||
gulong winId,
|
||||
gboolean visible);
|
||||
void gst_gl_display_set_visible_context (GstGLDisplay* display, gboolean visible);
|
||||
void gst_gl_display_resize_context (GstGLDisplay* display, gint width, gint height);
|
||||
gboolean gst_gl_display_redisplay (GstGLDisplay* display, GLuint texture, gint width, gint height);
|
||||
|
||||
void gst_gl_display_gen_texture (GstGLDisplay* display, guint* pTexture);
|
||||
void gst_gl_display_del_texture (GstGLDisplay* display, guint texture);
|
||||
|
||||
void gst_gl_display_init_upload (GstGLDisplay* display, GstVideoFormat video_format,
|
||||
guint gl_width, guint gl_height);
|
||||
void gst_gl_display_prepare_texture (GstGLDisplay* display, guint* pTexture);
|
||||
void gst_gl_display_do_upload (GstGLDisplay* display, GstVideoFormat video_format,
|
||||
gint video_width, gint video_height, gpointer data,
|
||||
guint gl_width, guint gl_height, guint pTexture);
|
||||
void gst_gl_display_clearTexture (GstGLDisplay* display, guint texture);
|
||||
|
||||
void gst_gl_display_videoChanged (GstGLDisplay* display, GstVideoFormat video_format,
|
||||
gint width, gint height, GLuint recordedTexture, gpointer data);
|
||||
gboolean gst_gl_display_postRedisplay (GstGLDisplay* display, GLuint texture, gint width, gint height);
|
||||
void gst_gl_display_requestFBO (GstGLDisplay* display, gint width, gint height,
|
||||
guint* fbo, guint* depthbuffer);
|
||||
void gst_gl_display_useFBO (GstGLDisplay* display, gint textureFBOWidth, gint textureFBOheight,
|
||||
guint fbo, guint depthbuffer, guint textureFBO, GLCB cb,
|
||||
guint inputTextureWidth, guint inputTextureHeight, guint inputTexture,
|
||||
GLhandleARB handleShader);
|
||||
void gst_gl_display_useFBO2 (GstGLDisplay* display, gint textureFBOWidth, gint textureFBOheight,
|
||||
guint fbo, guint depthbuffer, guint textureFBO, GLCB2 cb,
|
||||
gpointer* p1, gpointer* p2);
|
||||
void gst_gl_display_rejectFBO (GstGLDisplay* display, guint fbo,
|
||||
guint depthbuffer);
|
||||
|
||||
void gst_gl_display_init_download (GstGLDisplay* display, GstVideoFormat video_format,
|
||||
gint width, gint height);
|
||||
void gst_gl_display_initShader (GstGLDisplay* display, gchar* textShader, GLhandleARB* handleShader);
|
||||
void gst_gl_display_destroyShader (GstGLDisplay* display, GLhandleARB shader);
|
||||
void gst_gl_display_set_windowId (GstGLDisplay* display, gulong winId);
|
||||
void gst_gl_display_do_download (GstGLDisplay* display, GstVideoFormat video_format,
|
||||
gint width, gint height, GLuint recordedTexture, gpointer data);
|
||||
|
||||
void gst_gl_display_gen_fbo (GstGLDisplay* display, gint width, gint height,
|
||||
guint* fbo, guint* depthbuffer);
|
||||
void gst_gl_display_use_fbo (GstGLDisplay* display, gint textureFBOWidth, gint textureFBOheight,
|
||||
guint fbo, guint depthbuffer, guint textureFBO, GLCB cb,
|
||||
guint inputTextureWidth, guint inputTextureHeight, guint inputTexture,
|
||||
GLhandleARB handleShader);
|
||||
void gst_gl_display_use_fbo_2 (GstGLDisplay* display, gint textureFBOWidth, gint textureFBOheight,
|
||||
guint fbo, guint depthbuffer, guint textureFBO, GLCB2 cb,
|
||||
gpointer* p1, gpointer* p2);
|
||||
void gst_gl_display_del_fbo (GstGLDisplay* display, guint fbo,
|
||||
guint depthbuffer);
|
||||
|
||||
void gst_gl_display_gen_shader (GstGLDisplay* display, gchar* textShader, GLhandleARB* handleShader);
|
||||
void gst_gl_display_del_shader (GstGLDisplay* display, GLhandleARB shader);
|
||||
|
||||
void gst_gl_display_set_window_id (GstGLDisplay* display, gulong winId);
|
||||
void gst_gl_display_set_client_reshape_callback (GstGLDisplay* display, CRCB cb);
|
||||
void gst_gl_display_set_client_draw_callback (GstGLDisplay* display, CDCB cb);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ gst_gl_filter_reset (GstGLFilter* filter)
|
|||
if (filter->display)
|
||||
{
|
||||
//blocking call, delete the FBO
|
||||
gst_gl_display_rejectFBO (filter->display, filter->fbo,
|
||||
gst_gl_display_del_fbo (filter->display, filter->fbo,
|
||||
filter->depthbuffer);
|
||||
g_object_unref (filter->display);
|
||||
filter->display = NULL;
|
||||
|
|
@ -247,7 +247,7 @@ gst_gl_filter_prepare_output_buffer (GstBaseTransform* trans,
|
|||
filter->display = g_object_ref (gl_inbuf->display);
|
||||
|
||||
//blocking call, generate a FBO
|
||||
gst_gl_display_requestFBO (filter->display, filter->width, filter->height,
|
||||
gst_gl_display_gen_fbo (filter->display, filter->width, filter->height,
|
||||
&filter->fbo, &filter->depthbuffer);
|
||||
|
||||
if (filter_class->onInitFBO)
|
||||
|
|
|
|||
Loading…
Reference in a new issue