diff --git a/examples/autoplug/autoplug.c b/examples/autoplug/autoplug.c index 091508e352..e9135fb8d2 100644 --- a/examples/autoplug/autoplug.c +++ b/examples/autoplug/autoplug.c @@ -112,6 +112,11 @@ int main(int argc,char *argv[]) exit (-1); } + gst_bin_remove (GST_BIN (bin), disksrc); + // FIXME hack, reparent the disksrc so the scheduler doesn't break + bin = gst_pipeline_new("pipeline"); + + gst_bin_add (GST_BIN (bin), disksrc); gst_bin_add (GST_BIN (bin), new_element); gst_element_connect (disksrc, "src", new_element, "sink"); diff --git a/gst/autoplug/gststaticautoplugrender.c b/gst/autoplug/gststaticautoplugrender.c index ec30e374a2..2fb486c51d 100644 --- a/gst/autoplug/gststaticautoplugrender.c +++ b/gst/autoplug/gststaticautoplugrender.c @@ -267,7 +267,10 @@ gst_static_autoplug_to_render (GstAutoplug *autoplug, GstCaps *srccaps, GstEleme pad = GST_PAD_REALIZE (gst_element_get_pad_list (targetelement)->data); templ = GST_PAD_PADTEMPLATE (pad); - caps.sink = GST_PADTEMPLATE_CAPS (templ); + if (templ) + caps.sink = GST_PADTEMPLATE_CAPS (templ); + else + goto next; GST_INFO (GST_CAT_AUTOPLUG_ATTEMPT,"autoplugging two caps structures"); @@ -283,7 +286,7 @@ gst_static_autoplug_to_render (GstAutoplug *autoplug, GstCaps *srccaps, GstEleme } else { } - +next: targetelement = va_arg (args, GstElement *); } diff --git a/libs/putbits/gstputbits.c b/libs/putbits/gstputbits.c index 9ec9750bb5..cf4a4c17c4 100644 --- a/libs/putbits/gstputbits.c +++ b/libs/putbits/gstputbits.c @@ -63,7 +63,7 @@ void gst_putbits(gst_putbits_t *pb, int val, int n) int i; unsigned int mask; - //printf("putbits: %d %d %ld %ld\n", val, n, pb->outcnt, pb->newlen); + //printf("putbits: %p %08x %d %d %d\n", pb, val, n, pb->outcnt, pb->newlen); mask = 1 << (n-1); /* selects first (leftmost) bit */ for (i=0; i +#include +#include +#include +#include +#include +#include + +static void +gst_play_have_type (GstElement *sink, GstElement *sink2, gpointer data) +{ + GST_DEBUG (0,"GstPipeline: play have type %p\n", (gboolean *)data); + + *(gboolean *)data = TRUE; +} + +gboolean +idle_func (gpointer data) +{ + return gst_bin_iterate (GST_BIN (data)); +} + +static GstCaps* +gst_play_typefind (GstBin *bin, GstElement *element) +{ + gboolean found = FALSE; + GstElement *typefind; + GstCaps *caps = NULL; + + GST_DEBUG (0,"GstPipeline: typefind for element \"%s\" %p\n", + GST_ELEMENT_NAME(element), &found); + + typefind = gst_elementfactory_make ("typefind", "typefind"); + g_return_val_if_fail (typefind != NULL, FALSE); + + gtk_signal_connect (GTK_OBJECT (typefind), "have_type", + GTK_SIGNAL_FUNC (gst_play_have_type), &found); + + gst_pad_connect (gst_element_get_pad (element, "src"), + gst_element_get_pad (typefind, "sink")); + + gst_bin_add (bin, typefind); + + gst_element_set_state (GST_ELEMENT (bin), GST_STATE_PLAYING); + + // push a buffer... the have_type signal handler will set the found flag + gst_bin_iterate (bin); + + gst_element_set_state (GST_ELEMENT (bin), GST_STATE_NULL); + + caps = gst_pad_get_caps (gst_element_get_pad (element, "src")); + + gst_pad_disconnect (gst_element_get_pad (element, "src"), + gst_element_get_pad (typefind, "sink")); + gst_bin_remove (bin, typefind); + gst_object_unref (GST_OBJECT (typefind)); + + return caps; +} + +static GstElement* +get_video_encoder_bin (void) +{ + GstElement *bin; + GstElement *encoder, *queue, *colorspace, *videoscale; + + bin = gst_bin_new ("video_encoder_bin"); + + colorspace = gst_elementfactory_make ("colorspace", "colorspace"); + g_assert (colorspace != NULL); + videoscale = gst_elementfactory_make ("videoscale", "videoscale"); + g_assert (videoscale != NULL); + gtk_object_set (GTK_OBJECT (videoscale), "width", 352, "height", 288, NULL); + encoder = gst_elementfactory_make ("mpeg2enc", "video_encoder"); + g_assert (encoder != NULL); + queue = gst_elementfactory_make ("queue", "video_encoder_queue"); + g_assert (queue != NULL); + + gst_bin_add (GST_BIN (bin), colorspace); + gst_bin_add (GST_BIN (bin), videoscale); + gst_bin_add (GST_BIN (bin), encoder); + gst_bin_add (GST_BIN (bin), queue); + + gst_element_connect (colorspace, "src", videoscale, "sink"); + gst_element_connect (videoscale, "src", encoder, "sink"); + gst_element_connect (encoder, "src", queue, "sink"); + + gst_element_add_ghost_pad (bin, gst_element_get_pad (colorspace, "sink"), "sink"); + gst_element_add_ghost_pad (bin, gst_element_get_pad (queue, "src"), "src"); + + return bin; +} + +static GstElement* +get_audio_encoder_bin (void) +{ + GstElement *bin; + GstElement *encoder, *queue; + + bin = gst_bin_new ("audio_encoder_bin"); + + encoder = gst_elementfactory_make ("mpegaudio", "audio_encoder"); + g_assert (encoder != NULL); + queue = gst_elementfactory_make ("queue", "audio_encoder_queue"); + g_assert (queue != NULL); + + gst_bin_add (GST_BIN (bin), encoder); + gst_bin_add (GST_BIN (bin), queue); + + gst_element_connect (encoder, "src", queue, "sink"); + + gst_element_add_ghost_pad (bin, gst_element_get_pad (encoder, "sink"), "sink"); + gst_element_add_ghost_pad (bin, gst_element_get_pad (queue, "src"), "src"); + + return bin; +} + +int main(int argc,char *argv[]) +{ + GstElement *disksrc, *audio_enc, *video_enc; + GstElement *muxthread_video, *muxer, *fdsink_video; + GstElement *muxthread_audio, *fdsink_audio; + GstElement *bin; + GtkWidget *appwindow; + GstCaps *srccaps; + GstElement *new_element; + GstAutoplug *autoplug; + GtkWidget *socket; + gint fd_video; + gint fd_audio; + + g_thread_init(NULL); + gst_init(&argc,&argv); + gnome_init("autoplug","0.0.1", argc,argv); + + if (argc != 4) { + g_print("usage: %s \n", argv[0]); + exit(-1); + } + + /* create a new bin to hold the elements */ + bin = gst_pipeline_new("pipeline"); + g_assert(bin != NULL); + + /* create a disk reader */ + disksrc = gst_elementfactory_make("disksrc", "disk_source"); + g_assert(disksrc != NULL); + gtk_object_set(GTK_OBJECT(disksrc),"location", argv[1],NULL); + + gst_bin_add (GST_BIN (bin), disksrc); + + srccaps = gst_play_typefind (GST_BIN (bin), disksrc); + + if (!srccaps) { + g_print ("could not autoplug, unknown media type...\n"); + exit (-1); + } + + audio_enc = get_audio_encoder_bin(); + video_enc = get_video_encoder_bin(); + + autoplug = gst_autoplugfactory_make ("staticrender"); + g_assert (autoplug != NULL); + + new_element = gst_autoplug_to_renderers (autoplug, + srccaps, + video_enc, + audio_enc, + NULL); + + if (!new_element) { + g_print ("could not autoplug, no suitable codecs found...\n"); + exit (-1); + } + + gst_bin_remove (GST_BIN (bin), disksrc); + gst_object_destroy (GST_OBJECT (bin)); + + // FIXME hack, reparent the disksrc so the scheduler doesn't break + bin = gst_pipeline_new("pipeline"); + + gst_bin_add (GST_BIN (bin), disksrc); + gst_bin_add (GST_BIN (bin), new_element); + + gst_element_connect (disksrc, "src", new_element, "sink"); + + muxer = gst_elementfactory_make ("system_encode", "muxer"); + g_assert (muxer != NULL); + + if (gst_bin_get_by_name (GST_BIN (new_element), "video_encoder_bin")) { + muxthread_video = gst_thread_new("thread_video"); + + fdsink_video = gst_elementfactory_make ("fdsink", "fdsink_video"); + g_assert (fdsink_video != NULL); + fd_video = open (argv[2], O_CREAT|O_RDWR|O_TRUNC); + gtk_object_set (GTK_OBJECT (fdsink_video), "fd", fd_video, NULL); + + gst_element_connect (video_enc, "src", fdsink_video, "sink"); + gst_bin_add (GST_BIN (muxthread_video), fdsink_video); + + gst_bin_add (GST_BIN (bin), muxthread_video); + } + + if (gst_bin_get_by_name (GST_BIN (new_element), "audio_encoder_bin")) { + muxthread_audio = gst_thread_new("thread_audio"); + + fdsink_audio = gst_elementfactory_make ("fdsink", "fdsink_audio"); + g_assert (fdsink_audio != NULL); + fd_audio = open (argv[3], O_CREAT|O_RDWR|O_TRUNC); + gtk_object_set (GTK_OBJECT (fdsink_audio), "fd", fd_audio, NULL); + + gst_element_connect (audio_enc, "src", fdsink_audio, "sink"); + gst_bin_add (GST_BIN (muxthread_audio), fdsink_audio); + + gst_bin_add (GST_BIN (bin), muxthread_audio); + } + + //gtk_object_set (GTK_OBJECT (muxer), "video", "00", NULL); + //gtk_object_set (GTK_OBJECT (muxer), "audio", "00", NULL); + + /* start playing */ + gst_element_set_state(GST_ELEMENT(bin), GST_STATE_PLAYING); + + gtk_idle_add(idle_func, bin); + + gst_main(); + + /* stop the bin */ + gst_element_set_state(GST_ELEMENT(bin), GST_STATE_NULL); + + gst_pipeline_destroy(bin); + + exit(0); +} + diff --git a/tests/old/examples/autoplug/autoplug.c b/tests/old/examples/autoplug/autoplug.c index 091508e352..e9135fb8d2 100644 --- a/tests/old/examples/autoplug/autoplug.c +++ b/tests/old/examples/autoplug/autoplug.c @@ -112,6 +112,11 @@ int main(int argc,char *argv[]) exit (-1); } + gst_bin_remove (GST_BIN (bin), disksrc); + // FIXME hack, reparent the disksrc so the scheduler doesn't break + bin = gst_pipeline_new("pipeline"); + + gst_bin_add (GST_BIN (bin), disksrc); gst_bin_add (GST_BIN (bin), new_element); gst_element_connect (disksrc, "src", new_element, "sink");