projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
02fdc64
)
glmemory: use the correct size for the pbo
author
Matthew Waters
<matthew@centricular.com>
Thu, 15 Jan 2015 01:57:59 +0000
(12:57 +1100)
committer
Tim-Philipp Müller
<tim@centricular.com>
Sat, 9 Dec 2017 19:31:52 +0000
(19:31 +0000)
It was missing the GstVideoAlignment padding which could cause GL
errors related to overrunning the size of the pbo.
gst-libs/gst/gl/gstglmemory.c
patch
|
blob
|
history
diff --git
a/gst-libs/gst/gl/gstglmemory.c
b/gst-libs/gst/gl/gstglmemory.c
index 2dc656dbb4d3377f128b34db92b592a86fbd4a77..c1d53aad5ced16d1f916524a9c1276d74f784987 100644
(file)
--- a/
gst-libs/gst/gl/gstglmemory.c
+++ b/
gst-libs/gst/gl/gstglmemory.c
@@
-472,9
+472,7
@@
_transfer_upload (GstGLContext * context, GstGLMemory * gl_mem)
GST_CAT_DEBUG (GST_CAT_GL_MEMORY, "uploading texture %u using pbo %u",
gl_mem->tex_id, gl_mem->transfer_pbo);
- size =
- GL_MEM_HEIGHT (gl_mem) * GL_MEM_WIDTH (gl_mem) *
- _gl_texture_type_n_bytes (gl_mem->tex_type);
+ size = ((GstMemory *) gl_mem)->maxsize;
if (USING_OPENGL (context) || USING_GLES3 (context)
|| USING_OPENGL3 (context)) {