Fixed a few plugins so that mpeg1 encoding sorta works.

Original commit message from CVS:
Fixed a few plugins so that mpeg1 encoding sorta works.
Added an mpeg1 encoder example, it uses the autoplugger to convert
the stream to audio/video, which is then fed to the encoders.

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");

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);
 
+    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 *);
   }
 

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<n; i++)

test/Makefile.am

@@ -4,7 +4,7 @@ noinst_PROGRAMS = qtest spectrum record wave mp3 teardown buffer mp3parse \
 		  mpeg2parse mp1parse mp3play ac3parse ac3play dvdcat fake cobin videotest \
 		  aviparse vidcapture avi2mpg mp2tomp1 mp1tomp1 pipetest \
 		  vidcapture2 mp2toavi mp3tovorbis mpeg2parse2 xmmstest videotest2 \
-		  mp3mad
+		  mp3mad video2mp1
 
 SUBDIRS = xml bindings
 

test/mp2tomp1.c

@@ -37,7 +37,7 @@ create_muxer (GstElement *pipeline, gchar *type, gchar *number)
 static void 
 mp2tomp1 (GstElement *parser, GstPad *pad, GstElement *pipeline) 
 {
-  GstElement *parse_audio, *parse_video, *decode, *decode_video, *play, *encode, *audio_resample;
+  GstElement *decode, *decode_video, *play, *encode, *audio_resample;
   GstElement *smooth, *median;
   GstElement *audio_queue, *video_queue;
   GstElement *audio_thread, *video_thread;
@@ -51,9 +51,6 @@ mp2tomp1 (GstElement *parser, GstPad *pad, GstElement *pipeline)
   //if (0) {
   if (strncmp(gst_pad_get_name(pad), "private_stream_1.0", 18) == 0) {
     // construct internal pipeline elements
-    parse_audio = gst_elementfactory_make("ac3parse","parse_audio");
-    g_return_if_fail(parse_audio != NULL);
-    gtk_object_set(GTK_OBJECT(parse_audio),"skip", 15, NULL);
     decode = gst_elementfactory_make("ac3dec","decode_audio");
     g_return_if_fail(decode != NULL);
     audio_resample = gst_elementfactory_make("audioscale","audioscale");
@@ -68,7 +65,6 @@ mp2tomp1 (GstElement *parser, GstPad *pad, GstElement *pipeline)
     // create the thread and pack stuff into it
     audio_thread = gst_thread_new("audio_thread");
     g_return_if_fail(audio_thread != NULL);
-    gst_bin_add(GST_BIN(audio_thread),GST_ELEMENT(parse_audio));
     gst_bin_add(GST_BIN(audio_thread),GST_ELEMENT(decode));
     gst_bin_add(GST_BIN(audio_thread),GST_ELEMENT(audio_resample));
     gst_bin_add(GST_BIN(audio_thread),GST_ELEMENT(audio_encode));
@@ -77,9 +73,7 @@ mp2tomp1 (GstElement *parser, GstPad *pad, GstElement *pipeline)
 
     // set up pad connections
     gst_element_add_ghost_pad(GST_ELEMENT(audio_thread),
-                              gst_element_get_pad(parse_audio,"sink"),"sink");
+                              gst_element_get_pad(decode,"sink"),"sink");
-    gst_pad_connect(gst_element_get_pad(parse_audio,"src"),
-                    gst_element_get_pad(decode,"sink"));
     gst_pad_connect(gst_element_get_pad(decode,"src"),
                     gst_element_get_pad(audio_resample,"sink"));
     gst_pad_connect(gst_element_get_pad(audio_resample,"src"),
@@ -106,9 +100,7 @@ mp2tomp1 (GstElement *parser, GstPad *pad, GstElement *pipeline)
     //                gst_element_get_pad(merge_subtitles,"subtitle"));
   } else if (strncmp(gst_pad_get_name(pad), "audio_", 6) == 0) {
     // construct internal pipeline elements
-    parse_audio = gst_elementfactory_make("mp3parse","parse_audio");
+    decode = gst_elementfactory_make("mad","decode_audio");
-    g_return_if_fail(parse_audio != NULL);
-    decode = gst_elementfactory_make("mpg123","decode_audio");
     g_return_if_fail(decode != NULL);
     play = gst_elementfactory_make("osssink","play_audio");
     g_return_if_fail(play != NULL);
@@ -116,16 +108,13 @@ mp2tomp1 (GstElement *parser, GstPad *pad, GstElement *pipeline)
     // create the thread and pack stuff into it
     audio_thread = gst_thread_new("audio_thread");
     g_return_if_fail(audio_thread != NULL);
-    gst_bin_add(GST_BIN(audio_thread),GST_ELEMENT(parse_audio));
     gst_bin_add(GST_BIN(audio_thread),GST_ELEMENT(decode));
     gst_bin_add(GST_BIN(audio_thread),GST_ELEMENT(play));
 
 
     // set up pad connections
     gst_element_add_ghost_pad(GST_ELEMENT(audio_thread),
-                              gst_element_get_pad(parse_audio,"sink"),"sink");
+                              gst_element_get_pad(decode,"sink"),"sink");
-    gst_pad_connect(gst_element_get_pad(parse_audio,"src"),
-                    gst_element_get_pad(decode,"sink"));
     gst_pad_connect(gst_element_get_pad(decode,"src"),
                     gst_element_get_pad(play,"sink"));
 
@@ -148,9 +137,7 @@ mp2tomp1 (GstElement *parser, GstPad *pad, GstElement *pipeline)
 
     //gst_plugin_load("mpeg1encoder");
     // construct internal pipeline elements
-    parse_video = gst_elementfactory_make("mp2videoparse","parse_video");
+    decode_video = gst_elementfactory_make("mpeg2dec","decode_video");
-    g_return_if_fail(parse_video != NULL);
-    decode_video = gst_elementfactory_make("mpeg2play","decode_video");
     g_return_if_fail(decode_video != NULL);
     //merge_subtitles = gst_elementfactory_make("mpeg2subt","merge_subtitles");
     //g_return_if_fail(merge_subtitles != NULL);
@@ -174,13 +161,14 @@ mp2tomp1 (GstElement *parser, GstPad *pad, GstElement *pipeline)
     //gtk_object_set(GTK_OBJECT(show),"width",640, "height", 480,NULL);
 
     muxerpad = create_muxer (pipeline, "video", "00");
+    g_return_if_fail(muxerpad != NULL);
+    
 
     // create the thread and pack stuff into it
     video_thread = gst_thread_new("video_thread");
     g_return_if_fail(video_thread != NULL);
-    gst_bin_add(GST_BIN(video_thread),GST_ELEMENT(parse_video));
     gst_bin_add(GST_BIN(video_thread),GST_ELEMENT(decode_video));
-    gst_bin_add(GST_BIN(video_thread),GST_ELEMENT(merge_subtitles));
+    //gst_bin_add(GST_BIN(video_thread),GST_ELEMENT(merge_subtitles));
     gst_bin_add(GST_BIN(video_thread),GST_ELEMENT(median));
     gst_bin_add(GST_BIN(video_thread),GST_ELEMENT(smooth));
     gst_bin_add(GST_BIN(video_thread),GST_ELEMENT(videoscale));
@@ -189,9 +177,7 @@ mp2tomp1 (GstElement *parser, GstPad *pad, GstElement *pipeline)
 
     // set up pad connections
     gst_element_add_ghost_pad(GST_ELEMENT(video_thread),
-                              gst_element_get_pad(parse_video,"sink"),"sink");
+                              gst_element_get_pad(decode_video,"sink"),"sink");
-    gst_pad_connect(gst_element_get_pad(parse_video,"src"),
-                    gst_element_get_pad(decode_video,"sink"));
     gst_pad_connect(gst_element_get_pad(decode_video,"src"),
                     gst_element_get_pad(median,"sink"));
     gst_pad_connect(gst_element_get_pad(median,"src"),

test/video2mp1.c

@@ -0,0 +1,236 @@
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <string.h>
+#include <glib.h>
+#include <gst/gst.h>
+#include <gnome.h>
+
+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 <in_filename> <out_video> <out_audio>\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);
+}
+

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");