mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-23 08:46:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

check/pipelines/simple_launch_lines.c (run_pipeline): Merge from the state change patch.

Browse source 
Original commit message from CVS:
2005-10-10  Andy Wingo  <wingo@pobox.com>

* check/pipelines/simple_launch_lines.c (run_pipeline): Merge from
the state change patch.
This commit is contained in:
Andy Wingo 2005-10-10 10:59:33 +00:00
parent d2e605454e
commit 4353da375f
3 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2005-10-10 Andy Wingo <wingo@pobox.com>
* check/pipelines/simple_launch_lines.c (run_pipeline): Merge from
the state change patch.
* check/gst/gstghostpad.c (test_ghost_pads): Merge from the state
change patch.

10
check/pipelines/simple_launch_lines.c
View file

@ -48,12 +48,16 @@ run_pipeline (GstElement * pipeline, gchar * descr,
{
GstBus *bus;
GstMessageType revent;
GstStateChangeReturn ret;
g_assert (pipeline);
bus = gst_element_get_bus (pipeline);
g_assert (bus);
if (gst_element_set_state (pipeline,
GST_STATE_PLAYING) != GST_STATE_CHANGE_SUCCESS) {
ret = gst_element_set_state (pipeline, GST_STATE_PLAYING);
ret = gst_element_get_state (pipeline, NULL, NULL, NULL);
if (ret != GST_STATE_CHANGE_SUCCESS) {
g_critical ("Couldn't set pipeline to PLAYING");
goto done;
}
@ -190,7 +194,7 @@ simple_launch_lines_suite (void)
TCase *tc_chain = tcase_create ("linear");
/* time out after 20s, not the default 3 */
tcase_set_timeout (tc_chain, 20);
tcase_set_timeout (tc_chain, 0);
suite_add_tcase (s, tc_chain);
tcase_add_test (tc_chain, test_2_elements);

10
tests/check/pipelines/simple-launch-lines.c
View file

@ -48,12 +48,16 @@ run_pipeline (GstElement * pipeline, gchar * descr,
{
GstBus *bus;
GstMessageType revent;
GstStateChangeReturn ret;
g_assert (pipeline);
bus = gst_element_get_bus (pipeline);
g_assert (bus);
if (gst_element_set_state (pipeline,
GST_STATE_PLAYING) != GST_STATE_CHANGE_SUCCESS) {
ret = gst_element_set_state (pipeline, GST_STATE_PLAYING);
ret = gst_element_get_state (pipeline, NULL, NULL, NULL);
if (ret != GST_STATE_CHANGE_SUCCESS) {
g_critical ("Couldn't set pipeline to PLAYING");
goto done;
}
@ -190,7 +194,7 @@ simple_launch_lines_suite (void)
TCase *tc_chain = tcase_create ("linear");
/* time out after 20s, not the default 3 */
tcase_set_timeout (tc_chain, 20);
tcase_set_timeout (tc_chain, 0);
suite_add_tcase (s, tc_chain);
tcase_add_test (tc_chain, test_2_elements);