From 32dda1398473142e01a042494f0ae31e0aa02816 Mon Sep 17 00:00:00 2001 From: Erik Walthinsen Date: Sat, 28 Apr 2001 04:23:55 +0000 Subject: [PATCH] brought in mpeg2parse3.c from HEAD and fixed it up so it works Original commit message from CVS: brought in mpeg2parse3.c from HEAD and fixed it up so it works --- test/Makefile.am | 2 +- test/mpeg2parse2.c | 1 + test/mpeg2parse3.c | 168 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 test/mpeg2parse3.c diff --git a/test/Makefile.am b/test/Makefile.am index 7ee61b9831..4558f19e65 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -2,7 +2,7 @@ if HAVE_GNOME GNOME_PROGS = spectrum wave mpeg2parse mp1parse videotest aviparse \ - mpeg2parse2 videotest2 video2mp1 dvshow dv2mp1 + mpeg2parse2 videotest2 video2mp1 dvshow dv2mp1 mpeg2parse3 else GNOME_PROGS = endif diff --git a/test/mpeg2parse2.c b/test/mpeg2parse2.c index 176eed35d2..75a04c42f2 100644 --- a/test/mpeg2parse2.c +++ b/test/mpeg2parse2.c @@ -86,6 +86,7 @@ int main(int argc,char *argv[]) { gtk_socket = gtk_socket_new (); gtk_widget_show (gtk_socket); + gtk_widget_set_usize(gtk_socket,320,240); gnome_app_set_contents(GNOME_APP(appwindow), GTK_WIDGET(gtk_socket)); diff --git a/test/mpeg2parse3.c b/test/mpeg2parse3.c new file mode 100644 index 0000000000..0ebe5cce2a --- /dev/null +++ b/test/mpeg2parse3.c @@ -0,0 +1,168 @@ +#include +#include + +GstPipeline *pipeline; +GstElement *parse2, *v_queue, *a_queue, *v_thread, *a_thread; +GtkWidget *appwindow; + +void eof(GstElement *src) { + g_print("have eos, quitting\n"); + exit(0); +} + +gboolean idle_func(gpointer data) { + gst_bin_iterate(GST_BIN(data)); + return TRUE; +} + +void mpeg2parse_newpad(GstElement *parser,GstPad *pad, GstElement *pipeline) { + + g_print("***** a new pad %s was created\n", gst_pad_get_name(pad)); +// gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PAUSED); + + if (strncmp(gst_pad_get_name(pad), "video_", 6) == 0) { + gst_pad_connect(pad, gst_element_get_pad(v_queue,"sink")); + gst_bin_add(GST_BIN(pipeline),v_thread); + gst_element_set_state(v_thread,GST_STATE_PLAYING); + } else if (strcmp(gst_pad_get_name(pad), "private_stream_1.0") == 0) { + gst_pad_connect(pad, gst_element_get_pad(a_queue,"sink")); + gst_bin_add(GST_BIN(pipeline),a_thread); + gst_element_set_state(a_thread,GST_STATE_PLAYING); + } +// gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING); +} + +int main(int argc,char *argv[]) { + GstElement *src, *parse; + GstElement *v_decode, *show, *color; + GstElement *a_decode, *osssink; + GtkWidget *gtk_socket; + + g_print("have %d args\n",argc); + + gst_init(&argc,&argv); + gnome_init("MPEG2 Video player","0.0.1",argc,argv); + //gst_plugin_load("mpeg1parse"); + + pipeline = GST_PIPELINE(gst_pipeline_new("pipeline")); + g_return_val_if_fail(pipeline != NULL, -1); + + v_thread = GST_ELEMENT(gst_thread_new("v_thread")); + g_return_val_if_fail(v_thread != NULL, -1); + + a_thread = GST_ELEMENT(gst_thread_new("a_thread")); + g_return_val_if_fail(a_thread != NULL, -1); + + if (strstr(argv[1],"video_ts")) { + src = gst_elementfactory_make("dvdsrc","src"); + g_print("using DVD source\n"); + } else { + src = gst_elementfactory_make("disksrc","src"); + } + + g_return_val_if_fail(src != NULL, -1); + gtk_object_set(GTK_OBJECT(src),"location",argv[1],NULL); + if (argc >= 3) { + gtk_object_set(GTK_OBJECT(src),"bytesperread",atoi(argv[2]),NULL); + g_print("block size is %d\n",atoi(argv[2])); + } + g_print("should be using file '%s'\n",argv[1]); + + parse = gst_elementfactory_make("mpeg2parse","parse"); + //parse = gst_elementfactory_make("mpeg1parse","parse"); + g_return_val_if_fail(parse != NULL, -1); + + v_queue = gst_elementfactory_make("queue","v_queue"); + g_return_val_if_fail(v_queue != NULL, -1); + + a_queue = gst_elementfactory_make("queue","a_queue"); + g_return_val_if_fail(a_queue != NULL, -1); + + /**** + * you can substitute mpeg2play with you own player here + * optionally you can remove the parse2 element. make + * sure to remove the pad connections too and don't add the + * mp2videoparse element to the bin. + **/ + //parse2 = gst_elementfactory_make("mp2videoparse","parse"); + //g_return_val_if_fail(parse2 != NULL, -1); + v_decode = gst_elementfactory_make("mpeg2dec","decode_video"); + g_return_val_if_fail(v_decode != NULL, -1); + + color = gst_elementfactory_make("colorspace","color"); + g_return_val_if_fail(color != NULL, -1); + + show = gst_elementfactory_make("xvideosink","show"); + //show = gst_elementfactory_make("aasink","show"); + //gtk_object_set(GTK_OBJECT(show),"xv_enabled",FALSE,NULL); + g_return_val_if_fail(show != NULL, -1); + + a_decode = gst_elementfactory_make("ac3dec","decode_audio"); + g_return_val_if_fail(a_decode != NULL, -1); + + osssink = gst_elementfactory_make("osssink","osssink"); + g_return_val_if_fail(osssink != NULL, -1); + + appwindow = gnome_app_new("MPEG player","MPEG player"); + + gtk_socket = gtk_socket_new (); + gtk_widget_show (gtk_socket); + gtk_widget_set_usize(gtk_socket,320,240); + + gnome_app_set_contents(GNOME_APP(appwindow), + GTK_WIDGET(gtk_socket)); + + gtk_widget_realize (gtk_socket); + gtk_socket_steal (GTK_SOCKET (gtk_socket), + gst_util_get_int_arg (GTK_OBJECT(show), "xid")); + + gst_bin_add(GST_BIN(pipeline),GST_ELEMENT(src)); + gst_bin_add(GST_BIN(pipeline),GST_ELEMENT(parse)); + gst_bin_add(GST_BIN(pipeline),GST_ELEMENT(v_queue)); + + gst_bin_add(GST_BIN(v_thread),GST_ELEMENT(v_queue)); + //gst_bin_add(GST_BIN(v_thread),GST_ELEMENT(parse2)); + gst_bin_add(GST_BIN(v_thread),GST_ELEMENT(v_decode)); + gst_bin_add(GST_BIN(v_thread),GST_ELEMENT(color)); + gst_bin_add(GST_BIN(v_thread),GST_ELEMENT(show)); + + gst_bin_add(GST_BIN(v_thread),GST_ELEMENT(a_queue)); + gst_bin_add(GST_BIN(a_thread),GST_ELEMENT(a_decode)); + gst_bin_add(GST_BIN(a_thread),GST_ELEMENT(osssink)); + + gtk_signal_connect(GTK_OBJECT(parse),"new_pad",mpeg2parse_newpad, pipeline); + + gtk_signal_connect(GTK_OBJECT(src),"eos",GTK_SIGNAL_FUNC(eof),NULL); + + gst_pad_connect(gst_element_get_pad(src,"src"), + gst_element_get_pad(parse,"sink")); + + // video + gst_pad_connect(gst_element_get_pad(v_queue,"src"), + // gst_element_get_pad(parse2,"sink")); + //gst_pad_connect(gst_element_get_pad(parse2,"src"), + gst_element_get_pad(v_decode,"sink")); + gst_pad_connect(gst_element_get_pad(v_decode,"src"), + gst_element_get_pad(color,"sink")); + gst_pad_connect(gst_element_get_pad(color,"src"), + gst_element_get_pad(show,"sink")); + + // audio + gst_pad_connect(gst_element_get_pad(a_queue,"src"), + gst_element_get_pad(a_decode,"sink")); + gst_pad_connect(gst_element_get_pad(a_decode,"src"), + gst_element_get_pad(osssink,"sink")); + + gtk_widget_show_all(appwindow); + + g_print("setting to PLAYING state\n"); + gst_element_set_state(GST_ELEMENT(pipeline),GST_STATE_PLAYING); + + gtk_idle_add(idle_func,pipeline); + + gdk_threads_enter(); + gtk_main(); + gdk_threads_leave(); + + return 0; +}