mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-03 09:12:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

gl/tests: update for API changes

Browse source
This commit is contained in:
Matthew Waters 2014-08-01 10:01:18 +10:00 committed by Tim-Philipp Müller
parent 4277d2742a
commit 5e2f15403c
2 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
tests/check/libs/gstglmemory.c
View file

@ -54,29 +54,32 @@ GST_START_TEST (test_basic)
GstMemory *mem, *mem2; GstMemory *mem, *mem2;
GstGLMemory *gl_mem, *gl_mem2; GstGLMemory *gl_mem, *gl_mem2;
GstAllocator *gl_allocator; GstAllocator *gl_allocator;
gint i; gint i, j;
static GstVideoGLTextureType formats[] = { static GstVideoFormat formats[] = {
GST_VIDEO_GL_TEXTURE_TYPE_RGBA, GST_VIDEO_GL_TEXTURE_TYPE_RGB, GST_VIDEO_FORMAT_RGBA, GST_VIDEO_FORMAT_RGB,
GST_VIDEO_GL_TEXTURE_TYPE_LUMINANCE_ALPHA, GST_VIDEO_FORMAT_YUY2, GST_VIDEO_FORMAT_I420
GST_VIDEO_GL_TEXTURE_TYPE_LUMINANCE
}; };
for (i = 0; i < G_N_ELEMENTS (formats); i++) {
gsize width = 320, height = 240, stride = 324;
gl_allocator = gst_allocator_find (GST_GL_MEMORY_ALLOCATOR); gl_allocator = gst_allocator_find (GST_GL_MEMORY_ALLOCATOR);
fail_if (gl_allocator == NULL); fail_if (gl_allocator == NULL);
/* test allocator creation */ /* test allocator creation */
ASSERT_WARNING (mem = gst_allocator_alloc (gl_allocator, 0, NULL);); ASSERT_WARNING (mem = gst_allocator_alloc (gl_allocator, 0, NULL);
mem = gst_gl_memory_alloc (context, formats[i], width, height, stride); );
for (i = 0; i < G_N_ELEMENTS (formats); i++) {
GstVideoInfo v_info;
gsize width = 320, height = 240;
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);
fail_if (mem == NULL); fail_if (mem == NULL);
gl_mem = (GstGLMemory *) mem; gl_mem = (GstGLMemory *) mem;
/* test init params */ /* test init params */
fail_if (gl_mem->width != width); fail_if (gst_video_info_is_equal (&v_info, &gl_mem->info) == FALSE);
fail_if (gl_mem->height != height);
fail_if (gl_mem->stride != stride);
fail_if (gl_mem->context != context); fail_if (gl_mem->context != context);
fail_if (gl_mem->tex_id == 0); fail_if (gl_mem->tex_id == 0);
@ -86,10 +89,8 @@ GST_START_TEST (test_basic)
gl_mem2 = (GstGLMemory *) mem2; gl_mem2 = (GstGLMemory *) mem2;
/* test params */ /* test params */
fail_if (gl_mem->tex_id == gl_mem2->tex_id); fail_if (gst_video_info_is_equal (&gl_mem2->info,
fail_if (gl_mem->tex_type != gl_mem2->tex_type); &gl_mem->info) == FALSE);
fail_if (gl_mem->width != gl_mem2->width);
fail_if (gl_mem->stride != gl_mem2->stride);
fail_if (gl_mem->context != gl_mem2->context); fail_if (gl_mem->context != gl_mem2->context);
if (gst_gl_context_get_error ()) if (gst_gl_context_get_error ())
@ -98,10 +99,11 @@ GST_START_TEST (test_basic)
gst_memory_unref (mem); gst_memory_unref (mem);
gst_memory_unref (mem2); gst_memory_unref (mem2);
}
}
gst_object_unref (gl_allocator); gst_object_unref (gl_allocator);
} }
}
GST_END_TEST; GST_END_TEST;

6
tests/check/libs/gstglupload.c
View file

@ -264,8 +264,7 @@ GST_START_TEST (test_upload_buffer)
/* create GL buffer */ /* create GL buffer */
buffer = gst_buffer_new (); buffer = gst_buffer_new ();
gl_mem = gst_gl_memory_wrapped (context, FORMAT, WIDTH, HEIGHT, WIDTH * 4, gl_mem = gst_gl_memory_wrapped (context, &in_info, 0, rgba_data, NULL, NULL);
rgba_data, NULL, NULL);
gst_buffer_append_memory (buffer, (GstMemory *) gl_mem); gst_buffer_append_memory (buffer, (GstMemory *) gl_mem);
gst_gl_upload_set_format (upload, &in_info); gst_gl_upload_set_format (upload, &in_info);
@ -304,8 +303,7 @@ GST_START_TEST (test_upload_meta_producer)
/* create GL buffer */ /* create GL buffer */
buffer = gst_buffer_new (); buffer = gst_buffer_new ();
gl_mem = gst_gl_memory_wrapped (context, FORMAT, WIDTH, HEIGHT, WIDTH * 4, gl_mem = gst_gl_memory_wrapped (context, &in_info, 0, rgba_data, NULL, NULL);
rgba_data, NULL, NULL);
gst_buffer_append_memory (buffer, (GstMemory *) gl_mem); gst_buffer_append_memory (buffer, (GstMemory *) gl_mem);
gst_gl_context_gen_texture (context, &tex_ids[0], GST_VIDEO_FORMAT_RGBA, gst_gl_context_gen_texture (context, &tex_ids[0], GST_VIDEO_FORMAT_RGBA,