From dfc431dbb870d6fba6b8c16fa41c757262d317d2 Mon Sep 17 00:00:00 2001 From: Stefan Sauer Date: Wed, 15 Feb 2012 11:25:45 +0100 Subject: [PATCH 1/4] spectrum-demo: show the effect of fast-mode --- tests/examples/spectrum/Makefile.am | 3 +- tests/examples/spectrum/demo-audiotest.c | 54 ++++++++++++++++++++++-- 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/tests/examples/spectrum/Makefile.am b/tests/examples/spectrum/Makefile.am index 8bb89da794..c7bcbfa8fe 100644 --- a/tests/examples/spectrum/Makefile.am +++ b/tests/examples/spectrum/Makefile.am @@ -8,7 +8,8 @@ demo_osssrc_LDADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS) demo_audiotest_SOURCES = demo-audiotest.c demo_audiotest_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) -demo_audiotest_LDADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS) +demo_audiotest_LDADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ + -lgstfft-$(GST_MAJORMINOR) $(GST_LIBS) $(GTK_LIBS) spectrum_example_SOURCES = spectrum-example.c spectrum_example_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) diff --git a/tests/examples/spectrum/demo-audiotest.c b/tests/examples/spectrum/demo-audiotest.c index f9d1058acd..1095d75ecf 100644 --- a/tests/examples/spectrum/demo-audiotest.c +++ b/tests/examples/spectrum/demo-audiotest.c @@ -17,6 +17,19 @@ * Boston, MA 02111-1307, USA. */ /* TODO: add wave selection */ +/* fast vs. slow mode - see update_spectrum_bands() + * we are still cheating below, we only draw the first spect_bands and ignore a few :/ + * + * xtime gst-launch-0.10 -q audiotestsrc num-buffers=10000 ! spectrum bands=1441 ! fakesink + * 2.29u 0.02s 2.14r 25504kB gst-launch-0.10 -q audiotestsrc num-buffers=10000 ! spectrum bands=1441 ! fakesink + * 2.20u 0.05s 2.10r 25664kB gst-launch-0.10 -q audiotestsrc num-buffers=10000 ! spectrum bands=1441 ! fakesink + * 2.23u 0.04s 2.10r 25664kB gst-launch-0.10 -q audiotestsrc num-buffers=10000 ! spectrum bands=1441 ! fakesink + * + * xtime gst-launch-0.10 -q audiotestsrc num-buffers=10000 ! spectrum bands=1440 ! fakesink + * 25.01u 0.08s 25.00r 25552kB gst-launch-0.10 -q audiotestsrc num-buffers=10000 ! spectrum bands=1440 ! fakesink + * 24.96u 0.03s 24.88r 25568kB gst-launch-0.10 -q audiotestsrc num-buffers=10000 ! spectrum bands=1440 ! fakesink + * 25.11u 0.03s 25.03r 25536kB gst-launch-0.10 -q audiotestsrc num-buffers=10000 ! spectrum bands=1440 ! fakesink + */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -27,6 +40,7 @@ #include #include #include +#include #include #ifndef DEFAULT_AUDIOSINK @@ -36,8 +50,10 @@ static guint spect_height = 64; static guint spect_bands = 256; static gfloat height_scale = 1.0; +static gboolean fast = FALSE; static GtkWidget *drawingarea = NULL; +static GtkWidget *bands_used = NULL; static GstClock *sync_clock = NULL; static void @@ -57,21 +73,41 @@ on_frequency_changed (GtkRange * range, gpointer user_data) g_object_set (machine, "freq", value, NULL); } +static void +update_spectrum_bands (GstElement * spectrum) +{ + guint bands = spect_bands; + gchar str[50]; + + if (fast) + bands = ((gst_fft_next_fast_length (2 * bands - 2) + 2) / 2); + + sprintf (str, "using %u bands", bands); + + g_object_set (bands_used, "label", str, NULL); + g_object_set (G_OBJECT (spectrum), "bands", bands, NULL); +} + static gboolean on_configure_event (GtkWidget * widget, GdkEventConfigure * event, gpointer user_data) { - GstElement *spectrum = GST_ELEMENT (user_data); - /*GST_INFO ("%d x %d", event->width, event->height); */ spect_height = event->height; height_scale = event->height / 64.0; spect_bands = event->width; - g_object_set (G_OBJECT (spectrum), "bands", spect_bands, NULL); + update_spectrum_bands (GST_ELEMENT (user_data)); return FALSE; } +static void +on_fast_slow_mode_changed (GtkToggleButton * togglebutton, gpointer user_data) +{ + fast = gtk_toggle_button_get_active (togglebutton); + update_spectrum_bands (GST_ELEMENT (user_data)); +} + /* draw frequency spectrum as a bunch of bars */ static void draw_spectrum (gfloat * data) @@ -170,7 +206,7 @@ main (int argc, char *argv[]) GstElement *bin; GstElement *src, *spectrum, *audioconvert, *sink; GstBus *bus; - GtkWidget *appwindow, *vbox, *widget; + GtkWidget *appwindow, *vbox, *hbox, *widget; gst_init (&argc, &argv); gtk_init (&argc, &argv); @@ -205,6 +241,16 @@ main (int argc, char *argv[]) G_CALLBACK (on_window_destroy), NULL); vbox = gtk_vbox_new (FALSE, 6); + hbox = gtk_hbox_new (FALSE, 6); + widget = gtk_check_button_new_with_label ("Fast"); + g_signal_connect (G_OBJECT (widget), "toggled", + G_CALLBACK (on_fast_slow_mode_changed), (gpointer) spectrum); + gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0); + bands_used = gtk_label_new (""); + gtk_box_pack_start (GTK_BOX (hbox), bands_used, FALSE, FALSE, 0); + + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + widget = gtk_hscale_new_with_range (50.0, 20000.0, 10); gtk_scale_set_draw_value (GTK_SCALE (widget), TRUE); gtk_scale_set_value_pos (GTK_SCALE (widget), GTK_POS_TOP); From 71477a3eac1351869f81296400c3a576add4de28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 15 Feb 2012 23:55:44 +0000 Subject: [PATCH 2/4] examples: fix spectrum example build issues Find fft headers in uninstalled setup, fix LIBS order. --- tests/examples/spectrum/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/examples/spectrum/Makefile.am b/tests/examples/spectrum/Makefile.am index c7bcbfa8fe..4fc796e263 100644 --- a/tests/examples/spectrum/Makefile.am +++ b/tests/examples/spectrum/Makefile.am @@ -7,9 +7,10 @@ demo_osssrc_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) demo_osssrc_LDADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS) demo_audiotest_SOURCES = demo-audiotest.c -demo_audiotest_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) -demo_audiotest_LDADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ - -lgstfft-$(GST_MAJORMINOR) $(GST_LIBS) $(GTK_LIBS) +demo_audiotest_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) +demo_audiotest_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstfft-$(GST_MAJORMINOR) \ + $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS) spectrum_example_SOURCES = spectrum-example.c spectrum_example_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) From ef37bb48bc6093c218271cf49ff063f57b6f0207 Mon Sep 17 00:00:00 2001 From: Tuukka Pasanen Date: Thu, 16 Feb 2012 12:59:10 +0000 Subject: [PATCH 3/4] v4l2src: fix for webcamstudio vloopback Because vlooback emits 25 - ENOTTY and no EINVAL v4l2src thought it can't handle this and does not work. https://bugzilla.gnome.org/show_bug.cgi?id=669455 --- sys/v4l2/v4l2_calls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c index 3808d8e621..c8af0a6cad 100644 --- a/sys/v4l2/v4l2_calls.c +++ b/sys/v4l2/v4l2_calls.c @@ -253,7 +253,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) control.id = n; if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_QUERYCTRL, &control) < 0) { - if (errno == EINVAL) { + if (errno == EINVAL || errno == ENOTTY) { if (n < V4L2_CID_PRIVATE_BASE) { GST_DEBUG_OBJECT (e, "skipping control %08x", n); /* continue so that we also check private controls */ From c1c858f2733aba9fd8f6120656b0db20a66b6c77 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Thu, 16 Feb 2012 17:14:20 +0800 Subject: [PATCH 4/4] v4l2src: failure to query some optional controls is not a fatal error Don't post a (fatal) error message on the bus just because we failed to query some control. Fixes issue with built-in Suyin Corp webcam for HP notebook (usbid 064e:e28a) on OpenSuse 12.1, where querying red/blue balance fails. https://bugzilla.gnome.org/show_bug.cgi?id=670197 --- sys/v4l2/v4l2_calls.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c index c8af0a6cad..309bfb668e 100644 --- a/sys/v4l2/v4l2_calls.c +++ b/sys/v4l2/v4l2_calls.c @@ -253,7 +253,7 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) control.id = n; if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_QUERYCTRL, &control) < 0) { - if (errno == EINVAL || errno == ENOTTY) { + if (errno == EINVAL || errno == ENOTTY || errno == EIO) { if (n < V4L2_CID_PRIVATE_BASE) { GST_DEBUG_OBJECT (e, "skipping control %08x", n); /* continue so that we also check private controls */ @@ -263,12 +263,9 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) break; } } else { - GST_ELEMENT_ERROR (e, RESOURCE, SETTINGS, - (_("Failed getting controls attributes on device '%s'."), - v4l2object->videodev), - ("Failed querying control %d on device '%s'. (%d - %s)", - n, v4l2object->videodev, errno, strerror (errno))); - return FALSE; + GST_WARNING_OBJECT (e, "Failed querying control %d on device '%s'. " + "(%d - %s)", n, v4l2object->videodev, errno, strerror (errno)); + continue; } } if (control.flags & V4L2_CTRL_FLAG_DISABLED) {