gltest: Port to new API

https://bugzilla.gnome.org/show_bug.cgi?id=740900
This commit is contained in:
Nicolas Dufresne 2014-12-19 13:18:50 -05:00 committed by Tim-Philipp Müller
parent eeda7a29ce
commit 7c7af39c4a
3 changed files with 10 additions and 8 deletions

View file

@ -129,7 +129,7 @@ check_conversion (TestFrame * frames, guint size)
/* create GL buffer */
inbuf = gst_buffer_new ();
fail_unless (gst_gl_memory_setup_wrapped (context, &in_info,
fail_unless (gst_gl_memory_setup_wrapped (context, &in_info, NULL,
(gpointer *) in_data, in_mem));
for (j = 0; j < GST_VIDEO_INFO_N_PLANES (&in_info); j++) {

View file

@ -73,7 +73,7 @@ GST_START_TEST (test_basic)
gst_video_info_set_format (&v_info, formats[i], width, height);
for (j = 0; j < GST_VIDEO_INFO_N_PLANES (&v_info); j++) {
mem = gst_gl_memory_alloc (context, &v_info, j);
mem = gst_gl_memory_alloc (context, &v_info, j, NULL);
fail_if (mem == NULL);
gl_mem = (GstGLMemory *) mem;
@ -124,7 +124,7 @@ GST_START_TEST (test_transfer)
gst_video_info_set_format (&v_info, GST_VIDEO_FORMAT_RGBA, 1, 1);
/* texture creation */
mem = (GstMemory *) gst_gl_memory_alloc (context, &v_info, 0);
mem = (GstMemory *) gst_gl_memory_alloc (context, &v_info, 0, NULL);
fail_unless (!GST_GL_MEMORY_FLAG_IS_SET (mem,
GST_GL_MEMORY_FLAG_NEED_UPLOAD));
fail_unless (!GST_GL_MEMORY_FLAG_IS_SET (mem,
@ -132,8 +132,8 @@ GST_START_TEST (test_transfer)
/* test wrapping raw data */
mem2 =
(GstMemory *) gst_gl_memory_wrapped (context, &v_info, 0, rgba_pixel,
NULL, NULL);
(GstMemory *) gst_gl_memory_wrapped (context, &v_info, 0, NULL,
rgba_pixel, NULL, NULL);
fail_if (mem == NULL);
fail_unless (GST_GL_MEMORY_FLAG_IS_SET (mem2,
@ -143,7 +143,7 @@ GST_START_TEST (test_transfer)
/* wrapped texture creation */
mem3 = (GstMemory *) gst_gl_memory_wrapped_texture (context,
((GstGLMemory *) mem)->tex_id, &v_info, 0, NULL, NULL);
((GstGLMemory *) mem)->tex_id, &v_info, 0, NULL, NULL, NULL);
fail_unless (!GST_GL_MEMORY_FLAG_IS_SET (mem3,
GST_GL_MEMORY_FLAG_NEED_UPLOAD));
fail_unless (GST_GL_MEMORY_FLAG_IS_SET (mem3,

View file

@ -285,7 +285,8 @@ GST_START_TEST (test_upload_buffer)
/* create GL buffer */
buffer = gst_buffer_new ();
gl_mem = gst_gl_memory_wrapped (context, &in_info, 0, rgba_data, NULL, NULL);
gl_mem =
gst_gl_memory_wrapped (context, &in_info, 0, NULL, rgba_data, NULL, NULL);
res =
gst_memory_map ((GstMemory *) gl_mem, &map_info,
@ -337,7 +338,8 @@ GST_START_TEST (test_upload_meta_producer)
/* create GL buffer */
buffer = gst_buffer_new ();
gl_mem = gst_gl_memory_wrapped (context, &in_info, 0, rgba_data, NULL, NULL);
gl_mem =
gst_gl_memory_wrapped (context, &in_info, 0, NULL, rgba_data, NULL, NULL);
gst_buffer_append_memory (buffer, (GstMemory *) gl_mem);
gst_gl_context_gen_texture (context, &tex_ids[0], GST_VIDEO_FORMAT_RGBA,