mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-01 21:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests: fix g_usleep() in camerabin2 test

Browse source 
g_usleep() takes a microsecond value, GST_SECOND is nanoseconds, so
we were sleeping for more than 3 minutes here instead of 200ms.
This commit is contained in:
Tim-Philipp Müller 2011-12-11 15:03:17 +00:00
parent 93e2ee890f
commit f760b3318a
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tests/check/elements/camerabin2.c
View file

@ -633,7 +633,8 @@ wait_for_idle_state (void)
if (idle) if (idle)
break; break;
g_usleep (GST_SECOND / 5); GST_LOG ("waiting for idle state..");
g_usleep (G_USEC_PER_SEC / 5);
} }
fail_unless (idle); fail_unless (idle);
} }
@ -816,6 +817,7 @@ GST_START_TEST (test_multiple_video_recordings)
gst_caps_unref (caps); gst_caps_unref (caps);
GST_LOG ("starting #%d with caps %" GST_PTR_FORMAT, i, caps);
g_signal_emit_by_name (camera, "start-capture", NULL); g_signal_emit_by_name (camera, "start-capture", NULL);
g_object_get (camera, "idle", &idle, NULL); g_object_get (camera, "idle", &idle, NULL);
@ -824,15 +826,20 @@ GST_START_TEST (test_multiple_video_recordings)
g_timeout_add_seconds (VIDEO_DURATION, (GSourceFunc) g_main_loop_quit, g_timeout_add_seconds (VIDEO_DURATION, (GSourceFunc) g_main_loop_quit,
main_loop); main_loop);
g_main_loop_run (main_loop); g_main_loop_run (main_loop);
GST_LOG ("stopping run %d", i);
g_signal_emit_by_name (camera, "stop-capture", NULL); g_signal_emit_by_name (camera, "stop-capture", NULL);
msg = wait_for_element_message (camera, "video-done", GST_CLOCK_TIME_NONE); msg = wait_for_element_message (camera, "video-done", GST_CLOCK_TIME_NONE);
fail_unless (msg != NULL); fail_unless (msg != NULL);
gst_message_unref (msg); gst_message_unref (msg);
GST_LOG ("video done, checking preview image");
check_preview_image (camera, video_filename, i); check_preview_image (camera, video_filename, i);
GST_LOG ("waiting for idle state");
wait_for_idle_state (); wait_for_idle_state ();
GST_LOG ("finished run %d", i);
} }
gst_element_set_state (GST_ELEMENT (camera), GST_STATE_NULL); gst_element_set_state (GST_ELEMENT (camera), GST_STATE_NULL);