mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

glmemory: check for pbo availability before attempting pbo download

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=751165
This commit is contained in:
Matthew Waters 2015-07-20 18:19:02 +10:00
parent d5996de5d7
commit d13201fedb
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gst-libs/gst/gl/gstglmemory.c
View file

@ -740,18 +740,20 @@ static gpointer
_pbo_download_transfer (GstGLMemory * gl_mem, GstMapInfo * info, gsize size) _pbo_download_transfer (GstGLMemory * gl_mem, GstMapInfo * info, gsize size)
{ {
GstGLBaseBufferAllocatorClass *alloc_class; GstGLBaseBufferAllocatorClass *alloc_class;
gpointer data; gpointer data = NULL;
GST_DEBUG ("downloading texture %u using pbo %u", gl_mem->tex_id,
gl_mem->mem.id);
alloc_class = alloc_class =
GST_GL_BASE_BUFFER_ALLOCATOR_CLASS (gst_gl_allocator_parent_class); GST_GL_BASE_BUFFER_ALLOCATOR_CLASS (gst_gl_allocator_parent_class);
/* texture -> pbo */ /* texture -> pbo */
if (info->flags & GST_MAP_READ) if (info->flags & GST_MAP_READ
&& gl_mem->transfer_state & GST_GL_MEMORY_TRANSFER_NEED_DOWNLOAD) {
GST_CAT_TRACE (GST_CAT_GL_MEMORY, "attempting download of texture %u "
"using pbo %u", gl_mem->tex_id, gl_mem->mem.id);
if (!_read_pixels_to_pbo (gl_mem)) if (!_read_pixels_to_pbo (gl_mem))
return NULL; return NULL;
}
/* get a cpu accessible mapping from the pbo */ /* get a cpu accessible mapping from the pbo */
gl_mem->mem.target = GL_PIXEL_PACK_BUFFER; gl_mem->mem.target = GL_PIXEL_PACK_BUFFER;
@ -779,12 +781,13 @@ _gl_mem_download_get_tex_image (GstGLMemory * gl_mem, GstMapInfo * info,
&& gl_mem->tex_type != GST_VIDEO_GL_TEXTURE_TYPE_LUMINANCE_ALPHA) && gl_mem->tex_type != GST_VIDEO_GL_TEXTURE_TYPE_LUMINANCE_ALPHA)
return NULL; return NULL;
gst_gl_base_buffer_alloc_data ((GstGLBaseBuffer *) gl_mem);
if (info->flags & GST_MAP_READ if (info->flags & GST_MAP_READ
&& gl_mem->transfer_state & GST_GL_MEMORY_TRANSFER_NEED_DOWNLOAD) { && gl_mem->transfer_state & GST_GL_MEMORY_TRANSFER_NEED_DOWNLOAD) {
guint format, type; guint format, type;
GST_CAT_TRACE (GST_CAT_GL_MEMORY, "attempting download of texture %u "
"using glGetTexImage", gl_mem->tex_id);
format = gst_gl_format_from_gl_texture_type (gl_mem->tex_type); format = gst_gl_format_from_gl_texture_type (gl_mem->tex_type);
type = GL_UNSIGNED_BYTE; type = GL_UNSIGNED_BYTE;
if (gl_mem->tex_type == GST_VIDEO_GL_TEXTURE_TYPE_RGB16) if (gl_mem->tex_type == GST_VIDEO_GL_TEXTURE_TYPE_RGB16)
@ -805,10 +808,10 @@ _gl_mem_download_read_pixels (GstGLMemory * gl_mem, GstMapInfo * info,
if (size != -1 && size != ((GstMemory *) gl_mem)->maxsize) if (size != -1 && size != ((GstMemory *) gl_mem)->maxsize)
return NULL; return NULL;
gst_gl_base_buffer_alloc_data ((GstGLBaseBuffer *) gl_mem);
if (info->flags & GST_MAP_READ if (info->flags & GST_MAP_READ
&& gl_mem->transfer_state & GST_GL_MEMORY_TRANSFER_NEED_DOWNLOAD) { && gl_mem->transfer_state & GST_GL_MEMORY_TRANSFER_NEED_DOWNLOAD) {
GST_CAT_TRACE (GST_CAT_GL_MEMORY, "attempting download of texture %u "
"using glReadPixels", gl_mem->tex_id);
if (!_gl_mem_read_pixels (gl_mem, gl_mem->mem.data)) if (!_gl_mem_read_pixels (gl_mem, gl_mem->mem.data))
return NULL; return NULL;
} }
@ -819,8 +822,12 @@ _gl_mem_download_read_pixels (GstGLMemory * gl_mem, GstMapInfo * info,
static gpointer static gpointer
_gl_mem_map_cpu_access (GstGLMemory * gl_mem, GstMapInfo * info, gsize size) _gl_mem_map_cpu_access (GstGLMemory * gl_mem, GstMapInfo * info, gsize size)
{ {
gpointer data; gpointer data = NULL;
gst_gl_base_buffer_alloc_data ((GstGLBaseBuffer *) gl_mem);
if (!data && gl_mem->mem.id
&& CONTEXT_SUPPORTS_PBO_DOWNLOAD (gl_mem->mem.context))
data = _pbo_download_transfer (gl_mem, info, size); data = _pbo_download_transfer (gl_mem, info, size);
if (!data) if (!data)
data = _gl_mem_download_get_tex_image (gl_mem, info, size); data = _gl_mem_download_get_tex_image (gl_mem, info, size);
@ -1347,7 +1354,9 @@ _download_transfer (GstGLContext * context, GstGLMemory * gl_mem)
GstGLBaseBuffer *mem = (GstGLBaseBuffer *) gl_mem; GstGLBaseBuffer *mem = (GstGLBaseBuffer *) gl_mem;
g_mutex_lock (&mem->lock); g_mutex_lock (&mem->lock);
_read_pixels_to_pbo (gl_mem); if (_read_pixels_to_pbo (gl_mem))
GST_CAT_TRACE (GST_CAT_GL_MEMORY, "optimistic download of texture %u "
"using pbo %u", gl_mem->tex_id, gl_mem->mem.id);
g_mutex_unlock (&mem->lock); g_mutex_unlock (&mem->lock);
} }