mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-08 18:39:54 +00:00
Code Issues 1 Projects Releases Wiki Activity

glupload: don't reuse output textures for raw data upload

Browse source 
Causes stale textures to be used further down the chain.
This commit is contained in:
Matthew Waters 2015-05-19 11:47:23 +10:00
parent 2352545bee
commit 2747eb1232
1 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gst-libs/gst/gl/gstglupload.c
View file

@ -681,7 +681,6 @@ static const UploadMethod _upload_meta_upload = {
struct RawUpload struct RawUpload
{ {
GstGLUpload *upload; GstGLUpload *upload;
GstGLMemory *in_tex[GST_VIDEO_MAX_PLANES];
GstVideoFrame in_frame; GstVideoFrame in_frame;
}; };
@ -751,24 +750,24 @@ static GstGLUploadReturn
_raw_data_upload_perform (gpointer impl, GstBuffer * buffer, _raw_data_upload_perform (gpointer impl, GstBuffer * buffer,
GstBuffer ** outbuf) GstBuffer ** outbuf)
{ {
GstGLMemory *in_tex[GST_VIDEO_MAX_PLANES] = { 0, };
struct RawUpload *raw = impl; struct RawUpload *raw = impl;
int i; int i;
if (!raw->in_tex[0]) gst_gl_memory_setup_wrapped (raw->upload->context,
gst_gl_memory_setup_wrapped (raw->upload->context, &raw->upload->priv->in_info, NULL, raw->in_frame.data, in_tex);
&raw->upload->priv->in_info, NULL, raw->in_frame.data, raw->in_tex);
for (i = 0; i < GST_VIDEO_MAX_PLANES; i++) { for (i = 0; i < GST_VIDEO_MAX_PLANES; i++) {
if (raw->in_tex[i]) { if (in_tex[i]) {
raw->in_tex[i]->data = raw->in_frame.data[i]; in_tex[i]->data = raw->in_frame.data[i];
GST_GL_MEMORY_FLAG_SET (raw->in_tex[i], GST_GL_MEMORY_FLAG_NEED_UPLOAD); GST_GL_MEMORY_FLAG_SET (in_tex[i], GST_GL_MEMORY_FLAG_NEED_UPLOAD);
} }
} }
*outbuf = gst_buffer_new (); *outbuf = gst_buffer_new ();
for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&raw->upload->priv->in_info); i++) { for (i = 0; i < GST_VIDEO_INFO_N_PLANES (&raw->upload->priv->in_info); i++) {
gst_buffer_append_memory (*outbuf, gst_buffer_append_memory (*outbuf,
gst_memory_ref ((GstMemory *) raw->in_tex[i])); gst_memory_ref ((GstMemory *) in_tex[i]));
} }
return GST_GL_UPLOAD_DONE; return GST_GL_UPLOAD_DONE;
@ -786,12 +785,7 @@ static void
_raw_data_upload_free (gpointer impl) _raw_data_upload_free (gpointer impl)
{ {
struct RawUpload *raw = impl; struct RawUpload *raw = impl;
int i;
for (i = 0; i < GST_VIDEO_MAX_PLANES; i++) {
if (raw->in_tex[i])
gst_memory_unref ((GstMemory *) raw->in_tex[i]);
}
g_free (raw); g_free (raw);
} }