summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorAlessandro Decina <alessandro.d@gmail.com>2015-12-18 13:17:34 +1100
committerAlessandro Decina <alessandro.d@gmail.com>2015-12-18 14:25:32 +1100
commit6961945110465940294d1cdfc33532c76aa85f2d (patch)
tree7db1515eb893f424a1f176b1232eff5dfa97a693 /ext
parenta3ebe19d8704200d6c2371b6c4a5a4efe1484643 (diff)
downloadgstreamer-plugins-bad-6961945110465940294d1cdfc33532c76aa85f2d.tar.gz
glmemory: add gst_gl_memory_allocator_get_default
Add gst_gl_memory_allocator_get_default to get the default allocator based on the opengl version. Allows us to stop hardcoding the PBO allocator which isn't supported on gles2. Fixes GL upload on iOS9 among other things.
Diffstat (limited to 'ext')
-rw-r--r--ext/gl/gstgloverlay.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/gl/gstgloverlay.c b/ext/gl/gstgloverlay.c
index c23412d36..fa6c6c116 100644
--- a/ext/gl/gstgloverlay.c
+++ b/ext/gl/gstgloverlay.c
@@ -698,8 +698,8 @@ gst_gl_overlay_load_jpeg (GstGLOverlay * overlay, FILE * fp)
gst_video_info_align (&v_info, &v_align);
mem_allocator =
- GST_GL_BASE_MEMORY_ALLOCATOR (gst_allocator_find
- (GST_GL_MEMORY_PBO_ALLOCATOR_NAME));
+ GST_GL_BASE_MEMORY_ALLOCATOR (gst_gl_memory_allocator_get_default
+ (GST_GL_BASE_FILTER (overlay)->context));
params =
gst_gl_video_allocation_params_new (GST_GL_BASE_FILTER (overlay)->context,
NULL, &v_info, 0, &v_align, GST_GL_TEXTURE_TARGET_2D);
@@ -813,8 +813,8 @@ gst_gl_overlay_load_png (GstGLOverlay * overlay, FILE * fp)
gst_video_info_set_format (&v_info, GST_VIDEO_FORMAT_RGBA, width, height);
mem_allocator =
- GST_GL_BASE_MEMORY_ALLOCATOR (gst_allocator_find
- (GST_GL_MEMORY_PBO_ALLOCATOR_NAME));
+ GST_GL_BASE_MEMORY_ALLOCATOR (gst_gl_memory_allocator_get_default
+ (GST_GL_BASE_FILTER (overlay)->context));
params =
gst_gl_video_allocation_params_new (GST_GL_BASE_FILTER (overlay)->context,
NULL, &v_info, 0, NULL, GST_GL_TEXTURE_TARGET_2D);