mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-22 05:56:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests: fix decodebin signal used in icles/playback/ decodetest, test and test5

Browse source 
Since release 1.1.4, "new-decoded-pad" no longer exists.
This commit is contained in:
Matthieu Crapet 2014-08-11 18:21:26 +02:00 committed by Sebastian Dröge
parent a080c0ebbf
commit 48f7a40078
3 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
tests/icles/playback/decodetest.c
View file

@ -71,8 +71,7 @@ state_cb (GstBus * bus, GstMessage * msg, GstElement * pipeline)
} }
static void static void
new_decoded_pad_cb (GstElement * decodebin, GstPad * pad, gboolean last, pad_added_cb (GstElement * decodebin, GstPad * pad, GstElement * pipeline)
GstElement * pipeline)
{ {
GstPadLinkReturn ret; GstPadLinkReturn ret;
GstElement *fakesink; GstElement *fakesink;
@ -149,8 +148,7 @@ main (gint argc, gchar * argv[])
gst_element_link_pads (source, "src", decoder, "sink"); gst_element_link_pads (source, "src", decoder, "sink");
g_signal_connect (decoder, "new-decoded-pad", g_signal_connect (decoder, "pad-added", G_CALLBACK (pad_added_cb), pipeline);
G_CALLBACK (new_decoded_pad_cb), pipeline);
res = gst_element_set_state (pipeline, GST_STATE_PLAYING); res = gst_element_set_state (pipeline, GST_STATE_PLAYING);
if (res == GST_STATE_CHANGE_FAILURE) { if (res == GST_STATE_CHANGE_FAILURE) {

13
tests/icles/playback/test.c
View file

@ -37,6 +37,7 @@ gen_video_element (void)
element = gst_bin_new ("vbin"); element = gst_bin_new ("vbin");
conv = gst_element_factory_make ("videoconvert", "conv"); conv = gst_element_factory_make ("videoconvert", "conv");
sink = gst_element_factory_make (DEFAULT_VIDEOSINK, "sink"); sink = gst_element_factory_make (DEFAULT_VIDEOSINK, "sink");
g_assert (sink);
gst_bin_add (GST_BIN (element), conv); gst_bin_add (GST_BIN (element), conv);
gst_bin_add (GST_BIN (element), sink); gst_bin_add (GST_BIN (element), sink);
@ -60,6 +61,7 @@ gen_audio_element (void)
element = gst_bin_new ("abin"); element = gst_bin_new ("abin");
conv = gst_element_factory_make ("audioconvert", "conv"); conv = gst_element_factory_make ("audioconvert", "conv");
sink = gst_element_factory_make (DEFAULT_AUDIOSINK, "sink"); sink = gst_element_factory_make (DEFAULT_AUDIOSINK, "sink");
g_assert (sink);
gst_bin_add (GST_BIN (element), conv); gst_bin_add (GST_BIN (element), conv);
gst_bin_add (GST_BIN (element), sink); gst_bin_add (GST_BIN (element), sink);
@ -73,7 +75,7 @@ gen_audio_element (void)
} }
static void static void
cb_newpad (GstElement * decodebin, GstPad * pad, gboolean last, gpointer data) pad_added_cb (GstElement * decodebin, GstPad * pad, gpointer data)
{ {
GstCaps *caps; GstCaps *caps;
GstStructure *str; GstStructure *str;
@ -152,8 +154,8 @@ main (gint argc, gchar * argv[])
decodebin = gst_element_factory_make ("decodebin", "decodebin"); decodebin = gst_element_factory_make ("decodebin", "decodebin");
g_assert (decodebin); g_assert (decodebin);
g_signal_connect (G_OBJECT (decodebin), "new-decoded-pad", g_signal_connect (G_OBJECT (decodebin), "pad-added",
G_CALLBACK (cb_newpad), pipeline); G_CALLBACK (pad_added_cb), pipeline);
gst_bin_add_many (GST_BIN (pipeline), filesrc, decodebin, NULL); gst_bin_add_many (GST_BIN (pipeline), filesrc, decodebin, NULL);
gst_element_link (filesrc, decodebin); gst_element_link (filesrc, decodebin);
@ -162,7 +164,12 @@ main (gint argc, gchar * argv[])
g_print ("usage: %s <uri>\n", argv[0]); g_print ("usage: %s <uri>\n", argv[0]);
exit (-1); exit (-1);
} }
if (!g_str_has_prefix (argv[1], "file://")) {
g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL); g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL);
} else {
g_object_set (G_OBJECT (filesrc), "location", argv[1] + 7, NULL);
}
/* set to paused, decodebin will autoplug and signal new_pad callbacks */ /* set to paused, decodebin will autoplug and signal new_pad callbacks */
res = gst_element_set_state (pipeline, GST_STATE_PAUSED); res = gst_element_set_state (pipeline, GST_STATE_PAUSED);

11
tests/icles/playback/test5.c
View file

@ -30,7 +30,7 @@
static GMainLoop *loop; static GMainLoop *loop;
static void static void
new_pad (GstElement * element, GstPad * pad, gboolean last, GstElement * sink) pad_added_cb (GstElement * element, GstPad * pad, GstElement * sink)
{ {
g_print ("New pad...\n"); g_print ("New pad...\n");
} }
@ -108,8 +108,8 @@ main (gint argc, gchar * argv[])
decodebin = gst_element_factory_make ("decodebin", "decodebin"); decodebin = gst_element_factory_make ("decodebin", "decodebin");
g_assert (decodebin); g_assert (decodebin);
g_signal_connect (G_OBJECT (decodebin), "new-decoded-pad", g_signal_connect (G_OBJECT (decodebin), "pad-added",
G_CALLBACK (new_pad), NULL); G_CALLBACK (pad_added_cb), NULL);
g_signal_connect (G_OBJECT (decodebin), "no-more-pads", g_signal_connect (G_OBJECT (decodebin), "no-more-pads",
G_CALLBACK (no_more_pads), NULL); G_CALLBACK (no_more_pads), NULL);
@ -120,7 +120,12 @@ main (gint argc, gchar * argv[])
g_print ("usage: %s <uri>\n", argv[0]); g_print ("usage: %s <uri>\n", argv[0]);
exit (-1); exit (-1);
} }
if (!g_str_has_prefix (argv[1], "file://")) {
g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL); g_object_set (G_OBJECT (filesrc), "location", argv[1], NULL);
} else {
g_object_set (G_OBJECT (filesrc), "location", argv[1] + 7, NULL);
}
/* event based programming approach */ /* event based programming approach */
loop = g_main_loop_new (NULL, TRUE); loop = g_main_loop_new (NULL, TRUE);