mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-20 13:06:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl/upload: update the respective state when we cache textures/data

Browse source
This commit is contained in:
Matthew Waters 2014-05-11 10:27:02 +10:00
parent a39c3bd01b
commit 0c92f185c4
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -510,7 +510,10 @@ _gst_gl_upload_perform_for_gl_texture_upload_meta (GstVideoGLTextureUploadMeta *
GST_VIDEO_INFO_HEIGHT (&upload->in_info), NULL, NULL);;
/* FIXME: kinda breaks the abstraction */
upload->out_tex->tex_id = texture_id[0];
if (upload->out_tex->tex_id != texture_id[0]) {
upload->out_tex->tex_id = texture_id[0];
GST_GL_MEMORY_FLAG_SET (upload->out_tex, GST_GL_MEMORY_FLAG_NEED_DOWNLOAD);
}
GST_LOG ("Uploading for meta with textures %i,%i,%i,%i", texture_id[0],
texture_id[1], texture_id[2], texture_id[3]);
@ -585,7 +588,10 @@ gst_gl_upload_perform_with_data (GstGLUpload * upload, GLuint texture_id,
GST_VIDEO_INFO_HEIGHT (&upload->in_info), NULL, NULL);
/* FIXME: kinda breaks the abstraction */
upload->out_tex->tex_id = texture_id;
if (upload->out_tex->tex_id != texture_id) {
upload->out_tex->tex_id = texture_id;
GST_GL_MEMORY_FLAG_SET (upload->out_tex, GST_GL_MEMORY_FLAG_NEED_DOWNLOAD);
}
ret = _gst_gl_upload_perform_with_data_unlocked (upload, texture_id, data);
@ -598,6 +604,8 @@ static gboolean
_gst_gl_upload_perform_with_data_unlocked (GstGLUpload * upload,
GLuint texture_id, gpointer data[GST_VIDEO_MAX_PLANES])
{
guint i;
g_return_val_if_fail (upload != NULL, FALSE);
g_return_val_if_fail (texture_id > 0, FALSE);
@ -605,6 +613,13 @@ _gst_gl_upload_perform_with_data_unlocked (GstGLUpload * upload,
gst_gl_memory_setup_wrapped (upload->context, &upload->in_info, data,
upload->in_tex);
for (i = 0; i < GST_VIDEO_MAX_PLANES; i++) {
if (upload->in_tex[i] && upload->in_tex[i]->data != data[i]) {
upload->in_tex[i]->data = data[i];
GST_GL_MEMORY_FLAG_SET (upload->in_tex[i], GST_GL_MEMORY_FLAG_NEED_UPLOAD);
}
}
GST_LOG ("Uploading data into texture %u", texture_id);
return _upload_memory (upload);