GStreamer

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Thu Jan 30 2003  10:30:48 PST

Log message:
cleaning up alsa, step 1: cleaning up caps parsing/setting and templates
- gst-launch ... ! spider ! alsasink works now
- alsasrc definitely does not work

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.28&r2=1.29

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- gstalsa.c	27 Jan 2003 12:59:24 -0000	1.28
+++ gstalsa.c	30 Jan 2003 18:30:30 -0000	1.29
@@ -60,7 +60,7 @@
 
 static GstPad           *gst_alsa_request_new_pad (GstElement *element, GstPadTemplate *templ, const gchar *name);
 static GstPadLinkReturn  gst_alsa_link (GstPad *pad, GstCaps *caps);
-static GstCaps          *gst_alsa_caps (GstAlsa *this);
+static GstCaps          *gst_alsa_caps (snd_pcm_format_t format, gint rate, gint channels);
 
 static GstElementStateReturn gst_alsa_change_state (GstElement *element);
 
@@ -98,16 +98,16 @@
 {
   static GType type = 0;
   static GEnumValue *values = NULL;
-  gint i, len = SND_PCM_FORMAT_GSM + 3;
+  gint i;
 
   if (values == NULL) {
     /* the three: for -1, 0, and the terminating NULL */
-    values = g_new0 (GEnumValue, len);
-
-    for (i = 0; i < len - 1; i++) {
-      values[i].value = i - 1;        /* UNKNOWN is -1 */
-      values[i].value_name = g_strdup_printf ("%d", i - 1);
-      values[i].value_nick = g_strdup (snd_pcm_format_name ((snd_pcm_format_t) i - 1));
+    values = g_new0 (GEnumValue, SND_PCM_FORMAT_LAST + 1);
+ 
+    for (i = -1; i <= SND_PCM_FORMAT_LAST; i++) {
+      values[i + 1].value = i; /* UNKNOWN is -1 */
+      values[i + 1].value_name = g_strdup_printf ("%d", i);
+      values[i + 1].value_nick = g_strdup (snd_pcm_format_name ((snd_pcm_format_t) i));
     }
   }
 
@@ -116,7 +116,6 @@
 
   return type;
 }
-
 GType
 gst_alsa_get_type (void)
 {
@@ -277,6 +276,8 @@
 
   /* data is interleaved by default, because there's only one default pad */
   this->data_interleaved = TRUE;
+  this->rate = 0;
+  this->channels = 0;
 
   gst_element_add_pad (GST_ELEMENT (this), GST_ALSA_PAD (this->pads)->pad);
 
@@ -384,8 +385,8 @@
   static GstPadTemplate *template = NULL;
 
   if (!template)
-    template = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_SOMETIMES,
-                                     gst_caps_new ("src", "audio/raw", NULL),
+    template = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+                                     gst_alsa_caps (SND_PCM_FORMAT_UNKNOWN, -1, -1),
                                      NULL);
 
   return template;
@@ -397,11 +398,9 @@
   static GstPadTemplate *template = NULL;
 
   if (!template)
-    template =
-      gst_pad_template_new ("src%d", GST_PAD_SRC, GST_PAD_REQUEST,
-                            gst_caps_new ("src-request", "audio/raw",
-                              gst_props_new ("channels", GST_PROPS_INT (1), NULL)),
-                            NULL);
+    template = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
+                                     gst_alsa_caps (SND_PCM_FORMAT_UNKNOWN, -1, 1),
+                                     NULL);
 
   return template;
 }
@@ -412,8 +411,8 @@
   static GstPadTemplate *template = NULL;
 
   if (!template)
-    template = gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_SOMETIMES,
-                                     gst_caps_new ("sink", "audio/raw", NULL),
+    template = gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
+                                     gst_alsa_caps (SND_PCM_FORMAT_UNKNOWN, -1, -1),
                                      NULL);
 
   return template;
@@ -427,8 +426,7 @@
   if (!template)
     template =
       gst_pad_template_new ("sink%d", GST_PAD_SINK, GST_PAD_REQUEST,
-                            gst_caps_new ("sink-request", "audio/raw",
-                              gst_props_new ("channels", GST_PROPS_INT (1), NULL)),
+                                     gst_alsa_caps (SND_PCM_FORMAT_UNKNOWN, -1, 1),
                             NULL);
 
   return template;
@@ -515,170 +513,148 @@
   return pad->pad;
 }
 
-static gboolean
-gst_alsa_parse_caps (GstAlsa *this, GstCaps *caps)
+/* gets the matching alsa format or SND_PCM_FORMAT_UNKNOWN if none matches */
+static snd_pcm_format_t
+gst_alsa_get_format (GstCaps *caps)
 {
-  gint law, endianness, width, depth, channels;
-  gboolean sign;
-  gint format = -1;
   const gchar *format_name;
-
+  /** 
+   * We have to differentiate between int and float, so lets find out which one we have.
+   * Somebody fix the float caps spec please.
+   */
   if (!gst_caps_get_string (caps, "format", &format_name))
-    return FALSE;
-
-  if (format_name == NULL) {
-    return FALSE;
-  } else if (strcmp (format_name, "int") == 0) {
+    return SND_PCM_FORMAT_UNKNOWN;
+    if (strncmp (format_name, "int", 3) == 0) {
+    gboolean sign;
+    int width, depth, endianness, law;
+    /* extract the needed information from the caps */
     if (!gst_caps_get (caps,
-                       "width", &width, "depth", &depth, "law", &law,
-                       "endianness", &endianness, "signed", &sign, NULL))
-      return FALSE;
-
-    if (law == 0) {
-      if (width == 8) {
-        if (sign == TRUE) {
-          format = SND_PCM_FORMAT_S8;
-        } else {
-          format = SND_PCM_FORMAT_U8;
-        }
-      } else if (width == 16) {
-        if (sign == TRUE) {
-          if (endianness == G_LITTLE_ENDIAN)   format = SND_PCM_FORMAT_S16_LE;
-          else if (endianness == G_BIG_ENDIAN) format = SND_PCM_FORMAT_S16_BE;
-        } else {
-          if (endianness == G_LITTLE_ENDIAN)   format = SND_PCM_FORMAT_U16_LE;
-          else if (endianness == G_BIG_ENDIAN) format = SND_PCM_FORMAT_U16_BE;
-        }
-      } else if (width == 24) {
-        if (sign == TRUE) {
-          if (endianness == G_LITTLE_ENDIAN)   format = SND_PCM_FORMAT_S24_LE;
-          else if (endianness == G_BIG_ENDIAN) format = SND_PCM_FORMAT_S24_BE;
-        } else {
-          if (endianness == G_LITTLE_ENDIAN)   format = SND_PCM_FORMAT_U24_LE;
-          else if (endianness == G_BIG_ENDIAN) format = SND_PCM_FORMAT_U24_BE;
-        }
-      } else if (width == 32) {
-        if (sign == TRUE) {
-          if (endianness == G_LITTLE_ENDIAN)   format = SND_PCM_FORMAT_S32_LE;
-          else if (endianness == G_BIG_ENDIAN) format = SND_PCM_FORMAT_S32_BE;
-        } else {
-          if (endianness == G_LITTLE_ENDIAN)   format = SND_PCM_FORMAT_U32_LE;
-          else if (endianness == G_BIG_ENDIAN) format = SND_PCM_FORMAT_U32_BE;
-        }
-      }
-    } else if (law == 1) { /* mu law */
-      if (width == depth && width == 8 && sign == FALSE) {
-        format = SND_PCM_FORMAT_MU_LAW;
-      } else {
-        return FALSE;
-      }
-    } else if (law == 2) { /* a law, ug. */
-      if (width == depth && width == 8 && sign == FALSE) {
-        format = SND_PCM_FORMAT_A_LAW;
-      }
-    } else {
-      return FALSE;
+                       "width", &width,
+                       "depth", &depth,
+                       "law", &law,
+                       "endianness", &endianness,
+                       "signed", &sign,
+                       NULL))
+        return SND_PCM_FORMAT_UNKNOWN;
+	
+    /* find corresponding alsa format */
+    switch (law) {
+      case 0: return snd_pcm_build_linear_format (depth, width, sign ? 0 : 1, endianness == G_LITTLE_ENDIAN ? 0 : 1);
+      case 1: return SND_PCM_FORMAT_A_LAW;
+      case 2: return SND_PCM_FORMAT_MU_LAW;
+      default: return SND_PCM_FORMAT_UNKNOWN;
     }
-  } else if (strcmp (format_name, "float") == 0) {
-    const gchar *layout;
-
-    if (!gst_caps_get_string (caps, "layout", &layout))
-      return FALSE;
-
-    if (strcmp (layout, "gfloat") == 0) {
-      format = SND_PCM_FORMAT_FLOAT;
+  } else if (strncmp (format_name, "float", 5) == 0) {
+    gchar *layout;
+    /* get layout */
+    if (!gst_caps_get_string (caps, "layout", (const gchar **) &layout))
+      return SND_PCM_FORMAT_UNKNOWN;
+	/* match layout to format wrt to endianness */
+    if (strncmp (layout, "gfloat", 6) == 0) {
+      return SND_PCM_FORMAT_FLOAT;
+    } else if (strncmp (layout, "gdouble", 7) == 0) {
+      return SND_PCM_FORMAT_FLOAT64;
     } else {
-      return FALSE;
-      /* you need doubles? jeez... */
+      return SND_PCM_FORMAT_UNKNOWN;
     }
-  } else {
-    return FALSE;
   }
+    
+  return SND_PCM_FORMAT_UNKNOWN;
+}
+/* get props for a spec */
+static GstProps *
+gst_alsa_get_props (snd_pcm_format_t format)
+{
+  /* int or float */
+  if (snd_pcm_format_linear (format)) {
+    GstProps *props = gst_props_new ("format", GST_PROPS_STRING ("int"),
+                          "width", GST_PROPS_INT(snd_pcm_format_physical_width (format)),
+                          "depth", GST_PROPS_INT(snd_pcm_format_width (format)),
+                          "signed", GST_PROPS_BOOLEAN (snd_pcm_format_signed (format) == 1 ? TRUE : FALSE),
+                          NULL);
+    /* endianness */
+    switch (snd_pcm_format_little_endian (format)) {
+    case 0:
+      gst_props_add_entry (props, gst_props_entry_new ("endianness", GST_PROPS_INT (G_BIG_ENDIAN)));
+      break;
+    case 1:
+      gst_props_add_entry (props, gst_props_entry_new ("endianness", GST_PROPS_INT (G_LITTLE_ENDIAN)));
+      break;
+    default:
+      break;
+    }
+    /* law */
+    switch (format) {
+    case SND_PCM_FORMAT_A_LAW:
+      gst_props_add_entry (props, gst_props_entry_new ("law", GST_PROPS_INT (1)));
+      break;
+    case SND_PCM_FORMAT_MU_LAW:
+      gst_props_add_entry (props, gst_props_entry_new ("law", GST_PROPS_INT (2)));
+      break;
+    default:
+      gst_props_add_entry (props, gst_props_entry_new ("law", GST_PROPS_INT (0)));
+      break;			
+    }
+    return props;
+  } else if (snd_pcm_format_float (format)) {
+    /* no float with non-platform endianness */
+    if (!snd_pcm_format_cpu_endian (format))
+      return NULL;
 
-  this->format = format;
-  if (!gst_caps_get (caps, "rate", &this->rate, "channels", &channels, NULL))
-    return FALSE;
-
-  if (this->data_interleaved)
-    this->channels = channels;
-  else if (channels != 1)
-    return FALSE;
-
-  return TRUE;
+    return gst_props_new ("format", GST_PROPS_STRING ("float"),
+                          "layout", GST_PROPS_STRING (snd_pcm_format_width (format) == 64 ? "gdouble" : "gfloat"),
+                          NULL);
+  }
+  return NULL;
 }
 
-/* caps are so painful sometimes. */
+static inline void add_channels (GstProps *props, gint rate, gint channels) {
+  if (rate < 0) {
+    gst_props_add_entry (props, gst_props_entry_new ("rate", GST_PROPS_INT_RANGE (8000, 192000)));
+  } else {
+    gst_props_add_entry (props, gst_props_entry_new ("rate", GST_PROPS_INT (rate)));
+  }
+  if (channels < 0) {
+    gst_props_add_entry (props, gst_props_entry_new ("channels", GST_PROPS_INT_RANGE (1, 64)));
+  } else {
+    gst_props_add_entry (props, gst_props_entry_new ("channels", GST_PROPS_INT (channels)));
+  }
+}
+/**
+ * Get all available caps.
+ * @format: SND_PCM_FORMAT_UNKNOWN for all formats, desired format else
+ * @rate: allowed rates if < 0, else desired rate
+ * @channels: all allowed values for channels if < 0, else desired channel number
+ */
 static GstCaps *
-gst_alsa_caps (GstAlsa *this)
+gst_alsa_caps (snd_pcm_format_t format, gint rate, gint channels)
 {
-  gint law, endianness, width, depth;
-  gboolean sign;
-  GstProps *props;
-
-  g_return_val_if_fail (this != NULL && this->handle != NULL, NULL);
+  GstCaps *ret_caps = NULL;
+	
+  if (format != SND_PCM_FORMAT_UNKNOWN) {
+    /* there are some caps set already */
+    GstProps *props = gst_alsa_get_props (format);
+    /* we can never use a format we can't set caps for */
+    g_assert (props != NULL);
 
-  if (this->format == SND_PCM_FORMAT_FLOAT) {
-    props = gst_props_new ("format",   GST_PROPS_STRING ("float"),
-                           "layout",   GST_PROPS_STRING ("gfloat"),
-                           "rate",     GST_PROPS_INT (this->rate),
-                           "channels", GST_PROPS_INT ((this->data_interleaved ? this->channels : 1)),
-                           NULL);
+    add_channels (props, rate, channels);
+    ret_caps = gst_caps_new ("alsacaps", "audio/raw", props);
   } else {
-    /* we'll just have to assume int, i don't feel like checking */
-    if (this->format == SND_PCM_FORMAT_MU_LAW) {
-      law = 1;
-      width = 8; sign = FALSE; endianness = 0;
-    } else if (this->format == SND_PCM_FORMAT_A_LAW) {
-      law = 2;
-      width = 8; sign = FALSE; endianness = 0;
-    } else {
-      law = 0;
-      if (this->format == SND_PCM_FORMAT_S8) {
-        width = 8; sign = TRUE; endianness = 0;
-      } else if (this->format == SND_PCM_FORMAT_U8) {
-        width = 8; sign = FALSE; endianness = 0;
-      } else if (this->format == SND_PCM_FORMAT_S16_LE) {
-        width = 16; sign = TRUE; endianness = G_LITTLE_ENDIAN;
-      } else if (this->format == SND_PCM_FORMAT_S16_BE) {
-        width = 16; sign = TRUE; endianness = G_BIG_ENDIAN;
-      } else if (this->format == SND_PCM_FORMAT_U16_LE) {
-        width = 16; sign = FALSE; endianness = G_LITTLE_ENDIAN;
-      } else if (this->format == SND_PCM_FORMAT_U16_BE) {
-        width = 16; sign = FALSE; endianness = G_BIG_ENDIAN;
-      } else if (this->format == SND_PCM_FORMAT_S24_LE) {
-        width = 24; sign = TRUE; endianness = G_LITTLE_ENDIAN;
-      } else if (this->format == SND_PCM_FORMAT_S24_BE) {
-        width = 24; sign = TRUE; endianness = G_BIG_ENDIAN;
-      } else if (this->format == SND_PCM_FORMAT_U24_LE) {
-        width = 24; sign = FALSE; endianness = G_LITTLE_ENDIAN;
-      } else if (this->format == SND_PCM_FORMAT_U24_BE) {
-        width = 24; sign = FALSE; endianness = G_BIG_ENDIAN;
-      } else if (this->format == SND_PCM_FORMAT_S32_LE) {
-        width = 32; sign = TRUE; endianness = G_LITTLE_ENDIAN;
-      } else if (this->format == SND_PCM_FORMAT_S32_BE) {
-        width = 32; sign = TRUE; endianness = G_BIG_ENDIAN;
-      } else if (this->format == SND_PCM_FORMAT_U32_LE) {
-        width = 32; sign = FALSE; endianness = G_LITTLE_ENDIAN;
-      } else if (this->format == SND_PCM_FORMAT_U32_BE) {
-        width = 32; sign = FALSE; endianness = G_BIG_ENDIAN;
-      } else {
-        g_error ("Unknown audio format %u", this->format);
-        return NULL;
+    int i;
+    GstProps *props;
+
+    for (i = 0; i <= SND_PCM_FORMAT_LAST; i++) {
+      props = gst_alsa_get_props (i);
+      /* can be NULL, because not all alsa formats can be specified as caps */
+      if (props != NULL) {
+        add_channels (props, rate, channels);
+        ret_caps = gst_caps_append (ret_caps, gst_caps_new (g_strdup (snd_pcm_format_name (i)),
+		      													"audio/raw", props));
       }
     }
-    depth = width;
-    props = gst_props_new ("format",     GST_PROPS_STRING ("int"),
-                           "rate",       GST_PROPS_INT (this->rate),
-                           "channels",   GST_PROPS_INT ((this->data_interleaved ? this->channels : 1)),
-                           "law",        GST_PROPS_INT (law),
-                           "endianness", GST_PROPS_INT (endianness),
-                           "signed",     GST_PROPS_BOOLEAN (sign),
-                           "width",      GST_PROPS_INT (width),
-                           "depth",      GST_PROPS_INT (depth),
-                           NULL);
   }
 
-  return gst_caps_new ("alsasrc", "audio/raw", props);
+  return ret_caps;
 }
 
 /* Negotiates the caps, "borrowed" from gstosssink.c */
@@ -686,6 +662,8 @@
 gst_alsa_link (GstPad *pad, GstCaps *caps)
 {
   GstAlsa *this;
+  snd_pcm_format_t format;
+  gint rate, channels;
   gboolean need_mmap;
 
   g_return_val_if_fail (caps != NULL, GST_PAD_LINK_REFUSED);
@@ -698,25 +676,43 @@
       if (!gst_alsa_open_audio (this))
         return GST_PAD_LINK_REFUSED;
 
-    if (gst_alsa_parse_caps (this, caps)) {
-      need_mmap = this->mmap_open;
-
-      /* sync the params */
-      if (GST_FLAG_IS_SET (this, GST_ALSA_RUNNING)) gst_alsa_stop_audio (this);
-      if (GST_FLAG_IS_SET (this, GST_ALSA_OPEN))    gst_alsa_close_audio (this);
+    /* FIXME: allow changing the format here */
+    format = gst_alsa_get_format (caps);
+    DEBUG ("found format %s\n", snd_pcm_format_name (format));
+    if (this->format != SND_PCM_FORMAT_UNKNOWN && this->format != format)
+      return GST_PAD_LINK_REFUSED;
+    if (!gst_caps_get (caps, "rate", &rate,
+                             "channels", &channels,
+                             NULL))
+      return GST_PAD_LINK_REFUSED;
+    if (this->format != SND_PCM_FORMAT_UNKNOWN && this->rate != rate)
+      return GST_PAD_LINK_REFUSED;      
+    if (this->format != SND_PCM_FORMAT_UNKNOWN && ((this->channels > 1 || channels > 1)))
+      return GST_PAD_LINK_REFUSED;
+    
+    if (this->format == SND_PCM_FORMAT_UNKNOWN) {
+      this->channels = channels;
+    } else {
+      this->channels++;
+    }
+    this->format = format;
+    this->rate = rate;
+    
+    need_mmap = this->mmap_open;
 
-      /* FIXME send out another caps if nego fails */
+    /* sync the params */
+    if (GST_FLAG_IS_SET (this, GST_ALSA_RUNNING)) gst_alsa_stop_audio (this);
+    if (GST_FLAG_IS_SET (this, GST_ALSA_OPEN))    gst_alsa_close_audio (this);
 
-      if (!gst_alsa_open_audio (this))  return GST_PAD_LINK_REFUSED;
-      if (!gst_alsa_start_audio (this)) return GST_PAD_LINK_REFUSED;
+    /* FIXME send out another caps if nego fails */
 
-      if (need_mmap && !gst_alsa_get_channel_addresses (this))
-        return GST_PAD_LINK_REFUSED;
+    if (!gst_alsa_open_audio (this))  return GST_PAD_LINK_REFUSED;
+    if (!gst_alsa_start_audio (this)) return GST_PAD_LINK_REFUSED;
 
-      return GST_PAD_LINK_OK;
-    }
+    if (need_mmap && !gst_alsa_get_channel_addresses (this))
+      return GST_PAD_LINK_REFUSED;
 
-    return GST_PAD_LINK_REFUSED;
+    return GST_PAD_LINK_OK;
   }
 
   return GST_PAD_LINK_DELAYED;
@@ -874,6 +870,7 @@
   gst_alsa_start_audio (this);
 }
 
+/* FIXME: DO NOT RECORD WITH ALSA, IT DOESN'T WORK, IT ONLY COMPILES */
 static gboolean
 gst_alsa_src_process (GstAlsa *this, snd_pcm_uframes_t frames)
 {
@@ -888,11 +885,11 @@
 
   /* let's get on the caps-setting merry-go-round! */
   if (!caps_set) {
-    caps = gst_alsa_caps (this);
+    caps = gst_alsa_caps (this->format, this->rate, this->channels);
     l = this->pads;
     while (l) {
       if (gst_pad_try_set_caps (GST_ALSA_PAD (l)->pad, caps) <= 0) {
-        g_print ("setting caps (%p) in source (%p) failed\n", caps, this);
+        DEBUG ("setting caps (%p) in source (%p) failed\n", caps, this);
         sleep (1);
         return FALSE;
       }
@@ -1032,7 +1029,7 @@
       g_warning ("GstAlsaSink: got an unknown event (Type: %d)", GST_EVENT_TYPE (event));
     }
   } else {
-    /* the element at the top of the chain did not emit an eos event. */
+    /* the element at the top of the chain did not emit an event. */
     g_assert_not_reached ();
   }
 }
@@ -1051,7 +1048,7 @@
   g_return_val_if_fail (this != NULL, FALSE);
   g_return_val_if_fail (this->handle != NULL, FALSE);
 
-  g_print ("Preparing channel: %s %dHz, %d channels\n",
+  DEBUG ("Preparing channel: %s %dHz, %d channels\n",
            snd_pcm_format_name (this->format), this->rate, this->channels);
 
   snd_pcm_hw_params_alloca (&hw_param);
@@ -1091,14 +1088,16 @@
     this->sample_bytes = snd_pcm_format_physical_width (this->format) / 8;
   }
 
-  ret = snd_pcm_hw_params_set_channels (this->handle, hw_param, this->channels);
-  if (ret < 0) {
-    g_warning ("Channels count (%d) not available: %s", this->channels, snd_strerror (ret));
-    return FALSE;
+  if (this->channels > 0) {
+    ret = snd_pcm_hw_params_set_channels (this->handle, hw_param, this->channels);
+    if (ret < 0) {
+      g_warning ("Channels count (%d) not available: %s", this->channels, snd_strerror (ret));
+      return FALSE;
+    }
+    this->channels = snd_pcm_hw_params_get_channels (hw_param);
   }
-  this->channels = snd_pcm_hw_params_get_channels (hw_param);
 
-  if (this->rate) {
+  if (this->rate > 0) {
     ret = snd_pcm_hw_params_set_rate (this->handle, hw_param, this->rate, 0);
     if (ret < 0) {
       g_warning ("error setting rate (%d): %s", this->rate, snd_strerror (ret));
@@ -1139,10 +1138,12 @@
     return FALSE;
   }
 
+  /* FIXME: this needs to be done for a src, but not for a sink
   if (!this->rate)
     this->rate = snd_pcm_hw_params_get_rate (hw_param, 0);
-  if (!this->format)
+  if (this->format == SND_PCM_UNKNOWN)
     this->format = snd_pcm_hw_params_get_format (hw_param);
+  */
   if (!this->period_count)
     this->period_count = snd_pcm_hw_params_get_periods (hw_param, 0);
   if (!this->period_frames)
@@ -1217,11 +1218,12 @@
   gint ret;
 
   g_assert (this != NULL);
+  g_assert (this->handle == NULL);
 
   if (this->handle)
     gst_alsa_close_audio (this);
 
-  g_print ("Opening alsa device \"%s\" for %s...\n", this->device,
+  DEBUG ("Opening alsa device \"%s\" for %s...\n", this->device,
            this->stream == SND_PCM_STREAM_PLAYBACK ? "playback" : "capture");
 
   ret = snd_output_stdio_attach (&this->out, stdout, 0);

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Sun Feb 09 2003  14:47:46 PST

Log message:
fixing alsa step 2: complete rewrite of data transfer. The whole stuff is clean enough to go from there now.
License change to LGPL, since no copied code is left now.
Missing:
- alsasrc
- resetting format
- corner cases
- testsuite

Modified files:
    ext/alsa        : README gstalsa.c gstalsa.h

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/README.diff?r1=1.1&r2=1.2
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.29&r2=1.30
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.h.diff?r1=1.6&r2=1.7

====Begin Diffs====
Index: README
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README	23 Dec 2001 00:25:30 -0000	1.1
+++ README	9 Feb 2003 22:47:34 -0000	1.2
@@ -3,7 +3,8 @@
 
 This plugin was originally written by Thomas Nyberg <thomas@...> for
 ALSA 0.5.x. It was updated and changed quite a bit in September 2001 by Andy
-Wingo for use with ALSA 0.9.x.
+Wingo for use with ALSA 0.9.x. It was rewritten in great part again by Benjamin 
+Otte in January/February 2003.
 
 1.0 Introduction
 ----------------
@@ -44,21 +45,18 @@
 these devices are stereo. The alsasink and alsasrc elements correspond to the
 default alsa devices.
 
-3.0 License
------------
-
-ALSA 0.9.x isn't very well documented, so I had to rely on a number of different
-sources for guidance. One of the main sources of inspiration was Paul Davis'
-audioengine (available in quasimodo's cvs tree,
-http://quasimodo.sourceforge.net/), from which I took a large amount of code.
-Since that project is licensed under the GPL, it was only right that I license
-the updated version of this plugin under the GPL as well. What, in my
-understanding, this means for the end user is that you cannot use the ALSA
-plugin with a non-GPL program. If in doubt, please refer to the COPYING file
-located in this directory.
-
-
-
+3.0 Where to look for other ALSA drivers
+----------------------------------------
 
+ALSA 0.9 isn't very well documented, so we had to rely on a number of different
+sources for guidance. Sources of inspiration include JACK's alsa driver 
+(available in jack's cvs tree, http://jack.sourceforge.net/), the alsa2 driver 
+of mplayer (http://www.mplayerhq.hu) and the pcm.c example from the ALSA library
+itself.
+(http://www.alsa-project.org/alsa-doc/alsa-lib/_2test_2pcm_8c-example.html)
 
+4.0 License
+-----------
 
+This plugin is licensed under the Lesser General Public License (LGPL). See the
+file COPYING in the top source directory.
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- gstalsa.c	30 Jan 2003 18:30:30 -0000	1.29
+++ gstalsa.c	9 Feb 2003 22:47:34 -0000	1.30
@@ -2,6 +2,7 @@
  * Copyright (C) 2001 CodeFactory AB
  * Copyright (C) 2001 Thomas Nyberg <thomas@...>
  * Copyright (C) 2001-2002 Andy Wingo <apwingo@...>
+ * Copyright (C) 2003 Benjamin Otte <in7y118@...>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
@@ -22,6 +23,33 @@
 #include <sys/time.h>
 #include "gstalsa.h"
 
[...1294 lines suppressed...]
 
 /*** GSTREAMER PLUGIN *********************************************************/
 
@@ -1373,12 +1174,15 @@
   if (!gst_library_load ("gstbytestream"))
     return FALSE;
 
+  /* FIXME: doesn't work */
+  if (0) {
   factory = gst_element_factory_new ("alsasrc", GST_TYPE_ALSA_SRC, &gst_alsa_src_details);
   g_return_val_if_fail (factory != NULL, FALSE);
   gst_element_factory_add_pad_template (factory, gst_alsa_src_pad_factory ());
   gst_element_factory_add_pad_template (factory, gst_alsa_src_request_pad_factory ());
   gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
-
+  }
+  
   factory = gst_element_factory_new ("alsasink", GST_TYPE_ALSA_SINK, &gst_alsa_sink_details);
   g_return_val_if_fail (factory != NULL, FALSE);
   gst_element_factory_add_pad_template (factory, gst_alsa_sink_pad_factory ());
Index: gstalsa.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- gstalsa.h	27 Jan 2003 12:59:24 -0000	1.6
+++ gstalsa.h	9 Feb 2003 22:47:34 -0000	1.7
@@ -2,6 +2,7 @@
  * Copyright (C) 2001 CodeFactory AB
  * Copyright (C) 2001 Thomas Nyberg <thomas@...>
  * Copyright (C) 2001-2002 Andy Wingo <apwingo@...>
+ * Copyright (C) 2003 Benjamin Otte <in7y118@...>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -21,11 +22,16 @@
 #ifndef __GST_ALSA_H__
 #define __GST_ALSA_H__
 
+#define ALSA_PCM_NEW_HW_PARAMS_API
+#define ALSA_PCM_NEW_SW_PARAMS_API
+
 #include <alsa/asoundlib.h>
 #include <gst/gst.h>
 #include <gst/bytestream/bytestream.h>
 #include <glib.h>
 
+#define GST_ALSA_MAX_CHANNELS 64 /* we don't support more than 64 channels */
+
 #define GST_ALSA(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_ALSA, GstAlsa)
 #define GST_ALSA_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_ALSA, GstAlsaClass)
 #define GST_IS_ALSA(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_ALSA)
@@ -44,8 +50,6 @@
 #define GST_IS_ALSA_SRC_CLASS(klass) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_ALSA_SRC)
 #define GST_TYPE_ALSA_SRC gst_alsa_src_get_type()
 
-#define GST_ALSA_PAD(obj) ((GstAlsaPad*)obj->data) /* obj is a GList */
-
 /* I would have preferred to avoid this variety of trickery, but without it i
  * can't tell whether I'm a source or a sink upon creation. */
 
@@ -62,59 +66,32 @@
   GST_ALSA_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 3,
 };
 
-typedef gboolean (*GstAlsaProcessFunc) (GstAlsa *, snd_pcm_uframes_t frames);
-
 typedef struct {
-  gint channel;
   GstPad *pad;
   GstByteStream *bs;
-
-  /* buf and offset are only used for src elements to hold data from the sound
-     card, while we're waiting for an entire period_frames data. */
-  char *buf;
-  snd_pcm_uframes_t offset;
+  guint8 *data;
 } GstAlsaPad;
 
 struct _GstAlsa {
   GstElement parent;
 
-  /* list of GstAlsaPads */
-  GList *pads;
+  /* array of GstAlsaPads */
+  GstAlsaPad pads[GST_ALSA_MAX_CHANNELS];
 
   gchar *device;
   snd_pcm_stream_t stream;
   snd_pcm_t *handle;
   snd_output_t *out;
 
-  /* our mmap'd data areas */
-  gboolean mmap_open;
-  const snd_pcm_channel_area_t *mmap_areas;
-  char **access_addr;
-  snd_pcm_uframes_t offset;
-  snd_pcm_sframes_t avail;
-
-  GstAlsaProcessFunc process;
-
   snd_pcm_format_t format;
   guint rate;
   gint channels;
-  guint32 mute; /* bitmask. */
-
-  /* the gstreamer data */
-  gboolean data_interleaved;
-  gboolean autorecover;
-
-  /* access to the hardware */
-  gboolean access_interleaved;
-  guint sample_bytes;
-  guint interleave_unit;
-  guint interleave_skip;
 
-  guint buffer_frames;
-  guint period_count; /* 'number of fragments' in oss-speak */
-  guint period_frames;
+  /* latency / performance parameters */
+  snd_pcm_uframes_t period_size;
+  unsigned int period_count;
 
-  gboolean debug;
+  gboolean autorecover; 
 };
 
 struct _GstAlsaClass {

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Thu Feb 27 2003  14:33:15 PST

Log message:
bugfixes found while testing:
- return after 1 iteration, don't loop for ever
- caps nego: only parse endianness when necessary
- caps nego: make mu law and a law work
- caps nego: make float work
- call right function when going from PAUSED to PLAYING
- stupid error in request_new_pad

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.30&r2=1.31

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- gstalsa.c	9 Feb 2003 22:47:34 -0000	1.30
+++ gstalsa.c	27 Feb 2003 22:33:01 -0000	1.31
@@ -453,7 +453,7 @@
   gint channel = 0;
 
   g_return_val_if_fail ((this = GST_ALSA (element)), NULL);
-  g_return_val_if_fail (GST_FLAG_IS_SET (element, GST_ALSA_RUNNING), NULL);
+  g_return_val_if_fail (!GST_FLAG_IS_SET (element, GST_ALSA_RUNNING), NULL);
 
   /* you can't request a pad if the non-request pad already has more than 1 channel */
   g_return_val_if_fail (this->channels > GST_ELEMENT(this)->numpads, NULL);
@@ -514,23 +514,49 @@
                        "width", &width,
                        "depth", &depth,
                        "law", &law,
-                       "endianness", &endianness,
                        "signed", &sign,
                        NULL))
         return SND_PCM_FORMAT_UNKNOWN;
 	
+    /* extract endianness if needed */
+    if (width > 8) {
+      if (!gst_caps_get (caps,
+                         "endianness", &endianness,
+                         NULL))
+        return SND_PCM_FORMAT_UNKNOWN;      
+    } else {
+      endianness = G_BYTE_ORDER;
+    }
+    
     /* find corresponding alsa format */
     switch (law) {
       case 0: return snd_pcm_build_linear_format (depth, width, sign ? 0 : 1, endianness == G_LITTLE_ENDIAN ? 0 : 1);
-      case 1: return SND_PCM_FORMAT_A_LAW;
-      case 2: return SND_PCM_FORMAT_MU_LAW;
+      case 1: 
+        if (width == 8 && depth == 8 && sign == FALSE) {
+          return SND_PCM_FORMAT_MU_LAW;
+        } else {
+          return SND_PCM_FORMAT_UNKNOWN;
+        }
+      case 2: 
+        if (width == 8 && depth == 8 && sign == FALSE) {
+          return SND_PCM_FORMAT_A_LAW;
+        } else {
+          return SND_PCM_FORMAT_UNKNOWN;
+        }
       default: return SND_PCM_FORMAT_UNKNOWN;
     }
   } else if (strncmp (format_name, "float", 5) == 0) {
     gchar *layout;
+    gfloat intercept, slope;
     /* get layout */
-    if (!gst_caps_get_string (caps, "layout", (const gchar **) &layout))
+    if (!gst_caps_get (caps, "layout", &layout,
+                             "intercept", &intercept,
+                             "slope", &slope,
+                             NULL))
       return SND_PCM_FORMAT_UNKNOWN;
+    if (intercept != 0.0f || slope != 1.0f) {
+      return SND_PCM_FORMAT_UNKNOWN;      
+    }
 	/* match layout to format wrt to endianness */
     if (strncmp (layout, "gfloat", 6) == 0) {
       return SND_PCM_FORMAT_FLOAT;
@@ -547,35 +573,42 @@
 static GstProps *
 gst_alsa_get_props (snd_pcm_format_t format)
 {
-  /* int or float */
-  if (snd_pcm_format_linear (format)) {
+  if (format == SND_PCM_FORMAT_A_LAW) {
+    return gst_props_new ("format", GST_PROPS_STRING ("int"),
+                          "law", GST_PROPS_INT(2),
+                          "width", GST_PROPS_INT(8),
+                          "depth", GST_PROPS_INT(8),
+                          "signed", GST_PROPS_BOOLEAN (FALSE),
+                          NULL);
+  } else if (format == SND_PCM_FORMAT_MU_LAW) {
+    return gst_props_new ("format", GST_PROPS_STRING ("int"),
+                          "law", GST_PROPS_INT(1),
+                          "width", GST_PROPS_INT(8),
+                          "depth", GST_PROPS_INT(8),
+                          "signed", GST_PROPS_BOOLEAN (FALSE),
+                          NULL);
+  } else if (snd_pcm_format_linear (format)) {
+    /* int */
     GstProps *props = gst_props_new ("format", GST_PROPS_STRING ("int"),
                           "width", GST_PROPS_INT(snd_pcm_format_physical_width (format)),
                           "depth", GST_PROPS_INT(snd_pcm_format_width (format)),
+                          "law", GST_PROPS_INT(0),
                           "signed", GST_PROPS_BOOLEAN (snd_pcm_format_signed (format) == 1 ? TRUE : FALSE),
                           NULL);
     /* endianness */
-    switch (snd_pcm_format_little_endian (format)) {
-    case 0:
-      gst_props_add_entry (props, gst_props_entry_new ("endianness", GST_PROPS_INT (G_BIG_ENDIAN)));
-      break;
-    case 1:
-      gst_props_add_entry (props, gst_props_entry_new ("endianness", GST_PROPS_INT (G_LITTLE_ENDIAN)));
-      break;
-    default:
-      break;
-    }
-    /* law */
-    switch (format) {
-    case SND_PCM_FORMAT_A_LAW:
-      gst_props_add_entry (props, gst_props_entry_new ("law", GST_PROPS_INT (1)));
-      break;
-    case SND_PCM_FORMAT_MU_LAW:
-      gst_props_add_entry (props, gst_props_entry_new ("law", GST_PROPS_INT (2)));
-      break;
-    default:
-      gst_props_add_entry (props, gst_props_entry_new ("law", GST_PROPS_INT (0)));
-      break;			
+    if (snd_pcm_format_physical_width (format) > 8) {
+      switch (snd_pcm_format_little_endian (format)) {
+      case 0:
+        gst_props_add_entry (props, gst_props_entry_new ("endianness", GST_PROPS_INT (G_BIG_ENDIAN)));
+        break;
+      case 1:
+        gst_props_add_entry (props, gst_props_entry_new ("endianness", GST_PROPS_INT (G_LITTLE_ENDIAN)));
+        break;
+      default:
+        g_warning("ALSA: Unknown byte order in sound driver. Continuing by assuming system byte order.");
+        gst_props_add_entry (props, gst_props_entry_new ("endianness", GST_PROPS_INT (G_BYTE_ORDER)));
+        break;
+      }
     }
     return props;
   } else if (snd_pcm_format_float (format)) {
@@ -585,6 +618,8 @@
 
     return gst_props_new ("format", GST_PROPS_STRING ("float"),
                           "layout", GST_PROPS_STRING (snd_pcm_format_width (format) == 64 ? "gdouble" : "gfloat"),
+                          "intercept", GST_PROPS_FLOAT (0),
+                          "slope", GST_PROPS_FLOAT (1),
                           NULL);
   }
   return NULL;
@@ -657,11 +692,11 @@
       if (!gst_alsa_open_audio (this))
         return GST_PAD_LINK_REFUSED;
 
-    /* FIXME: allow changing the format here, even by retrying caps on other pads */
     format = gst_alsa_get_format (caps);
     GST_DEBUG (GST_CAT_CAPS, "found format %s\n", snd_pcm_format_name (format));
       
-    if (this->format != SND_PCM_FORMAT_UNKNOWN && this->format != format)
+    /* FIXME: allow changing the format here, even by retrying caps on other pads */
+    if (format == SND_PCM_FORMAT_UNKNOWN || (this->format != SND_PCM_FORMAT_UNKNOWN && this->format != format))
       return GST_PAD_LINK_REFUSED;
     if (!gst_caps_get (caps, "rate", &rate,
                              "channels", &channels,
@@ -710,8 +745,8 @@
   case GST_STATE_READY_TO_PAUSED:
     break;
   case GST_STATE_PAUSED_TO_PLAYING:
-    if (GST_FLAG_IS_SET (element, GST_ALSA_OPEN) == FALSE)
-      if (!gst_alsa_open_audio (this))
+    if (GST_FLAG_IS_SET (element, GST_ALSA_RUNNING) == FALSE)
+      if (!gst_alsa_start_audio (this))
         return GST_STATE_FAILURE;
 
   case GST_STATE_PLAYING_TO_PAUSED:
@@ -763,18 +798,18 @@
     }
   }
   
-  while (1) {
-    
-    avail = snd_pcm_avail_update (this->handle);
-    if (avail < 0) {
-      if (avail == -EPIPE) {
-        gst_alsa_xrun_recovery (this);
-        continue;
-      } else {
-        g_warning ("unknown ALSA avail_update return value (%d)", (int) avail);
-        return;
-      }
+restart:
+  
+  avail = snd_pcm_avail_update (this->handle);
+  if (avail < 0) {
+    if (avail == -EPIPE) {
+      gst_alsa_xrun_recovery (this);
+      goto restart;
+    } else {
+      g_warning ("unknown ALSA avail_update return value (%d)", (int) avail);
+      return;
     }
+  }
 
     if (avail > 0) {
       /* check how many bytes we still have in all our bytestreams */
@@ -852,15 +887,14 @@
            * under gdb, or when exiting due to a signal */
           GST_DEBUG (GST_CAT_PLUGIN_INFO, "got interrupted while waiting");
           if (gst_element_interrupt (element))
-            break;
+            return;
           else
-            continue;
+            goto restart;
          }
         g_warning ("error waiting for alsa pcm: (%d: %s)", errno, strerror (errno));
         return;
       }
     }
-  }
 }
 
 static void

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Mon Mar 10 2003  13:30:17 PST

Log message:
Bugfixing in alsa again:
- Leif's commit reverted an earlier patch
  (stupid diff)
- Some comment from Leif made me clean up his code
- Moved wait() directly in front of mmap
- Assorted fixes
- fixed newbie bug: DON'T EVER USE STATIC VARIABLES WHEN YOU'RE NOT ABSOLUTELY SURE WHAT YOU'RE DOING, Leif *slap* ;)
I hope I didn't break the src now...

Modified files:
    ext/alsa        : gstalsa.c gstalsa.h

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.32&r2=1.33
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.h.diff?r1=1.8&r2=1.9

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- gstalsa.c	27 Feb 2003 23:13:20 -0000	1.32
+++ gstalsa.c	10 Mar 2003 21:29:59 -0000	1.33
@@ -97,7 +97,7 @@
 static GstElementStateReturn gst_alsa_change_state (GstElement *element);
 
 /* audio processing functions */
-static int      gst_alsa_do_mmap (GstAlsa *this, guint numpads, snd_pcm_sframes_t *avail);
+static int      gst_alsa_do_mmap (GstAlsa *this, snd_pcm_sframes_t *avail);
 
 static void     gst_alsa_sink_loop (GstElement *element);
 static void     gst_alsa_src_loop (GstElement *element);
@@ -280,6 +280,7 @@
   /* init values */
   this->handle = NULL;
   this->channels = 1;
+  this->caps_set = FALSE;
 
   GST_FLAG_SET (this, GST_ELEMENT_THREAD_SUGGESTED);
 
@@ -816,20 +817,16 @@
 /*** AUDIO PROCESSING *********************************************************/
 
 static int
-gst_alsa_do_mmap (GstAlsa *this, guint numpads, snd_pcm_sframes_t *avail)
+gst_alsa_do_mmap (GstAlsa *this, snd_pcm_sframes_t *avail)
 {
   snd_pcm_uframes_t offset;
   snd_pcm_channel_area_t *dst, *src, *areas;
   int i, err, width = snd_pcm_format_physical_width (this->format);
 
   /* areas points to the memory areas that belong to gstreamer. */
-  if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC) {
-    areas = dst = calloc(this->channels, sizeof(snd_pcm_channel_area_t));
-  } else {
-    areas = src = calloc(this->channels, sizeof(snd_pcm_channel_area_t));
-  }
+  areas = src = dst = calloc(this->channels, sizeof(snd_pcm_channel_area_t));
 
-  if (numpads == 1) {
+  if (((GstElement *) this)->numpads == 1) {
     /* interleaved */
     for (i = 0; i < this->channels; i++) {
       areas[i].addr = this->pads[0].data;
@@ -845,18 +842,11 @@
     }
   }
 
-  /* might want to try to do some pointer sneakery in the first if block to get
-     rid of this second if block ... but right now i'm too sleepy */
-  if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC) {
-    if ((err = snd_pcm_mmap_begin (this->handle, (const snd_pcm_channel_area_t **) &src, &offset, avail)) < 0) {
-      g_warning ("gstalsa: mmap failed: %s", snd_strerror (err));
-      return -1;
-    }
-  } else {
-    if ((err = snd_pcm_mmap_begin (this->handle, (const snd_pcm_channel_area_t **) &dst, &offset, avail)) < 0) {
-      g_warning ("gstalsa: mmap failed: %s", snd_strerror (err));
-      return -1;
-    }
+  if ((err = snd_pcm_mmap_begin (this->handle, (
+             const snd_pcm_channel_area_t **) (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC ? &src : &dst),
+             &offset, avail)) < 0) {
+    g_warning ("gstalsa: mmap failed: %s", snd_strerror (err));
+    return -1;
   }
 
   if ((err = snd_pcm_areas_copy (dst, offset, src, 0, this->channels, *avail, this->format)) < 0) {
@@ -879,16 +869,15 @@
   if (avail < 0) {
     if (avail == -EPIPE) {
       gst_alsa_xrun_recovery (this);
-      return -EPIPE;
     } else {
       g_warning ("unknown ALSA avail_update return value (%d)", (int) avail);
-      return -1;
     }
   }
   return avail;
 }
 
-inline static gint
+/* returns TRUE, if the loop should go on */
+inline static gboolean
 gst_alsa_pcm_wait (GstAlsa *this)
 {
   if (snd_pcm_state (this->handle) == SND_PCM_STATE_RUNNING) {
@@ -896,20 +885,23 @@
       if (errno == EINTR) {
         /* happens mostly when run under gdb, or when exiting due to a signal */
         GST_DEBUG (GST_CAT_PLUGIN_INFO, "got interrupted while waiting");
-        if (gst_element_interrupt (GST_ELEMENT (this)))
-          return -1;
+        if (gst_element_interrupt (GST_ELEMENT (this))) {
+          return TRUE;
+        } else {
+          return FALSE;
+        }
       }
       g_warning ("error waiting for alsa pcm: (%d: %s)", errno, strerror (errno));
-      return -1;
+      return FALSE;
     }
   }
-  return 0;
+  return TRUE;
 }
 
 static void
 gst_alsa_sink_loop (GstElement *element)
 {
-  snd_pcm_sframes_t avail, copied;
+  snd_pcm_sframes_t avail, avail2, copied;
   gint i;
   gint bytes, num_bytes; /* per channel */
   GstAlsa *this = GST_ALSA (element);
@@ -932,50 +924,57 @@
     }
   }
 
- sink_restart:
-
-  while (1) {
-    avail = gst_alsa_update_avail (this);
-    if (avail == -EPIPE) goto sink_restart;
-    if (avail == -1) break;
-    if (avail > 0) {
-      int width = snd_pcm_format_physical_width (this->format);
+sink_restart:
 
-      /* check how many bytes we still have in all our bytestreams */
-      bytes = avail * ( width / 8 ) * (element->numpads == 1 ? this->channels : 1);
-      for (i = 0; i < element->numpads; i++) {
-        g_assert (this->pads[i].pad != NULL);
-        do {
-          num_bytes = gst_bytestream_peek_bytes (this->pads[i].bs, &this->pads[i].data, bytes);
-        } while (num_bytes == 0 && gst_alsa_sink_check_event (this, i));
-        if (num_bytes == 0)
-          break;
-        bytes = MIN (bytes, num_bytes);
-      }
+  avail = gst_alsa_update_avail (this);
+  if (avail == -EPIPE) goto sink_restart;
+  if (avail < 0) return;
+  if (avail > 0) {
+    int width = snd_pcm_format_physical_width (this->format);
+    
+    /* Not enough space. We grab data nonetheless and sleep afterwards */
+    if (avail < this->period_size) {
+      avail = this->period_size;
+    }
+    
+    /* check how many bytes we still have in all our bytestreams */
+    bytes = avail * ( width / 8 ) * (element->numpads == 1 ? this->channels : 1);
+    for (i = 0; i < element->numpads; i++) {
+      g_assert (this->pads[i].pad != NULL);
+      do {
+        num_bytes = gst_bytestream_peek_bytes (this->pads[i].bs, &this->pads[i].data, bytes);
+      } while (num_bytes == 0 && gst_alsa_sink_check_event (this, i));
+      if (num_bytes == 0)
+        return;
+      bytes = MIN (bytes, num_bytes);
+    }
+    avail = bytes / (width / 8 ) / (element->numpads == 1 ? this->channels : 1);
 
-      /* FIXME: lotsa stuff can have happened while fetching data. Do we need to check something? */
+    /* FIXME: lotsa stuff can have happened while fetching data. Do we need to check something? */
 
-      /* put this data into alsa */
-      avail = bytes / (width / 8 ) / (element->numpads == 1 ? this->channels : 1);
-      if ((copied = gst_alsa_do_mmap (this, element->numpads, &avail)) < 0)
-        break;
+    /* wait until the hw buffer has enough space */
+    while ((avail2 = gst_alsa_update_avail (this)) < avail) {
+      if (avail2 == -EPIPE) goto sink_restart;
+      if (avail < 0) return;
+      if (gst_alsa_pcm_wait (this) == FALSE)
+        return;
+    }
+    /* put this data into alsa */
+    if ((copied = gst_alsa_do_mmap (this, &avail)) < 0)
+      return;
 
-      /* flush the data */
-      bytes = copied * ( width / 8 ) * (element->numpads == 1 ? this->channels : 1);
-      for (i = 0; i < element->numpads; i++)
-        gst_bytestream_flush (this->pads[i].bs, bytes);
+    /* flush the data */
+    bytes = copied * ( width / 8 ) * (element->numpads == 1 ? this->channels : 1);
+    for (i = 0; i < element->numpads; i++)
+      gst_bytestream_flush (this->pads[i].bs, bytes);
 
-      /* BUG: we start the stream explicitly, autostart doesn't work correctly (alsa 0.9.0rc7) */
-      if (snd_pcm_state(this->handle) == SND_PCM_STATE_PREPARED && snd_pcm_avail_update (this->handle) == 0) {
-        GST_DEBUG (GST_CAT_PLUGIN_INFO, "Explicitly starting playback");
-        snd_pcm_start(this->handle);
-      }
+    /* BUG: we start the stream explicitly, autostart doesn't work correctly (alsa 0.9.0rc7) */
+    if (snd_pcm_state(this->handle) == SND_PCM_STATE_PREPARED && snd_pcm_avail_update (this->handle) == 0) {
+      GST_DEBUG (GST_CAT_PLUGIN_INFO, "Explicitly starting playback");
+      snd_pcm_start(this->handle);
     }
-
-    /* wait */
-    if (gst_alsa_pcm_wait (this) < 0)
-      break;
   }
+
 }
 
 static void
@@ -991,11 +990,9 @@
 
   g_return_if_fail (this != NULL);
 
-  static gboolean caps_set = FALSE;
-
   /* set the caps on all pads */
-  if (!caps_set) {
-    GST_DEBUG (GST_CAT_NEGOTIATION, "starting caps negotiation");
+  if (!this->caps_set) {
+    GST_DEBUG (GST_CAT_NEGOTIATION, "starting caps negotiationgst_alsa_pcm_wait");
     caps = gst_alsa_caps (this->format, this->rate, this->channels);
     for (i = 0; i < element->numpads; i++) {
       if (gst_pad_try_set_caps (this->pads[i].pad, caps) <= 0) {
@@ -1003,58 +1000,55 @@
         return;
       }
     }
-    caps_set = TRUE;
+    this->caps_set = TRUE;
   }
 
- src_restart:
+src_restart:
 
-  while (1) {
-    avail = gst_alsa_update_avail (this);
+  while ((avail = gst_alsa_update_avail (this)) < this->period_size) {
     if (avail == -EPIPE) goto src_restart;
-    if (avail == -1) break;
-    if (avail > 0) {
-      int width = snd_pcm_format_physical_width (this->format);
-      int bytes_per_frame = ( width / 8 ) * (element->numpads == 1 ? this->channels : 1);
-
-      if ((copied = gst_alsa_do_mmap (this, element->numpads, &avail)) < 0)
-        break;
-
-      /* we get the buffer pool once per go round */
-      if (! pool) pool = gst_alsa_src_get_buffer_pool (this->pads[0].pad);
+    if (avail < 0) return;
+    /* wait */
+    if (gst_alsa_pcm_wait (this) == FALSE)
+      return;
+  }
+  if (avail > 0) {
+    int width = snd_pcm_format_physical_width (this->format);
+    int bytes_per_frame = ( width / 8 ) * (element->numpads == 1 ? this->channels : 1);
+    if ((copied = gst_alsa_do_mmap (this, &avail)) < 0)
+      return;
+      
+    /* we get the buffer pool once per go round */
+    if (! pool) pool = gst_alsa_src_get_buffer_pool (this->pads[0].pad);
 
-      /* push the data to gstreamer if it's big enough to fill up a buffer. */
-      for (i = 0; i < element->numpads; i++) {
-        pad = &this->pads[i];
-        pad->offset += MIN (copied, this->period_size - pad->offset);
+    /* push the data to gstreamer if it's big enough to fill up a buffer. */
+    for (i = 0; i < element->numpads; i++) {
+      pad = &this->pads[i];
+      pad->offset += MIN (copied, this->period_size - pad->offset);
 
-        if (pad->offset >= this->period_size) {
-          g_assert (pad->offset <= this->period_size);
+      if (pad->offset >= this->period_size) {
+        g_assert (pad->offset <= this->period_size);
 
-          buf = gst_buffer_new_from_pool (pool, 0, 0);
+        buf = gst_buffer_new_from_pool (pool, 0, 0);
 
-          GST_BUFFER_DATA (buf) = pad->data;
-          GST_BUFFER_SIZE (buf) = this->period_size * bytes_per_frame;
-          GST_BUFFER_MAXSIZE (buf) = this->period_size * bytes_per_frame;
+        GST_BUFFER_DATA (buf) = pad->data;
+        GST_BUFFER_SIZE (buf) = this->period_size * bytes_per_frame;
+        GST_BUFFER_MAXSIZE (buf) = this->period_size * bytes_per_frame;
 
-          gst_pad_push (pad->pad, buf);
+        gst_pad_push (pad->pad, buf);
 
-          pad->data = NULL;
-          pad->offset = 0;
-        }
+        pad->data = NULL;
+        pad->offset = 0;
       }
+    }
 
-      pool = NULL;
+    pool = NULL;
 
-      /* BUG: we start the stream explicitly, autostart doesn't work correctly (alsa 0.9.0rc7) */
-      if (snd_pcm_state(this->handle) == SND_PCM_STATE_PREPARED && snd_pcm_avail_update (this->handle) == 0) {
-        GST_DEBUG (GST_CAT_PLUGIN_INFO, "Explicitly starting capture");
-        snd_pcm_start(this->handle);
-      }
+    /* BUG: we start the stream explicitly, autostart doesn't work correctly (alsa 0.9.0rc7) */
+    if (snd_pcm_state(this->handle) == SND_PCM_STATE_PREPARED && snd_pcm_avail_update (this->handle) == 0) {
+      GST_DEBUG (GST_CAT_PLUGIN_INFO, "Explicitly starting capture");
+      snd_pcm_start(this->handle);
     }
-
-    /* wait */
-    if (gst_alsa_pcm_wait (this) < 0)
-      break;
   }
 }
 
Index: gstalsa.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gstalsa.h	27 Feb 2003 23:13:22 -0000	1.8
+++ gstalsa.h	10 Mar 2003 21:30:00 -0000	1.9
@@ -87,6 +87,7 @@
   snd_pcm_format_t format;
   guint rate;
   gint channels;
+  gboolean caps_set;
 
   /* latency / performance parameters */
   snd_pcm_uframes_t period_size;

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Tue Mar 18 2003  14:08:09 PST

Log message:
ALSA cleanup step 3:
- make caps nego work, when caps are already set
- rewriting lots of caps nego while doing so
- start stream explicitly now (will probably stay that way because of sync)
- random bugfixes
alsasrc is probably broken again.
alsasink should now be stable enough to be used with gst-player or rhythmbox (seeking works)

Modified files:
    ext/alsa        : gstalsa.c gstalsa.h

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.33&r2=1.34
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.h.diff?r1=1.9&r2=1.10

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- gstalsa.c	10 Mar 2003 21:29:59 -0000	1.33
+++ gstalsa.c	18 Mar 2003 22:07:55 -0000	1.34
@@ -58,7 +58,7 @@
   "Output to a sound card via ALSA",
   VERSION,
   "Thomas Nyberg <thomas@...>, "
-  "Andy Wingo <apwingo@...>"
+  "Andy Wingo <apwingo@...>, "
   "Benjamin Otte <in7y118@...>",
   "(C) 2001-2003"
 };
@@ -71,7 +71,7 @@
   "Read from a sound card via ALSA",
   VERSION,
   "Thomas Nyberg <thomas@...>, "
-  "Andy Wingo <apwingo@...>"
+  "Andy Wingo <apwingo@...>, "
   "Benjamin Otte <in7y118@...>",
   "(C) 2001-2003"
 };
@@ -279,14 +279,11 @@
   gint i;
   /* init values */
   this->handle = NULL;
-  this->channels = 1;
-  this->caps_set = FALSE;
 
   GST_FLAG_SET (this, GST_ELEMENT_THREAD_SUGGESTED);
 
   if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC) {
     this->stream = SND_PCM_STREAM_CAPTURE;
-    this->format = SND_PCM_FORMAT_S16;        /* native endian */
     gst_element_set_loop_function (GST_ELEMENT (this), gst_alsa_src_loop);
     this->pads[0].pad = gst_pad_new_from_template (gst_alsa_src_pad_factory (), "src");
     gst_pad_set_bufferpool_function(this->pads[0].pad, gst_alsa_src_get_buffer_pool);
@@ -294,10 +291,8 @@
     /* set the rate to a sensible value. we can't have gobject construct this
        manually since it only really makes sense on src elements. the rate can
        be changed later through the gobject set property function. */
-    this->rate = 44100;
   } else if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SINK) {
     this->stream = SND_PCM_STREAM_PLAYBACK;
-    this->format = SND_PCM_FORMAT_UNKNOWN; /* we don't know until caps are set */
     gst_element_set_loop_function (GST_ELEMENT (this), gst_alsa_sink_loop);
     this->pads[0].pad = gst_pad_new_from_template (gst_alsa_sink_pad_factory (), "sink");
     this->pads[0].bs = gst_bytestream_new (this->pads[0].pad);
@@ -328,17 +323,17 @@
   case ARG_FORMAT:
     /* setting this property only makes sense on sources */
     if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC)
-      this->format = g_value_get_enum (value);
+      this->format->format = g_value_get_enum (value);
     break;
   case ARG_CHANNELS:
     /* setting this property only makes sense on sources */
     if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC)
-      this->channels = g_value_get_int (value);
+      this->format->channels = g_value_get_int (value);
     break;
   case ARG_RATE:
     /* setting this property only makes sense on sources */
     if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC)
-      this->rate = g_value_get_int (value);
+      this->format->rate = g_value_get_int (value);
     break;
   case ARG_PERIODCOUNT:
     g_return_if_fail (!GST_FLAG_IS_SET (this, GST_ALSA_RUNNING));
@@ -383,13 +378,13 @@
     g_value_set_string (value, this->device);
     break;
   case ARG_FORMAT:
-    g_value_set_enum (value, this->format);
+    g_value_set_enum (value, this->format ? this->format->format : SND_PCM_FORMAT_UNKNOWN);
     break;
   case ARG_CHANNELS:
-    g_value_set_int (value, this->channels);
+    g_value_set_int (value, this->format ? this->format->channels : 2);
     break;
   case ARG_RATE:
-    g_value_set_int (value, this->rate);
+    g_value_set_int (value, this->format ? this->format->rate : 44100);
     break;
   case ARG_PERIODCOUNT:
     g_value_set_int (value, this->period_count);
@@ -474,9 +469,6 @@
   g_return_val_if_fail ((this = GST_ALSA (element)), NULL);
   g_return_val_if_fail (!GST_FLAG_IS_SET (element, GST_ALSA_RUNNING), NULL);
 
-  /* you can't request a pad if the non-request pad already has more than 1 channel */
-  g_return_val_if_fail (this->channels <= element->numpads, NULL);
-
   if (name) {
     /* locate the channel number in the requested pad name. to do so look at
        where the % (which begins the %d) is in the template name. */
@@ -516,15 +508,19 @@
   return this->pads[channel].pad;
 }
 
-/* gets the matching alsa format or SND_PCM_FORMAT_UNKNOWN if none matches */
-static snd_pcm_format_t
+/* gets the matching alsa format or NULL if none matches */
+static GstAlsaFormat *
 gst_alsa_get_format (GstCaps *caps)
 {
   const gchar *format_name;
+  GstAlsaFormat *ret;
+
+  if (!(ret = g_new (GstAlsaFormat, 1)))
+    return NULL;
 
   /* we have to differentiate between int and float formats */
   if (!gst_caps_get_string (caps, "format", &format_name))
-    return SND_PCM_FORMAT_UNKNOWN;
+    goto error;
 
   if (strncmp (format_name, "int", 3) == 0) {
     gboolean sign;
@@ -537,36 +533,40 @@
                        "law", &law,
                        "signed", &sign,
                        NULL))
-        return SND_PCM_FORMAT_UNKNOWN;
+        goto error;
 	
     /* extract endianness if needed */
     if (width > 8) {
       if (!gst_caps_get (caps,
                          "endianness", &endianness,
                          NULL))
-        return SND_PCM_FORMAT_UNKNOWN;      
-    } else {
+        goto error;
+      } else {
       endianness = G_BYTE_ORDER;
     }
     
     /* find corresponding alsa format */
     switch (law) {
-      case 0: return snd_pcm_build_linear_format (depth, width, sign ? 0 : 1, endianness == G_LITTLE_ENDIAN ? 0 : 1);
+      case 0: 
+	ret->format = snd_pcm_build_linear_format (depth, width, sign ? 0 : 1, endianness == G_LITTLE_ENDIAN ? 0 : 1);
+        break;
       case 1: 
         if (width == 8 && depth == 8 && sign == FALSE) {
-          return SND_PCM_FORMAT_MU_LAW;
+          ret->format = SND_PCM_FORMAT_MU_LAW;
+	  break;
         } else {
-          return SND_PCM_FORMAT_UNKNOWN;
+          goto error;
         }
       case 2: 
         if (width == 8 && depth == 8 && sign == FALSE) {
-          return SND_PCM_FORMAT_A_LAW;
+          ret->format = SND_PCM_FORMAT_A_LAW;
+	  break;
         } else {
-          return SND_PCM_FORMAT_UNKNOWN;
+          goto error;
         }
-      default: return SND_PCM_FORMAT_UNKNOWN;
+      default: 
+        goto error;
     }
-
   } else if (strncmp (format_name, "float", 5) == 0) {
     gchar *layout;
     gfloat intercept, slope;
@@ -576,27 +576,54 @@
                              "intercept", &intercept,
                              "slope", &slope,
                              NULL))
-      return SND_PCM_FORMAT_UNKNOWN;
+      goto error;
     if (intercept != 0.0f || slope != 1.0f) {
-      return SND_PCM_FORMAT_UNKNOWN;      
+      goto error;
     }
-	/* match layout to format wrt to endianness */
+    /* match layout to format wrt to endianness */
     if (strncmp (layout, "gfloat", 6) == 0) {
-      if (G_BYTE_ORDER == G_LITTLE_ENDIAN) return SND_PCM_FORMAT_FLOAT_LE;
-      if (G_BYTE_ORDER == G_BIG_ENDIAN) return SND_PCM_FORMAT_FLOAT_BE;
-      return SND_PCM_FORMAT_FLOAT;
+      if (G_BYTE_ORDER == G_LITTLE_ENDIAN) {
+	ret->format = SND_PCM_FORMAT_FLOAT_LE;
+      } else if (G_BYTE_ORDER == G_BIG_ENDIAN) {
+        ret->format = SND_PCM_FORMAT_FLOAT_BE;
+      } else {
+        ret->format = SND_PCM_FORMAT_FLOAT;
+      }
     } else if (strncmp (layout, "gdouble", 7) == 0) {
-      if (G_BYTE_ORDER == G_LITTLE_ENDIAN) return SND_PCM_FORMAT_FLOAT64_LE;
-      if (G_BYTE_ORDER == G_BIG_ENDIAN) return SND_PCM_FORMAT_FLOAT64_BE;
-      return SND_PCM_FORMAT_FLOAT64;
+      if (G_BYTE_ORDER == G_LITTLE_ENDIAN) {
+	ret->format = SND_PCM_FORMAT_FLOAT64_LE;
+      } else if (G_BYTE_ORDER == G_BIG_ENDIAN) {
+        ret->format = SND_PCM_FORMAT_FLOAT64_BE;
+      } else {
+        ret->format = SND_PCM_FORMAT_FLOAT64;
+      }
     } else {
-      return SND_PCM_FORMAT_UNKNOWN;
+      goto error;
     }
   }
 
-  return SND_PCM_FORMAT_UNKNOWN;
+  /* get rate and channels */
+  if (!gst_caps_get (caps, "rate", &ret->rate,
+                           "channels", &ret->channels,
+                           NULL))
+    goto error;
+  
+  return ret;
+  
+error:
+  g_free (ret);
+  return NULL;
 }
 
+static inline gboolean
+gst_alsa_formats_match (GstAlsaFormat *one, GstAlsaFormat *two)
+{
+  if (one == two) return TRUE;
+  if (one == NULL || two == NULL) return FALSE;
+  return (one->format == two->format) && 
+         (one->rate == two->rate) && 
+         (one->channels == two->channels);
+}
 /* get props for a spec */
 static GstProps *
 gst_alsa_get_props (snd_pcm_format_t format)
@@ -695,7 +722,7 @@
       if (props != NULL) {
         add_channels (props, rate, channels);
         ret_caps = gst_caps_append (ret_caps, gst_caps_new (g_strdup (snd_pcm_format_name (i)),
-		      													"audio/raw", props));
+                                    "audio/raw", props));
       }
     }
   }
@@ -708,8 +735,7 @@
 gst_alsa_link (GstPad *pad, GstCaps *caps)
 {
   GstAlsa *this;
-  snd_pcm_format_t format;
-  gint rate, channels;
+  GstAlsaFormat *format;
 
   g_return_val_if_fail (caps != NULL, GST_PAD_LINK_REFUSED);
   g_return_val_if_fail (pad != NULL, GST_PAD_LINK_REFUSED);
@@ -722,33 +748,42 @@
         return GST_PAD_LINK_REFUSED;
 
     format = gst_alsa_get_format (caps);
-    GST_DEBUG (GST_CAT_CAPS, "found format %s\n", snd_pcm_format_name (format));
-    /* FIXME: allow changing the format here, even by retrying caps on other pads */
-    if (format == SND_PCM_FORMAT_UNKNOWN || (this->format != SND_PCM_FORMAT_UNKNOWN && this->format != format))
-      return GST_PAD_LINK_REFUSED;
-    if (!gst_caps_get (caps, "rate", &rate,
-                             "channels", &channels,
-                             NULL))
-      return GST_PAD_LINK_REFUSED;
-    if (this->format != SND_PCM_FORMAT_UNKNOWN && this->rate != rate)
-      return GST_PAD_LINK_REFUSED;
-    if (this->format != SND_PCM_FORMAT_UNKNOWN && ((this->channels > 1 || channels > 1)))
-      return GST_PAD_LINK_REFUSED;
-
-    if (this->format == SND_PCM_FORMAT_UNKNOWN) {
-      this->channels = channels;
-    } else {
-      this->channels++;
+    if (format == NULL)
+      return GST_PAD_LINK_DELAYED;
+    
+    GST_DEBUG (GST_CAT_CAPS, "found format %s\n", snd_pcm_format_name (format->format));
+    
+    if (gst_alsa_formats_match (this->format, format)) {
+      g_free (format);
+      return GST_PAD_LINK_OK;
     }
-    this->format = format;
-    this->rate = rate;
 
-    /* sync the params */
-    if (GST_FLAG_IS_SET (this, GST_ALSA_RUNNING)) gst_alsa_stop_audio (this);
-    if (GST_FLAG_IS_SET (this, GST_ALSA_OPEN))    gst_alsa_close_audio (this);
+    if (!GST_FLAG_IS_SET (this, GST_ALSA_CAPS_NEGO)) {
+      gint i;
 
-    if (!gst_alsa_open_audio (this))  return GST_PAD_LINK_REFUSED;
-    if (!gst_alsa_start_audio (this)) return GST_PAD_LINK_REFUSED;
+      GST_FLAG_SET (this, GST_ALSA_CAPS_NEGO);
+
+      for (i = 0; i < ((GstElement *) this)->numpads; i++) {
+        g_assert (this->pads[i].pad != NULL);
+        if (this->pads[i].pad == pad)
+	  continue;
+        if (gst_pad_try_set_caps (this->pads[i].pad, gst_caps_ref (caps)) == GST_PAD_LINK_REFUSED) {
+          g_free (format);
+          return GST_PAD_LINK_REFUSED;
+        }
+      }
+    
+      GST_FLAG_UNSET (this, GST_ALSA_CAPS_NEGO);
+      g_free (this->format);
+      this->format = format;
+
+      /* sync the params */
+      if (GST_FLAG_IS_SET (this, GST_ALSA_RUNNING)) gst_alsa_stop_audio (this);
+      if (GST_FLAG_IS_SET (this, GST_ALSA_OPEN))    gst_alsa_close_audio (this);
+
+      if (!gst_alsa_open_audio (this))  return GST_PAD_LINK_REFUSED;
+      if (!gst_alsa_start_audio (this)) return GST_PAD_LINK_REFUSED;
+    }
 
     return GST_PAD_LINK_OK;
   }
@@ -763,8 +798,8 @@
 
   GstAlsa *this = GST_ALSA (gst_pad_get_parent (pad));
 
-  width = snd_pcm_format_physical_width (this->format);
-  bytes_per_frame = ( width / 8 ) * (GST_ELEMENT (this)->numpads == 1 ? this->channels : 1);
+  width = snd_pcm_format_physical_width (this->format->format);
+  bytes_per_frame = ( width / 8 ) * (GST_ELEMENT (this)->numpads == 1 ? this->format->channels : 1);
 
   /* FIXME : is this right ? constant size buffers are probably a good thing,
      but what if the size changes (e.g. during xrun autorecovery) ? */
@@ -782,23 +817,30 @@
 
   switch (GST_STATE_TRANSITION (element)) {
   case GST_STATE_NULL_TO_READY:
-    if (GST_FLAG_IS_SET (element, GST_ALSA_OPEN) == FALSE)
+    if (!GST_FLAG_IS_SET (element, GST_ALSA_OPEN))
       if (!gst_alsa_open_audio (this))
         return GST_STATE_FAILURE;
     break;
   case GST_STATE_READY_TO_PAUSED:
-    break;
-  case GST_STATE_PAUSED_TO_PLAYING:
-    if (GST_FLAG_IS_SET (element, GST_ALSA_RUNNING) == FALSE)
+    if (!GST_FLAG_IS_SET (element, GST_ALSA_RUNNING))
       if (!gst_alsa_start_audio (this))
         return GST_STATE_FAILURE;
-
+    break;
+  case GST_STATE_PAUSED_TO_PLAYING:
+    if (snd_pcm_state (this->handle) == SND_PCM_STATE_PAUSED)
+      snd_pcm_pause (this->handle, 0);
+    break;
   case GST_STATE_PLAYING_TO_PAUSED:
+    if (GST_ALSA_CAPS_IS_SET(this, GST_ALSA_CAPS_PAUSE)) {
+    if (snd_pcm_state (this->handle) == SND_PCM_STATE_RUNNING)
+      snd_pcm_pause (this->handle, 1);
+      break;
+    }
+    /* if device doesn't know how to pause, we just stop */
+  case GST_STATE_PAUSED_TO_READY:
     if (GST_FLAG_IS_SET (element, GST_ALSA_RUNNING))
       gst_alsa_drain_audio (this);
     break;
-  case GST_STATE_PAUSED_TO_READY:
-    break;
   case GST_STATE_READY_TO_NULL:
     if (GST_FLAG_IS_SET (element, GST_ALSA_OPEN))
       gst_alsa_close_audio (this);
@@ -821,21 +863,21 @@
 {
   snd_pcm_uframes_t offset;
   snd_pcm_channel_area_t *dst, *src, *areas;
-  int i, err, width = snd_pcm_format_physical_width (this->format);
+  int i, err, width = snd_pcm_format_physical_width (this->format->format);
 
   /* areas points to the memory areas that belong to gstreamer. */
-  areas = src = dst = calloc(this->channels, sizeof(snd_pcm_channel_area_t));
+  areas = src = dst = calloc(this->format->channels, sizeof(snd_pcm_channel_area_t));
 
   if (((GstElement *) this)->numpads == 1) {
     /* interleaved */
-    for (i = 0; i < this->channels; i++) {
+    for (i = 0; i < this->format->channels; i++) {
       areas[i].addr = this->pads[0].data;
       areas[i].first = i * width;
-      areas[i].step = this->channels * width;
+      areas[i].step = this->format->channels * width;
     }
   } else {
     /* noninterleaved */
-    for (i = 0; i < this->channels; i++) {
+    for (i = 0; i < this->format->channels; i++) {
       areas[i].addr = this->pads[i].data;
       areas[i].first = 0;
       areas[i].step = width;
@@ -849,7 +891,7 @@
     return -1;
   }
 
-  if ((err = snd_pcm_areas_copy (dst, offset, src, 0, this->channels, *avail, this->format)) < 0) {
+  if ((err = snd_pcm_areas_copy (dst, offset, src, 0, this->format->channels, *avail, this->format->format)) < 0) {
     snd_pcm_mmap_commit (this->handle, offset, 0);
     g_warning ("gstalsa: data copy failed: %s", snd_strerror (err));
     return -1;
@@ -875,7 +917,6 @@
   }
   return avail;
 }
-
 /* returns TRUE, if the loop should go on */
 inline static gboolean
 gst_alsa_pcm_wait (GstAlsa *this)
@@ -898,6 +939,34 @@
   return TRUE;
 }
 
+/**
+ * error out or make sure we're in SND_PCM_STATE_RUNNING afterwards 
+ * return FALSE if we're not
+ */
+inline static gboolean
+gst_alsa_start (GstAlsa *this)
+{
+  GST_DEBUG (GST_CAT_PLUGIN_INFO, "Starting playback");
+
+  switch (snd_pcm_state(this->handle)) {
+    case SND_PCM_STATE_XRUN:
+      gst_alsa_xrun_recovery (this);
+      return gst_alsa_start (this);
+    case SND_PCM_STATE_PREPARED:
+      ERROR_CHECK (snd_pcm_start(this->handle), "error starting playback: %s");
+      break;
+    case SND_PCM_STATE_PAUSED:
+      ERROR_CHECK (snd_pcm_pause (this->handle, 0), "error unpausing: %s");
+      break;
+    case SND_PCM_STATE_RUNNING:
+      break;
+    default:
+      /* it's a bug when we get here */
+      g_assert_not_reached ();
+      break;
+  }
+  return TRUE;
+}
 static void
 gst_alsa_sink_loop (GstElement *element)
 {
@@ -909,7 +978,7 @@
   g_return_if_fail (this != NULL);
 
   /* caps nego: fetch 1 byte from every pad */
-  if (this->format == SND_PCM_FORMAT_UNKNOWN) {
+  if (this->format == NULL) {
     GST_DEBUG (GST_CAT_NEGOTIATION, "starting caps negotiation");
     for (i = 0; i < element->numpads; i++) {
       g_assert (this->pads[i].pad != NULL);
@@ -919,7 +988,7 @@
       if (num_bytes == 0)
         return;
     }
-    if (this->format == SND_PCM_FORMAT_UNKNOWN) {
+    if (this->format == NULL) {
       gst_element_error (GST_ELEMENT (this), "alsasink: No caps available");
     }
   }
@@ -930,7 +999,7 @@
   if (avail == -EPIPE) goto sink_restart;
   if (avail < 0) return;
   if (avail > 0) {
-    int width = snd_pcm_format_physical_width (this->format);
+    int width = snd_pcm_format_physical_width (this->format->format);
     
     /* Not enough space. We grab data nonetheless and sleep afterwards */
     if (avail < this->period_size) {
@@ -938,7 +1007,7 @@
     }
     
     /* check how many bytes we still have in all our bytestreams */
-    bytes = avail * ( width / 8 ) * (element->numpads == 1 ? this->channels : 1);
+    bytes = avail * ( width / 8 ) * (element->numpads == 1 ? this->format->channels : 1);
     for (i = 0; i < element->numpads; i++) {
       g_assert (this->pads[i].pad != NULL);
       do {
@@ -948,31 +1017,35 @@
         return;
       bytes = MIN (bytes, num_bytes);
     }
-    avail = bytes / (width / 8 ) / (element->numpads == 1 ? this->channels : 1);
-
-    /* FIXME: lotsa stuff can have happened while fetching data. Do we need to check something? */
+    avail = bytes / (width / 8 ) / (element->numpads == 1 ? this->format->channels : 1);
 
     /* wait until the hw buffer has enough space */
-    while ((avail2 = gst_alsa_update_avail (this)) < avail) {
-      if (avail2 == -EPIPE) goto sink_restart;
-      if (avail < 0) return;
+    while (gst_element_get_state (element) == GST_STATE_PLAYING && (avail2 = gst_alsa_update_avail (this)) < avail) {
+      if (avail2 <= -EPIPE) goto sink_restart;
+      if (avail2 < 0) return;
+      if (avail2 < avail && snd_pcm_state(this->handle) != SND_PCM_STATE_RUNNING)
+	if (!gst_alsa_start (this)) return;
       if (gst_alsa_pcm_wait (this) == FALSE)
         return;
     }
+
+    if (gst_element_get_state (element) != GST_STATE_PLAYING)
+      return;
+    /* FIXME: lotsa stuff can have happened while fetching data. Do we need to check something? */
+
+  
     /* put this data into alsa */
     if ((copied = gst_alsa_do_mmap (this, &avail)) < 0)
       return;
 
     /* flush the data */
-    bytes = copied * ( width / 8 ) * (element->numpads == 1 ? this->channels : 1);
+    bytes = copied * ( width / 8 ) * (element->numpads == 1 ? this->format->channels : 1);
     for (i = 0; i < element->numpads; i++)
       gst_bytestream_flush (this->pads[i].bs, bytes);
+  }
 
-    /* BUG: we start the stream explicitly, autostart doesn't work correctly (alsa 0.9.0rc7) */
-    if (snd_pcm_state(this->handle) == SND_PCM_STATE_PREPARED && snd_pcm_avail_update (this->handle) == 0) {
-      GST_DEBUG (GST_CAT_PLUGIN_INFO, "Explicitly starting playback");
-      snd_pcm_start(this->handle);
-    }
+  if (snd_pcm_state(this->handle) != SND_PCM_STATE_RUNNING && snd_pcm_avail_update (this->handle) == 0) {
+    gst_alsa_start (this);
   }
 
 }
@@ -991,16 +1064,22 @@
   g_return_if_fail (this != NULL);
 
   /* set the caps on all pads */
-  if (!this->caps_set) {
+  if (!this->format) {
+    if (!(this->format = g_new (GstAlsaFormat, 1))) {
+      gst_element_error (element, "No more memory");
+    }
+    /* FIXME: make this settable */
+    this->format->format = SND_PCM_FORMAT_S16;
+    this->format->rate = 44100;
+    this->format->channels = (element->numpads == 1) ? 2 : element->numpads;
     GST_DEBUG (GST_CAT_NEGOTIATION, "starting caps negotiationgst_alsa_pcm_wait");
-    caps = gst_alsa_caps (this->format, this->rate, this->channels);
+    caps = gst_alsa_caps (this->format->format, this->format->rate, this->format->channels);
     for (i = 0; i < element->numpads; i++) {
       if (gst_pad_try_set_caps (this->pads[i].pad, caps) <= 0) {
         GST_DEBUG (GST_CAT_NEGOTIATION, "setting caps (%p) in alsasrc (%p) on pad %d failed", caps, this, i);
         return;
       }
     }
-    this->caps_set = TRUE;
   }
 
 src_restart:
@@ -1008,13 +1087,14 @@
   while ((avail = gst_alsa_update_avail (this)) < this->period_size) {
     if (avail == -EPIPE) goto src_restart;
     if (avail < 0) return;
+    if (snd_pcm_state(this->handle) != SND_PCM_STATE_RUNNING) break;
     /* wait */
     if (gst_alsa_pcm_wait (this) == FALSE)
       return;
   }
   if (avail > 0) {
-    int width = snd_pcm_format_physical_width (this->format);
-    int bytes_per_frame = ( width / 8 ) * (element->numpads == 1 ? this->channels : 1);
+    int width = snd_pcm_format_physical_width (this->format->format);
+    int bytes_per_frame = ( width / 8 ) * (element->numpads == 1 ? this->format->channels : 1);
     if ((copied = gst_alsa_do_mmap (this, &avail)) < 0)
       return;
       
@@ -1043,12 +1123,12 @@
     }
 
     pool = NULL;
+  }
 
-    /* BUG: we start the stream explicitly, autostart doesn't work correctly (alsa 0.9.0rc7) */
-    if (snd_pcm_state(this->handle) == SND_PCM_STATE_PREPARED && snd_pcm_avail_update (this->handle) == 0) {
-      GST_DEBUG (GST_CAT_PLUGIN_INFO, "Explicitly starting capture");
-      snd_pcm_start(this->handle);
-    }
+  /* BUG: we start the stream explicitly, autostart doesn't work correctly (alsa 0.9.0rc7) */
+  if (snd_pcm_state(this->handle) == SND_PCM_STATE_PREPARED && snd_pcm_avail_update (this->handle) == 0) {
+    GST_DEBUG (GST_CAT_PLUGIN_INFO, "Explicitly starting capture");
+    snd_pcm_start(this->handle);
   }
 }
 
@@ -1101,11 +1181,17 @@
   gst_bytestream_get_status (this->pads[pad_nr].bs, &avail, &event);
 
   if (event) {
-    if (GST_EVENT_TYPE (event) == GST_EVENT_EOS) {
-      gst_element_set_eos (GST_ELEMENT (this));
-      cont = FALSE;
-    } else {
-      g_warning ("GstAlsaSink: got an unknown event (Type: %d)", GST_EVENT_TYPE (event));
+    switch (GST_EVENT_TYPE (event)) {
+      case GST_EVENT_EOS:
+        gst_element_set_eos (GST_ELEMENT (this));
+        cont = FALSE;
+        break;
+      case GST_EVENT_INTERRUPT:
+	cont = FALSE;
+        break;
+      default:
+        g_warning ("GstAlsaSink: got an unknown event (Type: %d)", GST_EVENT_TYPE (event));
+        break;
     }
     gst_event_unref (event);
   } else {
@@ -1135,7 +1221,11 @@
   GST_FLAG_SET (this, GST_ALSA_OPEN);
   return TRUE;
 }
-/* you must set all hw parameters at once - thx ALSA for not documenting this */
+/**
+ * You must set all hw parameters at once and can't use already set params and
+ * change them.
+ * Thx ALSA for not documenting this
+ */
 static gboolean
 gst_alsa_set_hw_params (GstAlsa *this)
 {
@@ -1145,13 +1235,13 @@
   unsigned int count_min, count_max;
   
   /* whether to use default values when setting params */
-  gboolean def = (this->format == SND_PCM_FORMAT_UNKNOWN); 
+  gboolean def = (this->format == NULL); 
 
   g_return_val_if_fail (this != NULL, FALSE);
   g_return_val_if_fail (this->handle != NULL, FALSE);
 
   GST_INFO (GST_CAT_PLUGIN_INFO, "Preparing channel: %s %dHz, %d channels\n",
-            snd_pcm_format_name (this->format), this->rate, this->channels);
+            snd_pcm_format_name (this->format->format), this->format->rate, this->format->channels);
 
   snd_pcm_hw_params_alloca (&hw_params);
   ERROR_CHECK (snd_pcm_hw_params_any (this->handle, hw_params),
@@ -1169,12 +1259,12 @@
   ERROR_CHECK (snd_pcm_hw_params_set_access_mask (this->handle, hw_params, mask),
                "The Gstreamer ALSA plugin does not support your hardware. Error: %s");
   
-  ERROR_CHECK (snd_pcm_hw_params_set_format (this->handle, hw_params, def ? SND_PCM_FORMAT_S16 : this->format),
-               "Sample format (%s) not available: %s", snd_pcm_format_name (def ? SND_PCM_FORMAT_S16 : this->format));
-  ERROR_CHECK (snd_pcm_hw_params_set_channels (this->handle, hw_params, this->channels),
-               "Channels count (%d) not available: %s", this->channels);
-  ERROR_CHECK (snd_pcm_hw_params_set_rate (this->handle, hw_params, def ? 44100 : this->rate, 0),
-                 "error setting rate (%d): %s", def ? 44100 : this->rate);
+  ERROR_CHECK (snd_pcm_hw_params_set_format (this->handle, hw_params, def ? SND_PCM_FORMAT_S16 : this->format->format),
+               "Sample format (%s) not available: %s", snd_pcm_format_name (def ? SND_PCM_FORMAT_S16 : this->format->format));
+  ERROR_CHECK (snd_pcm_hw_params_set_channels (this->handle, hw_params, def ? ((GstElement *) this)->numpads : this->format->channels),
+               "Channels count (%d) not available: %s", def ? ((GstElement *) this)->numpads : this->format->channels);
+  ERROR_CHECK (snd_pcm_hw_params_set_rate (this->handle, hw_params, def ? 44100 : this->format->rate, 0),
+                 "error setting rate (%d): %s", def ? 44100 : this->format->rate);
 
   if (snd_pcm_hw_params_get_period_size_min (hw_params, &size_min, 0) < 0) size_min = this->period_size;
   if (snd_pcm_hw_params_get_period_size_max (hw_params, &size_max, 0) < 0) size_max = this->period_size;
@@ -1194,6 +1284,11 @@
   ERROR_CHECK (snd_pcm_hw_params (this->handle, hw_params),
                "Could not set hardware parameters: %s");
 
+  /* now get the pcm caps */
+  GST_ALSA_CAPS_SET (this, GST_ALSA_CAPS_PAUSE, snd_pcm_hw_params_can_pause (hw_params));
+  GST_ALSA_CAPS_SET (this, GST_ALSA_CAPS_RESUME, snd_pcm_hw_params_can_resume (hw_params));
+  GST_ALSA_CAPS_SET (this, GST_ALSA_CAPS_SYNC_START, snd_pcm_hw_params_can_sync_start (hw_params));
+  
   return TRUE;
 }
 static gboolean
@@ -1211,7 +1306,8 @@
                "could not set silence threshold: %s");
   ERROR_CHECK (snd_pcm_sw_params_set_avail_min (this->handle, sw_params, this->period_size),
                "could not set avail min: %s");
-  ERROR_CHECK (snd_pcm_sw_params_set_start_threshold (this->handle, sw_params, 1),
+  /* we start explicitly */
+  ERROR_CHECK (snd_pcm_sw_params_set_start_threshold (this->handle, sw_params, this->period_size * this->period_count + 1),
                "could not set start mode: %s");
   ERROR_CHECK (snd_pcm_sw_params_set_stop_threshold (this->handle, sw_params, this->period_size * this->period_count),
                "could not set stop mode: %s");
Index: gstalsa.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gstalsa.h	10 Mar 2003 21:30:00 -0000	1.9
+++ gstalsa.h	18 Mar 2003 22:07:56 -0000	1.10
@@ -63,8 +63,23 @@
 enum {
   GST_ALSA_OPEN = GST_ELEMENT_FLAG_LAST,
   GST_ALSA_RUNNING,
+  GST_ALSA_CAPS_NEGO,
   GST_ALSA_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 3,
 };
+typedef enum {
+  GST_ALSA_CAPS_PAUSE = 0,
+  GST_ALSA_CAPS_RESUME,
+  GST_ALSA_CAPS_SYNC_START
+  /* add more */
+} GstAlsaPcmCaps;
+#define GST_ALSA_CAPS_IS_SET(obj, flag)		(GST_ALSA (obj)->pcm_caps & (1<<(flag)))
+#define GST_ALSA_CAPS_SET(obj, flag, set)	G_STMT_START{  \
+  if (set) { \
+    (GST_ALSA (obj)->pcm_caps |= (1<<(flag))); \
+  } else { \
+    (GST_ALSA (obj)->pcm_caps &= ~(1<<(flag))); \
+  } \
+}G_STMT_END
 
 typedef struct {
   GstPad *pad;
@@ -72,7 +87,11 @@
   guint8 *data;
   guint8 offset;
 } GstAlsaPad;
-
+typedef struct {
+  snd_pcm_format_t format;
+  guint rate;
+  gint channels;  
+} GstAlsaFormat;
 struct _GstAlsa {
   GstElement parent;
 
@@ -82,12 +101,10 @@
   gchar *device;
   snd_pcm_stream_t stream;
   snd_pcm_t *handle;
+  guint pcm_caps;
   snd_output_t *out;
 
-  snd_pcm_format_t format;
-  guint rate;
-  gint channels;
-  gboolean caps_set;
+  GstAlsaFormat *format; /* NULL if undefined */
 
   /* latency / performance parameters */
   snd_pcm_uframes_t period_size;

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Wed Mar 19 2003  13:34:07 PST

Log message:
fix all kinds of shutdown stuff and do proper freeing of memory

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.34&r2=1.35

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- gstalsa.c	18 Mar 2003 22:07:55 -0000	1.34
+++ gstalsa.c	19 Mar 2003 21:33:52 -0000	1.35
@@ -79,6 +79,7 @@
 /* GObject functions */
 static void gst_alsa_class_init (GstAlsaClass *klass);
 static void gst_alsa_init (GstAlsa *this);
+static void gst_alsa_dispose (GObject *object);
 static void gst_alsa_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
 static void gst_alsa_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
 
@@ -240,6 +241,7 @@
   if (parent_class == NULL)
     parent_class = g_type_class_ref (GST_TYPE_ELEMENT);
 
+  object_class->dispose = gst_alsa_dispose;
   object_class->get_property = gst_alsa_get_property;
   object_class->set_property = gst_alsa_set_property;
 
@@ -286,6 +288,7 @@
     this->stream = SND_PCM_STREAM_CAPTURE;
     gst_element_set_loop_function (GST_ELEMENT (this), gst_alsa_src_loop);
     this->pads[0].pad = gst_pad_new_from_template (gst_alsa_src_pad_factory (), "src");
+    this->pads[0].bs = NULL;
     gst_pad_set_bufferpool_function(this->pads[0].pad, gst_alsa_src_get_buffer_pool);
 
     /* set the rate to a sensible value. we can't have gobject construct this
@@ -307,6 +310,19 @@
 }
 
 static void
+gst_alsa_dispose (GObject *object)
+{
+  gint i;
+  GstAlsa *this = GST_ALSA (object);
+
+  for (i = 0; i < ((GstElement *) this)->numpads; i++) {
+    if (this->pads[i].bs)
+      gst_bytestream_destroy (this->pads[i].bs);
+  }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+}
+static void
 gst_alsa_set_property (GObject *object, guint prop_id, const GValue *value,
                        GParamSpec *pspec)
 {
@@ -811,6 +827,7 @@
 gst_alsa_change_state (GstElement *element)
 {
   GstAlsa *this;
+  gint i;
 
   g_return_val_if_fail (element != NULL, FALSE);
   this = GST_ALSA (element);
@@ -832,14 +849,21 @@
     break;
   case GST_STATE_PLAYING_TO_PAUSED:
     if (GST_ALSA_CAPS_IS_SET(this, GST_ALSA_CAPS_PAUSE)) {
-    if (snd_pcm_state (this->handle) == SND_PCM_STATE_RUNNING)
-      snd_pcm_pause (this->handle, 1);
+      if (snd_pcm_state (this->handle) == SND_PCM_STATE_RUNNING)
+        snd_pcm_pause (this->handle, 1);
       break;
     }
     /* if device doesn't know how to pause, we just stop */
   case GST_STATE_PAUSED_TO_READY:
     if (GST_FLAG_IS_SET (element, GST_ALSA_RUNNING))
       gst_alsa_drain_audio (this);
+    /* clear format and pads */
+    g_free (this->format);
+    this->format = NULL;
+    for (i = 0; i < element->numpads; i++) {
+      if (this->pads[i].bs)
+	gst_bytestream_reset (this->pads[i].bs);
+    }
     break;
   case GST_STATE_READY_TO_NULL:
     if (GST_FLAG_IS_SET (element, GST_ALSA_OPEN))

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Wed Mar 19 2003  14:54:52 PST

Log message:
fixing bugs:
- reset original caps on failed caps nego
- do only initialize format/rate/caps if known
- added line for fast debugging output (need this for iain now ;)

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.35&r2=1.36

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- gstalsa.c	19 Mar 2003 21:33:52 -0000	1.35
+++ gstalsa.c	19 Mar 2003 22:54:36 -0000	1.36
@@ -696,7 +696,8 @@
   return NULL;
 }
 
-static inline void add_channels (GstProps *props, gint rate, gint channels) {
+static inline void
+add_channels (GstProps *props, gint rate, gint channels) {
   if (rate < 0) {
     gst_props_add_entry (props, gst_props_entry_new ("rate", GST_PROPS_INT_RANGE (8000, 192000)));
   } else {
@@ -784,6 +785,19 @@
         if (this->pads[i].pad == pad)
 	  continue;
         if (gst_pad_try_set_caps (this->pads[i].pad, gst_caps_ref (caps)) == GST_PAD_LINK_REFUSED) {
+	  if (this->format) {
+	    GstCaps *old = gst_alsa_caps (this->format->format, this->format->rate, this->format->channels);
+	    for (--i; i >= 0; i--) {
+              if (gst_pad_try_set_caps (this->pads[i].pad, gst_caps_ref (old)) == GST_PAD_LINK_REFUSED) {
+	        gst_element_error (GST_ELEMENT (this), "error resetting caps to sane value");
+	        gst_caps_unref (old);
+                break;
+	      }
+	    }
+            gst_caps_unref (old);
+	  } else {
+	    /* FIXME: unset caps somehow */
+	  }
           g_free (format);
           return GST_PAD_LINK_REFUSED;
         }
@@ -1236,7 +1250,7 @@
   GST_INFO (GST_CAT_PLUGIN_INFO, "Opening alsa device \"%s\" for %s...\n", this->device,
             this->stream == SND_PCM_STREAM_PLAYBACK ? "playback" : "capture");
 
-  ERROR_CHECK (snd_output_stdio_attach (&this->out, stdout, 0),
+  ERROR_CHECK (snd_output_stdio_attach (&this->out, stderr, 0),
                "error opening log output: %s");
   /* blocking i/o */
   ERROR_CHECK (snd_pcm_open (&this->handle, this->device, this->stream, 0),
@@ -1258,9 +1272,6 @@
   snd_pcm_uframes_t size_min, size_max;
   unsigned int count_min, count_max;
   
-  /* whether to use default values when setting params */
-  gboolean def = (this->format == NULL); 
-
   g_return_val_if_fail (this != NULL, FALSE);
   g_return_val_if_fail (this->handle != NULL, FALSE);
 
@@ -1272,6 +1283,9 @@
                "Broken configuration for this PCM: %s");
   ERROR_CHECK (snd_pcm_hw_params_set_periods_integer (this->handle, hw_params), 
                "cannot restrict period size to integral value: %s");
+
+  /* enable this for soundcard specific debugging */
+  /* snd_pcm_hw_params_dump (hw_params, this->out); */
   
   mask = alloca (snd_pcm_access_mask_sizeof ());
   snd_pcm_access_mask_none (mask);
@@ -1283,12 +1297,14 @@
   ERROR_CHECK (snd_pcm_hw_params_set_access_mask (this->handle, hw_params, mask),
                "The Gstreamer ALSA plugin does not support your hardware. Error: %s");
   
-  ERROR_CHECK (snd_pcm_hw_params_set_format (this->handle, hw_params, def ? SND_PCM_FORMAT_S16 : this->format->format),
-               "Sample format (%s) not available: %s", snd_pcm_format_name (def ? SND_PCM_FORMAT_S16 : this->format->format));
-  ERROR_CHECK (snd_pcm_hw_params_set_channels (this->handle, hw_params, def ? ((GstElement *) this)->numpads : this->format->channels),
-               "Channels count (%d) not available: %s", def ? ((GstElement *) this)->numpads : this->format->channels);
-  ERROR_CHECK (snd_pcm_hw_params_set_rate (this->handle, hw_params, def ? 44100 : this->format->rate, 0),
-                 "error setting rate (%d): %s", def ? 44100 : this->format->rate);
+  if (this->format) {
+    ERROR_CHECK (snd_pcm_hw_params_set_format (this->handle, hw_params, this->format->format),
+                 "Sample format (%s) not available: %s", snd_pcm_format_name (this->format->format));
+    ERROR_CHECK (snd_pcm_hw_params_set_channels (this->handle, hw_params, this->format->channels),
+                 "Channels count (%d) not available: %s", this->format->channels);
+    ERROR_CHECK (snd_pcm_hw_params_set_rate (this->handle, hw_params, this->format->rate, 0),
+                   "error setting rate (%d): %s", this->format->rate);
+  }
 
   if (snd_pcm_hw_params_get_period_size_min (hw_params, &size_min, 0) < 0) size_min = this->period_size;
   if (snd_pcm_hw_params_get_period_size_max (hw_params, &size_max, 0) < 0) size_max = this->period_size;

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Fri Mar 21 2003  17:17:19 PST

Log message:
bugfixing:
- use better parameter setting functions
- assorted stuff
feature:
- added non-mmaped standard-rw output. Use 'alsasink mmap=false' to deactivate mmap output

Modified files:
    ext/alsa        : gstalsa.c gstalsa.h

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.36&r2=1.37
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.h.diff?r1=1.10&r2=1.11

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- gstalsa.c	19 Mar 2003 22:54:36 -0000	1.36
+++ gstalsa.c	22 Mar 2003 01:17:06 -0000	1.37
@@ -224,7 +224,8 @@
   ARG_PERIODSIZE,
   ARG_BUFFERSIZE,
   ARG_DEBUG,
-  ARG_AUTORECOVER
+  ARG_AUTORECOVER,
+  ARG_MMAP
 };
 
 static GstElement *parent_class = NULL;
@@ -270,6 +271,9 @@
   g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_AUTORECOVER,
     g_param_spec_boolean ("autorecover", "Automatic xrun recovery", "When TRUE tries to reduce processor load on xruns",
                           TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MMAP,
+    g_param_spec_boolean ("mmap", "Use mmap'ed access", "Wether to use mmap (faster) or standard read/write (more compatible)",
+                          TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
   element_class->change_state = gst_alsa_change_state;
   element_class->request_new_pad = gst_alsa_request_new_pad;
@@ -281,6 +285,7 @@
   gint i;
   /* init values */
   this->handle = NULL;
+  this->transmit = NULL;
 
   GST_FLAG_SET (this, GST_ELEMENT_THREAD_SUGGESTED);
 
@@ -367,6 +372,9 @@
   case ARG_AUTORECOVER:
     this->autorecover = g_value_get_boolean (value);
     return;
+  case ARG_MMAP:
+    this->mmap = g_value_get_boolean (value);
+    return;
   default:
     GST_DEBUG (0, "Unknown arg");
     return;
@@ -414,6 +422,9 @@
   case ARG_AUTORECOVER:
     g_value_set_boolean (value, this->autorecover);
     break;
+  case ARG_MMAP:
+    g_value_set_boolean (value, this->mmap);
+    break;
   default:
     GST_DEBUG (0, "Unknown arg");
     break;
@@ -941,7 +952,40 @@
 
   return err;
 }
+static int
+gst_alsa_do_read_write (GstAlsa *this, snd_pcm_sframes_t *avail)
+{
+  void *channels[this->format->channels];
+  int err, i;
 
+  if (((GstElement *) this)->numpads == 1) {
+    /* interleaved */
+    if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC) {
+      err = snd_pcm_readi (this->handle, this->pads[0].data, *avail);
+    } else {
+      err = snd_pcm_writei (this->handle, this->pads[0].data, *avail);
+    }
+  } else {
+    /* noninterleaved */
+    for (i = 0; i < this->format->channels; i++) {
+      channels[i] = this->pads[i].data;
+    }
+    if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC) {
+      err = snd_pcm_readn (this->handle, channels, *avail);
+    } else {
+      err = snd_pcm_writen (this->handle, channels, *avail);
+    }
+  }
+  /* error handling */
+  if (err < 0) {
+    if (err == -EPIPE) {
+      gst_alsa_xrun_recovery (this);
+      return 0;
+    }
+    g_warning ("error on data access: %s", snd_strerror (err));
+  }
+  return err;
+}
 inline static snd_pcm_sframes_t
 gst_alsa_update_avail (GstAlsa *this)
 {
@@ -1073,7 +1117,7 @@
 
   
     /* put this data into alsa */
-    if ((copied = gst_alsa_do_mmap (this, &avail)) < 0)
+    if ((copied = this->transmit (this, &avail)) < 0)
       return;
 
     /* flush the data */
@@ -1133,7 +1177,7 @@
   if (avail > 0) {
     int width = snd_pcm_format_physical_width (this->format->format);
     int bytes_per_frame = ( width / 8 ) * (element->numpads == 1 ? this->format->channels : 1);
-    if ((copied = gst_alsa_do_mmap (this, &avail)) < 0)
+    if ((copied = this->transmit (this, &avail)) < 0)
       return;
       
     /* we get the buffer pool once per go round */
@@ -1269,8 +1313,6 @@
 {
   snd_pcm_hw_params_t *hw_params;
   snd_pcm_access_mask_t *mask;
-  snd_pcm_uframes_t size_min, size_max;
-  unsigned int count_min, count_max;
   
   g_return_val_if_fail (this != NULL, FALSE);
   g_return_val_if_fail (this->handle != NULL, FALSE);
@@ -1290,9 +1332,9 @@
   mask = alloca (snd_pcm_access_mask_sizeof ());
   snd_pcm_access_mask_none (mask);
   if (GST_ELEMENT (this)->numpads == 1) {
-    snd_pcm_access_mask_set (mask, SND_PCM_ACCESS_MMAP_INTERLEAVED);
+    snd_pcm_access_mask_set (mask, this->mmap ? SND_PCM_ACCESS_MMAP_INTERLEAVED : SND_PCM_ACCESS_RW_INTERLEAVED);
   } else {
-    snd_pcm_access_mask_set (mask, SND_PCM_ACCESS_MMAP_NONINTERLEAVED);
+    snd_pcm_access_mask_set (mask, this->mmap ? SND_PCM_ACCESS_MMAP_NONINTERLEAVED : SND_PCM_ACCESS_RW_NONINTERLEAVED);
   }
   ERROR_CHECK (snd_pcm_hw_params_set_access_mask (this->handle, hw_params, mask),
                "The Gstreamer ALSA plugin does not support your hardware. Error: %s");
@@ -1306,20 +1348,10 @@
                    "error setting rate (%d): %s", this->format->rate);
   }
 
-  if (snd_pcm_hw_params_get_period_size_min (hw_params, &size_min, 0) < 0) size_min = this->period_size;
-  if (snd_pcm_hw_params_get_period_size_max (hw_params, &size_max, 0) < 0) size_max = this->period_size;
-  g_assert (size_max >= size_min);
-  if (size_min > this->period_size) this->period_size = size_min;
-  if (size_max < this->period_size) this->period_size = size_max;
-  ERROR_CHECK (snd_pcm_hw_params_set_period_size (this->handle, hw_params, this->period_size, 0), 
+  ERROR_CHECK (snd_pcm_hw_params_set_periods_near (this->handle, hw_params, &this->period_count, 0), 
+                 "error setting buffer size to %u: %s", (guint) this->period_count);
+  ERROR_CHECK (snd_pcm_hw_params_set_period_size_near (this->handle, hw_params, &this->period_size, 0), 
                "error setting period size to %u frames: %s", (guint) this->period_size);
-  if (snd_pcm_hw_params_get_periods_min (hw_params, &count_min, 0) < 0) count_min = this->period_count;
-  if (snd_pcm_hw_params_get_periods_max (hw_params, &count_max, 0) < 0) count_max = this->period_count;
-  g_assert (count_max >= count_min);
-  if (count_min > this->period_count) this->period_count = count_min;
-  if (count_max < this->period_count) this->period_count = count_max;
-  ERROR_CHECK (snd_pcm_hw_params_set_buffer_size (this->handle, hw_params, this->period_size * this->period_count), 
-                 "error setting buffer size to %u: %s", (guint) (this->period_size * this->period_count));
 
   ERROR_CHECK (snd_pcm_hw_params (this->handle, hw_params),
                "Could not set hardware parameters: %s");
@@ -1328,6 +1360,12 @@
   GST_ALSA_CAPS_SET (this, GST_ALSA_CAPS_PAUSE, snd_pcm_hw_params_can_pause (hw_params));
   GST_ALSA_CAPS_SET (this, GST_ALSA_CAPS_RESUME, snd_pcm_hw_params_can_resume (hw_params));
   GST_ALSA_CAPS_SET (this, GST_ALSA_CAPS_SYNC_START, snd_pcm_hw_params_can_sync_start (hw_params));
+  
+  if (this->mmap) {
+    this->transmit = gst_alsa_do_mmap;
+  } else {
+    this->transmit = gst_alsa_do_read_write;
+  }
   
   return TRUE;
 }
Index: gstalsa.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- gstalsa.h	18 Mar 2003 22:07:56 -0000	1.10
+++ gstalsa.h	22 Mar 2003 01:17:06 -0000	1.11
@@ -81,6 +81,8 @@
   } \
 }G_STMT_END
 
+typedef int (*GstAlsaTransmitFunction) (GstAlsa *this, snd_pcm_sframes_t *avail);
+
 typedef struct {
   GstPad *pad;
   GstByteStream *bs;
@@ -101,10 +103,12 @@
   gchar *device;
   snd_pcm_stream_t stream;
   snd_pcm_t *handle;
-  guint pcm_caps;
+  guint pcm_caps; /* capabilities of the pcm device */
   snd_output_t *out;
 
   GstAlsaFormat *format; /* NULL if undefined */
+  gboolean mmap; /* use mmap transmit (fast) or read/write (sloooow) */
+  GstAlsaTransmitFunction transmit;
 
   /* latency / performance parameters */
   snd_pcm_uframes_t period_size;

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Fri Mar 21 2003  18:17:20 PST

Log message:
bugfix: destroy bufferstreams after they're reset, not before

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.37&r2=1.38

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- gstalsa.c	22 Mar 2003 01:17:06 -0000	1.37
+++ gstalsa.c	22 Mar 2003 02:17:08 -0000	1.38
@@ -49,7 +49,6 @@
   } \
 }G_STMT_END
 #endif
-
 /* elementfactory information */
 static GstElementDetails gst_alsa_sink_details = {
   "Alsa Sink",
@@ -107,11 +106,11 @@
 static gboolean gst_alsa_sink_check_event (GstAlsa *this, gint pad_nr);
 
 /* alsa setup / start / stop functions */
-static gboolean gst_alsa_set_hw_params (GstAlsa *this);
+static gboolean gst_alsa_set_hw_params (GstAlsa *this, GstAlsaFormat *format);
 static gboolean gst_alsa_set_sw_params (GstAlsa *this);
 
 static gboolean gst_alsa_open_audio (GstAlsa *this);
-static gboolean gst_alsa_start_audio (GstAlsa *this);
+static gboolean gst_alsa_start_audio (GstAlsa *this, GstAlsaFormat *format);
 static gboolean gst_alsa_drain_audio (GstAlsa *this);
 static gboolean gst_alsa_stop_audio (GstAlsa *this);
 static gboolean gst_alsa_close_audio (GstAlsa *this);
@@ -320,12 +319,12 @@
   gint i;
   GstAlsa *this = GST_ALSA (object);
 
+  G_OBJECT_CLASS (parent_class)->dispose (object);
+
   for (i = 0; i < ((GstElement *) this)->numpads; i++) {
     if (this->pads[i].bs)
       gst_bytestream_destroy (this->pads[i].bs);
   }
-
-  G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 static void
 gst_alsa_set_property (GObject *object, guint prop_id, const GValue *value,
@@ -385,7 +384,7 @@
 
   if (GST_FLAG_IS_SET (this, GST_ALSA_RUNNING)) {
     gst_alsa_stop_audio (this);
-    gst_alsa_start_audio (this);
+    gst_alsa_start_audio (this, NULL);
   }
 }
 
@@ -815,15 +814,16 @@
       }
     
       GST_FLAG_UNSET (this, GST_ALSA_CAPS_NEGO);
-      g_free (this->format);
-      this->format = format;
 
       /* sync the params */
       if (GST_FLAG_IS_SET (this, GST_ALSA_RUNNING)) gst_alsa_stop_audio (this);
       if (GST_FLAG_IS_SET (this, GST_ALSA_OPEN))    gst_alsa_close_audio (this);
 
       if (!gst_alsa_open_audio (this))  return GST_PAD_LINK_REFUSED;
-      if (!gst_alsa_start_audio (this)) return GST_PAD_LINK_REFUSED;
+      if (!gst_alsa_start_audio (this, format)) {
+        g_free (format);
+        return GST_PAD_LINK_REFUSED;
+      }
     }
 
     return GST_PAD_LINK_OK;
@@ -865,7 +865,7 @@
     break;
   case GST_STATE_READY_TO_PAUSED:
     if (!GST_FLAG_IS_SET (element, GST_ALSA_RUNNING))
-      if (!gst_alsa_start_audio (this))
+      if (!gst_alsa_start_audio (this, NULL))
         return GST_STATE_FAILURE;
     break;
   case GST_STATE_PAUSED_TO_PLAYING:
@@ -1247,7 +1247,7 @@
     }
   }
 
-  if (!(gst_alsa_stop_audio (this) && gst_alsa_start_audio (this))) {
+  if (!(gst_alsa_stop_audio (this) && gst_alsa_start_audio (this, NULL))) {
     gst_element_error (GST_ELEMENT (this), "alsasink: Error restarting audio after xrun");
   }
 }
@@ -1303,28 +1303,70 @@
   GST_FLAG_SET (this, GST_ALSA_OPEN);
   return TRUE;
 }
+/* error checking for hw params functions (no warnings on probing ie during capsnego) */
+#ifdef G_HAVE_ISO_VARARGS
+#define MY_ERROR_CHECK(value, ...) G_STMT_START{ \
+  int err = (value); \
+  if (err < 0) { \
+    if (! (format && oldformat)) \
+      g_warning ( __VA_ARGS__, snd_strerror (err)); \
+    return FALSE; \
+  } \
+}G_STMT_END
+#elif defined(G_HAVE_GNUC_VARARGS)
+#define MY_ERROR_CHECK(value, args...) G_STMT_START{ \
+  int err = (value); \
+  if (err < 0) { \
+    if (! (format && oldformat)) \
+      g_warning ( ## args, snd_strerror (err)); \
+    return FALSE; \
+  } \
+}G_STMT_END
+#else
+#define MY_ERROR_CHECK(value, args...) G_STMT_START{ \
+  int err = (value); \
+  if (err < 0) { \
+    if (! (format && oldformat)) \
+      g_warning (snd_strerror (err)); \
+    return FALSE; \
+  } \
+}G_STMT_END
+#endif
 /**
  * You must set all hw parameters at once and can't use already set params and
  * change them.
  * Thx ALSA for not documenting this
  */
 static gboolean
-gst_alsa_set_hw_params (GstAlsa *this)
+gst_alsa_set_hw_params (GstAlsa *this, GstAlsaFormat *format)
 {
   snd_pcm_hw_params_t *hw_params;
   snd_pcm_access_mask_t *mask;
-  
+  GstAlsaFormat * oldformat;
+
   g_return_val_if_fail (this != NULL, FALSE);
   g_return_val_if_fail (this->handle != NULL, FALSE);
 
-  GST_INFO (GST_CAT_PLUGIN_INFO, "Preparing channel: %s %dHz, %d channels\n",
-            snd_pcm_format_name (this->format->format), this->format->rate, this->format->channels);
+  if (format == NULL || format == this->format) {
+    format = this->format;
+    oldformat = NULL;
+  } else {
+    oldformat = this->format;
+  }
+
+  if (format && oldformat) {
+    GST_INFO (GST_CAT_PLUGIN_INFO, "Probing format: %s %dHz, %d channels\n",
+              snd_pcm_format_name (format->format), format->rate, format->channels);
+  } else {
+    GST_INFO (GST_CAT_PLUGIN_INFO, "Preparing format: %s %dHz, %d channels\n",
+              snd_pcm_format_name (format->format), format->rate, format->channels);
+  }
 
   snd_pcm_hw_params_alloca (&hw_params);
-  ERROR_CHECK (snd_pcm_hw_params_any (this->handle, hw_params),
-               "Broken configuration for this PCM: %s");
-  ERROR_CHECK (snd_pcm_hw_params_set_periods_integer (this->handle, hw_params), 
-               "cannot restrict period size to integral value: %s");
+  MY_ERROR_CHECK (snd_pcm_hw_params_any (this->handle, hw_params),
+                  "Broken configuration for this PCM: %s");
+  MY_ERROR_CHECK (snd_pcm_hw_params_set_periods_integer (this->handle, hw_params), 
+                  "cannot restrict period size to integral value: %s");
 
   /* enable this for soundcard specific debugging */
   /* snd_pcm_hw_params_dump (hw_params, this->out); */
@@ -1336,25 +1378,25 @@
   } else {
     snd_pcm_access_mask_set (mask, this->mmap ? SND_PCM_ACCESS_MMAP_NONINTERLEAVED : SND_PCM_ACCESS_RW_NONINTERLEAVED);
   }
-  ERROR_CHECK (snd_pcm_hw_params_set_access_mask (this->handle, hw_params, mask),
-               "The Gstreamer ALSA plugin does not support your hardware. Error: %s");
+  MY_ERROR_CHECK (snd_pcm_hw_params_set_access_mask (this->handle, hw_params, mask),
+                  "The Gstreamer ALSA plugin does not support your hardware. Error: %s");
   
-  if (this->format) {
-    ERROR_CHECK (snd_pcm_hw_params_set_format (this->handle, hw_params, this->format->format),
-                 "Sample format (%s) not available: %s", snd_pcm_format_name (this->format->format));
-    ERROR_CHECK (snd_pcm_hw_params_set_channels (this->handle, hw_params, this->format->channels),
-                 "Channels count (%d) not available: %s", this->format->channels);
-    ERROR_CHECK (snd_pcm_hw_params_set_rate (this->handle, hw_params, this->format->rate, 0),
-                   "error setting rate (%d): %s", this->format->rate);
+  if (format) {
+    MY_ERROR_CHECK (snd_pcm_hw_params_set_format (this->handle, hw_params, format->format),
+                    "Sample format (%s) not available: %s", snd_pcm_format_name (format->format));
+    MY_ERROR_CHECK (snd_pcm_hw_params_set_channels (this->handle, hw_params, format->channels),
+                    "Channels count (%d) not available: %s", format->channels);
+    MY_ERROR_CHECK (snd_pcm_hw_params_set_rate (this->handle, hw_params, format->rate, 0),
+                    "error setting rate (%d): %s", format->rate);
   }
 
-  ERROR_CHECK (snd_pcm_hw_params_set_periods_near (this->handle, hw_params, &this->period_count, 0), 
-                 "error setting buffer size to %u: %s", (guint) this->period_count);
-  ERROR_CHECK (snd_pcm_hw_params_set_period_size_near (this->handle, hw_params, &this->period_size, 0), 
-               "error setting period size to %u frames: %s", (guint) this->period_size);
+  MY_ERROR_CHECK (snd_pcm_hw_params_set_periods_near (this->handle, hw_params, &this->period_count, 0), 
+                  "error setting buffer size to %u: %s", (guint) this->period_count);
+  MY_ERROR_CHECK (snd_pcm_hw_params_set_period_size_near (this->handle, hw_params, &this->period_size, 0), 
+                  "error setting period size to %u frames: %s", (guint) this->period_size);
 
-  ERROR_CHECK (snd_pcm_hw_params (this->handle, hw_params),
-               "Could not set hardware parameters: %s");
+  MY_ERROR_CHECK (snd_pcm_hw_params (this->handle, hw_params),
+                  "Could not set hardware parameters: %s");
 
   /* now get the pcm caps */
   GST_ALSA_CAPS_SET (this, GST_ALSA_CAPS_PAUSE, snd_pcm_hw_params_can_pause (hw_params));
@@ -1366,9 +1408,13 @@
   } else {
     this->transmit = gst_alsa_do_read_write;
   }
+
+  g_free (oldformat);
+  this->format = format;
   
   return TRUE;
 }
+#undef MY_ERROR_CHECK
 static gboolean
 gst_alsa_set_sw_params (GstAlsa *this)
 {
@@ -1398,9 +1444,9 @@
 }
 
 static gboolean
-gst_alsa_start_audio (GstAlsa *this)
+gst_alsa_start_audio (GstAlsa *this, GstAlsaFormat *format)
 {
-  if (!gst_alsa_set_hw_params (this))
+  if (!gst_alsa_set_hw_params (this, format))
     return FALSE;
   if (!gst_alsa_set_sw_params (this))
     return FALSE;

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Sun Mar 23 2003  19:45:57 PST

Log message:
rewrote the caps nego / state change stuff once again, new features:
- bugfixes
- get_caps function to report better caps when device is opened
- better _link function

Modified files:
    ext/alsa        : gstalsa.c gstalsa.h

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.38&r2=1.39
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.h.diff?r1=1.11&r2=1.12

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- gstalsa.c	22 Mar 2003 02:17:08 -0000	1.38
+++ gstalsa.c	24 Mar 2003 03:45:44 -0000	1.39
@@ -24,6 +24,12 @@
 #include "gstalsa.h"
 
 /* error checking for standard alsa functions */
+#define SIMPLE_ERROR_CHECK(value) G_STMT_START{ \
+  int err = (value); \
+  if (err < 0) { \
+    return FALSE; \
+  } \
+}G_STMT_END
 #ifdef G_HAVE_ISO_VARARGS
 #define ERROR_CHECK(value, ...) G_STMT_START{ \
   int err = (value); \
@@ -90,6 +96,7 @@
 
 static GstPad           *gst_alsa_request_new_pad (GstElement *element, GstPadTemplate *templ, const gchar *name);
 static GstPadLinkReturn  gst_alsa_link (GstPad *pad, GstCaps *caps);
+static GstCaps          *gst_alsa_get_caps (GstPad *pad, GstCaps *caps);
 static GstCaps          *gst_alsa_caps (snd_pcm_format_t format, gint rate, gint channels);
 
 static GstBufferPool    *gst_alsa_src_get_buffer_pool (GstPad *pad);
@@ -106,11 +113,12 @@
 static gboolean gst_alsa_sink_check_event (GstAlsa *this, gint pad_nr);
 
 /* alsa setup / start / stop functions */
-static gboolean gst_alsa_set_hw_params (GstAlsa *this, GstAlsaFormat *format);
+static gboolean gst_alsa_probe_hw_params (GstAlsa *this, GstAlsaFormat *format);
+static gboolean gst_alsa_set_hw_params (GstAlsa *this);
 static gboolean gst_alsa_set_sw_params (GstAlsa *this);
 
 static gboolean gst_alsa_open_audio (GstAlsa *this);
-static gboolean gst_alsa_start_audio (GstAlsa *this, GstAlsaFormat *format);
+static gboolean gst_alsa_start_audio (GstAlsa *this);
 static gboolean gst_alsa_drain_audio (GstAlsa *this);
 static gboolean gst_alsa_stop_audio (GstAlsa *this);
 static gboolean gst_alsa_close_audio (GstAlsa *this);
@@ -257,7 +265,7 @@
                       1, GST_ALSA_MAX_CHANNELS, 2, G_PARAM_READWRITE));
   g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_RATE,
     g_param_spec_int ("rate", "Rate", "Sample rate, in Hz",
-                      8000, 192000, 44100, G_PARAM_READWRITE));
+                      GST_ALSA_MIN_RATE, GST_ALSA_MAX_RATE, 44100, G_PARAM_READWRITE));
   g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PERIODCOUNT,
     g_param_spec_int ("period-count", "Period count", "Number of hardware buffers to use",
                       2, 64, 2, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
@@ -311,6 +319,7 @@
   }
 
   gst_pad_set_link_function (this->pads[0].pad, gst_alsa_link);
+  gst_pad_set_getcaps_function (this->pads[0].pad, gst_alsa_get_caps);
 }
 
 static void
@@ -384,7 +393,7 @@
 
   if (GST_FLAG_IS_SET (this, GST_ALSA_RUNNING)) {
     gst_alsa_stop_audio (this);
-    gst_alsa_start_audio (this, NULL);
+    gst_alsa_start_audio (this);
   }
 }
 
@@ -525,6 +534,7 @@
 found_channel:
   this->pads[channel].pad = gst_pad_new_from_template (templ, name);
   gst_pad_set_link_function (this->pads[channel].pad, gst_alsa_link);
+  gst_pad_set_getcaps_function (this->pads[channel].pad, gst_alsa_get_caps);
   gst_element_add_pad (GST_ELEMENT (this), this->pads[channel].pad);
   if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SINK)
     this->pads[channel].bs = gst_bytestream_new (this->pads[channel].pad);
@@ -707,16 +717,20 @@
 }
 
 static inline void
-add_channels (GstProps *props, gint rate, gint channels) {
-  if (rate < 0) {
-    gst_props_add_entry (props, gst_props_entry_new ("rate", GST_PROPS_INT_RANGE (8000, 192000)));
+add_channels (GstProps *props, gint min_rate, gint max_rate, gint min_channels, gint max_channels) {
+  if (min_rate < 0) {
+    gst_props_add_entry (props, gst_props_entry_new ("rate", GST_PROPS_INT_RANGE (GST_ALSA_MIN_RATE, GST_ALSA_MAX_RATE)));
+  } else if (max_rate < 0) {
+    gst_props_add_entry (props, gst_props_entry_new ("rate", GST_PROPS_INT (min_rate)));
   } else {
-    gst_props_add_entry (props, gst_props_entry_new ("rate", GST_PROPS_INT (rate)));
+    gst_props_add_entry (props, gst_props_entry_new ("rate", GST_PROPS_INT_RANGE (min_rate, max_rate)));
   }
-  if (channels < 0) {
+  if (min_channels < 0) {
     gst_props_add_entry (props, gst_props_entry_new ("channels", GST_PROPS_INT_RANGE (1, GST_ALSA_MAX_CHANNELS)));
+  } else if (max_channels < 0) {
+    gst_props_add_entry (props, gst_props_entry_new ("channels", GST_PROPS_INT (min_channels)));
   } else {
-    gst_props_add_entry (props, gst_props_entry_new ("channels", GST_PROPS_INT (channels)));
+    gst_props_add_entry (props, gst_props_entry_new ("channels", GST_PROPS_INT_RANGE (min_channels, max_channels)));
   }
 }
 
@@ -737,8 +751,8 @@
     /* we can never use a format we can't set caps for */
     g_assert (props != NULL);
 
-    add_channels (props, rate, channels);
-    ret_caps = gst_caps_new ("alsacaps", "audio/raw", props);
+    add_channels (props, rate, -1, channels, -1);
+    ret_caps = gst_caps_new (g_strdup (snd_pcm_format_name (format)), "audio/raw", props);
   } else {
     int i;
     GstProps *props;
@@ -747,7 +761,7 @@
       props = gst_alsa_get_props (i);
       /* can be NULL, because not all alsa formats can be specified as caps */
       if (props != NULL) {
-        add_channels (props, rate, channels);
+        add_channels (props, rate, -1, channels, -1);
         ret_caps = gst_caps_append (ret_caps, gst_caps_new (g_strdup (snd_pcm_format_name (i)),
                                     "audio/raw", props));
       }
@@ -757,12 +771,71 @@
   return ret_caps;
 }
 
+/* Return better caps when device is open */
+static GstCaps *
+gst_alsa_get_caps (GstPad *pad, GstCaps *caps)
+{
+  GstAlsa *this;
+  snd_pcm_hw_params_t *hw_params;
+  snd_pcm_format_mask_t *mask;
+  int i;
+  unsigned int min_rate, max_rate;
+  gint min_channels, max_channels;
+  GstCaps *ret = NULL;
+
+  g_return_val_if_fail (pad != NULL, NULL);
+
+  this = GST_ALSA (gst_pad_get_parent (pad));
+
+  if (!GST_FLAG_IS_SET (this, GST_ALSA_OPEN))
+    return gst_pad_get_pad_template_caps (pad);
+  
+  snd_pcm_hw_params_alloca (&hw_params);
+  ERROR_CHECK (snd_pcm_hw_params_any (this->handle, hw_params),
+               "Broken configuration for this PCM: %s");
+
+  if (((GstElement *) this)->numpads > 1) {
+    min_channels = 1;
+    max_channels = -1;
+  } else {
+    ERROR_CHECK (snd_pcm_hw_params_get_channels_min (hw_params, &min_rate),
+                 "Coulödn't get minimum channel count for device %s: %s", this->device);
+    ERROR_CHECK (snd_pcm_hw_params_get_channels_max (hw_params, &max_rate),
+                 "Coulödn't get maximum channel count for device %s: %s", this->device);
+    min_channels = min_rate;
+    max_channels = max_rate > GST_ALSA_MAX_CHANNELS ? GST_ALSA_MAX_CHANNELS : max_rate;
+  }
+
+  ERROR_CHECK (snd_pcm_hw_params_get_rate_min (hw_params, &min_rate, &i),
+               "Coulödn't get minimum rate for device %s: %s", this->device);
+  min_rate = min_rate < GST_ALSA_MIN_RATE ? GST_ALSA_MIN_RATE : min_rate + i;
+  ERROR_CHECK (snd_pcm_hw_params_get_rate_max (hw_params, &max_rate, &i),
+               "Coulödn't get maximum rate for device %s: %s", this->device);
+  max_rate = max_rate > GST_ALSA_MAX_RATE ? GST_ALSA_MAX_RATE : max_rate + i;
+  
+  snd_pcm_format_mask_alloca (&mask);
+  snd_pcm_hw_params_get_format_mask (hw_params, mask);
+  for (i = 0; i <= SND_PCM_FORMAT_LAST; i++) {
+    if (snd_pcm_format_mask_test (mask, i)) {
+      GstProps *props = gst_alsa_get_props (i);
+      /* we can never use a format we can't set caps for */
+      if (props != NULL) {
+        add_channels (props, min_rate, max_rate, min_channels, max_channels);
+        ret = gst_caps_append (ret, gst_caps_new (g_strdup (snd_pcm_format_name (i)),
+                               "audio/raw", props));
+      }
+    }
+  }
+
+  return ret;
+}
 /* Negotiates the caps */
 GstPadLinkReturn
 gst_alsa_link (GstPad *pad, GstCaps *caps)
 {
   GstAlsa *this;
   GstAlsaFormat *format;
+  GstPadLinkReturn ret;
 
   g_return_val_if_fail (caps != NULL, GST_PAD_LINK_REFUSED);
   g_return_val_if_fail (pad != NULL, GST_PAD_LINK_REFUSED);
@@ -780,16 +853,21 @@
     
     GST_DEBUG (GST_CAT_CAPS, "found format %s\n", snd_pcm_format_name (format->format));
     
-    if (gst_alsa_formats_match (this->format, format)) {
-      g_free (format);
-      return GST_PAD_LINK_OK;
-    }
-
     if (!GST_FLAG_IS_SET (this, GST_ALSA_CAPS_NEGO)) {
       gint i;
 
       GST_FLAG_SET (this, GST_ALSA_CAPS_NEGO);
 
+      if (gst_alsa_formats_match (this->format, format)) {
+        ret = GST_PAD_LINK_OK;
+        goto out;
+      }
+
+      if (!gst_alsa_probe_hw_params (this, format)) {
+        ret = GST_PAD_LINK_REFUSED;
+        goto out;
+      }
+
       for (i = 0; i < ((GstElement *) this)->numpads; i++) {
         g_assert (this->pads[i].pad != NULL);
         if (this->pads[i].pad == pad)
@@ -806,10 +884,10 @@
 	    }
             gst_caps_unref (old);
 	  } else {
-	    /* FIXME: unset caps somehow */
+	    /* FIXME: unset caps on pads somehow */
 	  }
-          g_free (format);
-          return GST_PAD_LINK_REFUSED;
+          ret = GST_PAD_LINK_REFUSED;
+	  goto out;
         }
       }
     
@@ -817,11 +895,10 @@
 
       /* sync the params */
       if (GST_FLAG_IS_SET (this, GST_ALSA_RUNNING)) gst_alsa_stop_audio (this);
-      if (GST_FLAG_IS_SET (this, GST_ALSA_OPEN))    gst_alsa_close_audio (this);
-
-      if (!gst_alsa_open_audio (this))  return GST_PAD_LINK_REFUSED;
-      if (!gst_alsa_start_audio (this, format)) {
-        g_free (format);
+      g_free (this->format);
+      this->format = format;
+      if (!gst_alsa_start_audio (this)) {
+        gst_element_error (GST_ELEMENT (this), "Probed format doesn't work");
         return GST_PAD_LINK_REFUSED;
       }
     }
@@ -830,6 +907,11 @@
   }
 
   return GST_PAD_LINK_DELAYED;
+
+out:
+  g_free (format);
+  GST_FLAG_UNSET (this, GST_ALSA_CAPS_NEGO);
+  return ret;
 }
 
 static GstBufferPool *
@@ -865,7 +947,7 @@
     break;
   case GST_STATE_READY_TO_PAUSED:
     if (!GST_FLAG_IS_SET (element, GST_ALSA_RUNNING))
-      if (!gst_alsa_start_audio (this, NULL))
+      if (!gst_alsa_start_audio (this))
         return GST_STATE_FAILURE;
     break;
   case GST_STATE_PAUSED_TO_PLAYING:
@@ -1072,6 +1154,7 @@
     }
     if (this->format == NULL) {
       gst_element_error (GST_ELEMENT (this), "alsasink: No caps available");
+      return;
     }
   }
 
@@ -1111,10 +1194,7 @@
         return;
     }
 
-    if (gst_element_get_state (element) != GST_STATE_PLAYING)
-      return;
     /* FIXME: lotsa stuff can have happened while fetching data. Do we need to check something? */
-
   
     /* put this data into alsa */
     if ((copied = this->transmit (this, &avail)) < 0)
@@ -1247,7 +1327,7 @@
     }
   }
 
-  if (!(gst_alsa_stop_audio (this) && gst_alsa_start_audio (this, NULL))) {
+  if (!(gst_alsa_stop_audio (this) && gst_alsa_start_audio (this))) {
     gst_element_error (GST_ELEMENT (this), "alsasink: Error restarting audio after xrun");
   }
 }
@@ -1303,70 +1383,70 @@
   GST_FLAG_SET (this, GST_ALSA_OPEN);
   return TRUE;
 }
-/* error checking for hw params functions (no warnings on probing ie during capsnego) */
-#ifdef G_HAVE_ISO_VARARGS
-#define MY_ERROR_CHECK(value, ...) G_STMT_START{ \
-  int err = (value); \
-  if (err < 0) { \
-    if (! (format && oldformat)) \
-      g_warning ( __VA_ARGS__, snd_strerror (err)); \
-    return FALSE; \
-  } \
-}G_STMT_END
-#elif defined(G_HAVE_GNUC_VARARGS)
-#define MY_ERROR_CHECK(value, args...) G_STMT_START{ \
-  int err = (value); \
-  if (err < 0) { \
-    if (! (format && oldformat)) \
-      g_warning ( ## args, snd_strerror (err)); \
-    return FALSE; \
-  } \
-}G_STMT_END
-#else
-#define MY_ERROR_CHECK(value, args...) G_STMT_START{ \
-  int err = (value); \
-  if (err < 0) { \
-    if (! (format && oldformat)) \
-      g_warning (snd_strerror (err)); \
-    return FALSE; \
-  } \
-}G_STMT_END
-#endif
+/* if someone finds an easy way to merge this with _set_hw_params, go ahead */
+static gboolean
+gst_alsa_probe_hw_params (GstAlsa *this, GstAlsaFormat *format)
+{
+  snd_pcm_hw_params_t *hw_params;
+  snd_pcm_access_mask_t *mask;
+  snd_pcm_uframes_t period_size;
+  unsigned int period_count;
+
+  g_return_val_if_fail (this != NULL, FALSE);
+  g_return_val_if_fail (format != NULL, FALSE);
+  
+  GST_INFO (GST_CAT_PLUGIN_INFO, "Probing format: %s %dHz, %d channels\n",
+            snd_pcm_format_name (format->format), format->rate, format->channels);
+
+  snd_pcm_hw_params_alloca (&hw_params);
+  SIMPLE_ERROR_CHECK (snd_pcm_hw_params_any (this->handle, hw_params));
+  SIMPLE_ERROR_CHECK (snd_pcm_hw_params_set_periods_integer (this->handle, hw_params));
+
+  /* enable this for soundcard specific debugging */
+  /* snd_pcm_hw_params_dump (hw_params, this->out); */
+  
+  mask = alloca (snd_pcm_access_mask_sizeof ());
+  snd_pcm_access_mask_none (mask);
+  if (GST_ELEMENT (this)->numpads == 1) {
+    snd_pcm_access_mask_set (mask, this->mmap ? SND_PCM_ACCESS_MMAP_INTERLEAVED : SND_PCM_ACCESS_RW_INTERLEAVED);
+  } else {
+    snd_pcm_access_mask_set (mask, this->mmap ? SND_PCM_ACCESS_MMAP_NONINTERLEAVED : SND_PCM_ACCESS_RW_NONINTERLEAVED);
+  }
+  SIMPLE_ERROR_CHECK (snd_pcm_hw_params_set_access_mask (this->handle, hw_params, mask));
+  
+  SIMPLE_ERROR_CHECK (snd_pcm_hw_params_set_format (this->handle, hw_params, format->format));
+  SIMPLE_ERROR_CHECK (snd_pcm_hw_params_set_channels (this->handle, hw_params, format->channels));
+  SIMPLE_ERROR_CHECK (snd_pcm_hw_params_set_rate (this->handle, hw_params, format->rate, 0));
+
+  period_count = this->period_count;
+  SIMPLE_ERROR_CHECK (snd_pcm_hw_params_set_periods_near (this->handle, hw_params, &period_count, 0));
+  period_size = this->period_size;
+  SIMPLE_ERROR_CHECK (snd_pcm_hw_params_set_period_size_near (this->handle, hw_params, &period_size, 0));
+
+  return TRUE;
+}
 /**
  * You must set all hw parameters at once and can't use already set params and
  * change them.
  * Thx ALSA for not documenting this
  */
 static gboolean
-gst_alsa_set_hw_params (GstAlsa *this, GstAlsaFormat *format)
+gst_alsa_set_hw_params (GstAlsa *this)
 {
   snd_pcm_hw_params_t *hw_params;
   snd_pcm_access_mask_t *mask;
-  GstAlsaFormat * oldformat;
 
   g_return_val_if_fail (this != NULL, FALSE);
   g_return_val_if_fail (this->handle != NULL, FALSE);
 
-  if (format == NULL || format == this->format) {
-    format = this->format;
-    oldformat = NULL;
-  } else {
-    oldformat = this->format;
-  }
-
-  if (format && oldformat) {
-    GST_INFO (GST_CAT_PLUGIN_INFO, "Probing format: %s %dHz, %d channels\n",
-              snd_pcm_format_name (format->format), format->rate, format->channels);
-  } else {
-    GST_INFO (GST_CAT_PLUGIN_INFO, "Preparing format: %s %dHz, %d channels\n",
-              snd_pcm_format_name (format->format), format->rate, format->channels);
-  }
+  GST_INFO (GST_CAT_PLUGIN_INFO, "Preparing format: %s %dHz, %d channels\n",
+            snd_pcm_format_name (this->format->format), this->format->rate, this->format->channels);
 
   snd_pcm_hw_params_alloca (&hw_params);
-  MY_ERROR_CHECK (snd_pcm_hw_params_any (this->handle, hw_params),
-                  "Broken configuration for this PCM: %s");
-  MY_ERROR_CHECK (snd_pcm_hw_params_set_periods_integer (this->handle, hw_params), 
-                  "cannot restrict period size to integral value: %s");
+  ERROR_CHECK (snd_pcm_hw_params_any (this->handle, hw_params),
+               "Broken configuration for this PCM: %s");
+  ERROR_CHECK (snd_pcm_hw_params_set_periods_integer (this->handle, hw_params), 
+               "cannot restrict period size to integral value: %s");
 
   /* enable this for soundcard specific debugging */
   /* snd_pcm_hw_params_dump (hw_params, this->out); */
@@ -1378,25 +1458,25 @@
   } else {
     snd_pcm_access_mask_set (mask, this->mmap ? SND_PCM_ACCESS_MMAP_NONINTERLEAVED : SND_PCM_ACCESS_RW_NONINTERLEAVED);
   }
-  MY_ERROR_CHECK (snd_pcm_hw_params_set_access_mask (this->handle, hw_params, mask),
-                  "The Gstreamer ALSA plugin does not support your hardware. Error: %s");
+  ERROR_CHECK (snd_pcm_hw_params_set_access_mask (this->handle, hw_params, mask),
+               "The Gstreamer ALSA plugin does not support your hardware. Error: %s");
   
-  if (format) {
-    MY_ERROR_CHECK (snd_pcm_hw_params_set_format (this->handle, hw_params, format->format),
-                    "Sample format (%s) not available: %s", snd_pcm_format_name (format->format));
-    MY_ERROR_CHECK (snd_pcm_hw_params_set_channels (this->handle, hw_params, format->channels),
-                    "Channels count (%d) not available: %s", format->channels);
-    MY_ERROR_CHECK (snd_pcm_hw_params_set_rate (this->handle, hw_params, format->rate, 0),
-                    "error setting rate (%d): %s", format->rate);
+  if (this->format) {
+    ERROR_CHECK (snd_pcm_hw_params_set_format (this->handle, hw_params, this->format->format),
+                 "Sample format (%s) not available: %s", snd_pcm_format_name (this->format->format));
+    ERROR_CHECK (snd_pcm_hw_params_set_channels (this->handle, hw_params, this->format->channels),
+                 "Channels count (%d) not available: %s", this->format->channels);
+    ERROR_CHECK (snd_pcm_hw_params_set_rate (this->handle, hw_params, this->format->rate, 0),
+                 "error setting rate (%d): %s", this->format->rate);
   }
 
-  MY_ERROR_CHECK (snd_pcm_hw_params_set_periods_near (this->handle, hw_params, &this->period_count, 0), 
-                  "error setting buffer size to %u: %s", (guint) this->period_count);
-  MY_ERROR_CHECK (snd_pcm_hw_params_set_period_size_near (this->handle, hw_params, &this->period_size, 0), 
-                  "error setting period size to %u frames: %s", (guint) this->period_size);
+  ERROR_CHECK (snd_pcm_hw_params_set_periods_near (this->handle, hw_params, &this->period_count, 0), 
+               "error setting buffer size to %u: %s", (guint) this->period_count);
+  ERROR_CHECK (snd_pcm_hw_params_set_period_size_near (this->handle, hw_params, &this->period_size, 0), 
+               "error setting period size to %u frames: %s", (guint) this->period_size);
 
-  MY_ERROR_CHECK (snd_pcm_hw_params (this->handle, hw_params),
-                  "Could not set hardware parameters: %s");
+  ERROR_CHECK (snd_pcm_hw_params (this->handle, hw_params),
+               "Could not set hardware parameters: %s");
 
   /* now get the pcm caps */
   GST_ALSA_CAPS_SET (this, GST_ALSA_CAPS_PAUSE, snd_pcm_hw_params_can_pause (hw_params));
@@ -1409,12 +1489,8 @@
     this->transmit = gst_alsa_do_read_write;
   }
 
-  g_free (oldformat);
-  this->format = format;
-  
   return TRUE;
 }
-#undef MY_ERROR_CHECK
 static gboolean
 gst_alsa_set_sw_params (GstAlsa *this)
 {
@@ -1444,9 +1520,11 @@
 }
 
 static gboolean
-gst_alsa_start_audio (GstAlsa *this, GstAlsaFormat *format)
+gst_alsa_start_audio (GstAlsa *this)
 {
-  if (!gst_alsa_set_hw_params (this, format))
+  g_assert (GST_FLAG_IS_SET (this, GST_ALSA_OPEN));
+  
+  if (!gst_alsa_set_hw_params (this))
     return FALSE;
   if (!gst_alsa_set_sw_params (this))
     return FALSE;
Index: gstalsa.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- gstalsa.h	22 Mar 2003 01:17:06 -0000	1.11
+++ gstalsa.h	24 Mar 2003 03:45:45 -0000	1.12
@@ -31,6 +31,8 @@
 #include <glib.h>
 
 #define GST_ALSA_MAX_CHANNELS 64 /* we don't support more than 64 channels */
+#define GST_ALSA_MIN_RATE 8000
+#define GST_ALSA_MAX_RATE 192000
 
 #define GST_ALSA(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_ALSA, GstAlsa)
 #define GST_ALSA_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_ALSA, GstAlsaClass)

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Wed Mar 26 2003  14:24:47 PST

Log message:
use err = snd_... instead of errno afterwards -- removed unnecessary include

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.39&r2=1.40

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- gstalsa.c	24 Mar 2003 03:45:44 -0000	1.39
+++ gstalsa.c	26 Mar 2003 22:24:35 -0000	1.40
@@ -19,7 +19,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <stdlib.h>
 #include <sys/time.h>
 #include "gstalsa.h"
 
@@ -1085,9 +1084,11 @@
 inline static gboolean
 gst_alsa_pcm_wait (GstAlsa *this)
 {
+  int err;
+
   if (snd_pcm_state (this->handle) == SND_PCM_STATE_RUNNING) {
-    if (snd_pcm_wait (this->handle, 1000) < 0) {
-      if (errno == EINTR) {
+    if ((err = snd_pcm_wait (this->handle, 1000)) < 0) {
+      if (err == EINTR) {
         /* happens mostly when run under gdb, or when exiting due to a signal */
         GST_DEBUG (GST_CAT_PLUGIN_INFO, "got interrupted while waiting");
         if (gst_element_interrupt (GST_ELEMENT (this))) {
@@ -1096,7 +1097,7 @@
           return FALSE;
         }
       }
-      g_warning ("error waiting for alsa pcm: (%d: %s)", errno, strerror (errno));
+      g_warning ("error waiting for alsa pcm: (%d: %s)", err, snd_strerror (err));
       return FALSE;
     }
   }

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Wed Mar 26 2003  16:17:39 PST

Log message:
get rid of bytestreams

Modified files:
    ext/alsa        : gstalsa.c gstalsa.h

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.40&r2=1.41
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.h.diff?r1=1.12&r2=1.13

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- gstalsa.c	26 Mar 2003 22:24:35 -0000	1.40
+++ gstalsa.c	27 Mar 2003 00:17:26 -0000	1.41
@@ -109,7 +109,7 @@
 static void     gst_alsa_src_loop (GstElement *element);
 static void     gst_alsa_xrun_recovery (GstAlsa *this);
 
-static gboolean gst_alsa_sink_check_event (GstAlsa *this, gint pad_nr);
+static gboolean gst_alsa_sink_check_event (GstAlsa *this, gint pad_nr, GstEvent *event);
 
 /* alsa setup / start / stop functions */
 static gboolean gst_alsa_probe_hw_params (GstAlsa *this, GstAlsaFormat *format);
@@ -270,10 +270,10 @@
                       2, 64, 2, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
   g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PERIODSIZE,
     g_param_spec_int ("period-size", "Period size", "Number of frames (samples on each channel) in one hardware period",
-                      64, 8192, 8192, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+                      2, 8192, 8192, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
   g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BUFFERSIZE,
     g_param_spec_int ("buffer-size", "Buffer size", "Number of frames the hardware buffer can hold",
-                      128, 65536, 16384, G_PARAM_READWRITE));
+                      4, 65536, 16384, G_PARAM_READWRITE));
   g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_AUTORECOVER,
     g_param_spec_boolean ("autorecover", "Automatic xrun recovery", "When TRUE tries to reduce processor load on xruns",
                           TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
@@ -292,6 +292,12 @@
   /* init values */
   this->handle = NULL;
   this->transmit = NULL;
+  for (i = 0; i < GST_ALSA_MAX_CHANNELS; i++) {
+    this->pads[i].pad = NULL;
+    this->pads[i].data = NULL;
+    this->pads[i].size = 0;
+    this->pads[i].buf = NULL;
+  }
 
   GST_FLAG_SET (this, GST_ELEMENT_THREAD_SUGGESTED);
 
@@ -299,7 +305,6 @@
     this->stream = SND_PCM_STREAM_CAPTURE;
     gst_element_set_loop_function (GST_ELEMENT (this), gst_alsa_src_loop);
     this->pads[0].pad = gst_pad_new_from_template (gst_alsa_src_pad_factory (), "src");
-    this->pads[0].bs = NULL;
     gst_pad_set_bufferpool_function(this->pads[0].pad, gst_alsa_src_get_buffer_pool);
 
     /* set the rate to a sensible value. we can't have gobject construct this
@@ -309,13 +314,9 @@
     this->stream = SND_PCM_STREAM_PLAYBACK;
     gst_element_set_loop_function (GST_ELEMENT (this), gst_alsa_sink_loop);
     this->pads[0].pad = gst_pad_new_from_template (gst_alsa_sink_pad_factory (), "sink");
-    this->pads[0].bs = gst_bytestream_new (this->pads[0].pad);
   }
 
   gst_element_add_pad (GST_ELEMENT (this), this->pads[0].pad);
-  for (i = 1; i < GST_ALSA_MAX_CHANNELS; i++) {
-    this->pads[i].pad = NULL;
-  }
 
   gst_pad_set_link_function (this->pads[0].pad, gst_alsa_link);
   gst_pad_set_getcaps_function (this->pads[0].pad, gst_alsa_get_caps);
@@ -327,12 +328,13 @@
   gint i;
   GstAlsa *this = GST_ALSA (object);
 
-  G_OBJECT_CLASS (parent_class)->dispose (object);
-
   for (i = 0; i < ((GstElement *) this)->numpads; i++) {
-    if (this->pads[i].bs)
-      gst_bytestream_destroy (this->pads[i].bs);
+    if (this->pads[i].buf) {
+      gst_data_unref (GST_DATA (this->pads[i].buf));
+    }
   }
+
+  G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 static void
 gst_alsa_set_property (GObject *object, guint prop_id, const GValue *value,
@@ -535,9 +537,7 @@
   gst_pad_set_link_function (this->pads[channel].pad, gst_alsa_link);
   gst_pad_set_getcaps_function (this->pads[channel].pad, gst_alsa_get_caps);
   gst_element_add_pad (GST_ELEMENT (this), this->pads[channel].pad);
-  if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SINK)
-    this->pads[channel].bs = gst_bytestream_new (this->pads[channel].pad);
-  else
+  if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC)
     gst_pad_set_bufferpool_function(this->pads[channel].pad, gst_alsa_src_get_buffer_pool);
 
   return this->pads[channel].pad;
@@ -967,8 +967,12 @@
     g_free (this->format);
     this->format = NULL;
     for (i = 0; i < element->numpads; i++) {
-      if (this->pads[i].bs)
-	gst_bytestream_reset (this->pads[i].bs);
+      if (this->pads[i].buf) {
+	gst_data_unref (GST_DATA (this->pads[i].buf));
+        this->pads[i].buf = NULL;
+        this->pads[i].data = NULL;
+        this->pads[i].size = 0;
+      }
     }
     break;
   case GST_STATE_READY_TO_NULL:
@@ -1137,35 +1141,18 @@
 {
   snd_pcm_sframes_t avail, avail2, copied;
   gint i;
-  gint bytes, num_bytes; /* per channel */
+  guint bytes; /* per channel */
   GstAlsa *this = GST_ALSA (element);
 
   g_return_if_fail (this != NULL);
 
-  /* caps nego: fetch 1 byte from every pad */
-  if (this->format == NULL) {
-    GST_DEBUG (GST_CAT_NEGOTIATION, "starting caps negotiation");
-    for (i = 0; i < element->numpads; i++) {
-      g_assert (this->pads[i].pad != NULL);
-      do {
-        num_bytes = gst_bytestream_peek_bytes (this->pads[i].bs, &this->pads[i].data, 1);
-      } while (num_bytes == 0 && gst_alsa_sink_check_event (this, i));
-      if (num_bytes == 0)
-        return;
-    }
-    if (this->format == NULL) {
-      gst_element_error (GST_ELEMENT (this), "alsasink: No caps available");
-      return;
-    }
-  }
-
 sink_restart:
 
   avail = gst_alsa_update_avail (this);
   if (avail == -EPIPE) goto sink_restart;
   if (avail < 0) return;
   if (avail > 0) {
-    int width = snd_pcm_format_physical_width (this->format->format);
+    int width;
     
     /* Not enough space. We grab data nonetheless and sleep afterwards */
     if (avail < this->period_size) {
@@ -1173,17 +1160,33 @@
     }
     
     /* check how many bytes we still have in all our bytestreams */
-    bytes = avail * ( width / 8 ) * (element->numpads == 1 ? this->format->channels : 1);
+    bytes = G_MAXUINT;
     for (i = 0; i < element->numpads; i++) {
-      g_assert (this->pads[i].pad != NULL);
-      do {
-        num_bytes = gst_bytestream_peek_bytes (this->pads[i].bs, &this->pads[i].data, bytes);
-      } while (num_bytes == 0 && gst_alsa_sink_check_event (this, i));
-      if (num_bytes == 0)
-        return;
-      bytes = MIN (bytes, num_bytes);
+      GstAlsaPad *pad = &this->pads[i];
+      g_assert (pad->pad != NULL);
+      while (pad->size == 0) {
+        pad->buf = gst_pad_pull (pad->pad);
+        if (GST_IS_EVENT (pad->buf)) {
+	  gboolean cont = gst_alsa_sink_check_event (this, i, GST_EVENT (pad->buf));
+	  gst_data_unref (GST_DATA (pad->buf));
+	  pad->buf = NULL;
+	  if (cont)
+	    continue;
+	  return;
+	}
+        pad->size = pad->buf->size;
+        pad->data = pad->buf->data;
+      }
+      bytes = MIN (bytes, pad->size);
+    }
+    /* caps nego failed somewhere */
+    if (this->format == NULL) {
+      gst_element_error (GST_ELEMENT (this), "alsasink: No caps available");
+      return;
     }
-    avail = bytes / (width / 8 ) / (element->numpads == 1 ? this->format->channels : 1);
+
+    width = snd_pcm_format_physical_width (this->format->format);
+    avail = MIN (avail, bytes / (width / 8 ) / (element->numpads == 1 ? this->format->channels : 1));
 
     /* wait until the hw buffer has enough space */
     while (gst_element_get_state (element) == GST_STATE_PLAYING && (avail2 = gst_alsa_update_avail (this)) < avail) {
@@ -1203,8 +1206,17 @@
 
     /* flush the data */
     bytes = copied * ( width / 8 ) * (element->numpads == 1 ? this->format->channels : 1);
-    for (i = 0; i < element->numpads; i++)
-      gst_bytestream_flush (this->pads[i].bs, bytes);
+    for (i = 0; i < element->numpads; i++) {
+      GstAlsaPad *pad = &this->pads[i];
+      if ((pad->size -= bytes) == 0) {
+        gst_data_unref (GST_DATA (pad->buf));
+        pad->buf = NULL;  /* needed? */
+        pad->data = NULL; /* needed? */
+        continue;
+      }
+      g_assert (pad->size > 0);
+      pad->data += bytes;
+    }
   }
 
   if (snd_pcm_state(this->handle) != SND_PCM_STATE_RUNNING && snd_pcm_avail_update (this->handle) == 0) {
@@ -1267,10 +1279,10 @@
     /* push the data to gstreamer if it's big enough to fill up a buffer. */
     for (i = 0; i < element->numpads; i++) {
       pad = &this->pads[i];
-      pad->offset += MIN (copied, this->period_size - pad->offset);
+      pad->size += MIN (copied, this->period_size - pad->size);
 
-      if (pad->offset >= this->period_size) {
-        g_assert (pad->offset <= this->period_size);
+      if (pad->size >= this->period_size) {
+        g_assert (pad->size <= this->period_size);
 
         buf = gst_buffer_new_from_pool (pool, 0, 0);
 
@@ -1281,7 +1293,7 @@
         gst_pad_push (pad->pad, buf);
 
         pad->data = NULL;
-        pad->offset = 0;
+        pad->size = 0;
       }
     }
 
@@ -1335,13 +1347,9 @@
 
 /* TRUE, if everything should continue */
 static gboolean
-gst_alsa_sink_check_event (GstAlsa *this, gint pad_nr)
+gst_alsa_sink_check_event (GstAlsa *this, gint pad_nr, GstEvent *event)
 {
-  GstEvent *event = NULL;
-  guint32 avail;
   gboolean cont = TRUE;
-
-  gst_bytestream_get_status (this->pads[pad_nr].bs, &avail, &event);
 
   if (event) {
     switch (GST_EVENT_TYPE (event)) {
Index: gstalsa.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- gstalsa.h	24 Mar 2003 03:45:45 -0000	1.12
+++ gstalsa.h	27 Mar 2003 00:17:26 -0000	1.13
@@ -27,8 +27,6 @@
 
 #include <alsa/asoundlib.h>
 #include <gst/gst.h>
-#include <gst/bytestream/bytestream.h>
-#include <glib.h>
 
 #define GST_ALSA_MAX_CHANNELS 64 /* we don't support more than 64 channels */
 #define GST_ALSA_MIN_RATE 8000
@@ -87,9 +85,9 @@
 
 typedef struct {
   GstPad *pad;
-  GstByteStream *bs;
-  guint8 *data;
-  guint8 offset;
+  guint8 *data; /* pointer into buffer */
+  guint size; /* sink: bytes left in buffer */
+  GstBuffer *buf; /* current buffer */
 } GstAlsaPad;
 typedef struct {
   snd_pcm_format_t format;

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Wed Mar 26 2003  19:16:43 PST

Log message:
bugfix: don't unref event twice

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.41&r2=1.42

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- gstalsa.c	27 Mar 2003 00:17:26 -0000	1.41
+++ gstalsa.c	27 Mar 2003 03:16:31 -0000	1.42
@@ -1168,7 +1168,6 @@
         pad->buf = gst_pad_pull (pad->pad);
         if (GST_IS_EVENT (pad->buf)) {
 	  gboolean cont = gst_alsa_sink_check_event (this, i, GST_EVENT (pad->buf));
-	  gst_data_unref (GST_DATA (pad->buf));
 	  pad->buf = NULL;
 	  if (cont)
 	    continue;

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Thu Apr 10 2003  17:24:32 PDT

Log message:
make alsa not pause playback but drain the buffer on EOS

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.42&r2=1.43

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- gstalsa.c	27 Mar 2003 03:16:31 -0000	1.42
+++ gstalsa.c	11 Apr 2003 00:24:19 -0000	1.43
@@ -112,6 +112,8 @@
 static gboolean gst_alsa_sink_check_event (GstAlsa *this, gint pad_nr, GstEvent *event);
 
 /* alsa setup / start / stop functions */
+static void     gst_alsa_set_eos (GstAlsa *this);
+
 static gboolean gst_alsa_probe_hw_params (GstAlsa *this, GstAlsaFormat *format);
 static gboolean gst_alsa_set_hw_params (GstAlsa *this);
 static gboolean gst_alsa_set_sw_params (GstAlsa *this);
@@ -1353,7 +1355,7 @@
   if (event) {
     switch (GST_EVENT_TYPE (event)) {
       case GST_EVENT_EOS:
-        gst_element_set_eos (GST_ELEMENT (this));
+        gst_alsa_set_eos (this);
         cont = FALSE;
         break;
       case GST_EVENT_INTERRUPT:
@@ -1373,6 +1375,12 @@
 
 /*** AUDIO SETUP / START / STOP ***********************************************/
 
+static void
+gst_alsa_set_eos (GstAlsa *this)
+{
+  gst_alsa_drain_audio (this);
+  gst_element_set_eos (GST_ELEMENT (this));
+}
 static gboolean
 gst_alsa_open_audio (GstAlsa *this)
 {
@@ -1542,7 +1550,8 @@
 }
 
 static gboolean
-gst_alsa_drain_audio (GstAlsa *this) {
+gst_alsa_drain_audio (GstAlsa *this)
+{
   g_assert (this != NULL);
   g_return_val_if_fail (this != NULL, FALSE);
   g_return_val_if_fail (this->handle != NULL, FALSE);

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Sat Apr 12 2003  21:13:24 PDT

Log message:
ALSA rewrite, part 5:
- sync to timestamps (which breaks a _lot_, because most plugins send out wrong timestamps)
- clocking support (A/V sync is superb as long as you don't sync and don't get wrong timestamps)
- 1/2 of format conversion
- assorted bugfixes
I'd like to get people to check the timestamps the plugins send out.
mpegdemux seems to be pretty broken, mad works (I just patched it...), avidemux works at least sometimes.
Haven't checked more so far.

Modified files:
    ext/alsa        : gstalsa.c gstalsa.h

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.43&r2=1.44
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.h.diff?r1=1.13&r2=1.14

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- gstalsa.c	11 Apr 2003 00:24:19 -0000	1.43
+++ gstalsa.c	13 Apr 2003 04:13:12 -0000	1.44
@@ -103,53 +103,68 @@
 static GstElementStateReturn gst_alsa_change_state (GstElement *element);
 
 /* audio processing functions */
-static int      gst_alsa_do_mmap (GstAlsa *this, snd_pcm_sframes_t *avail);
+static int      	gst_alsa_do_mmap (GstAlsa *this, snd_pcm_sframes_t *avail);
 
-static void     gst_alsa_sink_loop (GstElement *element);
-static void     gst_alsa_src_loop (GstElement *element);
-static void     gst_alsa_xrun_recovery (GstAlsa *this);
+static void     	gst_alsa_sink_loop (GstElement *element);
+static void     	gst_alsa_src_loop (GstElement *element);
+static void     	gst_alsa_xrun_recovery (GstAlsa *this);
 
-static gboolean gst_alsa_sink_check_event (GstAlsa *this, gint pad_nr, GstEvent *event);
+static gboolean 	gst_alsa_sink_check_event (GstAlsa *this, gint pad_nr, GstEvent *event);
 
 /* alsa setup / start / stop functions */
-static void     gst_alsa_set_eos (GstAlsa *this);
+static void     	gst_alsa_set_eos (GstAlsa *this);
 
-static gboolean gst_alsa_probe_hw_params (GstAlsa *this, GstAlsaFormat *format);
-static gboolean gst_alsa_set_hw_params (GstAlsa *this);
-static gboolean gst_alsa_set_sw_params (GstAlsa *this);
+static gboolean 	gst_alsa_probe_hw_params (GstAlsa *this, GstAlsaFormat *format);
+static gboolean 	gst_alsa_set_hw_params (GstAlsa *this);
+static gboolean 	gst_alsa_set_sw_params (GstAlsa *this);
 
-static gboolean gst_alsa_open_audio (GstAlsa *this);
-static gboolean gst_alsa_start_audio (GstAlsa *this);
-static gboolean gst_alsa_drain_audio (GstAlsa *this);
-static gboolean gst_alsa_stop_audio (GstAlsa *this);
-static gboolean gst_alsa_close_audio (GstAlsa *this);
+static gboolean 	gst_alsa_open_audio (GstAlsa *this);
+static gboolean 	gst_alsa_start_audio (GstAlsa *this);
+static gboolean 	gst_alsa_drain_audio (GstAlsa *this);
+static gboolean 	gst_alsa_stop_audio (GstAlsa *this);
+static gboolean 	gst_alsa_close_audio (GstAlsa *this);
 
-/*** TYPE FUNCTIONS ***********************************************************/
+/* clock functions */
+static void	 		gst_alsa_clock_class_init 	(GstAlsaClockClass *klass);
+static void 			gst_alsa_clock_init 		(GstAlsaClock *clock);
+static GstAlsaClock*		gst_alsa_clock_new		(gchar *name, 
+								 GstAlsaClockGetTimeFunc func,
+								 GstAlsa* owner);
 
-#define GST_TYPE_ALSA_FORMAT (gst_alsa_format_get_type())
-static GType
-gst_alsa_format_get_type (void)
-{
-  static GType type = 0;
-  static GEnumValue *values = NULL;
-  gint i;
+static void			gst_alsa_clock_start	 	(GstAlsaClock *clock);
+static void			gst_alsa_clock_stop	 	(GstAlsaClock *clock);
 
-  if (values == NULL) {
-    /* the three: for -1, 0, and the terminating NULL */
-    values = g_new0 (GEnumValue, SND_PCM_FORMAT_LAST + 1);
- 
-    for (i = -1; i <= SND_PCM_FORMAT_LAST; i++) {
-      values[i + 1].value = i; /* UNKNOWN is -1 */
-      values[i + 1].value_name = g_strdup_printf ("%d", i);
-      values[i + 1].value_nick = g_strdup (snd_pcm_format_name ((snd_pcm_format_t) i));
-    }
-  }
+static GstClockTime		gst_alsa_clock_get_internal_time (GstClock *clock);
+static guint64			gst_alsa_clock_get_resolution	(GstClock *clock);
+static GstClockEntryStatus	gst_alsa_clock_wait		(GstClock *clock,
+								 GstClockEntry *entry);
+static void			gst_alsa_clock_unlock		(GstClock *clock, 
+								 GstClockEntry *entry);
 
-  if (!type)
-    type = g_enum_register_static ("GstAlsaFormat", values);
+static GstClockTime		gst_alsa_sink_get_time		(GstAlsa *this);
+static GstClockTime		gst_alsa_src_get_time		(GstAlsa *this);
+static GstClock *		gst_alsa_get_clock		(GstElement *element);
+static void			gst_alsa_set_clock		(GstElement *element, 
+								 GstClock *clock);
+static GstClockClass *		clock_parent_class = NULL;
+/* static guint gst_alsa_clock_signals[LAST_SIGNAL] = { 0 }; */
+
+/* format conversions */
+static inline snd_pcm_uframes_t	gst_alsa_timestamp_to_samples 	(GstAlsa *		this, 
+								 GstClockTime 		time);
+static inline GstClockTime 	gst_alsa_samples_to_timestamp 	(GstAlsa *		this, 
+								 snd_pcm_uframes_t 	samples);
+static inline snd_pcm_uframes_t	gst_alsa_bytes_to_samples 	(GstAlsa *		this, 
+								 guint	 		bytes);
+static inline guint	 	gst_alsa_samples_to_bytes 	(GstAlsa *		this, 
+								 snd_pcm_uframes_t 	samples);
+static inline GstClockTime	gst_alsa_bytes_to_timestamp 	(GstAlsa *		this, 
+								 guint	 		bytes);
+static inline guint	 	gst_alsa_timestamp_to_bytes 	(GstAlsa *		this, 
+								 GstClockTime	 	time);
+
+/*** TYPE FUNCTIONS ***********************************************************/
 
-  return type;
-}
 GType
 gst_alsa_get_type (void)
 {
@@ -225,9 +240,6 @@
 {
   ARG_0,
   ARG_DEVICE,
-  ARG_FORMAT,
-  ARG_CHANNELS,
-  ARG_RATE,
   ARG_PERIODCOUNT,
   ARG_PERIODSIZE,
   ARG_BUFFERSIZE,
@@ -257,16 +269,6 @@
   g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_DEVICE,
     g_param_spec_string ("device", "Device", "Alsa device, as defined in an asoundrc",
                          "default", G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
-  /* the next 3 are only settable on srcs */
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FORMAT,
-    g_param_spec_enum ("format", "Format", "PCM audio format",
-                       GST_TYPE_ALSA_FORMAT, -1, G_PARAM_READWRITE));
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_CHANNELS,
-    g_param_spec_int ("channels", "Channels", "Number of channels",
-                      1, GST_ALSA_MAX_CHANNELS, 2, G_PARAM_READWRITE));
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_RATE,
-    g_param_spec_int ("rate", "Rate", "Sample rate, in Hz",
-                      GST_ALSA_MIN_RATE, GST_ALSA_MAX_RATE, 44100, G_PARAM_READWRITE));
   g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_PERIODCOUNT,
     g_param_spec_int ("period-count", "Period count", "Number of hardware buffers to use",
                       2, 64, 2, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
@@ -283,8 +285,10 @@
     g_param_spec_boolean ("mmap", "Use mmap'ed access", "Wether to use mmap (faster) or standard read/write (more compatible)",
                           TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
-  element_class->change_state = gst_alsa_change_state;
+  element_class->change_state    = gst_alsa_change_state;
   element_class->request_new_pad = gst_alsa_request_new_pad;
+  element_class->set_clock 	 = gst_alsa_set_clock;
+  element_class->get_clock 	 = gst_alsa_get_clock;
 }
 
 static void
@@ -308,16 +312,18 @@
     gst_element_set_loop_function (GST_ELEMENT (this), gst_alsa_src_loop);
     this->pads[0].pad = gst_pad_new_from_template (gst_alsa_src_pad_factory (), "src");
     gst_pad_set_bufferpool_function(this->pads[0].pad, gst_alsa_src_get_buffer_pool);
-
-    /* set the rate to a sensible value. we can't have gobject construct this
-       manually since it only really makes sense on src elements. the rate can
-       be changed later through the gobject set property function. */
+    this->clock = gst_alsa_clock_new ("alsasrcclock", gst_alsa_src_get_time, this);
   } else if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SINK) {
     this->stream = SND_PCM_STREAM_PLAYBACK;
     gst_element_set_loop_function (GST_ELEMENT (this), gst_alsa_sink_loop);
     this->pads[0].pad = gst_pad_new_from_template (gst_alsa_sink_pad_factory (), "sink");
+    this->clock = gst_alsa_clock_new ("alsasinkclock", gst_alsa_sink_get_time, this);
+  } else {
+    g_assert_not_reached ();
   }
-
+  /* we hold a ref to our clock until we're disposed */
+  gst_object_ref (GST_OBJECT (this->clock));
+  gst_object_sink (GST_OBJECT (this->clock));
   gst_element_add_pad (GST_ELEMENT (this), this->pads[0].pad);
 
   gst_pad_set_link_function (this->pads[0].pad, gst_alsa_link);
@@ -335,6 +341,8 @@
       gst_data_unref (GST_DATA (this->pads[i].buf));
     }
   }
+  gst_object_unref (GST_OBJECT (this->clock));
+
 
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
@@ -352,21 +360,6 @@
       g_free (this->device);
     this->device = g_strdup (g_value_get_string (value));
     break;
-  case ARG_FORMAT:
-    /* setting this property only makes sense on sources */
-    if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC)
-      this->format->format = g_value_get_enum (value);
-    break;
-  case ARG_CHANNELS:
-    /* setting this property only makes sense on sources */
-    if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC)
-      this->format->channels = g_value_get_int (value);
-    break;
-  case ARG_RATE:
-    /* setting this property only makes sense on sources */
-    if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC)
-      this->format->rate = g_value_get_int (value);
-    break;
   case ARG_PERIODCOUNT:
     g_return_if_fail (!GST_FLAG_IS_SET (this, GST_ALSA_RUNNING));
     this->period_count = g_value_get_int (value);
@@ -387,7 +380,7 @@
     this->mmap = g_value_get_boolean (value);
     return;
   default:
-    GST_DEBUG (0, "Unknown arg");
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     return;
   }
 
@@ -412,15 +405,6 @@
   case ARG_DEVICE:
     g_value_set_string (value, this->device);
     break;
-  case ARG_FORMAT:
-    g_value_set_enum (value, this->format ? this->format->format : SND_PCM_FORMAT_UNKNOWN);
-    break;
-  case ARG_CHANNELS:
-    g_value_set_int (value, this->format ? this->format->channels : 2);
-    break;
-  case ARG_RATE:
-    g_value_set_int (value, this->format ? this->format->rate : 44100);
-    break;
   case ARG_PERIODCOUNT:
     g_value_set_int (value, this->period_count);
     break;
@@ -437,7 +421,7 @@
     g_value_set_boolean (value, this->mmap);
     break;
   default:
-    GST_DEBUG (0, "Unknown arg");
+    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     break;
   }
 }
@@ -950,15 +934,28 @@
     if (!GST_FLAG_IS_SET (element, GST_ALSA_RUNNING))
       if (!gst_alsa_start_audio (this))
         return GST_STATE_FAILURE;
+    this->transmitted = 0;
     break;
   case GST_STATE_PAUSED_TO_PLAYING:
-    if (snd_pcm_state (this->handle) == SND_PCM_STATE_PAUSED)
-      snd_pcm_pause (this->handle, 0);
+    if (snd_pcm_state (this->handle) == SND_PCM_STATE_PAUSED) {
+      int err = snd_pcm_pause (this->handle, 0);
+      if (err < 0) {
+        g_warning ("Error unpausing sound: %s", snd_strerror (err));
+        return GST_STATE_FAILURE;
+      }
+      gst_alsa_clock_start (this->clock);
+    }
     break;
   case GST_STATE_PLAYING_TO_PAUSED:
     if (GST_ALSA_CAPS_IS_SET(this, GST_ALSA_CAPS_PAUSE)) {
-      if (snd_pcm_state (this->handle) == SND_PCM_STATE_RUNNING)
-        snd_pcm_pause (this->handle, 1);
+      if (snd_pcm_state (this->handle) == SND_PCM_STATE_RUNNING) {
+        int err = snd_pcm_pause (this->handle, 1);
+        if (err < 0) {
+          g_warning ("Error pausing sound: %s", snd_strerror (err));
+          return GST_STATE_FAILURE;
+        }
+        gst_alsa_clock_stop (this->clock);
+      }
       break;
     }
     /* if device doesn't know how to pause, we just stop */
@@ -1117,6 +1114,8 @@
 inline static gboolean
 gst_alsa_start (GstAlsa *this)
 {
+  gint avail;
+
   GST_DEBUG (GST_CAT_PLUGIN_INFO, "Starting playback");
 
   switch (snd_pcm_state(this->handle)) {
@@ -1136,12 +1135,18 @@
       g_assert_not_reached ();
       break;
   }
+  avail = (gint) gst_alsa_update_avail (this);
+  if (avail < 0)
+    return FALSE;
+  this->transmitted = this->period_count * this->period_size - avail;
+  gst_alsa_clock_start (this->clock);
   return TRUE;
 }
 static void
 gst_alsa_sink_loop (GstElement *element)
 {
   snd_pcm_sframes_t avail, avail2, copied;
+  snd_pcm_uframes_t samplestamp;
   gint i;
   guint bytes; /* per channel */
   GstAlsa *this = GST_ALSA (element);
@@ -1154,20 +1159,21 @@
   if (avail == -EPIPE) goto sink_restart;
   if (avail < 0) return;
   if (avail > 0) {
-    int width;
-    
-    /* Not enough space. We grab data nonetheless and sleep afterwards */
+
+  /* Not enough space. We grab data nonetheless and sleep afterwards */
     if (avail < this->period_size) {
       avail = this->period_size;
     }
     
     /* check how many bytes we still have in all our bytestreams */
-    bytes = G_MAXUINT;
+    /* initialize this value to a somewhat sane state, we might alloc this much data below (which would be a bug, but who knows)... */
+    bytes = this->period_size * this->period_count * element->numpads * 8; /* must be > max sample size in bytes */
     for (i = 0; i < element->numpads; i++) {
       GstAlsaPad *pad = &this->pads[i];
       g_assert (pad->pad != NULL);
       while (pad->size == 0) {
-        pad->buf = gst_pad_pull (pad->pad);
+        if (!pad->buf)
+          pad->buf = gst_pad_pull (pad->pad);
         if (GST_IS_EVENT (pad->buf)) {
 	  gboolean cont = gst_alsa_sink_check_event (this, i, GST_EVENT (pad->buf));
 	  pad->buf = NULL;
@@ -1175,19 +1181,55 @@
 	    continue;
 	  return;
 	}
-        pad->size = pad->buf->size;
-        pad->data = pad->buf->data;
+        /* caps nego failed somewhere */
+        if (this->format == NULL) {
+          gst_element_error (GST_ELEMENT (this), "alsasink: No caps available");
+          return;
+        }
+        samplestamp = gst_alsa_timestamp_to_samples (this, GST_BUFFER_TIMESTAMP (pad->buf));
+        if (!GST_BUFFER_TIMESTAMP_IS_VALID (pad->buf) || 
+	     /* difference between them is < GST_ALSA_DEVIATION */
+	    ((this->transmitted + GST_ALSA_DEVIATION > samplestamp) &&
+	     (this->transmitted < GST_ALSA_DEVIATION + samplestamp))) {
+no_difference:
+	  pad->size = pad->buf->size;
+          pad->data = pad->buf->data;
+          pad->behaviour = 0;
+	} else if (samplestamp > this->transmitted) {
+	  /* there are empty samples in front of us, fill them with silence */
+	  int samples = MIN (bytes, samplestamp - this->transmitted) * 
+	             (element->numpads == 1 ? this->format->channels : 1);
+	  int size = samples * snd_pcm_format_physical_width (this->format->format) / 8;
+	  g_print ("Allocating %d bytes (%d silent samples) now to resync to timestamp\n", size, samples);
+	  pad->data = g_malloc (size);
+	  if (!pad->data) {
+	    g_warning ("GstAlsa: error allocating %d bytes, buffers unsynced now.", size);
+	    goto no_difference;
+	  }
+	  pad->size = size;
+	  if (0 != snd_pcm_format_set_silence (this->format->format, pad->data, samples)) {
+	    g_warning ("GstAlsa: error silencing buffer, enjoy the noise.");
+	  }
+	  pad->behaviour = 1;
+	} else if (gst_alsa_samples_to_bytes (this, this->transmitted - samplestamp) >= pad->buf->size) {
+	  /* this buffer is way behind */
+	  gst_buffer_unref (pad->buf);
+	  pad->buf = NULL;
+	  continue;
+	} else if (this->transmitted > samplestamp) {
+	  gint difference = gst_alsa_samples_to_bytes (this, this->transmitted - samplestamp);	
+	  /* this buffer is only a bit behind */
+          pad->size = pad->buf->size - difference;
+          pad->data = pad->buf->data + difference;
+          pad->behaviour = 0;
+	} else {
+	  g_assert_not_reached ();
+	}
       }
       bytes = MIN (bytes, pad->size);
     }
-    /* caps nego failed somewhere */
-    if (this->format == NULL) {
-      gst_element_error (GST_ELEMENT (this), "alsasink: No caps available");
-      return;
-    }
 
-    width = snd_pcm_format_physical_width (this->format->format);
-    avail = MIN (avail, bytes / (width / 8 ) / (element->numpads == 1 ? this->format->channels : 1));
+    avail = MIN (avail, gst_alsa_bytes_to_samples (this, bytes));
 
     /* wait until the hw buffer has enough space */
     while (gst_element_get_state (element) == GST_STATE_PLAYING && (avail2 = gst_alsa_update_avail (this)) < avail) {
@@ -1204,19 +1246,32 @@
     /* put this data into alsa */
     if ((copied = this->transmit (this, &avail)) < 0)
       return;
-
+    /* update our clock */
+    this->transmitted += copied;
     /* flush the data */
-    bytes = copied * ( width / 8 ) * (element->numpads == 1 ? this->format->channels : 1);
+    bytes = gst_alsa_samples_to_bytes (this, copied);
     for (i = 0; i < element->numpads; i++) {
       GstAlsaPad *pad = &this->pads[i];
       if ((pad->size -= bytes) == 0) {
-        gst_data_unref (GST_DATA (pad->buf));
-        pad->buf = NULL;  /* needed? */
-        pad->data = NULL; /* needed? */
-        continue;
+        switch (pad->behaviour) {
+	case 0:
+          gst_data_unref (GST_DATA (pad->buf));
+          pad->buf = NULL;  /* needed? */
+          pad->data = NULL; /* needed? */
+          pad->behaviour = 0; /* needed? */
+          continue;
+	case 1:
+          g_free (pad->data);
+          pad->data = NULL; /* needed? */
+          pad->behaviour = 0; /* needed? */
+	  continue;
+	default:
+	  g_assert_not_reached ();
+	}
       }
       g_assert (pad->size > 0);
-      pad->data += bytes;
+      if (pad->behaviour != 1)
+        pad->data += bytes;
     }
   }
 
@@ -1361,8 +1416,48 @@
       case GST_EVENT_INTERRUPT:
 	cont = FALSE;
         break;
+      case GST_EVENT_NEW_MEDIA:
+	/* only the first pad my seek */
+	if (pad_nr != 0)
+	  break;	    
+	
+	this->transmitted = 0;
+	/* FIXME: Notify the clock that we're at offset 0 again */
+	break;
+      case GST_EVENT_DISCONTINUOUS: 
+	{
+	  gint64 value;
+	  
+	  /* only the first pad my seek */
+	  if (pad_nr != 0) {
+	    break;	    
+	  }
+	  if (gst_event_discont_get_value (event, GST_FORMAT_TIME, &value)) {
+	    if (!gst_clock_handle_discont (GST_ELEMENT (this)->clock, value))
+	      g_warning ("GstAlsa: clock couldn't handle discontinuity");
+	  }
+	  if (!gst_event_discont_get_value (event, GST_FORMAT_UNITS, &value)) {
+	    if (!gst_event_discont_get_value (event, GST_FORMAT_BYTES, &value)) {
+	      if (!gst_event_discont_get_value (event, GST_FORMAT_TIME, &value)) {
+	        g_warning ("GstAlsa: Could not acquire samplecount after seek, the clock might screw your pipeline now");
+	        break;
+	      } else {
+	        if (this->format) /* discont event before any data (and before any caps...) */
+	          value = gst_alsa_timestamp_to_samples (this, value);
+	      }
+	    } else {
+              if (this->format) /* discont event before any data (and before any caps...) */
+	        value = gst_alsa_bytes_to_samples (this, value);
+	    }
+	  }
+	  this->transmitted = value;
+	  if (snd_pcm_state (this->handle) == SND_PCM_STATE_RUNNING)
+	    gst_alsa_clock_start (this->clock);
+	  /* flush the current pad */
+	  break;
+        }
       default:
-        g_warning ("GstAlsaSink: got an unknown event (Type: %d)", GST_EVENT_TYPE (event));
+        g_warning ("GstAlsa: got an unknown event (Type: %d)", GST_EVENT_TYPE (event));
         break;
     }
     gst_event_unref (event);
@@ -1561,6 +1656,7 @@
   if (this->stream == SND_PCM_STREAM_PLAYBACK) {
     ERROR_CHECK (snd_pcm_drain (this->handle),
                  "couldn't stop and drain buffer: %s");
+    gst_alsa_clock_stop (this->clock);
   }
 
   GST_FLAG_UNSET (this, GST_ALSA_RUNNING);  
@@ -1579,6 +1675,7 @@
   if (this->stream == SND_PCM_STREAM_PLAYBACK) {
     ERROR_CHECK (snd_pcm_drop (this->handle),
                  "couldn't stop (dropping frames): %s");
+    gst_alsa_clock_stop (this->clock);
   }
 
   GST_FLAG_UNSET (this, GST_ALSA_RUNNING);  
@@ -1597,6 +1694,219 @@
   GST_FLAG_UNSET (this, GST_ALSA_OPEN);
 
   return TRUE;
+}
+
+/*** CLOCK FUNCTIONS **********************************************************/
+
+GType
+gst_alsa_clock_get_type (void)
+{ 
+  static GType clock_type = 0;
+	    
+  if (!clock_type) {
+    static const GTypeInfo clock_info = {
+      sizeof (GstAlsaClockClass),
+      NULL,
+      NULL,
+      (GClassInitFunc) gst_alsa_clock_class_init,
+      NULL,
+      NULL,
+      sizeof (GstAlsaClock),
+      4,
+      (GInstanceInitFunc) gst_alsa_clock_init,
+      NULL
+    };
+    clock_type = g_type_register_static (GST_TYPE_CLOCK, "GstAlsaClock",
+                                         &clock_info, 0);
+  }
+  return clock_type;
+}
+static void
+gst_alsa_clock_class_init (GstAlsaClockClass *klass)
+{
+  GObjectClass *gobject_class;
+  GstObjectClass *gstobject_class;
+  GstClockClass *gstclock_class;
+
+  gobject_class = (GObjectClass*) klass;
+  gstobject_class = (GstObjectClass*) klass;
+  gstclock_class = (GstClockClass*) klass;
+
+  clock_parent_class = g_type_class_ref (GST_TYPE_CLOCK);
+
+  gstclock_class->get_internal_time = gst_alsa_clock_get_internal_time;
+  gstclock_class->get_resolution = gst_alsa_clock_get_resolution;
+  gstclock_class->wait = gst_alsa_clock_wait;
+  gstclock_class->unlock = gst_alsa_clock_unlock;
+}
+static void
+gst_alsa_clock_init (GstAlsaClock *clock)
+{
+  gst_object_set_name (GST_OBJECT (clock), "GstAlsaClock");
+}
+GstAlsaClock*
+gst_alsa_clock_new (gchar *name, GstAlsaClockGetTimeFunc get_time, GstAlsa *owner)
+{
+  GstAlsaClock *alsa_clock = GST_ALSA_CLOCK (g_object_new (GST_TYPE_ALSA_CLOCK, NULL));
+
+  g_assert (alsa_clock);
+
+  alsa_clock->get_time = get_time;
+  alsa_clock->owner = owner;
+  alsa_clock->adjust = 0;
+
+  gst_object_set_name (GST_OBJECT (alsa_clock), name);
+
+  return alsa_clock;
+}
+void
+gst_alsa_clock_start (GstAlsaClock *clock)
+{
+  GTimeVal timeval;
+  g_get_current_time (&timeval);
+
+  if (clock->owner->format) {
+    clock->adjust = GST_TIMEVAL_TO_TIME (timeval) - clock->get_time (clock->owner);
+  } else {
+    clock->adjust = GST_TIMEVAL_TO_TIME (timeval);
+  }
+}
+void
+gst_alsa_clock_stop (GstAlsaClock *clock)
+{
+  clock->adjust = 0;
+}
+static GstClockTime
+gst_alsa_clock_get_internal_time (GstClock *clock)
+{
+  GstAlsaClock *alsa_clock = GST_ALSA_CLOCK (clock);
+  
+  if (alsa_clock->adjust) {
+    return alsa_clock->get_time (alsa_clock->owner) + alsa_clock->adjust;
+  } else {
+    GTimeVal timeval;
+    g_get_current_time (&timeval);
+    return GST_TIMEVAL_TO_TIME (timeval);
+  }
+}
+static guint64
+gst_alsa_clock_get_resolution (GstClock *clock)
+{
+  GstAlsaClock *this = GST_ALSA_CLOCK (clock);
+
+  if (this->owner->format) {
+    return GST_SECOND / this->owner->format->rate;
+  } else {
+    /* FIXME: is there an "unknown" value? We just return the sysclock's time by default */
+    return 1 * GST_USECOND;
+  }
+}
+static GstClockEntryStatus
+gst_alsa_clock_wait (GstClock *clock, GstClockEntry *entry)
+{
+  GstClockTime target, entry_time;
+  GstClockTimeDiff diff;
+  GstAlsaClock *this = GST_ALSA_CLOCK (clock);
+
+  entry_time = this->get_time (this->owner);
+  diff = GST_CLOCK_ENTRY_TIME (entry) - gst_clock_get_time (clock);
+
+  if (diff < 0)
+    return GST_CLOCK_ENTRY_EARLY;
+    
+  if (diff > clock->max_diff) {
+    g_warning ("GstAlsaClock: abnormal clock request diff: %" G_GINT64_FORMAT") >"
+               "  %"G_GINT64_FORMAT, diff, clock->max_diff);
+    return GST_CLOCK_ENTRY_EARLY;
+  }
+  
+  target = entry_time + diff;
+
+  GST_DEBUG (GST_CAT_CLOCK, "real_target %" G_GUINT64_FORMAT
+		            " target %" G_GUINT64_FORMAT
+			    " now %" G_GUINT64_FORMAT,
+                            target, GST_CLOCK_ENTRY_TIME (entry), entry_time);
+
+  while (this->get_time (this->owner) < target && this->last_unlock < entry_time) {
+    g_usleep (gst_alsa_clock_get_resolution (clock) * G_USEC_PER_SEC / GST_SECOND);
+  }
+
+  return entry->status;
+}
+static void
+gst_alsa_clock_unlock (GstClock *clock, GstClockEntry *entry)
+{
+  GstAlsaClock *this = GST_ALSA_CLOCK (clock);
+
+  this->last_unlock = this->get_time (this->owner);
+}
+static GstClockTime
+gst_alsa_sink_get_time (GstAlsa *this)
+{
+  snd_pcm_sframes_t delay;
+  
+  if (snd_pcm_delay (this->handle, &delay) == 0) {
+    return GST_SECOND * (GstClockTime) (this->transmitted > delay ? this->transmitted - delay : 0) / this->format->rate;
+  } else {
+    return 0;
+  }
+}
+static GstClockTime 
+gst_alsa_src_get_time (GstAlsa *this)
+{
+  snd_pcm_sframes_t delay;
+  
+  if (snd_pcm_delay (this->handle, &delay) == 0) {
+    return GST_SECOND * (this->transmitted + delay) / this->format->rate;
+  } else {
+    return 0;
+  }
+}
+static GstClock *
+gst_alsa_get_clock (GstElement *element)
+{
+  return GST_CLOCK (GST_ALSA (element)->clock);
+}
+static void 
+gst_alsa_set_clock (GstElement *element, GstClock *clock)
+{
+  /* we only must have this function so everybody knows we use a clock */
+}
+
+/*** FORMAT FUNCTIONS *********************************************************/
+/* ALL THES FUNCTIONS ASSUME this->format != NULL */
+
+static inline snd_pcm_uframes_t
+gst_alsa_timestamp_to_samples (GstAlsa *this, GstClockTime time)
+{
+  return (snd_pcm_uframes_t) ((time * this->format->rate + this->format->rate / 2) / GST_SECOND);
+}
+/* assumes that this->format != NULL */
+static inline GstClockTime
+gst_alsa_samples_to_timestamp (GstAlsa *this, snd_pcm_uframes_t samples)
+{
+  return (GstClockTime) ((samples * GST_SECOND + GST_SECOND / 2)/ this->format->rate);
+}
+
+static inline snd_pcm_uframes_t
+gst_alsa_bytes_to_samples (GstAlsa *this, guint bytes)
+{
+  return bytes / (snd_pcm_format_physical_width (this->format->format) / 8) / (GST_ELEMENT (this)->numpads == 1 ? this->format->channels : 1);
+}
+static inline guint
+gst_alsa_samples_to_bytes (GstAlsa *this, snd_pcm_uframes_t samples)
+{
+  return samples * snd_pcm_format_physical_width (this->format->format) / 8 * (GST_ELEMENT (this)->numpads == 1 ? this->format->channels : 1);
+}
+static inline GstClockTime
+gst_alsa_bytes_to_timestamp (GstAlsa *this, guint bytes)
+{
+  return gst_alsa_samples_to_timestamp (this, gst_alsa_bytes_to_samples (this, bytes));
+}
+static inline guint
+gst_alsa_timestamp_to_bytes (GstAlsa *this, GstClockTime time)
+{
+  return gst_alsa_samples_to_bytes (this, gst_alsa_timestamp_to_samples (this, time));
 }
 
 
Index: gstalsa.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- gstalsa.h	27 Mar 2003 00:17:26 -0000	1.13
+++ gstalsa.h	13 Apr 2003 04:13:12 -0000	1.14
@@ -31,6 +31,9 @@
 #define GST_ALSA_MAX_CHANNELS 64 /* we don't support more than 64 channels */
 #define GST_ALSA_MIN_RATE 8000
 #define GST_ALSA_MAX_RATE 192000
+/* max allowed deviation between timestamp and playback pointer before killing/inserting samples 
+   should be >= 1 to allow rounding errors on timestamp <=> samplerate conversions */
+#define GST_ALSA_DEVIATION 2 
 
 #define GST_ALSA(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_ALSA, GstAlsa)
 #define GST_ALSA_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_ALSA, GstAlsaClass)
@@ -50,6 +53,12 @@
 #define GST_IS_ALSA_SRC_CLASS(klass) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_ALSA_SRC)
 #define GST_TYPE_ALSA_SRC gst_alsa_src_get_type()
 
+#define GST_ALSA_CLOCK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ALSA_CLOCK,GstAlsaClock))
+#define GST_ALSA_CLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ALSA_CLOCK,GstAlsaClockClass))
+#define GST_IS_ALSA_CLOCK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ALSA_CLOCK))
+#define GST_IS_ALSA_CLOCK_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ALSA_CLOCK))
+#define GST_TYPE_ALSA_CLOCK (gst_alsa_clock_get_type())
+
 /* I would have preferred to avoid this variety of trickery, but without it i
  * can't tell whether I'm a source or a sink upon creation. */
 
@@ -60,6 +69,11 @@
 typedef GstAlsa GstAlsaSrc;
 typedef GstAlsaClass GstAlsaSrcClass;
 
+typedef struct _GstAlsaClock GstAlsaClock;
+typedef struct _GstAlsaClockClass GstAlsaClockClass;
+
+typedef GstClockTime (*GstAlsaClockGetTimeFunc) (GstAlsa *owner);
+
 enum {
   GST_ALSA_OPEN = GST_ELEMENT_FLAG_LAST,
   GST_ALSA_RUNNING,
@@ -84,10 +98,12 @@
 typedef int (*GstAlsaTransmitFunction) (GstAlsa *this, snd_pcm_sframes_t *avail);
 
 typedef struct {
-  GstPad *pad;
-  guint8 *data; /* pointer into buffer */
-  guint size; /* sink: bytes left in buffer */
-  GstBuffer *buf; /* current buffer */
+  GstPad *	pad;
+  guint8 *	data;	/* pointer into buffer */
+  guint		size;	/* sink: bytes left in buffer */
+  GstBuffer *	buf;	/* current buffer */
+  guint		behaviour; /* 0 = data points into buffer (so unref when size == 0), 
+                              1 = data should be freed, use buffer after that */
 } GstAlsaPad;
 typedef struct {
   snd_pcm_format_t format;
@@ -115,14 +131,39 @@
   unsigned int period_count;
 
   gboolean autorecover;
-};
 
+  /* clocking */
+  GstAlsaClock         *clock;			/* our provided clock */
+  snd_pcm_uframes_t	transmitted; 		/* samples transmitted since last sync 
+                                                   This thing actually is our master clock.
+						   We will event insert silent samples or
+						   drop some to sync to incoming timestamps.
+                                                 */
+};
 struct _GstAlsaClass {
   GstElementClass parent_class;
 };
 
-GType gst_alsa_get_type (void);
-GType gst_alsa_sink_get_type (void);
-GType gst_alsa_src_get_type (void);
+
+struct _GstAlsaClock {
+  GstSystemClock		parent;
+
+  GstAlsaClockGetTimeFunc	get_time;
+  GstAlsa *			owner;
+
+  GstClockTimeDiff		adjust; 	/* time_of_clock - time_of_element at sync point */
+
+  GstClockTime			last_unlock;    /* time of last unlock request */
+};
+
+struct _GstAlsaClockClass {
+  GstSystemClockClass 		parent_class;
+};
+
+GType 				gst_alsa_get_type		(void);
+GType 				gst_alsa_sink_get_type		(void);
+GType 				gst_alsa_src_get_type		(void);
+
+GType                   	gst_alsa_clock_get_type		(void);
 
 #endif /* __ALSA_H__ */

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Sun Apr 13 2003  07:21:14 PDT

Log message:
fix timestamp syncing
timestamps are only guessed so add a (big) threshold before starting to drop/insert
fix some clocking madness

Modified files:
    ext/alsa        : gstalsa.c gstalsa.h

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.44&r2=1.45
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.h.diff?r1=1.14&r2=1.15

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- gstalsa.c	13 Apr 2003 04:13:12 -0000	1.44
+++ gstalsa.c	13 Apr 2003 14:21:02 -0000	1.45
@@ -243,9 +243,9 @@
   ARG_PERIODCOUNT,
   ARG_PERIODSIZE,
   ARG_BUFFERSIZE,
-  ARG_DEBUG,
   ARG_AUTORECOVER,
-  ARG_MMAP
+  ARG_MMAP,
+  ARG_MAXDISCONT
 };
 
 static GstElement *parent_class = NULL;
@@ -284,6 +284,9 @@
   g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MMAP,
     g_param_spec_boolean ("mmap", "Use mmap'ed access", "Wether to use mmap (faster) or standard read/write (more compatible)",
                           TRUE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
+  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MAXDISCONT,
+    g_param_spec_uint64 ("max-discont", "Maximum Discontinuity", "GStreamer timeunits before the timestamp syncing starts dropping/insertting samples",
+   /* rounding errors */ 1000, GST_SECOND, GST_ALSA_DEFAULT_DISCONT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
   element_class->change_state    = gst_alsa_change_state;
   element_class->request_new_pad = gst_alsa_request_new_pad;
@@ -379,6 +382,9 @@
   case ARG_MMAP:
     this->mmap = g_value_get_boolean (value);
     return;
+  case ARG_MAXDISCONT:
+    this->max_discont = (GstClockTime) g_value_get_uint64 (value);
+    return;
   default:
     G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     return;
@@ -420,6 +426,9 @@
   case ARG_MMAP:
     g_value_set_boolean (value, this->mmap);
     break;
+  case ARG_MAXDISCONT:
+    g_value_set_uint64 (value, (guint64) this->max_discont);
+    return;
   default:
     G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
     break;
@@ -1189,8 +1198,8 @@
         samplestamp = gst_alsa_timestamp_to_samples (this, GST_BUFFER_TIMESTAMP (pad->buf));
         if (!GST_BUFFER_TIMESTAMP_IS_VALID (pad->buf) || 
 	     /* difference between them is < GST_ALSA_DEVIATION */
-	    ((this->transmitted + GST_ALSA_DEVIATION > samplestamp) &&
-	     (this->transmitted < GST_ALSA_DEVIATION + samplestamp))) {
+	    ((this->transmitted + gst_alsa_timestamp_to_samples (this, this->max_discont) >= samplestamp) &&
+	     (this->transmitted <= gst_alsa_timestamp_to_samples (this, this->max_discont) + samplestamp))) {
 no_difference:
 	  pad->size = pad->buf->size;
           pad->data = pad->buf->data;
@@ -1200,7 +1209,7 @@
 	  int samples = MIN (bytes, samplestamp - this->transmitted) * 
 	             (element->numpads == 1 ? this->format->channels : 1);
 	  int size = samples * snd_pcm_format_physical_width (this->format->format) / 8;
-	  g_print ("Allocating %d bytes (%d silent samples) now to resync to timestamp\n", size, samples);
+	  g_print ("Allocating %d bytes (%ld silent samples) now to resync to timestamp\n", size, MIN (bytes, samplestamp - this->transmitted));
 	  pad->data = g_malloc (size);
 	  if (!pad->data) {
 	    g_warning ("GstAlsa: error allocating %d bytes, buffers unsynced now.", size);
@@ -1212,12 +1221,14 @@
 	  }
 	  pad->behaviour = 1;
 	} else if (gst_alsa_samples_to_bytes (this, this->transmitted - samplestamp) >= pad->buf->size) {
+	  g_print ("Skipping %lu samples to resync (complete buffer)\n", gst_alsa_bytes_to_samples (this, pad->buf->size));
 	  /* this buffer is way behind */
 	  gst_buffer_unref (pad->buf);
 	  pad->buf = NULL;
 	  continue;
 	} else if (this->transmitted > samplestamp) {
 	  gint difference = gst_alsa_samples_to_bytes (this, this->transmitted - samplestamp);	
+	  g_print ("Skipping %lu samples to resync\n", (gulong) this->transmitted - samplestamp);
 	  /* this buffer is only a bit behind */
           pad->size = pad->buf->size - difference;
           pad->data = pad->buf->data + difference;
@@ -1808,7 +1819,7 @@
   GstClockTimeDiff diff;
   GstAlsaClock *this = GST_ALSA_CLOCK (clock);
 
-  entry_time = this->get_time (this->owner);
+  entry_time = gst_alsa_clock_get_internal_time (clock);
   diff = GST_CLOCK_ENTRY_TIME (entry) - gst_clock_get_time (clock);
 
   if (diff < 0)
@@ -1827,7 +1838,7 @@
 			    " now %" G_GUINT64_FORMAT,
                             target, GST_CLOCK_ENTRY_TIME (entry), entry_time);
 
-  while (this->get_time (this->owner) < target && this->last_unlock < entry_time) {
+  while (gst_alsa_clock_get_internal_time (clock) < target && this->last_unlock < entry_time) {
     g_usleep (gst_alsa_clock_get_resolution (clock) * G_USEC_PER_SEC / GST_SECOND);
   }
 
Index: gstalsa.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- gstalsa.h	13 Apr 2003 04:13:12 -0000	1.14
+++ gstalsa.h	13 Apr 2003 14:21:02 -0000	1.15
@@ -31,9 +31,10 @@
 #define GST_ALSA_MAX_CHANNELS 64 /* we don't support more than 64 channels */
 #define GST_ALSA_MIN_RATE 8000
 #define GST_ALSA_MAX_RATE 192000
-/* max allowed deviation between timestamp and playback pointer before killing/inserting samples 
-   should be >= 1 to allow rounding errors on timestamp <=> samplerate conversions */
-#define GST_ALSA_DEVIATION 2 
+/* max allowed discontinuity in time units between timestamp and playback pointer 
+   before killing/inserting samples 
+   should be big enough to allow smoothing errors on different video formats */
+#define GST_ALSA_DEFAULT_DISCONT (GST_SECOND / 10)
 
 #define GST_ALSA(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_ALSA, GstAlsa)
 #define GST_ALSA_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_ALSA, GstAlsaClass)
@@ -139,6 +140,9 @@
 						   We will event insert silent samples or
 						   drop some to sync to incoming timestamps.
                                                  */
+  GstClockTime		max_discont;		/* max difference between current
+  						   playback timestamp and buffers timestamps
+						 */
 };
 struct _GstAlsaClass {
   GstElementClass parent_class;

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Sun Apr 13 2003  07:28:27 PDT

Log message:
converted g_print to g_printerr

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.45&r2=1.46

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- gstalsa.c	13 Apr 2003 14:21:02 -0000	1.45
+++ gstalsa.c	13 Apr 2003 14:28:15 -0000	1.46
@@ -1209,7 +1209,7 @@
 	  int samples = MIN (bytes, samplestamp - this->transmitted) * 
 	             (element->numpads == 1 ? this->format->channels : 1);
 	  int size = samples * snd_pcm_format_physical_width (this->format->format) / 8;
-	  g_print ("Allocating %d bytes (%ld silent samples) now to resync to timestamp\n", size, MIN (bytes, samplestamp - this->transmitted));
+	  g_printerr ("Allocating %d bytes (%ld silent samples) now to resync to timestamp\n", size, MIN (bytes, samplestamp - this->transmitted));
 	  pad->data = g_malloc (size);
 	  if (!pad->data) {
 	    g_warning ("GstAlsa: error allocating %d bytes, buffers unsynced now.", size);
@@ -1221,14 +1221,14 @@
 	  }
 	  pad->behaviour = 1;
 	} else if (gst_alsa_samples_to_bytes (this, this->transmitted - samplestamp) >= pad->buf->size) {
-	  g_print ("Skipping %lu samples to resync (complete buffer)\n", gst_alsa_bytes_to_samples (this, pad->buf->size));
+	  g_printerr ("Skipping %lu samples to resync (complete buffer)\n", gst_alsa_bytes_to_samples (this, pad->buf->size));
 	  /* this buffer is way behind */
 	  gst_buffer_unref (pad->buf);
 	  pad->buf = NULL;
 	  continue;
 	} else if (this->transmitted > samplestamp) {
 	  gint difference = gst_alsa_samples_to_bytes (this, this->transmitted - samplestamp);	
-	  g_print ("Skipping %lu samples to resync\n", (gulong) this->transmitted - samplestamp);
+	  g_printerr ("Skipping %lu samples to resync\n", (gulong) this->transmitted - samplestamp);
 	  /* this buffer is only a bit behind */
           pad->size = pad->buf->size - difference;
           pad->data = pad->buf->data + difference;

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Fri Apr 18 2003  05:14:17 PDT

Log message:
fix clock - seeking, xruns etc should be handled correctly now
includes bugfix to not play the rest of the audio buffer when going PAUSED => READY

Modified files:
    ext/alsa        : gstalsa.c gstalsa.h

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.46&r2=1.47
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.h.diff?r1=1.15&r2=1.16

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- gstalsa.c	13 Apr 2003 14:28:15 -0000	1.46
+++ gstalsa.c	18 Apr 2003 12:14:03 -0000	1.47
@@ -970,7 +970,7 @@
     /* if device doesn't know how to pause, we just stop */
   case GST_STATE_PAUSED_TO_READY:
     if (GST_FLAG_IS_SET (element, GST_ALSA_RUNNING))
-      gst_alsa_drain_audio (this);
+      gst_alsa_close_audio (this);
     /* clear format and pads */
     g_free (this->format);
     this->format = NULL;
@@ -1147,7 +1147,7 @@
   avail = (gint) gst_alsa_update_avail (this);
   if (avail < 0)
     return FALSE;
-  this->transmitted = this->period_count * this->period_size - avail;
+  //this->transmitted = this->period_count * this->period_size - avail;
   gst_alsa_clock_start (this->clock);
   return TRUE;
 }
@@ -1209,7 +1209,8 @@
 	  int samples = MIN (bytes, samplestamp - this->transmitted) * 
 	             (element->numpads == 1 ? this->format->channels : 1);
 	  int size = samples * snd_pcm_format_physical_width (this->format->format) / 8;
-	  g_printerr ("Allocating %d bytes (%ld silent samples) now to resync to timestamp\n", size, MIN (bytes, samplestamp - this->transmitted));
+	  g_printerr ("Allocating %d bytes (%ld samples) now to resync: sample %ld expected, but got %ld\n", 
+	              size, MIN (bytes, samplestamp - this->transmitted), this->transmitted, samplestamp);
 	  pad->data = g_malloc (size);
 	  if (!pad->data) {
 	    g_warning ("GstAlsa: error allocating %d bytes, buffers unsynced now.", size);
@@ -1432,6 +1433,11 @@
 	if (pad_nr != 0)
 	  break;	    
 	
+	if (GST_CLOCK_TIME_IS_VALID (this->clock->start_time)) { /* if the clock is running */
+	  g_assert (this->format);
+	  /* adjust the start time */
+	  this->clock->start_time += gst_alsa_samples_to_timestamp (this, this->transmitted);
+	}
 	this->transmitted = 0;
 	/* FIXME: Notify the clock that we're at offset 0 again */
 	break;
@@ -1445,7 +1451,7 @@
 	  }
 	  if (gst_event_discont_get_value (event, GST_FORMAT_TIME, &value)) {
 	    if (!gst_clock_handle_discont (GST_ELEMENT (this)->clock, value))
-	      g_warning ("GstAlsa: clock couldn't handle discontinuity");
+	      g_printerr ("GstAlsa: clock couldn't handle discontinuity\n");
 	  }
 	  if (!gst_event_discont_get_value (event, GST_FORMAT_UNITS, &value)) {
 	    if (!gst_event_discont_get_value (event, GST_FORMAT_BYTES, &value)) {
@@ -1461,10 +1467,13 @@
 	        value = gst_alsa_bytes_to_samples (this, value);
 	    }
 	  }
+	  if (GST_CLOCK_TIME_IS_VALID (this->clock->start_time)) { /* if the clock is running */
+	    g_assert (this->format);
+	    /* adjust the start time */
+	    this->clock->start_time += gst_alsa_samples_to_timestamp (this, this->transmitted) - 
+	                               gst_alsa_samples_to_timestamp (this, value);
+	  }
 	  this->transmitted = value;
-	  if (snd_pcm_state (this->handle) == SND_PCM_STATE_RUNNING)
-	    gst_alsa_clock_start (this->clock);
-	  /* flush the current pad */
 	  break;
         }
       default:
@@ -1664,7 +1673,10 @@
 
   GST_DEBUG (GST_CAT_PLUGIN_INFO, "stopping alsa");
   
-  if (this->stream == SND_PCM_STREAM_PLAYBACK) {
+  if (this->stream == SND_PCM_STREAM_PLAYBACK && 
+      (snd_pcm_state (this->handle) == SND_PCM_STATE_PAUSED ||
+       snd_pcm_state (this->handle) == SND_PCM_STATE_XRUN ||
+       snd_pcm_state (this->handle) == SND_PCM_STATE_RUNNING)) {
     ERROR_CHECK (snd_pcm_drain (this->handle),
                  "couldn't stop and drain buffer: %s");
     gst_alsa_clock_stop (this->clock);
@@ -1678,12 +1690,14 @@
 gst_alsa_stop_audio (GstAlsa *this)
 {
   g_assert (this != NULL);
-  g_return_val_if_fail (this != NULL, FALSE);
   g_return_val_if_fail (this->handle != NULL, FALSE);
 
   GST_DEBUG (GST_CAT_PLUGIN_INFO, "stopping alsa, skipping pending frames");
   
-  if (this->stream == SND_PCM_STREAM_PLAYBACK) {
+  if (this->stream == SND_PCM_STREAM_PLAYBACK && 
+      (snd_pcm_state (this->handle) == SND_PCM_STATE_PAUSED ||
+       snd_pcm_state (this->handle) == SND_PCM_STATE_XRUN ||
+       snd_pcm_state (this->handle) == SND_PCM_STATE_RUNNING)) {
     ERROR_CHECK (snd_pcm_drop (this->handle),
                  "couldn't stop (dropping frames): %s");
     gst_alsa_clock_stop (this->clock);
@@ -1754,6 +1768,8 @@
 gst_alsa_clock_init (GstAlsaClock *clock)
 {
   gst_object_set_name (GST_OBJECT (clock), "GstAlsaClock");
+
+  clock->start_time = GST_CLOCK_TIME_NONE;
 }
 GstAlsaClock*
 gst_alsa_clock_new (gchar *name, GstAlsaClockGetTimeFunc get_time, GstAlsa *owner)
@@ -1776,28 +1792,36 @@
   GTimeVal timeval;
   g_get_current_time (&timeval);
 
+  g_assert (!GST_CLOCK_TIME_IS_VALID (clock->start_time));
+
   if (clock->owner->format) {
-    clock->adjust = GST_TIMEVAL_TO_TIME (timeval) - clock->get_time (clock->owner);
+    clock->start_time = GST_TIMEVAL_TO_TIME (timeval) + clock->adjust - clock->get_time (clock->owner);
   } else {
-    clock->adjust = GST_TIMEVAL_TO_TIME (timeval);
+    clock->start_time = GST_TIMEVAL_TO_TIME (timeval) + clock->adjust;
   }
 }
 void
 gst_alsa_clock_stop (GstAlsaClock *clock)
 {
-  clock->adjust = 0;
+  GTimeVal timeval;
+  g_get_current_time (&timeval);
+
+  g_assert (GST_CLOCK_TIME_IS_VALID (clock->start_time));
+
+  clock->adjust += GST_TIMEVAL_TO_TIME (timeval) - clock->start_time - clock->get_time (clock->owner);
+  clock->start_time = GST_CLOCK_TIME_NONE;
 }
 static GstClockTime
 gst_alsa_clock_get_internal_time (GstClock *clock)
 {
   GstAlsaClock *alsa_clock = GST_ALSA_CLOCK (clock);
   
-  if (alsa_clock->adjust) {
-    return alsa_clock->get_time (alsa_clock->owner) + alsa_clock->adjust;
+  if (GST_CLOCK_TIME_IS_VALID (alsa_clock->start_time)) {
+    return alsa_clock->get_time (alsa_clock->owner) + alsa_clock->start_time;
   } else {
     GTimeVal timeval;
     g_get_current_time (&timeval);
-    return GST_TIMEVAL_TO_TIME (timeval);
+    return GST_TIMEVAL_TO_TIME (timeval) + alsa_clock->adjust;
   }
 }
 static guint64
@@ -1892,7 +1916,6 @@
 {
   return (snd_pcm_uframes_t) ((time * this->format->rate + this->format->rate / 2) / GST_SECOND);
 }
-/* assumes that this->format != NULL */
 static inline GstClockTime
 gst_alsa_samples_to_timestamp (GstAlsa *this, snd_pcm_uframes_t samples)
 {
Index: gstalsa.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- gstalsa.h	13 Apr 2003 14:21:02 -0000	1.15
+++ gstalsa.h	18 Apr 2003 12:14:04 -0000	1.16
@@ -155,7 +155,8 @@
   GstAlsaClockGetTimeFunc	get_time;
   GstAlsa *			owner;
 
-  GstClockTimeDiff		adjust; 	/* time_of_clock - time_of_element at sync point */
+  GstClockTimeDiff		adjust; 	/* adjustment to real clock (recalculated when stopping) */
+  GstClockTime			start_time;	/* time when the stream started (NONE when stopped) */
 
   GstClockTime			last_unlock;    /* time of last unlock request */
 };

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Fri Apr 18 2003  16:32:44 PDT

Log message:
some more fixes for weird situations

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.47&r2=1.48

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- gstalsa.c	18 Apr 2003 12:14:03 -0000	1.47
+++ gstalsa.c	18 Apr 2003 23:32:29 -0000	1.48
@@ -1131,6 +1131,9 @@
     case SND_PCM_STATE_XRUN:
       gst_alsa_xrun_recovery (this);
       return gst_alsa_start (this);
+    case SND_PCM_STATE_SETUP:
+      ERROR_CHECK (snd_pcm_prepare (this->handle), "error preparing: %s");
+    case SND_PCM_STATE_SUSPENDED:
     case SND_PCM_STATE_PREPARED:
       ERROR_CHECK (snd_pcm_start(this->handle), "error starting playback: %s");
       break;
@@ -1139,6 +1142,11 @@
       break;
     case SND_PCM_STATE_RUNNING:
       break;
+    case SND_PCM_STATE_DRAINING:
+    case SND_PCM_STATE_OPEN:
+      /* this probably happens when someone replugged a pipeline and we're in a
+         really weird state because our cothread wasn't busted */
+      return FALSE;
     default:
       /* it's a bug when we get here */
       g_assert_not_reached ();
@@ -1147,7 +1155,6 @@
   avail = (gint) gst_alsa_update_avail (this);
   if (avail < 0)
     return FALSE;
-  //this->transmitted = this->period_count * this->period_size - avail;
   gst_alsa_clock_start (this->clock);
   return TRUE;
 }

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Tue Apr 22 2003  07:45:55 PDT

Log message:
indenting only

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.48&r2=1.49

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- gstalsa.c	18 Apr 2003 23:32:29 -0000	1.48
+++ gstalsa.c	22 Apr 2003 14:45:41 -0000	1.49
@@ -81,53 +81,69 @@
 };
 
 /* GObject functions */
-static void gst_alsa_class_init (GstAlsaClass *klass);
-static void gst_alsa_init (GstAlsa *this);
-static void gst_alsa_dispose (GObject *object);
-static void gst_alsa_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec);
-static void gst_alsa_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec);
+static void			gst_alsa_class_init		(GstAlsaClass *klass);
+static void			gst_alsa_init			(GstAlsa *this);
+static void			gst_alsa_dispose		(GObject *object);
+static void			gst_alsa_set_property		(GObject *object,
+								 guint prop_id,
+								 const GValue *value,
+								 GParamSpec *pspec);
+static void			gst_alsa_get_property		(GObject *object,
+								 guint prop_id,
+								 GValue *value,
+								 GParamSpec *pspec);
 
 /* GStreamer functions for pads and state changing */
-static GstPadTemplate   *gst_alsa_src_pad_factory ();
-static GstPadTemplate   *gst_alsa_src_request_pad_factory ();
-static GstPadTemplate   *gst_alsa_sink_pad_factory ();
-static GstPadTemplate   *gst_alsa_sink_request_pad_factory ();
+static GstPadTemplate *		gst_alsa_src_pad_factory 	(void);
+static GstPadTemplate *		gst_alsa_src_request_pad_factory (void);
+static GstPadTemplate *		gst_alsa_sink_pad_factory 	(void);
+static GstPadTemplate *		gst_alsa_sink_request_pad_factory (void);
 
-static GstPad           *gst_alsa_request_new_pad (GstElement *element, GstPadTemplate *templ, const gchar *name);
-static GstPadLinkReturn  gst_alsa_link (GstPad *pad, GstCaps *caps);
-static GstCaps          *gst_alsa_get_caps (GstPad *pad, GstCaps *caps);
-static GstCaps          *gst_alsa_caps (snd_pcm_format_t format, gint rate, gint channels);
+static GstPad *			gst_alsa_request_new_pad	(GstElement *element, 
+								 GstPadTemplate *templ,
+								 const gchar *name);
+static GstPadLinkReturn		gst_alsa_link 			(GstPad *pad, 
+								 GstCaps *caps);
+static GstCaps *		gst_alsa_get_caps		(GstPad *pad,
+								 GstCaps *caps);
+static GstCaps *		gst_alsa_caps			(snd_pcm_format_t format,
+								 gint rate,
+								 gint channels);
 
-static GstBufferPool    *gst_alsa_src_get_buffer_pool (GstPad *pad);
+static GstBufferPool *		gst_alsa_src_get_buffer_pool	(GstPad *pad);
 
-static GstElementStateReturn gst_alsa_change_state (GstElement *element);
+static GstElementStateReturn	gst_alsa_change_state		(GstElement *element);
 
 /* audio processing functions */
-static int      	gst_alsa_do_mmap (GstAlsa *this, snd_pcm_sframes_t *avail);
+static int			gst_alsa_do_mmap		(GstAlsa *this, 
+								 snd_pcm_sframes_t *avail);
 
-static void     	gst_alsa_sink_loop (GstElement *element);
-static void     	gst_alsa_src_loop (GstElement *element);
-static void     	gst_alsa_xrun_recovery (GstAlsa *this);
+static void			gst_alsa_sink_loop		(GstElement *element);
+static void			gst_alsa_src_loop		(GstElement *element);
+static void			gst_alsa_xrun_recovery		(GstAlsa *this);
 
-static gboolean 	gst_alsa_sink_check_event (GstAlsa *this, gint pad_nr, GstEvent *event);
+static gboolean			gst_alsa_sink_check_event	(GstAlsa *this, 
+								 gint pad_nr,
+								 GstEvent *event);
 
 /* alsa setup / start / stop functions */
-static void     	gst_alsa_set_eos (GstAlsa *this);
+static void			gst_alsa_set_eos		(GstAlsa *this);
 
-static gboolean 	gst_alsa_probe_hw_params (GstAlsa *this, GstAlsaFormat *format);
-static gboolean 	gst_alsa_set_hw_params (GstAlsa *this);
-static gboolean 	gst_alsa_set_sw_params (GstAlsa *this);
+static gboolean			gst_alsa_probe_hw_params	(GstAlsa *this, 
+								 GstAlsaFormat *format);
+static gboolean			gst_alsa_set_hw_params		(GstAlsa *this);
+static gboolean			gst_alsa_set_sw_params		(GstAlsa *this);
 
-static gboolean 	gst_alsa_open_audio (GstAlsa *this);
-static gboolean 	gst_alsa_start_audio (GstAlsa *this);
-static gboolean 	gst_alsa_drain_audio (GstAlsa *this);
-static gboolean 	gst_alsa_stop_audio (GstAlsa *this);
-static gboolean 	gst_alsa_close_audio (GstAlsa *this);
+static gboolean			gst_alsa_open_audio		(GstAlsa *this);
+static gboolean			gst_alsa_start_audio		(GstAlsa *this);
+static gboolean			gst_alsa_drain_audio		(GstAlsa *this);
+static gboolean 		gst_alsa_stop_audio		(GstAlsa *this);
+static gboolean 		gst_alsa_close_audio		(GstAlsa *this);
 
 /* clock functions */
 static void	 		gst_alsa_clock_class_init 	(GstAlsaClockClass *klass);
 static void 			gst_alsa_clock_init 		(GstAlsaClock *clock);
-static GstAlsaClock*		gst_alsa_clock_new		(gchar *name, 
+static GstAlsaClock *		gst_alsa_clock_new		(gchar *name, 
 								 GstAlsaClockGetTimeFunc func,
 								 GstAlsa* owner);

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Tue Apr 22 2003  11:28:46 PDT

Log message:
more indentation madness, no actual code changes

Modified files:
    ext/alsa        : gstalsa.c gstalsa.h

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.49&r2=1.50
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.h.diff?r1=1.16&r2=1.17

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- gstalsa.c	22 Apr 2003 14:45:41 -0000	1.49
+++ gstalsa.c	22 Apr 2003 18:28:33 -0000	1.50
@@ -81,17 +81,17 @@
 };
 
 /* GObject functions */
-static void			gst_alsa_class_init		(GstAlsaClass *klass);
-static void			gst_alsa_init			(GstAlsa *this);
-static void			gst_alsa_dispose		(GObject *object);
-static void			gst_alsa_set_property		(GObject *object,
-								 guint prop_id,
-								 const GValue *value,
-								 GParamSpec *pspec);
-static void			gst_alsa_get_property		(GObject *object,
-								 guint prop_id,
-								 GValue *value,
-								 GParamSpec *pspec);
+static void			gst_alsa_class_init		(GstAlsaClass *		klass);
+static void			gst_alsa_init			(GstAlsa *		this);
+static void			gst_alsa_dispose		(GObject *		object);
+static void			gst_alsa_set_property		(GObject *		object,
+								 guint			prop_id,
+								 const GValue *		value,
+								 GParamSpec *		pspec);
+static void			gst_alsa_get_property		(GObject *		object,
+								 guint			prop_id,
+								 GValue *		value,
+								 GParamSpec *		pspec);
 
 /* GStreamer functions for pads and state changing */
 static GstPadTemplate *		gst_alsa_src_pad_factory 	(void);
@@ -99,69 +99,69 @@
 static GstPadTemplate *		gst_alsa_sink_pad_factory 	(void);
 static GstPadTemplate *		gst_alsa_sink_request_pad_factory (void);
 
-static GstPad *			gst_alsa_request_new_pad	(GstElement *element, 
-								 GstPadTemplate *templ,
-								 const gchar *name);
-static GstPadLinkReturn		gst_alsa_link 			(GstPad *pad, 
-								 GstCaps *caps);
-static GstCaps *		gst_alsa_get_caps		(GstPad *pad,
-								 GstCaps *caps);
-static GstCaps *		gst_alsa_caps			(snd_pcm_format_t format,
-								 gint rate,
-								 gint channels);
+static GstPad *			gst_alsa_request_new_pad	(GstElement *		element, 
+								 GstPadTemplate *	templ,
+								 const gchar *		name);
+static GstPadLinkReturn		gst_alsa_link 			(GstPad *		pad, 
+								 GstCaps *		caps);
+static GstCaps *		gst_alsa_get_caps		(GstPad *		pad,
+								 GstCaps *		caps);
+static GstCaps *		gst_alsa_caps			(snd_pcm_format_t	format,
+								 gint			rate,
+								 gint			channels);
 
-static GstBufferPool *		gst_alsa_src_get_buffer_pool	(GstPad *pad);
+static GstBufferPool *		gst_alsa_src_get_buffer_pool	(GstPad *		pad);
 
-static GstElementStateReturn	gst_alsa_change_state		(GstElement *element);
+static GstElementStateReturn	gst_alsa_change_state		(GstElement *		element);
 
 /* audio processing functions */
-static int			gst_alsa_do_mmap		(GstAlsa *this, 
-								 snd_pcm_sframes_t *avail);
+static int			gst_alsa_do_mmap		(GstAlsa *		this, 
+								 snd_pcm_sframes_t *	avail);
 
-static void			gst_alsa_sink_loop		(GstElement *element);
-static void			gst_alsa_src_loop		(GstElement *element);
-static void			gst_alsa_xrun_recovery		(GstAlsa *this);
+static void			gst_alsa_sink_loop		(GstElement *		element);
+static void			gst_alsa_src_loop		(GstElement *		element);
+static void			gst_alsa_xrun_recovery		(GstAlsa *		this);
 
-static gboolean			gst_alsa_sink_check_event	(GstAlsa *this, 
-								 gint pad_nr,
-								 GstEvent *event);
+static gboolean			gst_alsa_sink_check_event	(GstAlsa *		this, 
+								 gint			pad_nr,
+								 GstEvent *		event);
 
 /* alsa setup / start / stop functions */
-static void			gst_alsa_set_eos		(GstAlsa *this);
+static void			gst_alsa_set_eos		(GstAlsa *		this);
 
-static gboolean			gst_alsa_probe_hw_params	(GstAlsa *this, 
-								 GstAlsaFormat *format);
-static gboolean			gst_alsa_set_hw_params		(GstAlsa *this);
-static gboolean			gst_alsa_set_sw_params		(GstAlsa *this);
+static gboolean			gst_alsa_probe_hw_params	(GstAlsa *		this, 
+								 GstAlsaFormat *	format);
+static gboolean			gst_alsa_set_hw_params		(GstAlsa *		this);
+static gboolean			gst_alsa_set_sw_params		(GstAlsa *		this);
 
-static gboolean			gst_alsa_open_audio		(GstAlsa *this);
-static gboolean			gst_alsa_start_audio		(GstAlsa *this);
-static gboolean			gst_alsa_drain_audio		(GstAlsa *this);
-static gboolean 		gst_alsa_stop_audio		(GstAlsa *this);
-static gboolean 		gst_alsa_close_audio		(GstAlsa *this);
+static gboolean			gst_alsa_open_audio		(GstAlsa *		this);
+static gboolean			gst_alsa_start_audio		(GstAlsa *		this);
+static gboolean			gst_alsa_drain_audio		(GstAlsa *		this);
+static gboolean 		gst_alsa_stop_audio		(GstAlsa *		this);
+static gboolean 		gst_alsa_close_audio		(GstAlsa *		this);
 
 /* clock functions */
-static void	 		gst_alsa_clock_class_init 	(GstAlsaClockClass *klass);
-static void 			gst_alsa_clock_init 		(GstAlsaClock *clock);
+static void	 		gst_alsa_clock_class_init 	(GstAlsaClockClass *	klass);
+static void 			gst_alsa_clock_init 		(GstAlsaClock *		clock);
 static GstAlsaClock *		gst_alsa_clock_new		(gchar *name, 
 								 GstAlsaClockGetTimeFunc func,
-								 GstAlsa* owner);
+								 GstAlsa* 		owner);
 
-static void			gst_alsa_clock_start	 	(GstAlsaClock *clock);
-static void			gst_alsa_clock_stop	 	(GstAlsaClock *clock);
+static void			gst_alsa_clock_start	 	(GstAlsaClock *		clock);
+static void			gst_alsa_clock_stop	 	(GstAlsaClock *		clock);
 
-static GstClockTime		gst_alsa_clock_get_internal_time (GstClock *clock);
-static guint64			gst_alsa_clock_get_resolution	(GstClock *clock);
-static GstClockEntryStatus	gst_alsa_clock_wait		(GstClock *clock,
-								 GstClockEntry *entry);
-static void			gst_alsa_clock_unlock		(GstClock *clock, 
-								 GstClockEntry *entry);
+static GstClockTime		gst_alsa_clock_get_internal_time (GstClock *		clock);
+static guint64			gst_alsa_clock_get_resolution	(GstClock *		clock);
+static GstClockEntryStatus	gst_alsa_clock_wait		(GstClock *		clock,
+								 GstClockEntry *	entry);
+static void			gst_alsa_clock_unlock		(GstClock *		clock, 
+								 GstClockEntry *	entry);
 
-static GstClockTime		gst_alsa_sink_get_time		(GstAlsa *this);
-static GstClockTime		gst_alsa_src_get_time		(GstAlsa *this);
-static GstClock *		gst_alsa_get_clock		(GstElement *element);
-static void			gst_alsa_set_clock		(GstElement *element, 
-								 GstClock *clock);
+static GstClockTime		gst_alsa_sink_get_time		(GstAlsa *		this);
+static GstClockTime		gst_alsa_src_get_time		(GstAlsa *		this);
+static GstClock *		gst_alsa_get_clock		(GstElement *		element);
+static void			gst_alsa_set_clock		(GstElement *		element, 
+								 GstClock *		clock);
 static GstClockClass *		clock_parent_class = NULL;
 /* static guint gst_alsa_clock_signals[LAST_SIGNAL] = { 0 }; */
 
Index: gstalsa.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- gstalsa.h	18 Apr 2003 12:14:04 -0000	1.16
+++ gstalsa.h	22 Apr 2003 18:28:33 -0000	1.17
@@ -100,47 +100,48 @@
 
 typedef struct {
   GstPad *	pad;
-  guint8 *	data;	/* pointer into buffer */
-  guint		size;	/* sink: bytes left in buffer */
-  GstBuffer *	buf;	/* current buffer */
-  guint		behaviour; /* 0 = data points into buffer (so unref when size == 0), 
-                              1 = data should be freed, use buffer after that */
+  guint8 *	data;		/* pointer into buffer */
+  guint		size;		/* sink: bytes left in buffer */
+  GstBuffer *	buf;		/* current buffer */
+  guint		behaviour; 	/* 0 = data points into buffer (so unref when size == 0), 
+				   1 = data should be freed, use buffer after that */
 } GstAlsaPad;
 typedef struct {
-  snd_pcm_format_t format;
-  guint rate;
-  gint channels;  
+  snd_pcm_format_t	format;
+  guint			rate;
+  gint			channels;  
 } GstAlsaFormat;
+
 struct _GstAlsa {
-  GstElement parent;
+  GstElement			parent;
 
   /* array of GstAlsaPads */
-  GstAlsaPad pads[GST_ALSA_MAX_CHANNELS];
+  GstAlsaPad			pads[GST_ALSA_MAX_CHANNELS];
 
-  gchar *device;
-  snd_pcm_stream_t stream;
-  snd_pcm_t *handle;
-  guint pcm_caps; /* capabilities of the pcm device */
-  snd_output_t *out;
+  gchar *			device;
+  snd_pcm_stream_t		stream;
+  snd_pcm_t *			handle;
+  guint				pcm_caps;	/* capabilities of the pcm device, see GstAlsaPcmCaps */
+  snd_output_t *		out;
 
-  GstAlsaFormat *format; /* NULL if undefined */
-  gboolean mmap; /* use mmap transmit (fast) or read/write (sloooow) */
-  GstAlsaTransmitFunction transmit;
+  GstAlsaFormat *		format;		/* NULL if undefined */
+  gboolean			mmap; 		/* use mmap transmit (fast) or read/write (sloooow) */
+  GstAlsaTransmitFunction	transmit;
 
   /* latency / performance parameters */
-  snd_pcm_uframes_t period_size;
-  unsigned int period_count;
+  snd_pcm_uframes_t		period_size;
+  unsigned int			period_count;
 
-  gboolean autorecover;
+  gboolean			autorecover;
 
   /* clocking */
-  GstAlsaClock         *clock;			/* our provided clock */
-  snd_pcm_uframes_t	transmitted; 		/* samples transmitted since last sync 
-                                                   This thing actually is our master clock.
+  GstAlsaClock *		clock;		/* our provided clock */
+  snd_pcm_uframes_t		transmitted; 	/* samples transmitted since last sync 
+						   This thing actually is our master clock.
 						   We will event insert silent samples or
 						   drop some to sync to incoming timestamps.
-                                                 */
-  GstClockTime		max_discont;		/* max difference between current
+						 */
+  GstClockTime			max_discont;	/* max difference between current
   						   playback timestamp and buffers timestamps
 						 */
 };

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Tue Apr 22 2003  16:33:19 PDT

Log message:
change alsa to use non-blocking mode

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.50&r2=1.51

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- gstalsa.c	22 Apr 2003 18:28:33 -0000	1.50
+++ gstalsa.c	22 Apr 2003 23:33:04 -0000	1.51
@@ -1530,8 +1530,8 @@
 
   ERROR_CHECK (snd_output_stdio_attach (&this->out, stderr, 0),
                "error opening log output: %s");
-  /* blocking i/o */
-  ERROR_CHECK (snd_pcm_open (&this->handle, this->device, this->stream, 0),
+  /* we use non-blocking i/o */
+  ERROR_CHECK (snd_pcm_open (&this->handle, this->device, this->stream, SND_PCM_NONBLOCK),
                "error opening pcm device %s: %s\n", this->device);
 
   GST_FLAG_SET (this, GST_ALSA_OPEN);
@@ -1690,6 +1690,8 @@
 static gboolean
 gst_alsa_drain_audio (GstAlsa *this)
 {
+  int err;
+
   g_assert (this != NULL);
   g_return_val_if_fail (this != NULL, FALSE);
   g_return_val_if_fail (this->handle != NULL, FALSE);
@@ -1700,9 +1702,14 @@
       (snd_pcm_state (this->handle) == SND_PCM_STATE_PAUSED ||
        snd_pcm_state (this->handle) == SND_PCM_STATE_XRUN ||
        snd_pcm_state (this->handle) == SND_PCM_STATE_RUNNING)) {
-    ERROR_CHECK (snd_pcm_drain (this->handle),
-                 "couldn't stop and drain buffer: %s");
     gst_alsa_clock_stop (this->clock);
+    /* snd_pcm_drain returns -EAGAIN in non-blocking mode while it outputs sound */
+    err = snd_pcm_drain (this->handle);
+    while (err == -EAGAIN) {
+      g_usleep (1000);
+      err = snd_pcm_drain (this->handle);
+    }
+    ERROR_CHECK (err, "couldn't stop and drain buffer: %s");
   }
 
   GST_FLAG_UNSET (this, GST_ALSA_RUNNING);  
@@ -1721,9 +1728,9 @@
       (snd_pcm_state (this->handle) == SND_PCM_STATE_PAUSED ||
        snd_pcm_state (this->handle) == SND_PCM_STATE_XRUN ||
        snd_pcm_state (this->handle) == SND_PCM_STATE_RUNNING)) {
+    gst_alsa_clock_stop (this->clock);
     ERROR_CHECK (snd_pcm_drop (this->handle),
                  "couldn't stop (dropping frames): %s");
-    gst_alsa_clock_stop (this->clock);
   }
 
   GST_FLAG_UNSET (this, GST_ALSA_RUNNING);

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Wed Apr 23 2003  17:03:21 PDT

Log message:
total code reorganization as a start to get alsasrc working - sink and src are now really different classes, not just on paper - includes a fix that makes the testsuite work that might be an older bug

Modified files:
    ext/alsa        : gstalsa.c gstalsa.h

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.51&r2=1.52
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.h.diff?r1=1.17&r2=1.18

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- gstalsa.c	22 Apr 2003 23:33:04 -0000	1.51
+++ gstalsa.c	24 Apr 2003 00:03:06 -0000	1.52
@@ -93,12 +93,31 @@
 								 GValue *		value,
 								 GParamSpec *		pspec);
 
-/* GStreamer functions for pads and state changing */
-static GstPadTemplate *		gst_alsa_src_pad_factory 	(void);
-static GstPadTemplate *		gst_alsa_src_request_pad_factory (void);
+/* GstAlsaSink functions */
 static GstPadTemplate *		gst_alsa_sink_pad_factory 	(void);
 static GstPadTemplate *		gst_alsa_sink_request_pad_factory (void);
+static void			gst_alsa_sink_class_init	(GstAlsaSinkClass *	klass);
+static void			gst_alsa_sink_init		(GstAlsaSink *		this);
[...1295 lines suppressed...]
-      (snd_pcm_state (this->handle) == SND_PCM_STATE_PAUSED ||
-       snd_pcm_state (this->handle) == SND_PCM_STATE_XRUN ||
-       snd_pcm_state (this->handle) == SND_PCM_STATE_RUNNING)) {
-    gst_alsa_clock_stop (this->clock);
-    ERROR_CHECK (snd_pcm_drop (this->handle),
-                 "couldn't stop (dropping frames): %s");
+  switch (snd_pcm_state (this->handle)) {
+    case SND_PCM_STATE_XRUN:
+    case SND_PCM_STATE_RUNNING:
+      gst_alsa_clock_stop (this->clock);
+      /* fall through - clock is already stopped when paused */
+    case SND_PCM_STATE_PAUSED:
+      ERROR_CHECK (snd_pcm_drop (this->handle),
+                   "couldn't stop (dropping frames): %s");
+      break;
+    default:
+      break;
   }
 
   GST_FLAG_UNSET (this, GST_ALSA_RUNNING);  
Index: gstalsa.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- gstalsa.h	22 Apr 2003 18:28:33 -0000	1.17
+++ gstalsa.h	24 Apr 2003 00:03:06 -0000	1.18
@@ -38,6 +38,7 @@
 
 #define GST_ALSA(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_ALSA, GstAlsa)
 #define GST_ALSA_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_ALSA, GstAlsaClass)
+#define GST_ALSA_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_ALSA, GstAlsaClass))
 #define GST_IS_ALSA(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_ALSA)
 #define GST_IS_ALSA_CLASS(klass) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_ALSA)
 #define GST_TYPE_ALSA gst_alsa_get_type()
@@ -65,10 +66,10 @@
 
 typedef struct _GstAlsa GstAlsa;
 typedef struct _GstAlsaClass GstAlsaClass;
-typedef GstAlsa GstAlsaSink;
-typedef GstAlsaClass GstAlsaSinkClass;
-typedef GstAlsa GstAlsaSrc;
-typedef GstAlsaClass GstAlsaSrcClass;
+typedef struct _GstAlsaSink GstAlsaSink;
+typedef struct _GstAlsaSinkClass GstAlsaSinkClass;
+typedef struct _GstAlsaSrc GstAlsaSrc;
+typedef struct _GstAlsaSrcClass GstAlsaSrcClass;
 
 typedef struct _GstAlsaClock GstAlsaClock;
 typedef struct _GstAlsaClockClass GstAlsaClockClass;
@@ -99,14 +100,6 @@
 typedef int (*GstAlsaTransmitFunction) (GstAlsa *this, snd_pcm_sframes_t *avail);
 
 typedef struct {
-  GstPad *	pad;
-  guint8 *	data;		/* pointer into buffer */
-  guint		size;		/* sink: bytes left in buffer */
-  GstBuffer *	buf;		/* current buffer */
-  guint		behaviour; 	/* 0 = data points into buffer (so unref when size == 0), 
-				   1 = data should be freed, use buffer after that */
-} GstAlsaPad;
-typedef struct {
   snd_pcm_format_t	format;
   guint			rate;
   gint			channels;  
@@ -116,10 +109,9 @@
   GstElement			parent;
 
   /* array of GstAlsaPads */
-  GstAlsaPad			pads[GST_ALSA_MAX_CHANNELS];
+  GstPad *			pad[GST_ALSA_MAX_CHANNELS];
 
   gchar *			device;
-  snd_pcm_stream_t		stream;
   snd_pcm_t *			handle;
   guint				pcm_caps;	/* capabilities of the pcm device, see GstAlsaPcmCaps */
   snd_output_t *		out;
@@ -146,9 +138,32 @@
 						 */
 };
 struct _GstAlsaClass {
-  GstElementClass parent_class;
-};
+  GstElementClass		parent_class;
 
+  snd_pcm_stream_t		stream;
+
+  /* different transmit functions */
+  GstAlsaTransmitFunction	transmit_mmap;
+  GstAlsaTransmitFunction	transmit_rw;
+};
+struct _GstAlsaSink {
+  GstAlsa			parent;
+  /* array of the data on the channels */
+  guint8 *			data[GST_ALSA_MAX_CHANNELS];		/* pointer into buffer */
+  guint				size[GST_ALSA_MAX_CHANNELS];		/* sink: bytes left in buffer */
+  GstBuffer *			buf[GST_ALSA_MAX_CHANNELS];		/* current buffer */
+  guint				behaviour[GST_ALSA_MAX_CHANNELS]; 	/* 0 = data points into buffer (so unref when size == 0), 
+									   1 = data should be freed, use buffer after that */
+};
+struct _GstAlsaSinkClass {
+  GstAlsaClass			parent_class;
+};
+struct _GstAlsaSrc {
+  GstAlsa			parent;
+};
+struct _GstAlsaSrcClass {
+  GstAlsaClass			parent_class;
+};
 
 struct _GstAlsaClock {
   GstSystemClock		parent;

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Thu Apr 24 2003  13:31:34 PDT

Log message:
fix segfault when --gst-mask=-1 is enabled

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.52&r2=1.53

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- gstalsa.c	24 Apr 2003 00:03:06 -0000	1.52
+++ gstalsa.c	24 Apr 2003 20:31:20 -0000	1.53
@@ -1735,8 +1735,12 @@
   g_return_val_if_fail (this != NULL, FALSE);
   g_return_val_if_fail (this->handle != NULL, FALSE);
 
-  GST_INFO (GST_CAT_PLUGIN_INFO, "Preparing format: %s %dHz, %d channels\n",
-            snd_pcm_format_name (this->format->format), this->format->rate, this->format->channels);
+  if (this->format) {
+    GST_INFO (GST_CAT_PLUGIN_INFO, "Preparing format: %s %dHz, %d channels",
+              snd_pcm_format_name (this->format->format), this->format->rate, this->format->channels);
+  } else {
+    GST_INFO (GST_CAT_PLUGIN_INFO, "Preparing format: (none)");
+  }
 
   snd_pcm_hw_params_alloca (&hw_params);
   ERROR_CHECK (snd_pcm_hw_params_any (this->handle, hw_params),

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Thu Apr 24 2003  15:58:46 PDT

Log message:
alsasrc works now, but it still uses hardcoded caps

Modified files:
    ext/alsa        : gstalsa.c gstalsa.h

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.53&r2=1.54
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.h.diff?r1=1.18&r2=1.19

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- gstalsa.c	24 Apr 2003 20:31:20 -0000	1.53
+++ gstalsa.c	24 Apr 2003 22:58:33 -0000	1.54
@@ -115,7 +115,13 @@
 static GstPadTemplate *		gst_alsa_src_request_pad_factory (void);
 static void			gst_alsa_src_class_init		(GstAlsaSrcClass *	klass);
 static void			gst_alsa_src_init		(GstAlsaSrc *		this);
+static int			gst_alsa_src_mmap		(GstAlsa *		this,
+								 snd_pcm_sframes_t *	avail);
+static int			gst_alsa_src_read		(GstAlsa *		this,
+								 snd_pcm_sframes_t *	avail);
 static void			gst_alsa_src_loop		(GstElement *		element);
+static void			gst_alsa_src_flush		(GstAlsaSrc *		src);
+static GstElementStateReturn	gst_alsa_src_change_state	(GstElement *		element);
 
 /* GStreamer functions for pads and state changing */
 static GstPad *			gst_alsa_request_new_pad	(GstElement *		element, 
@@ -868,7 +874,10 @@
     src_parent_class = g_type_class_ref (GST_TYPE_ALSA);
 
   alsa_class->stream		= SND_PCM_STREAM_CAPTURE;
+  alsa_class->transmit_mmap	= gst_alsa_src_mmap;
+  alsa_class->transmit_rw	= gst_alsa_src_read;
 
+  element_class->change_state	= gst_alsa_src_change_state;
 }
 static void
 gst_alsa_src_init (GstAlsaSrc *src)
@@ -887,89 +896,207 @@
 
   gst_element_set_loop_function (GST_ELEMENT (this), gst_alsa_src_loop);
 }
+static int
+gst_alsa_src_mmap (GstAlsa *this, snd_pcm_sframes_t *avail)
+{
+  snd_pcm_uframes_t offset;
+  snd_pcm_channel_area_t *dst;
+  const snd_pcm_channel_area_t *src;
+  int i, err, width = snd_pcm_format_physical_width (this->format->format);
+  GstAlsaSrc *alsa_src = GST_ALSA_SRC (this);
+
+  /* areas points to the memory areas that belong to gstreamer. */
+  dst = calloc(this->format->channels, sizeof(snd_pcm_channel_area_t));
+
+  if (((GstElement *) this)->numpads == 1) {
+    /* interleaved */
+    for (i = 0; i < this->format->channels; i++) {
+      dst[i].addr = alsa_src->buf[0]->data;
+      dst[i].first = i * width;
+      dst[i].step = this->format->channels * width;
+    }
+  } else {
+    /* noninterleaved */
+    for (i = 0; i < this->format->channels; i++) {
+      dst[i].addr = alsa_src->buf[i]->data;
+      dst[i].first = 0;
+      dst[i].step = width;
+    }
+  }
+
+  if ((err = snd_pcm_mmap_begin (this->handle, &src, &offset, avail)) < 0) {
+    g_warning ("gstalsa: mmap failed: %s", snd_strerror (err));
+    return -1;
+  }
+  if (*avail > 0 && (err = snd_pcm_areas_copy (dst, 0, src, offset, this->format->channels, *avail, this->format->format)) < 0) {
+    snd_pcm_mmap_commit (this->handle, offset, 0);
+    g_warning ("gstalsa: data copy failed: %s", snd_strerror (err));
+    return -1;
+  }
+  if ((err = snd_pcm_mmap_commit (this->handle, offset, *avail)) < 0) {
+    g_warning ("gstalsa: mmap commit failed: %s", snd_strerror (err));
+    return -1;
+  }
+
+  return err;
+}
+static int
+gst_alsa_src_read (GstAlsa *this, snd_pcm_sframes_t *avail)
+{
+  void *channels[this->format->channels];
+  int err, i;
+  GstAlsaSrc *src = GST_ALSA_SRC (this);
+
+  if (((GstElement *) this)->numpads == 1) {
+    /* interleaved */
+    err = snd_pcm_readi (this->handle, src->buf[0]->data, *avail);
+  } else {
+    /* noninterleaved */
+    for (i = 0; i < this->format->channels; i++) {
+      channels[i] = src->buf[i]->data;
+    }
+    err = snd_pcm_readn (this->handle, channels, *avail);
+  }
+  /* error handling */
+  if (err < 0) {
+    if (err == -EPIPE) {
+      gst_alsa_xrun_recovery (this);
+      return 0;
+    }
+    g_warning ("error on data access: %s", snd_strerror (err));
+  }
+  return err;
+}
+static gboolean
+gst_alsa_src_set_caps (GstAlsaSrc *src)
+{
+  gint i;
+  GstCaps *caps;
+  GstAlsa *this = GST_ALSA (src);
+
+  if (!(this->format = g_new (GstAlsaFormat, 1)))
+    return FALSE;
+  /* FIXME: make this do proper caps nego */
+  this->format->format = SND_PCM_FORMAT_S16;
+  this->format->rate = 44100;
+  this->format->channels = GST_ELEMENT (src)->numpads;
+  GST_DEBUG (GST_CAT_NEGOTIATION, "starting caps negotiation on alsa src");
+  caps = gst_alsa_caps (this->format->format, this->format->rate, this->format->channels);
+  for (i = 0; i < GST_ELEMENT (src)->numpads; i++) {
+    if (gst_pad_try_set_caps (this->pad[i], caps) <= 0) {
+      GST_DEBUG (GST_CAT_NEGOTIATION, "setting caps (%p) in alsasrc (%p) on pad %d failed", caps, this, i);
+      return FALSE;
+    }
+  }
+  
+  if (GST_FLAG_IS_SET (this, GST_ALSA_RUNNING)) gst_alsa_stop_audio (this);
+  if (!gst_alsa_start_audio (this)) {
+    /* FIXME: Try the next format */
+    return FALSE;
+  }
+
+  return TRUE;
+}
+/* we transmit buffers of period_size frames */
 static void
 gst_alsa_src_loop (GstElement *element)
 {
-#if 0
   snd_pcm_sframes_t avail, copied;
-  GstBufferPool *pool = NULL;
-  GstBuffer *buf;
-  GstCaps *caps;
   gint i;
-  GstAlsaPad *pad;
   GstAlsa *this = GST_ALSA (element);
-
-  g_return_if_fail (this != NULL);
+  GstAlsaSrc *src = GST_ALSA_SRC (element);
 
   /* set the caps on all pads */
   if (!this->format) {
-    if (!(this->format = g_new (GstAlsaFormat, 1))) {
-      gst_element_error (element, "No more memory");
-    }
-    /* FIXME: make this settable */
-    this->format->format = SND_PCM_FORMAT_S16;
-    this->format->rate = 44100;
-    this->format->channels = (element->numpads == 1) ? 2 : element->numpads;
-    GST_DEBUG (GST_CAT_NEGOTIATION, "starting caps negotiationgst_alsa_pcm_wait");
-    caps = gst_alsa_caps (this->format->format, this->format->rate, this->format->channels);
-    for (i = 0; i < element->numpads; i++) {
-      if (gst_pad_try_set_caps (this->pads[i].pad, caps) <= 0) {
-        GST_DEBUG (GST_CAT_NEGOTIATION, "setting caps (%p) in alsasrc (%p) on pad %d failed", caps, this, i);
-        return;
-      }
+    if (!gst_alsa_src_set_caps (src)) {
+      gst_element_error (element, "Could not set caps");
+      return;
     }
+    /* get the bufferpool going */
+    if (src->pool)
+      gst_buffer_pool_unref (src->pool);
+    src->pool = gst_buffer_pool_get_default (gst_alsa_samples_to_bytes (this, this->period_size), 
+                                             2 * element->numpads);
   }
 
-src_restart:
-
   while ((avail = gst_alsa_update_avail (this)) < this->period_size) {
-    if (avail == -EPIPE) goto src_restart;
+    if (avail == -EPIPE) continue;
     if (avail < 0) return;
-    if (snd_pcm_state(this->handle) != SND_PCM_STATE_RUNNING) break;
+    if (snd_pcm_state(this->handle) != SND_PCM_STATE_RUNNING) {
+      if (!gst_alsa_start (this))
+	return;
+      continue;
+    };
     /* wait */
     if (gst_alsa_pcm_wait (this) == FALSE)
       return;
   }
-  if (avail > 0) {
-    int width = snd_pcm_format_physical_width (this->format->format);
-    int bytes_per_frame = ( width / 8 ) * (element->numpads == 1 ? this->format->channels : 1);
-    if ((copied = this->transmit (this, &avail)) < 0)
+  g_assert (avail >= this->period_size);
+  /* make sure every pad has a buffer */
+  for (i = 0; i < element->numpads; i++) {
+    if (!src->buf[i]) {
+      src->buf[i] = gst_buffer_new_from_pool (src->pool, 0, 0);
+    }
+  }
+  /* fill buffer with data */
+  if ((copied = this->transmit (this, &avail)) <= 0)
+    return;
+  /* push the buffers out and let them have fun */
+  for (i = 0; i < element->numpads; i++) {
+    if (!src->buf[i])
       return;
-      
-    /* we get the buffer pool once per go round */
-    if (! pool) pool = gst_alsa_src_get_buffer_pool (this->pads[0].pad);
-
-    /* push the data to gstreamer if it's big enough to fill up a buffer. */
-    for (i = 0; i < element->numpads; i++) {
-      pad = &this->pads[i];
-      pad->size += MIN (copied, this->period_size - pad->size);
-
-      if (pad->size >= this->period_size) {
-        g_assert (pad->size <= this->period_size);
-
-        buf = gst_buffer_new_from_pool (pool, 0, 0);
-
-        GST_BUFFER_DATA (buf) = pad->data;
-        GST_BUFFER_SIZE (buf) = this->period_size * bytes_per_frame;
-        GST_BUFFER_MAXSIZE (buf) = this->period_size * bytes_per_frame;
+    if (copied != this->period_size)
+      GST_BUFFER_SIZE (src->buf[i]) = gst_alsa_samples_to_bytes (this, copied);
+    GST_BUFFER_TIMESTAMP (src->buf[i]) = gst_alsa_samples_to_timestamp (this, this->transmitted);
+    gst_pad_push (this->pad[i], src->buf[i]);
+    src->buf[i] = NULL;
+  }
+  this->transmitted += copied;
+}
 
-        gst_pad_push (pad->pad, buf);
+static void
+gst_alsa_src_flush (GstAlsaSrc *src)
+{
+  gint i;
 
-        pad->data = NULL;
-        pad->size = 0;
-      }
+  for (i = 0; i < GST_ELEMENT (src)->numpads; i++) { 
+    if (src->buf[i]) {
+      gst_buffer_unref (src->buf[i]);
+      src->buf[i] = NULL;
     }
-
-    pool = NULL;
   }
+  if (src->pool) {
+    gst_buffer_pool_unref (src->pool);
+    src->pool = NULL;
+  }
+}
+static GstElementStateReturn
+gst_alsa_src_change_state (GstElement *element)
+{
+  GstAlsaSrc *src;
 
-  /* BUG: we start the stream explicitly, autostart doesn't work correctly (alsa 0.9.0rc7) */
-  if (snd_pcm_state(this->handle) == SND_PCM_STATE_PREPARED && snd_pcm_avail_update (this->handle) == 0) {
-    GST_DEBUG (GST_CAT_PLUGIN_INFO, "Explicitly starting capture");
-    snd_pcm_start(this->handle);
+  g_return_val_if_fail (element != NULL, FALSE);
+  src = GST_ALSA_SRC (element);
+
+  switch (GST_STATE_TRANSITION (element)) {
+  case GST_STATE_NULL_TO_READY:
+  case GST_STATE_READY_TO_PAUSED:
+  case GST_STATE_PAUSED_TO_PLAYING:
+  case GST_STATE_PLAYING_TO_PAUSED:
+    break;
+  case GST_STATE_PAUSED_TO_READY:
+    gst_alsa_src_flush (src);
+    break;
+  case GST_STATE_READY_TO_NULL:
+    break;
+  default:
+    g_assert_not_reached();
   }
 
-#endif
+  if (GST_ELEMENT_CLASS (sink_parent_class)->change_state)
+    return GST_ELEMENT_CLASS (sink_parent_class)->change_state (element);
+
+  return GST_STATE_SUCCESS;
 }
 
 /*** GSTREAMER PAD / STATE FUNCTIONS*******************************************/
@@ -1455,87 +1582,7 @@
 }
 
 /*** AUDIO PROCESSING *********************************************************/
-#if 0
-static int
-gst_alsa_do_mmap (GstAlsa *this, snd_pcm_sframes_t *avail)
-{
-  snd_pcm_uframes_t offset;
-  snd_pcm_channel_area_t *dst, *src, *areas;
-  int i, err, width = snd_pcm_format_physical_width (this->format->format);
-
-  /* areas points to the memory areas that belong to gstreamer. */
-  areas = src = dst = calloc(this->format->channels, sizeof(snd_pcm_channel_area_t));
-
-  if (((GstElement *) this)->numpads == 1) {
-    /* interleaved */
-    for (i = 0; i < this->format->channels; i++) {
-      areas[i].addr = this->pads[0].data;
-      areas[i].first = i * width;
-      areas[i].step = this->format->channels * width;
-    }
-  } else {
-    /* noninterleaved */
-    for (i = 0; i < this->format->channels; i++) {
-      areas[i].addr = this->pads[i].data;
-      areas[i].first = 0;
-      areas[i].step = width;
-    }
-  }
-
-  if ((err = snd_pcm_mmap_begin (this->handle, (
-             const snd_pcm_channel_area_t **) (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC ? &src : &dst),
-             &offset, avail)) < 0) {
-    g_warning ("gstalsa: mmap failed: %s", snd_strerror (err));
-    return -1;
-  }
-
-  if ((err = snd_pcm_areas_copy (dst, offset, src, 0, this->format->channels, *avail, this->format->format)) < 0) {
-    snd_pcm_mmap_commit (this->handle, offset, 0);
-    g_warning ("gstalsa: data copy failed: %s", snd_strerror (err));
-    return -1;
-  }
-  if ((err = snd_pcm_mmap_commit (this->handle, offset, *avail)) < 0) {
-    g_warning ("gstalsa: mmap commit failed: %s", snd_strerror (err));
-    return -1;
-  }
-
-  return err;
-}
-static int
-gst_alsa_do_read_write (GstAlsa *this, snd_pcm_sframes_t *avail)
-{
-  void *channels[this->format->channels];
-  int err, i;
 
-  if (((GstElement *) this)->numpads == 1) {
-    /* interleaved */
-    if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC) {
-      err = snd_pcm_readi (this->handle, this->pads[0].data, *avail);
-    } else {
-      err = snd_pcm_writei (this->handle, this->pads[0].data, *avail);
-    }
-  } else {
-    /* noninterleaved */
-    for (i = 0; i < this->format->channels; i++) {
-      channels[i] = this->pads[i].data;
-    }
-    if (G_OBJECT_TYPE (this) == GST_TYPE_ALSA_SRC) {
-      err = snd_pcm_readn (this->handle, channels, *avail);
-    } else {
-      err = snd_pcm_writen (this->handle, channels, *avail);
-    }
-  }
-  /* error handling */
-  if (err < 0) {
-    if (err == -EPIPE) {
-      gst_alsa_xrun_recovery (this);
-      return 0;
-    }
-    g_warning ("error on data access: %s", snd_strerror (err));
-  }
-  return err;
-}
-#endif
 inline static snd_pcm_sframes_t
 gst_alsa_update_avail (GstAlsa *this)
 {
@@ -1580,9 +1627,9 @@
 inline static gboolean
 gst_alsa_start (GstAlsa *this)
 {
-  gint avail;
+  //gint avail;
 
-  GST_DEBUG (GST_CAT_PLUGIN_INFO, "Starting playback");
+  GST_DEBUG (GST_CAT_PLUGIN_INFO, "Setting state to RUNNING");
 
   switch (snd_pcm_state(this->handle)) {
     case SND_PCM_STATE_XRUN:
@@ -1609,9 +1656,9 @@
       g_assert_not_reached ();
       break;
   }
-  avail = (gint) gst_alsa_update_avail (this);
+/*  avail = (gint) gst_alsa_update_avail (this);
   if (avail < 0)
-    return FALSE;
+    return FALSE;*/
   gst_alsa_clock_start (this->clock);
   return TRUE;
 }
Index: gstalsa.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- gstalsa.h	24 Apr 2003 00:03:06 -0000	1.18
+++ gstalsa.h	24 Apr 2003 22:58:33 -0000	1.19
@@ -160,6 +160,9 @@
 };
 struct _GstAlsaSrc {
   GstAlsa			parent;
+
+  GstBuffer *			buf[GST_ALSA_MAX_CHANNELS];
+  GstBufferPool *		pool;
 };
 struct _GstAlsaSrcClass {
   GstAlsaClass			parent_class;

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Tue Apr 29 2003  14:51:23 PDT

Log message:
bugfixes:
- better error reporting
- segfault when using alsasrc without alsasink (d'oh)
- don't try to round when doing samples => time conversion

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.54&r2=1.55

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- gstalsa.c	24 Apr 2003 22:58:33 -0000	1.54
+++ gstalsa.c	29 Apr 2003 21:51:10 -0000	1.55
@@ -697,8 +697,8 @@
           return;
         }
         samplestamp = gst_alsa_timestamp_to_samples (this, GST_BUFFER_TIMESTAMP (sink->buf[i]));
-        if (!GST_BUFFER_TIMESTAMP_IS_VALID (sink->buf[i]) || 
-	     /* difference between them is < GST_ALSA_DEVIATION */
+        if ((!GST_BUFFER_TIMESTAMP_IS_VALID (sink->buf[i])) || 
+	     /* difference between expected and current is < GST_ALSA_DEVIATION */
 	    ((this->transmitted + gst_alsa_timestamp_to_samples (this, this->max_discont) >= samplestamp) &&
 	     (this->transmitted <= gst_alsa_timestamp_to_samples (this, this->max_discont) + samplestamp))) {
 no_difference:
@@ -723,14 +723,16 @@
 	  }
 	  sink->behaviour[i] = 1;
 	} else if (gst_alsa_samples_to_bytes (this, this->transmitted - samplestamp) >= sink->buf[i]->size) {
-	  g_printerr ("Skipping %lu samples to resync (complete buffer)\n", gst_alsa_bytes_to_samples (this, sink->buf[i]->size));
+	  g_printerr ("Skipping %lu samples to resync (complete buffer): sample %ld expected, but got %ld\n", 
+	              gst_alsa_bytes_to_samples (this, sink->buf[i]->size), this->transmitted, samplestamp);	              
 	  /* this buffer is way behind */
 	  gst_buffer_unref (sink->buf[i]);
 	  sink->buf[i] = NULL;
 	  continue;
 	} else if (this->transmitted > samplestamp) {
 	  gint difference = gst_alsa_samples_to_bytes (this, this->transmitted - samplestamp);	
-	  g_printerr ("Skipping %lu samples to resync\n", (gulong) this->transmitted - samplestamp);
+	  g_printerr ("Skipping %lu samples to resync: sample %ld expected, but got %ld\n",
+		      (gulong) this->transmitted - samplestamp, this->transmitted, samplestamp);
 	  /* this buffer is only a bit behind */
           sink->size[i] = sink->buf[i]->size - difference;
           sink->data[i] = sink->buf[i]->data + difference;
@@ -1093,8 +1095,8 @@
     g_assert_not_reached();
   }
 
-  if (GST_ELEMENT_CLASS (sink_parent_class)->change_state)
-    return GST_ELEMENT_CLASS (sink_parent_class)->change_state (element);
+  if (GST_ELEMENT_CLASS (src_parent_class)->change_state)
+    return GST_ELEMENT_CLASS (src_parent_class)->change_state (element);
 
   return GST_STATE_SUCCESS;
 }
@@ -2144,7 +2146,7 @@
 static inline GstClockTime
 gst_alsa_samples_to_timestamp (GstAlsa *this, snd_pcm_uframes_t samples)
 {
-  return (GstClockTime) ((samples * GST_SECOND + GST_SECOND / 2)/ this->format->rate);
+  return (GstClockTime) (samples * GST_SECOND / this->format->rate);
 }
 
 static inline snd_pcm_uframes_t

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Sat May 10 2003  04:37:47 PDT

Log message:
be parent of own clock

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.55&r2=1.56

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- gstalsa.c	29 Apr 2003 21:51:10 -0000	1.55
+++ gstalsa.c	10 May 2003 11:37:35 -0000	1.56
@@ -284,6 +284,7 @@
 static void
 gst_alsa_init (GstAlsa *this)
 {
+  GST_FLAG_SET (this, GST_ELEMENT_EVENT_AWARE);
   GST_FLAG_SET (this, GST_ELEMENT_THREAD_SUGGESTED);
 }
 static void
@@ -292,7 +293,7 @@
   GstAlsa *this = GST_ALSA (object);
 
   if (this->clock)
-    gst_object_unref (GST_OBJECT (this->clock));
+    gst_object_unparent (GST_OBJECT (this->clock));
 
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
@@ -1998,7 +1999,7 @@
 
   clock->start_time = GST_CLOCK_TIME_NONE;
 }
-GstAlsaClock*
+static GstAlsaClock*
 gst_alsa_clock_new (gchar *name, GstAlsaClockGetTimeFunc get_time, GstAlsa *owner)
 {
   GstAlsaClock *alsa_clock = GST_ALSA_CLOCK (g_object_new (GST_TYPE_ALSA_CLOCK, NULL));
@@ -2010,6 +2011,7 @@
   alsa_clock->adjust = 0;
 
   gst_object_set_name (GST_OBJECT (alsa_clock), name);
+  gst_object_set_parent (GST_OBJECT (alsa_clock), GST_OBJECT (owner));
 
   return alsa_clock;
 }
@@ -2089,7 +2091,8 @@
 			    " now %" G_GUINT64_FORMAT,
                             target, GST_CLOCK_ENTRY_TIME (entry), entry_time);
 
-  while (gst_alsa_clock_get_internal_time (clock) < target && this->last_unlock < entry_time) {
+  while (gst_alsa_clock_get_internal_time (clock) < target && 
+         this->last_unlock < entry_time) {
     g_usleep (gst_alsa_clock_get_resolution (clock) * G_USEC_PER_SEC / GST_SECOND);
   }

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Thu May 15 2003  09:32:35 PDT

Log message:
next big bunch of stuff:
- proper caps setting in alsasrc
- query / conversion functions
WARNING: Alsa 0.9.2 is heavily borked wrt recording - expect segfaults

Modified files:
    ext/alsa        : gstalsa.c gstalsa.h

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.56&r2=1.57
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.h.diff?r1=1.19&r2=1.20

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- gstalsa.c	10 May 2003 11:37:35 -0000	1.56
+++ gstalsa.c	15 May 2003 16:32:22 -0000	1.57
@@ -123,7 +123,7 @@
 static void			gst_alsa_src_flush		(GstAlsaSrc *		src);
 static GstElementStateReturn	gst_alsa_src_change_state	(GstElement *		element);
 
-/* GStreamer functions for pads and state changing */
+/* GStreamer functions for pads, queries, conversions and state changing */
 static GstPad *			gst_alsa_request_new_pad	(GstElement *		element, 
 								 GstPadTemplate *	templ,
 								 const gchar *		name);
@@ -135,9 +135,32 @@
 								 gint			rate,
 								 gint			channels);
 static GstElementStateReturn	gst_alsa_change_state		(GstElement *		element);
+static const GstFormat * 	gst_alsa_get_formats	 	(GstPad *		pad);
+static gboolean 		gst_alsa_convert 		(GstAlsa *		this,
+								 GstFormat		src_format, 
+								 gint64			src_value,
+	            						 GstFormat *		dest_format,
+								 gint64 *		dest_value);
+static gboolean 		gst_alsa_pad_convert 		(GstPad *		pad,
+								 GstFormat		src_format, 
+								 gint64			src_value,
+	            						 GstFormat *		dest_format,
+								 gint64 *		dest_value);
+static const GstQueryType * 	gst_alsa_get_query_types 	(GstPad *		pad);
+static gboolean 		gst_alsa_query_func 		(GstElement *		element,
+								 GstQueryType		type, 
+								 GstFormat *		format,
+								 gint64 *		value);
+static gboolean 		gst_alsa_query	 		(GstElement *		element,
+								 GstQueryType		type, 
+								 GstFormat *		format,
+								 gint64 *		value);
+static gboolean 		gst_alsa_pad_query 		(GstPad *		pad,
+								 GstQueryType		type,
+								 GstFormat *		format,
+								 gint64 *		value);
 
 /* audio processing functions */
-static void			gst_alsa_src_loop		(GstElement *		element);
 static void			gst_alsa_xrun_recovery		(GstAlsa *		this);
 inline static snd_pcm_sframes_t	gst_alsa_update_avail		(GstAlsa *		this);
 inline static gboolean		gst_alsa_pcm_wait		(GstAlsa *		this);
@@ -275,10 +298,11 @@
     g_param_spec_uint64 ("max-discont", "Maximum Discontinuity", "GStreamer timeunits before the timestamp syncing starts dropping/insertting samples",
    /* rounding errors */ 1000, GST_SECOND, GST_ALSA_DEFAULT_DISCONT, G_PARAM_READWRITE | G_PARAM_CONSTRUCT));
 
-  element_class->change_state    = gst_alsa_change_state;
-  element_class->request_new_pad = gst_alsa_request_new_pad;
-  element_class->set_clock 	 = gst_alsa_set_clock;
-  element_class->get_clock 	 = gst_alsa_get_clock;
+  element_class->change_state    = GST_DEBUG_FUNCPTR (gst_alsa_change_state);
+  element_class->query	 	 = GST_DEBUG_FUNCPTR (gst_alsa_query);
+  element_class->request_new_pad = GST_DEBUG_FUNCPTR (gst_alsa_request_new_pad);
+  element_class->set_clock 	 = GST_DEBUG_FUNCPTR (gst_alsa_set_clock);
+  element_class->get_clock 	 = GST_DEBUG_FUNCPTR (gst_alsa_get_clock);
 }
 
 static void
@@ -970,35 +994,97 @@
   }
   return err;
 }
-static gboolean
-gst_alsa_src_set_caps (GstAlsaSrc *src)
+static inline gint
+gst_alsa_adjust_rate (gint rate, gboolean aggressive)
 {
+  static gint rates[] = { 96000, 48000, 44100, 22050, 8000 };
   gint i;
-  GstCaps *caps;
+
+  if (aggressive)
+    return rate;
+  
+  for (i = 0; i < G_N_ELEMENTS (rates); i--) {
+    if (rate > rates[i])
+      return rates[i];
+  }
+
+  return 0;
+}
+static gboolean
+gst_alsa_src_set_caps (GstAlsaSrc *src, gboolean aggressive)
+{
+  GstCaps *all_caps, *caps, *walk;
+  gint channels, min_channels, max_channels;
+  gint rate, min_rate, max_rate;
+  gint i, law, endian, width, depth;
+  gboolean sign;
   GstAlsa *this = GST_ALSA (src);
 
-  if (!(this->format = g_new (GstAlsaFormat, 1)))
-    return FALSE;
-  /* FIXME: make this do proper caps nego */
-  this->format->format = SND_PCM_FORMAT_S16;
-  this->format->rate = 44100;
-  this->format->channels = GST_ELEMENT (src)->numpads;
-  GST_DEBUG (GST_CAT_NEGOTIATION, "starting caps negotiation on alsa src");
-  caps = gst_alsa_caps (this->format->format, this->format->rate, this->format->channels);
+  all_caps = gst_alsa_get_caps (this->pad[0], NULL);
+  if (all_caps == NULL) return FALSE;
+  /* now intersect this with all caps of the peers... */
   for (i = 0; i < GST_ELEMENT (src)->numpads; i++) {
-    if (gst_pad_try_set_caps (this->pad[i], caps) <= 0) {
-      GST_DEBUG (GST_CAT_NEGOTIATION, "setting caps (%p) in alsasrc (%p) on pad %d failed", caps, this, i);
+    all_caps = gst_caps_intersect (all_caps, gst_pad_get_caps (this->pad[i]));
+    if (all_caps == NULL) {
+      GST_DEBUG (GST_CAT_NEGOTIATION, "No compatible caps found in alsasrc (%s)", GST_ELEMENT_NAME (this));
       return FALSE;
     }
   }
   
-  if (GST_FLAG_IS_SET (this, GST_ALSA_RUNNING)) gst_alsa_stop_audio (this);
-  if (!gst_alsa_start_audio (this)) {
-    /* FIXME: Try the next format */
-    return FALSE;
+  /* construct caps */
+  caps = GST_CAPS_NEW ("alsasrc caps", "audio/raw",
+                       "format",      GST_PROPS_STRING ("int"),
+		       "law",         GST_PROPS_INT (0),
+		       "endianness",  GST_PROPS_INT (G_BYTE_ORDER),
+		       "signed",      GST_PROPS_BOOLEAN (TRUE),
+		       "width",       GST_PROPS_INT (16),
+		       "depth",       GST_PROPS_INT (16),
+		       "rate",        GST_PROPS_INT (44100),
+		       "channels",    GST_PROPS_INT (1));
+  gst_caps_ref (caps);
+  gst_caps_sink (caps);
+
+  /* now try to find the best match */
+  walk = all_caps;
+  while (walk) {
+    gst_caps_get (walk, "law", &law, "signed", &sign, "width", &width, "depth", &depth, NULL);
+    if (gst_caps_has_property (walk, "endianness")) {
+      gst_caps_get_int (walk, "endianness", &endian);
+    } else {
+      endian = G_BYTE_ORDER;
+    }
+    gst_caps_set (caps, "law", GST_PROPS_INT (law));
+    gst_caps_set (caps, "endianness", GST_PROPS_INT (endian));
+    gst_caps_set (caps, "width", GST_PROPS_INT (width));
+    gst_caps_set (caps, "depth", GST_PROPS_INT (depth));
+    gst_caps_set (caps, "signed", GST_PROPS_BOOLEAN (sign));
+  
+    gst_props_entry_get_int_range (gst_props_get_entry (GST_CAPS_PROPERTIES (walk), "rate"), &min_rate, &max_rate);
+    gst_props_entry_get_int_range (gst_props_get_entry (GST_CAPS_PROPERTIES (walk), "channels"), &min_channels, &max_channels);
+    for (rate = max_rate;; rate--) {
+      if ((rate = gst_alsa_adjust_rate (rate, aggressive)) < min_rate)
+	break;    
+      gst_caps_set (caps, "rate", GST_PROPS_INT (rate));
+      for (channels = aggressive ? max_channels : MIN (max_channels, 2); channels >= min_channels; channels--) {
+        gst_caps_set (caps, "channels", GST_PROPS_INT (channels));
+        g_print ("trying new caps: law %d, %ssigned, endianness: %d, width %d, depth %d, channels %d, rate %d\n",
+                 law, sign ? "" : "un", endian, width, depth, channels, rate);
+        if (gst_pad_try_set_caps (this->pad[0], caps))
+          gst_alsa_link (this->pad[0], caps);
+      
+        if (this->format) {	  
+	  /* try to set caps here */
+	  return TRUE;
+	}
+      }
+    }
+    walk = GST_CAPS_NEXT (walk);
   }
 
-  return TRUE;
+  if (!aggressive)
+    return gst_alsa_src_set_caps (src, TRUE);
+
+  return FALSE;
 }
 /* we transmit buffers of period_size frames */
 static void
@@ -1011,7 +1097,7 @@
 
   /* set the caps on all pads */
   if (!this->format) {
-    if (!gst_alsa_src_set_caps (src)) {
+    if (!gst_alsa_src_set_caps (src, FALSE)) {
       gst_element_error (element, "Could not set caps");
       return;
     }
@@ -1102,7 +1188,7 @@
   return GST_STATE_SUCCESS;
 }
 
-/*** GSTREAMER PAD / STATE FUNCTIONS*******************************************/
+/*** GSTREAMER PAD / QUERY / CONVERSION / STATE FUNCTIONS *********************/
 
 static GstPad *
 gst_alsa_request_new_pad (GstElement *element, GstPadTemplate *templ,
@@ -1146,7 +1232,11 @@
   gst_pad_set_link_function (this->pad[channel], gst_alsa_link);
   gst_pad_set_getcaps_function (this->pad[channel], gst_alsa_get_caps);
   gst_element_add_pad (GST_ELEMENT (this), this->pad[channel]);
-
+  gst_pad_set_convert_function (this->pad[channel], gst_alsa_pad_convert);
+  gst_pad_set_query_function (this->pad[channel], gst_alsa_pad_query);
+  gst_pad_set_query_type_function (this->pad[channel], gst_alsa_get_query_types);
+  gst_pad_set_formats_function (this->pad[channel], gst_alsa_get_formats);
+  
   return this->pad[channel];
 }
 
@@ -1583,6 +1673,138 @@
 
   return GST_STATE_SUCCESS;
 }
+static const GstFormat *
+gst_alsa_get_formats (GstPad *pad)
+{
+  static const GstFormat formats[] = {
+    GST_FORMAT_TIME,
+    GST_FORMAT_UNITS,
+    GST_FORMAT_BYTES,
+    0
+  };
+  return formats;
+}
+static gboolean
+gst_alsa_pad_convert (GstPad *pad, GstFormat src_format, gint64 src_value,
+		      GstFormat *dest_format, gint64 *dest_value)
+{
+  return gst_alsa_convert (GST_ALSA (GST_PAD_PARENT (pad)), src_format, src_value, dest_format, dest_value);
+}
+static gboolean
+gst_alsa_convert (GstAlsa *this, GstFormat src_format, gint64 src_value,
+	          GstFormat *dest_format, gint64 *dest_value)
+{
+  gboolean res = TRUE;
+
+  if (src_format == *dest_format || (src_format == GST_FORMAT_UNITS && *dest_format == GST_FORMAT_DEFAULT)) {
+    *dest_format = GST_FORMAT_UNITS;
+    *dest_value = src_value;
+    return TRUE;
+  }
+  if (this->format == NULL)
+    return FALSE;
+
+  switch (src_format) {
+    case GST_FORMAT_BYTES:
+      switch (*dest_format) {
+        case GST_FORMAT_DEFAULT:
+          *dest_format = GST_FORMAT_UNITS;
+        case GST_FORMAT_TIME:
+	  *dest_value = gst_alsa_bytes_to_timestamp (this, (guint) src_value);
+          break;
+        case GST_FORMAT_UNITS:
+	  *dest_value = gst_alsa_samples_to_timestamp (this, (guint) src_value);
+          break;
+        default:
+          res = FALSE;
+	  break;
+      }
+      break;
+    case GST_FORMAT_TIME:
+      switch (*dest_format) {
+        case GST_FORMAT_DEFAULT:
+          *dest_format = GST_FORMAT_UNITS;
+        case GST_FORMAT_UNITS:
+	  *dest_value = gst_alsa_timestamp_to_samples (this, (GstClockTime) src_value);
+          break;
+        case GST_FORMAT_BYTES:
+	  *dest_value = gst_alsa_timestamp_to_bytes (this, (GstClockTime) src_value);
+          break;
+        default:
+          res = FALSE;
+	  break;
+      }
+      break;
+    case GST_FORMAT_UNITS:
+      switch (*dest_format) {	  
+        case GST_FORMAT_TIME:
+	  *dest_value = gst_alsa_samples_to_timestamp (this, (guint) src_value);
+          break;
+        case GST_FORMAT_BYTES:
+	  *dest_value = gst_alsa_samples_to_bytes (this, (guint) src_value);
+          break;
+        case GST_FORMAT_DEFAULT:
+          g_assert_not_reached ();
+	  /* fall through */
+        default:
+          res = FALSE;
+	  break;
+      }
+      break;
+    default:
+      res = FALSE;
+  }
+
+  return res;
+}
+static const GstQueryType * 
+gst_alsa_get_query_types (GstPad *pad)
+{
+  static const GstQueryType query_types[] = {
+    GST_QUERY_LATENCY,
+    GST_QUERY_POSITION,
+    0,
+  };
+  return query_types;
+}
+static gboolean
+gst_alsa_query_func (GstElement *element, GstQueryType type, GstFormat *format, gint64 *value)
+{
+  gboolean res = FALSE;
+  GstAlsa *this = GST_ALSA (element);
+
+  switch (type) {
+    case GST_QUERY_LATENCY: {
+      snd_pcm_sframes_t delay;
+      ERROR_CHECK (snd_pcm_delay (this->handle, &delay), "Error getting delay: %s");
+      res = gst_alsa_convert (this, GST_FORMAT_UNITS, (gint64) delay, format, value); 
+      break;
+    }
+    case GST_QUERY_POSITION:
+      res = gst_alsa_convert (this, GST_FORMAT_UNITS, this->transmitted, format, value);
+      break;
+    default:
+      break;
+  }
+
+  return res;
+}
+static gboolean
+gst_alsa_query (GstElement *element, GstQueryType type, GstFormat *format, gint64 *value)
+{
+  return gst_alsa_pad_query (GST_ALSA (element)->pad[0], type, format, value);
+}
+static gboolean
+gst_alsa_pad_query (GstPad *pad, GstQueryType type, GstFormat *format, gint64 *value)
+{
+  if (gst_alsa_query_func (GST_PAD_PARENT (pad), type, format, value))
+    return TRUE;
+
+  if (GST_PAD_DIRECTION (pad) == GST_PAD_SINK && gst_pad_query (gst_pad_get_peer (pad), type, format, value))
+    return TRUE;
+  
+  return FALSE;
+}
 
 /*** AUDIO PROCESSING *********************************************************/
 
@@ -1630,8 +1852,6 @@
 inline static gboolean
 gst_alsa_start (GstAlsa *this)
 {
-  //gint avail;
-
   GST_DEBUG (GST_CAT_PLUGIN_INFO, "Setting state to RUNNING");
 
   switch (snd_pcm_state(this->handle)) {
@@ -1659,9 +1879,6 @@
       g_assert_not_reached ();
       break;
   }
-/*  avail = (gint) gst_alsa_update_avail (this);
-  if (avail < 0)
-    return FALSE;*/
   gst_alsa_clock_start (this->clock);
   return TRUE;
 }
@@ -1882,7 +2099,6 @@
   GST_FLAG_SET (this, GST_ALSA_RUNNING);
   return TRUE;
 }
-
 static gboolean
 gst_alsa_drain_audio (GstAlsa *this)
 {
Index: gstalsa.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- gstalsa.h	24 Apr 2003 22:58:33 -0000	1.19
+++ gstalsa.h	15 May 2003 16:32:22 -0000	1.20
@@ -36,30 +36,30 @@
    should be big enough to allow smoothing errors on different video formats */
 #define GST_ALSA_DEFAULT_DISCONT (GST_SECOND / 10)
 
-#define GST_ALSA(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_ALSA, GstAlsa)
-#define GST_ALSA_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_ALSA, GstAlsaClass)
-#define GST_ALSA_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_ALSA, GstAlsaClass))
-#define GST_IS_ALSA(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_ALSA)
-#define GST_IS_ALSA_CLASS(klass) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_ALSA)
-#define GST_TYPE_ALSA gst_alsa_get_type()
+#define GST_ALSA(obj)			(G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_ALSA, GstAlsa))
+#define GST_ALSA_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_ALSA, GstAlsaClass))
+#define GST_ALSA_GET_CLASS(obj)		(G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_ALSA, GstAlsaClass))
+#define GST_IS_ALSA(obj)		(G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_ALSA))
+#define GST_IS_ALSA_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_ALSA))
+#define GST_TYPE_ALSA			(gst_alsa_get_type())
 
-#define GST_ALSA_SINK(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_ALSA_SINK, GstAlsaSink)
-#define GST_ALSA_SINK_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_ALSA_SINK, GstAlsaSinkClass)
-#define GST_IS_ALSA_SINK(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_ALSA_SINK)
-#define GST_IS_ALSA_SINK_CLASS(klass) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_ALSA_SINK)
-#define GST_TYPE_ALSA_SINK gst_alsa_sink_get_type()
+#define GST_ALSA_SINK(obj)		(G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_ALSA_SINK, GstAlsaSink))
+#define GST_ALSA_SINK_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_ALSA_SINK, GstAlsaSinkClass))
+#define GST_IS_ALSA_SINK(obj)		(G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_ALSA_SINK))
+#define GST_IS_ALSA_SINK_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_ALSA_SINK))
+#define GST_TYPE_ALSA_SINK		(gst_alsa_sink_get_type())
 
-#define GST_ALSA_SRC(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_ALSA_SRC, GstAlsaSrc)
-#define GST_ALSA_SRC_CLASS(klass) G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_ALSA_SRC, GstAlsaSrcClass)
-#define GST_IS_ALSA_SRC(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_ALSA_SRC)
-#define GST_IS_ALSA_SRC_CLASS(klass) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_ALSA_SRC)
-#define GST_TYPE_ALSA_SRC gst_alsa_src_get_type()
+#define GST_ALSA_SRC(obj)		(G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_ALSA_SRC, GstAlsaSrc))
+#define GST_ALSA_SRC_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST(klass, GST_TYPE_ALSA_SRC, GstAlsaSrcClass))
+#define GST_IS_ALSA_SRC(obj)		(G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_ALSA_SRC))
+#define GST_IS_ALSA_SRC_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_ALSA_SRC))
+#define GST_TYPE_ALSA_SRC		(gst_alsa_src_get_type())
 
-#define GST_ALSA_CLOCK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ALSA_CLOCK,GstAlsaClock))
-#define GST_ALSA_CLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ALSA_CLOCK,GstAlsaClockClass))
-#define GST_IS_ALSA_CLOCK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ALSA_CLOCK))
-#define GST_IS_ALSA_CLOCK_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ALSA_CLOCK))
-#define GST_TYPE_ALSA_CLOCK (gst_alsa_clock_get_type())
+#define GST_ALSA_CLOCK(obj)		(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ALSA_CLOCK,GstAlsaClock))
+#define GST_ALSA_CLOCK_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ALSA_CLOCK,GstAlsaClockClass))
+#define GST_IS_ALSA_CLOCK(obj)		(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ALSA_CLOCK))
+#define GST_IS_ALSA_CLOCK_CLASS(obj)	(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ALSA_CLOCK))
+#define GST_TYPE_ALSA_CLOCK		(gst_alsa_clock_get_type())
 
 /* I would have preferred to avoid this variety of trickery, but without it i
  * can't tell whether I'm a source or a sink upon creation. */

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Sat May 17 2003  13:39:47 PDT

Log message:
make filtered connections actually work. Remove a leftover g_print

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.57&r2=1.58

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- gstalsa.c	15 May 2003 16:32:22 -0000	1.57
+++ gstalsa.c	17 May 2003 20:39:34 -0000	1.58
@@ -1003,8 +1003,8 @@
   if (aggressive)
     return rate;
   
-  for (i = 0; i < G_N_ELEMENTS (rates); i--) {
-    if (rate > rates[i])
+  for (i = 0; i < G_N_ELEMENTS (rates); i++) {
+    if (rate >= rates[i])
       return rates[i];
   }
 
@@ -1067,9 +1067,9 @@
       gst_caps_set (caps, "rate", GST_PROPS_INT (rate));
       for (channels = aggressive ? max_channels : MIN (max_channels, 2); channels >= min_channels; channels--) {
         gst_caps_set (caps, "channels", GST_PROPS_INT (channels));
-        g_print ("trying new caps: law %d, %ssigned, endianness: %d, width %d, depth %d, channels %d, rate %d\n",
-                 law, sign ? "" : "un", endian, width, depth, channels, rate);
-        if (gst_pad_try_set_caps (this->pad[0], caps))
+        GST_DEBUG (0, "trying new caps: law %d, %ssigned, endianness: %d, width %d, depth %d, channels %d, rate %d\n",
+                   law, sign ? "" : "un", endian, width, depth, channels, rate);
+        if (gst_pad_try_set_caps (this->pad[0], caps) != GST_PAD_LINK_REFUSED)
           gst_alsa_link (this->pad[0], caps);
       
         if (this->format) {

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Fri Jul 25 2003  11:43:27 PDT

Log message:
copy license from .h to .c, so it's really the LGPL header now

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.65&r2=1.66

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- gstalsa.c	19 Jul 2003 23:22:47 -0000	1.65
+++ gstalsa.c	25 Jul 2003 18:43:15 -0000	1.66
@@ -11,14 +11,14 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-
+                                                                                                                    
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Sun Oct 12 2003  10:04:11 PDT

Log message:
update alsa to the new debugging system

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.71&r2=1.72

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- gstalsa.c	8 Oct 2003 16:07:34 -0000	1.71
+++ gstalsa.c	12 Oct 2003 17:03:59 -0000	1.72
@@ -25,6 +25,9 @@
 #include <sys/time.h>
 #include "gstalsa.h"
 
+GST_DEBUG_CATEGORY_STATIC (alsa_debug);
+#define GST_CAT_DEFAULT alsa_debug
+
 /* error checking for standard alsa functions */
 #define SIMPLE_ERROR_CHECK(value) G_STMT_START{ \
   int err = (value); \
@@ -36,7 +39,7 @@
 #define ERROR_CHECK(value, ...) G_STMT_START{ \
   int err = (value); \
   if (err < 0) { \
-    g_warning ( __VA_ARGS__, snd_strerror (err)); \
+    GST_ERROR_OBJECT (this, __VA_ARGS__, snd_strerror (err)); \
     return FALSE; \
   } \
 }G_STMT_END
@@ -44,7 +47,7 @@
 #define ERROR_CHECK(value, args...) G_STMT_START{ \
   int err = (value); \
   if (err < 0) { \
-    g_warning ( ## args, snd_strerror (err)); \
+    GST_ERROR_OBJECT (this, ## args, snd_strerror (err)); \
     return FALSE; \
   } \
 }G_STMT_END
@@ -52,7 +55,7 @@
 #define ERROR_CHECK(value, args...) G_STMT_START{ \
   int err = (value); \
   if (err < 0) { \
-    g_warning (snd_strerror (err)); \
+    GST_ERROR_OBJECT (this, snd_strerror (err)); \
     return FALSE; \
   } \
 }G_STMT_END
@@ -560,12 +563,12 @@
 	  }
 	  if (gst_event_discont_get_value (event, GST_FORMAT_TIME, &value)) {
 	    if (!gst_clock_handle_discont (GST_ELEMENT (this)->clock, value))
-	      g_printerr ("GstAlsa: clock couldn't handle discontinuity\n");
+	      GST_WARNING_OBJECT (this, "clock couldn't handle discontinuity");
 	  }
 	  if (!gst_event_discont_get_value (event, GST_FORMAT_DEFAULT, &value)) {
 	    if (!gst_event_discont_get_value (event, GST_FORMAT_BYTES, &value)) {
 	      if (!gst_event_discont_get_value (event, GST_FORMAT_TIME, &value)) {
-	        g_warning ("GstAlsa: Could not acquire samplecount after seek, the clock might screw your pipeline now");
+	        GST_WARNING_OBJECT (this, "could not acquire samplecount after seek, the clock might screw your pipeline now");
 	        break;
 	      } else {
 	        if (this->format) /* discont event before any data (and before any caps...) */
@@ -586,7 +589,7 @@
 	  break;
         }
       default:
-        g_warning ("GstAlsa: got an unknown event (Type: %d)", GST_EVENT_TYPE (event));
+        GST_INFO_OBJECT (this, "got an unknown event (Type: %d)", GST_EVENT_TYPE (event));
         break;
     }
     gst_event_unref (event);
@@ -626,17 +629,17 @@
   }
 
   if ((err = snd_pcm_mmap_begin (this->handle, &dst, &offset, avail)) < 0) {
-    g_warning ("gstalsa: mmap failed: %s", snd_strerror (err));
+    GST_ERROR_OBJECT (this, "mmap failed: %s", snd_strerror (err));
     return -1;
   }
 
   if ((err = snd_pcm_areas_copy (dst, offset, src, 0, this->format->channels, *avail, this->format->format)) < 0) {
     snd_pcm_mmap_commit (this->handle, offset, 0);
-    g_warning ("gstalsa: data copy failed: %s", snd_strerror (err));
+    GST_ERROR_OBJECT (this, "data copy failed: %s", snd_strerror (err));
     return -1;
   }
   if ((err = snd_pcm_mmap_commit (this->handle, offset, *avail)) < 0) {
-    g_warning ("gstalsa: mmap commit failed: %s", snd_strerror (err));
+    GST_ERROR_OBJECT (this, "mmap commit failed: %s", snd_strerror (err));
     return -1;
   }
 
@@ -665,7 +668,7 @@
       gst_alsa_xrun_recovery (this);
       return 0;
     }
-    g_warning ("error on data access: %s", snd_strerror (err));
+    GST_ERROR_OBJECT (this, "error on data access: %s", snd_strerror (err));
   }
   return err;
 }
@@ -727,27 +730,27 @@
 	  int size = samples * snd_pcm_format_physical_width (this->format->format) / 8;
 	  g_printerr ("Allocating %d bytes (%ld samples) now to resync: sample %ld expected, but got %ld\n", 
 	              size, MIN (bytes, samplestamp - this->transmitted), this->transmitted, samplestamp);
-	  sink->data[i] = g_malloc (size);
+	  sink->data[i] = g_try_malloc (size);
 	  if (!sink->data[i]) {
-	    g_warning ("GstAlsa: error allocating %d bytes, buffers unsynced now.", size);
+	    GST_WARNING_OBJECT (this, "error allocating %d bytes, buffers unsynced now.", size);
 	    goto no_difference;
 	  }
 	  sink->size[i] = size;
 	  if (0 != snd_pcm_format_set_silence (this->format->format, sink->data[i], samples)) {
-	    g_warning ("GstAlsa: error silencing buffer, enjoy the noise.");
+	    GST_WARNING_OBJECT (this, "error silencing buffer, enjoy the noise.");
 	  }
 	  sink->behaviour[i] = 1;
 	} else if (gst_alsa_samples_to_bytes (this, this->transmitted - samplestamp) >= sink->buf[i]->size) {
-	  g_printerr ("Skipping %lu samples to resync (complete buffer): sample %ld expected, but got %ld\n", 
-	              gst_alsa_bytes_to_samples (this, sink->buf[i]->size), this->transmitted, samplestamp);	              
+	  GST_INFO_OBJECT (this, "Skipping %lu samples to resync (complete buffer): sample %ld expected, but got %ld\n", 
+			   gst_alsa_bytes_to_samples (this, sink->buf[i]->size), this->transmitted, samplestamp);	              
 	  /* this buffer is way behind */
 	  gst_buffer_unref (sink->buf[i]);
 	  sink->buf[i] = NULL;
 	  continue;
 	} else if (this->transmitted > samplestamp) {
 	  gint difference = gst_alsa_samples_to_bytes (this, this->transmitted - samplestamp);	
-	  g_printerr ("Skipping %lu samples to resync: sample %ld expected, but got %ld\n",
-		      (gulong) this->transmitted - samplestamp, this->transmitted, samplestamp);
+	  GST_INFO_OBJECT (this, "Skipping %lu samples to resync: sample %ld expected, but got %ld\n",
+			   (gulong) this->transmitted - samplestamp, this->transmitted, samplestamp);
 	  /* this buffer is only a bit behind */
           sink->size[i] = sink->buf[i]->size - difference;
           sink->data[i] = sink->buf[i]->data + difference;
@@ -942,16 +945,16 @@
   }
 
   if ((err = snd_pcm_mmap_begin (this->handle, &src, &offset, avail)) < 0) {
-    g_warning ("gstalsa: mmap failed: %s", snd_strerror (err));
+    GST_ERROR_OBJECT (this, "mmap failed: %s", snd_strerror (err));
     return -1;
   }
   if (*avail > 0 && (err = snd_pcm_areas_copy (dst, 0, src, offset, this->format->channels, *avail, this->format->format)) < 0) {
     snd_pcm_mmap_commit (this->handle, offset, 0);
-    g_warning ("gstalsa: data copy failed: %s", snd_strerror (err));
+    GST_ERROR_OBJECT (this, "data copy failed: %s", snd_strerror (err));
     return -1;
   }
   if ((err = snd_pcm_mmap_commit (this->handle, offset, *avail)) < 0) {
-    g_warning ("gstalsa: mmap commit failed: %s", snd_strerror (err));
+    GST_ERROR_OBJECT (this, "mmap commit failed: %s", snd_strerror (err));
     return -1;
   }
 
@@ -980,7 +983,7 @@
       gst_alsa_xrun_recovery (this);
       return 0;
     }
-    g_warning ("error on data access: %s", snd_strerror (err));
+    GST_ERROR_OBJECT (this, "error on data access: %s", snd_strerror (err));
   }
   return err;
 }
@@ -1194,14 +1197,14 @@
     channel = (gint) strtol (name + (strchr (templ->name_template, '%') -
                             templ->name_template), NULL, 0);
     if (channel < 1 || channel >= GST_ALSA_MAX_CHANNELS) {
-      g_warning ("invalid channel requested. (%d)", channel);
+      GST_INFO_OBJECT (this, "invalid channel requested. (%d)", channel);
       return NULL;
     }
   }
 
   /* make sure the requested channel is free. */
   if (channel > 0 || this->pad[channel] != NULL) {
-    g_warning ("requested channel %d already in use.", channel);
+    GST_INFO_OBJECT (this, "requested channel %d already in use.", channel);
     return NULL;
   }
 
@@ -1352,7 +1355,7 @@
         gst_props_add_entry (props, gst_props_entry_new ("endianness", GST_PROPS_INT (G_LITTLE_ENDIAN)));
         break;
       default:
-        g_warning("ALSA: Unknown byte order in sound driver. Continuing by assuming system byte order.");
+        GST_WARNING ("Unknown byte order in sound driver. Continuing by assuming system byte order.");
         gst_props_add_entry (props, gst_props_entry_new ("endianness", GST_PROPS_INT (G_BYTE_ORDER)));
         break;
       }
@@ -1593,7 +1596,7 @@
     if (snd_pcm_state (this->handle) == SND_PCM_STATE_PAUSED) {
       int err = snd_pcm_pause (this->handle, 0);
       if (err < 0) {
-        g_warning ("Error unpausing sound: %s", snd_strerror (err));
+        GST_ERROR_OBJECT (this, "Error unpausing sound: %s", snd_strerror (err));
         return GST_STATE_FAILURE;
       }
       gst_alsa_clock_start (this->clock);
@@ -1604,7 +1607,7 @@
       if (snd_pcm_state (this->handle) == SND_PCM_STATE_RUNNING) {
         int err = snd_pcm_pause (this->handle, 1);
         if (err < 0) {
-          g_warning ("Error pausing sound: %s", snd_strerror (err));
+          GST_ERROR_OBJECT (this, "Error pausing sound: %s", snd_strerror (err));
           return GST_STATE_FAILURE;
         }
         gst_alsa_clock_stop (this->clock);
@@ -1770,7 +1773,7 @@
     if (avail == -EPIPE) {
       gst_alsa_xrun_recovery (this);
     } else {
-      g_warning ("unknown ALSA avail_update return value (%d)", (int) avail);
+      GST_WARNING_OBJECT (this, "unknown ALSA avail_update return value (%d)", (int) avail);
     }
   }
   return avail;
@@ -1792,7 +1795,7 @@
           return FALSE;
         }
       }
-      g_warning ("error waiting for alsa pcm: (%d: %s)", err, snd_strerror (err));
+      GST_ERROR_OBJECT (this, "error waiting for alsa pcm: (%d: %s)", err, snd_strerror (err));
       return FALSE;
     }
   }
@@ -1845,7 +1848,7 @@
   snd_pcm_status_alloca (&status);
 
   if ((err = snd_pcm_status (this->handle, status)) < 0)
-    g_warning ("status error: %s", snd_strerror (err));
+    GST_ERROR_OBJECT (this, "status error: %s", snd_strerror (err));
 
   if (snd_pcm_status_get_state (status) == SND_PCM_STATE_XRUN) {
     struct timeval now, diff, tstamp;
@@ -1853,7 +1856,7 @@
     gettimeofday (&now, 0);
     snd_pcm_status_get_trigger_tstamp (status, &tstamp);
     timersub (&now, &tstamp, &diff);
-    g_warning ("alsa: xrun of at least %.3f msecs", diff.tv_sec * 1000 + diff.tv_usec / 1000.0);
+    GST_INFO_OBJECT (this, "alsa: xrun of at least %.3f msecs", diff.tv_sec * 1000 + diff.tv_usec / 1000.0);
 
     /* if we're allowed to recover, ... */
     if (this->autorecover) {
@@ -2249,14 +2252,14 @@
     return GST_CLOCK_ENTRY_EARLY;
     
   if (diff > clock->max_diff) {
-    g_warning ("GstAlsaClock: abnormal clock request diff: %" G_GINT64_FORMAT") >"
-               "  %"G_GINT64_FORMAT, diff, clock->max_diff);
+    GST_INFO_OBJECT (this, "GstAlsaClock: abnormal clock request diff: %" G_GINT64_FORMAT") >"
+		     "  %"G_GINT64_FORMAT, diff, clock->max_diff);
     return GST_CLOCK_ENTRY_EARLY;
   }
   
   target = entry_time + diff;
 
-  GST_DEBUG ("real_target %" G_GUINT64_FORMAT
+  GST_DEBUG_OBJECT (this, "real_target %" G_GUINT64_FORMAT
 		            " target %" G_GUINT64_FORMAT
 			    " now %" G_GUINT64_FORMAT,
                             target, GST_CLOCK_ENTRY_TIME (entry), entry_time);
@@ -2350,6 +2353,8 @@
 plugin_init (GModule * module, GstPlugin * plugin)
 {
   GstElementFactory *factory;
+
+  GST_DEBUG_CATEGORY_INIT (alsa_debug, "alsa", 0, "alsa plugins");
 
   factory = gst_element_factory_new ("alsasrc", GST_TYPE_ALSA_SRC, &gst_alsa_src_details);
   g_return_val_if_fail (factory != NULL, FALSE);

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Tue Nov 11 2003  18:49:43 PST

Log message:
use debugging macros for debugging (d'oh)

Modified files:
    ext/alsa        : gstalsa.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.74&r2=1.75

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- gstalsa.c	11 Nov 2003 00:38:11 -0000	1.74
+++ gstalsa.c	12 Nov 2003 02:49:30 -0000	1.75
@@ -744,7 +744,7 @@
 	  int samples = MIN (bytes, samplestamp - this->transmitted) * 
 	             (element->numpads == 1 ? this->format->channels : 1);
 	  int size = samples * snd_pcm_format_physical_width (this->format->format) / 8;
-	  g_printerr ("Allocating %d bytes (%ld samples) now to resync: sample %ld expected, but got %ld\n", 
+	  GST_INFO_OBJECT (this, "Allocating %d bytes (%ld samples) now to resync: sample %ld expected, but got %ld\n", 
 	              size, MIN (bytes, samplestamp - this->transmitted), this->transmitted, samplestamp);
 	  sink->data[i] = g_try_malloc (size);
 	  if (!sink->data[i]) {

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Tue Nov 18 2003  07:33:04 PST

Log message:
fixes for recent changes:
- GstAlsaClock is not a GstSystemClock
- initialize debugging system correctly

Modified files:
    ext/alsa        : gstalsa.c gstalsa.h gstalsaclock.h
                      gstalsaplugin.c gstalsasink.c gstalsasrc.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.76&r2=1.77
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.h.diff?r1=1.21&r2=1.22
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsaclock.h.diff?r1=1.1&r2=1.2
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsaplugin.c.diff?r1=1.1&r2=1.2
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsasink.c.diff?r1=1.1&r2=1.2
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsasrc.c.diff?r1=1.1&r2=1.2

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- gstalsa.c	16 Nov 2003 00:40:01 -0000	1.76
+++ gstalsa.c	18 Nov 2003 15:32:52 -0000	1.77
@@ -697,7 +697,7 @@
         GST_ERROR_OBJECT (this, "Error unpausing sound: %s", snd_strerror (err));
         return GST_STATE_FAILURE;
       }
-      gst_alsa_clock_start (GST_ALSA_CLOCK (this->clock));
+      gst_alsa_clock_start (this->clock);
     }
     break;
   case GST_STATE_PLAYING_TO_PAUSED:
@@ -708,7 +708,7 @@
           GST_ERROR_OBJECT (this, "Error pausing sound: %s", snd_strerror (err));
           return GST_STATE_FAILURE;
         }
-        gst_alsa_clock_stop (GST_ALSA_CLOCK (this->clock));
+        gst_alsa_clock_stop (this->clock);
       }
       break;
     }
@@ -946,7 +946,7 @@
       g_assert_not_reached ();
       break;
   }
-  gst_alsa_clock_start (GST_ALSA_CLOCK (this->clock));
+  gst_alsa_clock_start (this->clock);
   return TRUE;
 }
 void
@@ -1177,7 +1177,7 @@
   switch (snd_pcm_state (this->handle)) {
     case SND_PCM_STATE_XRUN:
     case SND_PCM_STATE_RUNNING:
-      gst_alsa_clock_stop (GST_ALSA_CLOCK (this->clock));
+      gst_alsa_clock_stop (this->clock);
       /* fall through - clock is already stopped when paused */
     case SND_PCM_STATE_PAUSED:
       /* snd_pcm_drain only works in blocking mode */
@@ -1204,7 +1204,7 @@
   switch (snd_pcm_state (this->handle)) {
     case SND_PCM_STATE_XRUN:
     case SND_PCM_STATE_RUNNING:
-      gst_alsa_clock_stop (GST_ALSA_CLOCK (this->clock));
+      gst_alsa_clock_stop (this->clock);
       /* fall through - clock is already stopped when paused */
     case SND_PCM_STATE_PAUSED:
       ERROR_CHECK (snd_pcm_drop (this->handle),
Index: gstalsa.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- gstalsa.h	16 Nov 2003 00:40:01 -0000	1.21
+++ gstalsa.h	18 Nov 2003 15:32:52 -0000	1.22
@@ -29,7 +29,7 @@
 #include <gst/gst.h>
 
 
-GST_DEBUG_CATEGORY_STATIC (alsa_debug);
+GST_DEBUG_CATEGORY_EXTERN (alsa_debug);
 #define GST_CAT_DEFAULT alsa_debug
 
 
@@ -110,6 +110,9 @@
   else     { (GST_ALSA (obj)->pcm_caps &= ~(1<<(flag))); } \
 }G_STMT_END
 
+typedef struct _GstAlsaClock GstAlsaClock;
+typedef struct _GstAlsaClockClass GstAlsaClockClass;
+
 typedef struct _GstAlsa GstAlsa;
 typedef struct _GstAlsaClass GstAlsaClass;
 
@@ -143,7 +146,7 @@
   gboolean			autorecover;
 
   /* clocking */
-  GstSystemClock *		clock;		/* our provided clock */
+  GstAlsaClock *		clock;		/* our provided clock */
   snd_pcm_uframes_t		transmitted; 	/* samples transmitted since last sync 
 						   This thing actually is our master clock.
 						   We will event insert silent samples or
Index: gstalsaclock.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsaclock.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gstalsaclock.h	16 Nov 2003 00:40:01 -0000	1.1
+++ gstalsaclock.h	18 Nov 2003 15:32:52 -0000	1.2
@@ -32,9 +32,6 @@
 #define GST_IS_ALSA_CLOCK_CLASS(obj)	(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ALSA_CLOCK))
 #define GST_TYPE_ALSA_CLOCK		(gst_alsa_clock_get_type())
 
-typedef struct _GstAlsaClock GstAlsaClock;
-typedef struct _GstAlsaClockClass GstAlsaClockClass;
-
 typedef GstClockTime (*GstAlsaClockGetTimeFunc) (GstAlsa *);
 
 struct _GstAlsaClock {
Index: gstalsaplugin.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsaplugin.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gstalsaplugin.c	16 Nov 2003 00:40:01 -0000	1.1
+++ gstalsaplugin.c	18 Nov 2003 15:32:52 -0000	1.2
@@ -27,6 +27,8 @@
 #include "gstalsasink.h"
 #include "gstalsasrc.h"
 
+GST_DEBUG_CATEGORY (alsa_debug);
+
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
Index: gstalsasink.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsasink.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gstalsasink.c	16 Nov 2003 00:40:01 -0000	1.1
+++ gstalsasink.c	18 Nov 2003 15:32:52 -0000	1.2
@@ -149,7 +149,7 @@
   gst_pad_set_getcaps_function (this->pad[0], gst_alsa_get_caps);
   gst_element_add_pad (GST_ELEMENT (this), this->pad[0]);
   
-  this->clock = GST_SYSTEM_CLOCK (gst_alsa_clock_new ("alsasinkclock", gst_alsa_sink_get_time, this));
+  this->clock = gst_alsa_clock_new ("alsasinkclock", gst_alsa_sink_get_time, this);
   /* we hold a ref to our clock until we're disposed */
   gst_object_ref (GST_OBJECT (this->clock));
   gst_object_sink (GST_OBJECT (this->clock));
@@ -232,10 +232,10 @@
           }
 
           /* if the clock is running */
-	  if (GST_CLOCK_TIME_IS_VALID (GST_ALSA_CLOCK (this->clock)->start_time)) {
+	  if (GST_CLOCK_TIME_IS_VALID (this->clock->start_time)) {
 	    g_assert (this->format);
             /* adjust the start time */
-	    GST_ALSA_CLOCK (this->clock)->start_time +=
+	    this->clock->start_time +=
 	      gst_alsa_samples_to_timestamp (this, this->transmitted) -
 	      gst_alsa_samples_to_timestamp (this, value);
 	  }
Index: gstalsasrc.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsasrc.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- gstalsasrc.c	16 Nov 2003 00:40:01 -0000	1.1
+++ gstalsasrc.c	18 Nov 2003 15:32:52 -0000	1.2
@@ -144,7 +144,7 @@
   gst_pad_set_getcaps_function (this->pad[0], gst_alsa_get_caps);
   gst_element_add_pad (GST_ELEMENT (this), this->pad[0]);
   
-  this->clock = GST_SYSTEM_CLOCK (gst_alsa_clock_new ("alsasrcclock", gst_alsa_src_get_time, this));
+  this->clock = gst_alsa_clock_new ("alsasrcclock", gst_alsa_src_get_time, this);
   /* we hold a ref to our clock until we're disposed */
   gst_object_ref (GST_OBJECT (this->clock));
   gst_object_sink (GST_OBJECT (this->clock));

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Sat Nov 22 2003  08:15:37 PST

Log message:
don't print to stderr, use debug messages

Modified files:
    ext/alsa        : gstalsasink.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsasink.c.diff?r1=1.2&r2=1.3

====Begin Diffs====
Index: gstalsasink.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsasink.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gstalsasink.c	18 Nov 2003 15:32:52 -0000	1.2
+++ gstalsasink.c	22 Nov 2003 16:15:24 -0000	1.3
@@ -385,8 +385,8 @@
 	  int samples = MIN (bytes, sample_diff) *
 	             (element->numpads == 1 ? this->format->channels : 1);
 	  int size = samples * snd_pcm_format_physical_width (this->format->format) / 8;
-	  g_printerr ("Allocating %d bytes (%ld samples) now to resync: sample %ld expected, but got %ld\n", 
-	              size, MIN (bytes, sample_diff), this->transmitted, samplestamp);
+	  GST_INFO_OBJECT (this, "Allocating %d bytes (%ld samples) now to resync: sample %ld expected, but got %ld\n", 
+			   size, MIN (bytes, sample_diff), this->transmitted, samplestamp);
 	  sink->data[i] = g_try_malloc (size);
 	  if (!sink->data[i]) {
 	    GST_WARNING_OBJECT (this, "error allocating %d bytes, buffers unsynced now.", size);

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Fri Dec 12 2003  14:53:09 PST
Branch:         CAPS

Log message:
convert alsa to new caps. compiles, but untested

Modified files:
    ext/alsa        : gstalsa.c gstalsa.h gstalsasink.c gstalsasrc.c

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.c.diff?r1=1.77&r2=1.77.4.1
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsa.h.diff?r1=1.22&r2=1.22.4.1
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsasink.c.diff?r1=1.3&r2=1.3.4.1
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsasrc.c.diff?r1=1.2&r2=1.2.4.1

====Begin Diffs====
Index: gstalsa.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.c,v
retrieving revision 1.77
retrieving revision 1.77.4.1
diff -u -d -r1.77 -r1.77.4.1
--- gstalsa.c	18 Nov 2003 15:32:52 -0000	1.77
+++ gstalsa.c	12 Dec 2003 22:52:57 -0000	1.77.4.1
@@ -331,29 +331,29 @@
 
 /* gets the matching alsa format or NULL if none matches */
 static GstAlsaFormat *
-gst_alsa_get_format (GstCaps *caps)
+gst_alsa_get_format (const GstStructure *structure)
 {
   const gchar *mimetype;
   GstAlsaFormat *ret;
 
-  if (!(ret = g_new (GstAlsaFormat, 1)))
-    return NULL;
+  ret = g_new (GstAlsaFormat, 1);
 
   /* we have to differentiate between int and float formats */
-  mimetype = gst_caps_get_mime (caps);
+  mimetype = gst_structure_get_name (structure);
 
   if (! strncmp (mimetype, "audio/x-raw-int", 15)) {
     gboolean sign;
     gint width, depth, endianness;
 
-    /* extract the needed information from the caps */
-    if (!gst_caps_get (caps,
-           "width", &width, "depth", &depth, "signed", &sign, NULL))
+    /* extract the needed information from the cap */
+    if (!(gst_structure_get_int (structure, "width", &width) &&
+	  gst_structure_get_int (structure, "depth", &depth) &&
+	  gst_structure_get_boolean (structure, "signed", &sign)))
         goto error;
 
     /* extract endianness if needed */
     if (width > 8) {
-      if (!gst_caps_get (caps, "endianness", &endianness, NULL))
+      if (!gst_structure_get_int (structure, "endianness", &endianness))
         goto error;
     } else {
       endianness = G_BYTE_ORDER;
@@ -365,7 +365,7 @@
     gint width;
 
     /* get layout */
-    if (!gst_caps_get (caps, "width", &width, NULL))
+    if (!gst_structure_get_int (structure, "width", &width))
       goto error;
 
     /* match layout to format wrt to endianness */
@@ -395,8 +395,8 @@
   }
 
   /* get rate and channels */
-  if (!gst_caps_get (caps,
-         "rate", &ret->rate, "channels", &ret->channels, NULL))
+  if (!(gst_structure_get_int (structure, "rate", &ret->rate) &&
+	gst_structure_get_int (structure, "channels", &ret->channels)))
     goto error;
 
   return ret;
@@ -416,77 +416,67 @@
          (one->channels == two->channels);
 }
 /* get props for a spec */
-static GstCaps *
+static GstCaps2 *
 gst_alsa_get_caps_internal (snd_pcm_format_t format)
 {
-  const gchar *name = snd_pcm_format_name (format);
-
   if (format == SND_PCM_FORMAT_A_LAW) {
-    return GST_CAPS_NEW (name, "audio/x-alaw",
-                          "law", GST_PROPS_INT(2),
-                          "width", GST_PROPS_INT(8),
-                          "depth", GST_PROPS_INT(8),
-                          "signed", GST_PROPS_BOOLEAN (FALSE),
-                          NULL);
+    return gst_caps2_new_simple ("audio/x-alaw", NULL);
   } else if (format == SND_PCM_FORMAT_MU_LAW) {
-    return GST_CAPS_NEW (name, "audio/x-mulaw",
-                          "law", GST_PROPS_INT(1),
-                          "width", GST_PROPS_INT(8),
-                          "depth", GST_PROPS_INT(8),
-                          "signed", GST_PROPS_BOOLEAN (FALSE),
-                          NULL);
+    return gst_caps2_new_simple ("audio/x-mulaw", NULL);
   } else if (snd_pcm_format_linear (format)) {
     /* int */
-    GstProps *props =
-      gst_props_new ("width",  GST_PROPS_INT(snd_pcm_format_physical_width (format)),
-                     "depth",  GST_PROPS_INT(snd_pcm_format_width (format)),
-                     "law",    GST_PROPS_INT(0),
-                     "signed", GST_PROPS_BOOLEAN (snd_pcm_format_signed (format) == 1 ? TRUE : FALSE),
-                     NULL);
+    GstStructure *structure = gst_structure_new ("audio/x-raw-int",
+	    "width",  G_TYPE_INT, (gint) snd_pcm_format_physical_width (format),
+            "depth",  G_TYPE_INT, (gint) snd_pcm_format_width (format),
+            "signed", G_TYPE_BOOLEAN, snd_pcm_format_signed (format) == 1 ? TRUE : FALSE,
+            NULL);
     /* endianness */
     if (snd_pcm_format_physical_width (format) > 8) {
       switch (snd_pcm_format_little_endian (format)) {
       case 0:
-        gst_props_add_entry (props, gst_props_entry_new ("endianness", GST_PROPS_INT (G_BIG_ENDIAN)));
+        gst_structure_set (structure, "endianness", G_TYPE_INT, G_BIG_ENDIAN, NULL);
         break;
       case 1:
-        gst_props_add_entry (props, gst_props_entry_new ("endianness", GST_PROPS_INT (G_LITTLE_ENDIAN)));
+        gst_structure_set (structure, "endianness", G_TYPE_INT, G_LITTLE_ENDIAN, NULL);
         break;
       default:
         GST_WARNING ("Unknown byte order in sound driver. Continuing by assuming system byte order.");
-        gst_props_add_entry (props, gst_props_entry_new ("endianness", GST_PROPS_INT (G_BYTE_ORDER)));
+        gst_structure_set (structure, "endianness", G_TYPE_INT, G_BYTE_ORDER, NULL);
         break;
       }
     }
-    return gst_caps_new (name, "audio/x-raw-int", props);
+    return gst_caps2_new_full (structure, NULL);
   } else if (snd_pcm_format_float (format)) {
     /* no float with non-platform endianness */
     if (!snd_pcm_format_cpu_endian (format))
       return NULL;
 
-    return GST_CAPS_NEW (name,
-                         "audio/x-raw-float",
-                         "width",      GST_PROPS_INT (snd_pcm_format_width (format)),
-                         "endianness", GST_PROPS_INT (G_BYTE_ORDER));
+    return gst_caps2_new_simple ("audio/x-raw-float",
+	    "width",      G_TYPE_INT, (gint) snd_pcm_format_width (format),
+	    "endianness", G_TYPE_INT, G_BYTE_ORDER);
   }
   return NULL;
 }
 
 static inline void
-add_channels (GstProps *props, gint min_rate, gint max_rate, gint min_channels, gint max_channels) {
+add_channels (GstStructure *structure, gint min_rate, gint max_rate, gint min_channels, gint max_channels) {
   if (min_rate < 0) {
-    gst_props_add_entry (props, gst_props_entry_new ("rate", GST_PROPS_INT_RANGE (GST_ALSA_MIN_RATE, GST_ALSA_MAX_RATE)));
-  } else if (max_rate < 0) {
-    gst_props_add_entry (props, gst_props_entry_new ("rate", GST_PROPS_INT (min_rate)));
+    min_rate = GST_ALSA_MIN_RATE;
+    max_rate = GST_ALSA_MAX_RATE;
+  }
+  if (max_rate < 0) {
+    gst_structure_set (structure, "rate", G_TYPE_INT, min_rate, NULL);
   } else {
-    gst_props_add_entry (props, gst_props_entry_new ("rate", GST_PROPS_INT_RANGE (min_rate, max_rate)));
+    gst_structure_set (structure, "rate", GST_TYPE_INT_RANGE, min_rate, max_rate);
   }
   if (min_channels < 0) {
-    gst_props_add_entry (props, gst_props_entry_new ("channels", GST_PROPS_INT_RANGE (1, GST_ALSA_MAX_CHANNELS)));
-  } else if (max_channels < 0) {
-    gst_props_add_entry (props, gst_props_entry_new ("channels", GST_PROPS_INT (min_channels)));
+    min_channels = 1;
+    max_channels = GST_ALSA_MAX_CHANNELS;
+  }
+  if (max_channels < 0) {
+    gst_structure_set (structure, "channels", G_TYPE_INT, min_channels, NULL);
   } else {
-    gst_props_add_entry (props, gst_props_entry_new ("channels", GST_PROPS_INT_RANGE (min_channels, max_channels)));
+    gst_structure_set (structure, "channels", GST_TYPE_INT_RANGE, min_channels, max_channels);
   }
 }
 
@@ -496,10 +486,10 @@
  * @rate: allowed rates if < 0, else desired rate
  * @channels: all allowed values for channels if < 0, else desired channels
  */
-GstCaps *
+GstCaps2 *
 gst_alsa_caps (snd_pcm_format_t format, gint rate, gint channels)
 {
-  GstCaps *ret_caps = NULL;
+  GstCaps2 *ret_caps = NULL;
 
   if (format != SND_PCM_FORMAT_UNKNOWN) {
     /* there are some caps set already */
@@ -507,20 +497,21 @@
 
     /* we can never use a format we can't set caps for */
     g_assert (ret_caps != NULL);
-    g_assert (ret_caps->properties != NULL);
+    g_assert (gst_caps2_get_n_structures (ret_caps) == 1);
 
-    add_channels (ret_caps->properties, rate, -1, channels, -1);
+    add_channels (gst_caps2_get_nth_cap (ret_caps, 0), rate, -1, channels, -1);
   } else {
     int i;
-    GstCaps *temp;
+    GstCaps2 *temp;
 
     for (i = 0; i <= SND_PCM_FORMAT_LAST; i++) {
       temp = gst_alsa_get_caps_internal (i);
 
       /* can be NULL, because not all alsa formats can be specified as caps */
-      if (temp != NULL && temp->properties != NULL) {
-        add_channels (temp->properties, rate, -1, channels, -1);
-        ret_caps = gst_caps_append (ret_caps, temp);
+      if (temp != NULL) {
+	g_assert (gst_caps2_get_n_structures (temp) == 1);
+        add_channels (gst_caps2_get_nth_cap (temp, 0), rate, -1, channels, -1);
+        gst_caps2_append (ret_caps, temp);
       }
     }
   }
@@ -529,8 +520,8 @@
 }
 
 /* Return better caps when device is open */
-GstCaps *
-gst_alsa_get_caps (GstPad *pad, GstCaps *caps)
+GstCaps2 *
+gst_alsa_get_caps (GstPad *pad)
 {
   GstAlsa *this;
   snd_pcm_hw_params_t *hw_params;
@@ -538,14 +529,14 @@
   int i;
   unsigned int min_rate, max_rate;
   gint min_channels, max_channels;
-  GstCaps *ret = NULL;
+  GstCaps2 *ret = NULL;
 
   g_return_val_if_fail (pad != NULL, NULL);
 
   this = GST_ALSA (gst_pad_get_parent (pad));
 
   if (!GST_FLAG_IS_SET (this, GST_ALSA_OPEN))
-    return gst_pad_get_pad_template_caps (pad);
+    return gst_caps2_copy (gst_pad_get_pad_template_caps (pad));
   
   snd_pcm_hw_params_alloca (&hw_params);
   ERROR_CHECK (snd_pcm_hw_params_any (this->handle, hw_params),
@@ -574,11 +565,12 @@
   snd_pcm_hw_params_get_format_mask (hw_params, mask);
   for (i = 0; i <= SND_PCM_FORMAT_LAST; i++) {
     if (snd_pcm_format_mask_test (mask, i)) {
-      GstCaps *caps = gst_alsa_get_caps_internal (i);
+      GstCaps2 *caps = gst_alsa_get_caps_internal (i);
       /* we can never use a format we can't set caps for */
-      if (caps != NULL && caps->properties != NULL) {
-        add_channels (caps->properties, min_rate, max_rate, min_channels, max_channels);
-        ret = gst_caps_append (ret, caps);
+      if (caps != NULL) {
+	g_assert (gst_caps2_get_n_structures (caps) == 1);
+        add_channels (gst_caps2_get_nth_cap (caps, 0), min_rate, max_rate, min_channels, max_channels);
+	gst_caps2_append (ret, caps);
       }
     }
   }
@@ -587,7 +579,7 @@
 }
 /* Negotiates the caps */
 GstPadLinkReturn
-gst_alsa_link (GstPad *pad, GstCaps *caps)
+gst_alsa_link (GstPad *pad, const GstCaps2 *caps)
 {
   GstAlsa *this;
   GstAlsaFormat *format;
@@ -598,50 +590,48 @@
 
   this = GST_ALSA (gst_pad_get_parent (pad));
 
-  if (GST_CAPS_IS_FIXED (caps)) {
-    if (this->handle == NULL)
-      if (!gst_alsa_open_audio (this))
-        return GST_PAD_LINK_REFUSED;
+  if (this->handle == NULL)
+    if (!gst_alsa_open_audio (this))
+      return GST_PAD_LINK_REFUSED;
 
-    format = gst_alsa_get_format (caps);
-    if (format == NULL)
-      return GST_PAD_LINK_DELAYED;
+  format = gst_alsa_get_format (gst_caps2_get_nth_cap (caps, 0));
+  if (format == NULL)
+    return GST_PAD_LINK_REFUSED;
     
-    GST_DEBUG ("found format %s", snd_pcm_format_name (format->format));
+  GST_DEBUG ("found format %s", snd_pcm_format_name (format->format));
     
-    if (!GST_FLAG_IS_SET (this, GST_ALSA_CAPS_NEGO)) {
-      gint i;
+  if (!GST_FLAG_IS_SET (this, GST_ALSA_CAPS_NEGO)) {
+    gint i;
 
-      GST_FLAG_SET (this, GST_ALSA_CAPS_NEGO);
+    GST_FLAG_SET (this, GST_ALSA_CAPS_NEGO);
 
-      if (gst_alsa_formats_match (this->format, format)) {
-        ret = GST_PAD_LINK_OK;
-        goto out;
-      }
+    if (gst_alsa_formats_match (this->format, format)) {
+      ret = GST_PAD_LINK_OK;
+      goto out;
+    }
 
-      if (!gst_alsa_probe_hw_params (this, format)) {
-        ret = GST_PAD_LINK_REFUSED;
-        goto out;
-      }
+    if (!gst_alsa_probe_hw_params (this, format)) {
+      ret = GST_PAD_LINK_REFUSED;
+      goto out;
+    }
 
-      for (i = 0; i < ((GstElement *) this)->numpads; i++) {
-        g_assert (this->pad[i] != NULL);
-        if (this->pad[i] == pad)
-	  continue;
-        if (gst_pad_try_set_caps (this->pad[i], gst_caps_ref (caps)) == GST_PAD_LINK_REFUSED) {
-	  if (this->format) {
-	    GstCaps *old = gst_alsa_caps (this->format->format, this->format->rate, this->format->channels);
-	    for (--i; i >= 0; i--) {
-              if (gst_pad_try_set_caps (this->pad[i], gst_caps_ref (old)) == GST_PAD_LINK_REFUSED) {
-	        gst_element_error (GST_ELEMENT (this), "error resetting caps to sane value");
-	        gst_caps_unref (old);
-                break;
-	      }
+    for (i = 0; i < ((GstElement *) this)->numpads; i++) {
+      g_assert (this->pad[i] != NULL);
+      if (this->pad[i] == pad)
+	continue;
+      if (gst_pad_try_set_caps (this->pad[i], caps) == GST_PAD_LINK_REFUSED) {
+	if (this->format) {
+	  GstCaps2 *old = gst_alsa_caps (this->format->format, this->format->rate, this->format->channels);
+	  for (--i; i >= 0; i--) {
+	    if (gst_pad_try_set_caps (this->pad[i], old) == GST_PAD_LINK_REFUSED) {
+	      gst_element_error (GST_ELEMENT (this), "error resetting caps to sane value");
+	      gst_caps2_free (old);
+	      break;
+	    } else {
+	      /* FIXME: unset caps on pads somehow */
 	    }
-            gst_caps_unref (old);
-	  } else {
-	    /* FIXME: unset caps on pads somehow */
 	  }
+          gst_caps2_free (old);
           ret = GST_PAD_LINK_REFUSED;
 	  goto out;
         }
Index: gstalsa.h
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsa.h,v
retrieving revision 1.22
retrieving revision 1.22.4.1
diff -u -d -r1.22 -r1.22.4.1
--- gstalsa.h	18 Nov 2003 15:32:52 -0000	1.22
+++ gstalsa.h	12 Dec 2003 22:52:57 -0000	1.22.4.1
@@ -174,10 +174,9 @@
 
 void			gst_alsa_set_eos	(GstAlsa *		this);
 GstPadLinkReturn	gst_alsa_link		(GstPad *		pad,
-						 GstCaps *		caps);
-GstCaps *		gst_alsa_get_caps	(GstPad *		pad,
-						 GstCaps *caps);
-GstCaps *		gst_alsa_caps		(snd_pcm_format_t	format,
+						 const GstCaps2 *	caps);
+GstCaps2 *		gst_alsa_get_caps	(GstPad *		pad);
+GstCaps2 *		gst_alsa_caps		(snd_pcm_format_t	format,
 						 gint			rate,
 						 gint			channels);
 
Index: gstalsasink.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsasink.c,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -d -r1.3 -r1.3.4.1
--- gstalsasink.c	22 Nov 2003 16:15:24 -0000	1.3
+++ gstalsasink.c	12 Dec 2003 22:52:57 -0000	1.3.4.1
@@ -65,8 +65,7 @@
 
   if (!template)
     template = gst_pad_template_new ("sink", GST_PAD_SINK, GST_PAD_ALWAYS,
-                                     gst_alsa_caps (SND_PCM_FORMAT_UNKNOWN, -1, -1),
-                                     NULL);
+                                     gst_alsa_caps (SND_PCM_FORMAT_UNKNOWN, -1, -1));
 
   return template;
 }
@@ -78,8 +77,7 @@
   if (!template)
     template =
       gst_pad_template_new ("sink%d", GST_PAD_SINK, GST_PAD_REQUEST,
-                                     gst_alsa_caps (SND_PCM_FORMAT_UNKNOWN, -1, 1),
-                            NULL);
+                                     gst_alsa_caps (SND_PCM_FORMAT_UNKNOWN, -1, 1));
 
   return template;
 }
Index: gstalsasrc.c
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/ext/alsa/gstalsasrc.c,v
retrieving revision 1.2
retrieving revision 1.2.4.1
diff -u -d -r1.2 -r1.2.4.1
--- gstalsasrc.c	18 Nov 2003 15:32:52 -0000	1.2
+++ gstalsasrc.c	12 Dec 2003 22:52:57 -0000	1.2.4.1
@@ -61,8 +61,7 @@
 
   if (!template)
     template = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
-                                     gst_alsa_caps (SND_PCM_FORMAT_UNKNOWN, -1, -1),
-                                     NULL);
+                                     gst_alsa_caps (SND_PCM_FORMAT_UNKNOWN, -1, -1));
 
   return template;
 }
@@ -73,8 +72,7 @@
 
   if (!template)
     template = gst_pad_template_new ("src", GST_PAD_SRC, GST_PAD_ALWAYS,
-                                     gst_alsa_caps (SND_PCM_FORMAT_UNKNOWN, -1, 1),
-                                     NULL);
+                                     gst_alsa_caps (SND_PCM_FORMAT_UNKNOWN, -1, 1));
 
   return template;
 }
@@ -241,18 +239,19 @@
 static gboolean
 gst_alsa_src_set_caps (GstAlsaSrc *src, gboolean aggressive)
 {
-  GstCaps *all_caps, *caps, *walk;
+  GstCaps2 *all_caps, *caps;
+  GstStructure *structure, *walk;
   gint channels, min_channels, max_channels;
   gint rate, min_rate, max_rate;
   gint i, endian, width, depth;
   gboolean sign;
   GstAlsa *this = GST_ALSA (src);
 
-  all_caps = gst_alsa_get_caps (this->pad[0], NULL);
+  all_caps = gst_alsa_get_caps (this->pad[0]);
   if (all_caps == NULL) return FALSE;
   /* now intersect this with all caps of the peers... */
   for (i = 0; i < GST_ELEMENT (src)->numpads; i++) {
-    all_caps = gst_caps_intersect (all_caps, gst_pad_get_caps (this->pad[i]));
+    all_caps = gst_caps2_intersect (all_caps, gst_pad_get_caps (this->pad[i]));
     if (all_caps == NULL) {
       GST_DEBUG ("No compatible caps found in alsasrc (%s)", GST_ELEMENT_NAME (this));
       return FALSE;
@@ -260,38 +259,40 @@
   }
 
   /* construct caps */
-  caps = GST_CAPS_NEW ("alsasrc caps", "audio/x-raw-int",
-		       "endianness",  GST_PROPS_INT (G_BYTE_ORDER),
-		       "signed",      GST_PROPS_BOOLEAN (TRUE),
-		       "width",       GST_PROPS_INT (16),
-		       "depth",       GST_PROPS_INT (16),
-		       "rate",        GST_PROPS_INT (44100),
-		       "channels",    GST_PROPS_INT (1));
-  gst_caps_ref (caps);
-  gst_caps_sink (caps);
+  caps = gst_caps2_new_simple ("audio/x-raw-int",
+      NULL);
+  g_assert (gst_caps2_get_n_structures (caps) == 1);
+  structure = gst_caps2_get_nth_cap (caps, 0);
 
   /* now try to find the best match */
-  walk = all_caps;
-  while (walk) {
-    gst_caps_get (walk, "signed", &sign, "width", &width, "depth", &depth, NULL);
-    if (gst_caps_has_property (walk, "endianness")) {
-      gst_caps_get_int (walk, "endianness", &endian);
-    } else {
+  for (i = 0; i < gst_caps2_get_n_structures (all_caps); i++) {
+    walk = gst_caps2_get_nth_cap (all_caps, i);
+    if (!(gst_structure_get_int (walk, "signed", &sign) &&
+	  gst_structure_get_int (walk, "width", &sign) &&
+	  gst_structure_get_int (walk, "depth", &sign))) {
+      GST_ERROR_OBJECT (src, "couldn't parse my own format. Huh?");
+      continue;
+    }
+    if (!gst_structure_get_int (walk, "endianness", &endian)) {
       endian = G_BYTE_ORDER;
     }
-    gst_caps_set (caps, "endianness", GST_PROPS_INT (endian));
-    gst_caps_set (caps, "width", GST_PROPS_INT (width));
-    gst_caps_set (caps, "depth", GST_PROPS_INT (depth));
-    gst_caps_set (caps, "signed", GST_PROPS_BOOLEAN (sign));
+    gst_structure_set (structure, 
+	"endianness", G_TYPE_INT, endian,
+	"width",      G_TYPE_INT, width,
+	"depth",      G_TYPE_INT, depth,
+	"signed",     G_TYPE_BOOLEAN, sign,
+	NULL);
 
-    gst_props_entry_get_int_range (gst_props_get_entry (GST_CAPS_PROPERTIES (walk), "rate"), &min_rate, &max_rate);
-    gst_props_entry_get_int_range (gst_props_get_entry (GST_CAPS_PROPERTIES (walk), "channels"), &min_channels, &max_channels);
+    min_rate = gst_value_get_int_range_min (gst_structure_get_value (walk, "rate"));
+    max_rate = gst_value_get_int_range_max (gst_structure_get_value (walk, "rate"));
+    min_channels = gst_value_get_int_range_min (gst_structure_get_value (walk, "channels"));
+    max_channels = gst_value_get_int_range_max (gst_structure_get_value (walk, "channels"));
     for (rate = max_rate;; rate--) {
       if ((rate = gst_alsa_src_adjust_rate (rate, aggressive)) < min_rate)
 	break;
-      gst_caps_set (caps, "rate", GST_PROPS_INT (rate));
+      gst_structure_set (structure, "rate", G_TYPE_INT, rate, NULL);
       for (channels = aggressive ? max_channels : MIN (max_channels, 2); channels >= min_channels; channels--) {
-        gst_caps_set (caps, "channels", GST_PROPS_INT (channels));
+        gst_structure_set (structure, "channels", G_TYPE_INT, channels, NULL);
         GST_DEBUG ("trying new caps: %ssigned, endianness: %d, width %d, depth %d, channels %d, rate %d",
                    sign ? "" : "un", endian, width, depth, channels, rate);
         if (gst_pad_try_set_caps (this->pad[0], caps) != GST_PAD_LINK_REFUSED)
@@ -303,7 +304,6 @@
 	}
       }
     }
-    walk = GST_CAPS_NEXT (walk);
   }
 
   if (!aggressive)

CVS Root:       /home/cvs/gstreamer
Module:         gst-plugins
Changes by:     company
Date:           Sun May 16 2004  16:33:52 PDT

Log message:
I suck

Modified files:
    ext/alsa        : gstalsasink.c

Links:
http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/alsa/gstalsasink.c.diff?r1=1.20&r2=1.21

====Begin Diffs====
Index: gstalsasink.c
===================================================================
RCS file: /home/cvs/gstreamer/gst-plugins/ext/alsa/gstalsasink.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- a/gstalsasink.c	16 May 2004 23:30:00 -0000	1.20
+++ b/gstalsasink.c	16 May 2004 23:33:40 -0000	1.21
@@ -335,7 +335,6 @@
   g_return_if_fail (sink != NULL);
 
 sink_restart:
-  g_print ("start: %p, %u\n", sink->data[0], sink->size[0]);
   avail = gst_alsa_update_avail (this);
   if (avail == -EPIPE)
@@ -476,7 +475,6 @@
     }
     /* FIXME: lotsa stuff can have happened while fetching data. Do we need to check something? */
-    g_print ("transmit: %p, %u\n", sink->data[0], sink->size[0]);
     /* put this data into alsa */
     if ((copied = this->transmit (this, &avail)) < 0)