Re: GNOME-media 2.5.5
- From: Jan Schmidt <thaytan mad scientist com>
- To: GNOME Multimedia List <gnome-multimedia gnome org>
- Subject: Re: GNOME-media 2.5.5
- Date: Tue, 9 Mar 2004 10:14:34 +1100
Take a look at this patch for gstreamer-properties.
Summary:
* Add "audioconvert ! audioscale" to the pipeline for testing audio sinks.
This makes esdsink 'work' and fixes #136407
* Wrap lines in pipeline-constants to 80 chars for readability.
* Use gst_parse_launch to evaluate the validity of a sink pipeline, rather
than assuming that they contain only a single sink. Resurrects Ascii Art.
* Add a disabled cacasink destination. Disabled because apparently cacasink
briefly creates an empty window, even though we never set the element to
READY.
* Disable jack source & sink, since they're not working.
* Remove ossgst audio source which no longer exists.
* Remove fakesrc as a video source.
Sending it here rather than attaching it to #136407 since it covers other
things as well.
J.
--
Jan Schmidt thaytan mad scientist com
"Karaoke bars combine two of the nation's greatest evils:
people who shouldn't drink with people who shouldn't sing."
-Tom Dreesen
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gnome-media/ChangeLog,v
retrieving revision 1.208
diff -u -u -r1.208 ChangeLog
--- ChangeLog 7 Mar 2004 19:34:19 -0000 1.208
+++ ChangeLog 8 Mar 2004 23:10:11 -0000
@@ -1,3 +1,21 @@
+2004-03-09 Jan Schmidt <thaytan mad scientist com>
+
+ * gstreamer-properties/gstreamer-properties.c:
+ (create_pipeline_menu):
+ * gstreamer-properties/pipeline-constants.c:
+ - Add "audioconvert ! audioscale" to the pipeline for testing
+ audio sinks. This makes esdsink 'work' and fixes #136407
+ - Wrap lines in pipeline-constants to 80 chars for readability.
+ - Use gst_parse_launch to evaluate the validity of a sink pipeline, i
+ rather than assuming that they contain only a single sink.
+ Resurrects Ascii Art.
+ - Add a disabled cacasink destination. Disabled because apparently
+ cacasink briefly creates an empty window, even though we never
+ set the element to READY.
+ - Disable jack source & sink, since they're not working.
+ - Remove ossgst audio source which no longer exists.
+ - Remove fakesrc as a video source.
+
2004-03-07 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.in: check for 0.8 and 0.7 GStreamer
Index: gstreamer-properties/gstreamer-properties.c
===================================================================
RCS file: /cvs/gnome/gnome-media/gstreamer-properties/gstreamer-properties.c,v
retrieving revision 1.9
diff -u -u -r1.9 gstreamer-properties.c
--- gstreamer-properties/gstreamer-properties.c 7 Mar 2004 16:04:17 -0000 1.9
+++ gstreamer-properties/gstreamer-properties.c 8 Mar 2004 23:10:13 -0000
@@ -201,11 +201,16 @@
for (i = 0; i < editor->n_pipeline_desc; i++)
{
GSTPPipelineDescription *cur_pipeline_desc = &(pipeline_desc[i]);
- GstElementFactory *factory;
+ GstElement *pipeline;
+ GError *error = NULL;
if (cur_pipeline_desc->pipeline != NULL) {
- factory = gst_element_factory_find (cur_pipeline_desc->pipeline);
- if (factory == NULL) {
+ pipeline = gst_parse_launch (cur_pipeline_desc->pipeline, &error);
+ if (pipeline != NULL) {
+ gst_object_unref (GST_OBJECT (pipeline));
+ }
+ if (error != NULL) {
+ g_error_free (error);
continue;
}
}
Index: gstreamer-properties/pipeline-constants.c
===================================================================
RCS file: /cvs/gnome/gnome-media/gstreamer-properties/pipeline-constants.c,v
retrieving revision 1.6
diff -u -u -r1.6 pipeline-constants.c
--- gstreamer-properties/pipeline-constants.c 7 Mar 2004 16:04:17 -0000 1.6
+++ gstreamer-properties/pipeline-constants.c 8 Mar 2004 23:10:13 -0000
@@ -31,7 +31,7 @@
/* Test specified inputs for pipelines */
/* static const gchar audiosink_test_pipe[] = "afsrc location=\"" TEST_MEDIA_FILE "\""; FIXME*/
-static gchar audiosink_test_pipe[] = "sinesrc freq=512";
+static gchar audiosink_test_pipe[] = "sinesrc freq=512 ! audioconvert ! audioscale";
static gchar videosink_test_pipe[] = "videotestsrc ! ffcolorspace";
static gchar GSTPROPS_KEY_DEFAULT_VIDEOSINK[] = "default/videosink";
@@ -47,14 +47,16 @@
GSTPPipelineDescription audiosink_pipelines[] = {
{PIPE_TYPE_AUDIOSINK, 0,"ALSA - Advanced Linux Sound Architecture",
"alsasink", FALSE, TEST_PIPE_SUPPLIED, audiosink_test_pipe, FALSE},
- {PIPE_TYPE_AUDIOSINK, 0,"Artsd - ART Sound Daemon", "artsdsink", FALSE,
+ {PIPE_TYPE_AUDIOSINK, 0,"Artsd - ART Sound Daemon",
+ "artsdsink", FALSE, TEST_PIPE_SUPPLIED, audiosink_test_pipe, FALSE},
+ {PIPE_TYPE_AUDIOSINK, 0,"ESD - Enlightenment Sound Daemon",
+ "esdsink", FALSE, TEST_PIPE_SUPPLIED, audiosink_test_pipe, FALSE},
+#if 0 /* Disabled this until it works */
+ {PIPE_TYPE_AUDIOSINK, 0,"Jack", "jackbin.( jacksink )", FALSE,
TEST_PIPE_SUPPLIED, audiosink_test_pipe, FALSE},
- {PIPE_TYPE_AUDIOSINK, 0,"ESD - Enlightenment Sound Daemon", "esdsink",
- FALSE, TEST_PIPE_SUPPLIED, audiosink_test_pipe, FALSE},
- {PIPE_TYPE_AUDIOSINK, 0,"Jack", "jacksink", FALSE, TEST_PIPE_SUPPLIED,
- audiosink_test_pipe, FALSE},
- {PIPE_TYPE_AUDIOSINK, 0,"OSS - Open Sound System", "osssink", FALSE,
- TEST_PIPE_SUPPLIED, audiosink_test_pipe, TRUE},
+#endif
+ {PIPE_TYPE_AUDIOSINK, 0,"OSS - Open Sound System",
+ "osssink", FALSE, TEST_PIPE_SUPPLIED, audiosink_test_pipe, TRUE},
{PIPE_TYPE_AUDIOSINK, 0, N_("Custom"), NULL, TRUE, TEST_PIPE_SUPPLIED,
audiosink_test_pipe, TRUE}
};
@@ -64,13 +66,17 @@
TEST_PIPE_SUPPLIED, videosink_test_pipe, FALSE},
{PIPE_TYPE_VIDEOSINK, 0,"Ascii Art - console", "aasink driver=1", FALSE,
TEST_PIPE_SUPPLIED, videosink_test_pipe, FALSE},
- {PIPE_TYPE_VIDEOSINK, 0,"Generic Videosink", "videosink", FALSE,
+#if 0
+ /* Leaving this one disabled, because of a bug in cacasink that
+ * pops up a window in NULL state
+ */
+ {PIPE_TYPE_VIDEOSINK, 0,"Colour Ascii Art", "cacasink", FALSE,
TEST_PIPE_SUPPLIED, videosink_test_pipe, FALSE},
+#endif
{PIPE_TYPE_VIDEOSINK, 0,"SDL - Simple DirectMedia Layer", "sdlvideosink",
FALSE, TEST_PIPE_SUPPLIED, videosink_test_pipe, FALSE},
{PIPE_TYPE_VIDEOSINK, 0,"XWindows (No Xv)",
- "ximagesink", FALSE, TEST_PIPE_SUPPLIED,
- videosink_test_pipe, FALSE},
+ "ximagesink", FALSE, TEST_PIPE_SUPPLIED, videosink_test_pipe, FALSE},
{PIPE_TYPE_VIDEOSINK, 0,"XWindows (X11/XShm/Xv)", "xvimagesink", FALSE,
TEST_PIPE_SUPPLIED, videosink_test_pipe, FALSE},
{PIPE_TYPE_VIDEOSINK, 0, N_("Custom"), NULL, TRUE, TEST_PIPE_SUPPLIED,
@@ -82,12 +88,12 @@
"alsasrc", FALSE, TEST_PIPE_AUDIOSINK, NULL, FALSE},
{PIPE_TYPE_AUDIOSRC, 0,"ESD - Enlightenment Sound Daemon", "esdmon",
FALSE, TEST_PIPE_AUDIOSINK, NULL, FALSE},
- {PIPE_TYPE_AUDIOSRC, 0,"Jack", "jacksrc", FALSE, TEST_PIPE_AUDIOSINK,
+#if 0 /* Disabled this until it works */
+ {PIPE_TYPE_AUDIOSRC, 0,"Jack", "jackbin{ jacksrc }", FALSE, TEST_PIPE_AUDIOSINK,
NULL, FALSE},
+#endif
{PIPE_TYPE_AUDIOSRC, 0,"OSS - Open Sound System", "osssrc", FALSE,
TEST_PIPE_AUDIOSINK, NULL, FALSE},
- {PIPE_TYPE_AUDIOSRC, 0,"OSS Monitor (capture OSS apps)", "ossgst",
- FALSE, TEST_PIPE_AUDIOSINK, NULL, FALSE},
{PIPE_TYPE_AUDIOSRC, 0,"Silence", "silence", FALSE, TEST_PIPE_AUDIOSINK,
NULL, FALSE},
{PIPE_TYPE_AUDIOSRC, 0, N_("Custom"), NULL, TRUE, TEST_PIPE_AUDIOSINK, NULL,
@@ -95,8 +101,6 @@
};
GSTPPipelineDescription videosrc_pipelines[] = {
-/* {PIPE_TYPE_VIDEOSRC, 0,"None", "fakesrc", FALSE,
- TEST_PIPE_VIDEOSINK, NULL, FALSE}, */
{PIPE_TYPE_VIDEOSRC, 0,"MJPEG (e.g. Zoran v4l device)", "v4lmjpegsrc", FALSE,
TEST_PIPE_VIDEOSINK, NULL, FALSE},
{PIPE_TYPE_VIDEOSRC, 0,"QCAM", "qcamsrc", FALSE, TEST_PIPE_VIDEOSINK,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
