Changeset eca79ff in mainline

Timestamp:

2013-04-06T14:14:20Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

7e706a3

Parents:

599034e

Message:

hound: cleanup

remove unused sync primitives
move buffer filling to a helper function

Location:

uspace/srv/audio/hound

Files:

• audio_device.c (modified) (7 diffs)
• audio_device.h (modified) (1 diff)

uspace/srv/audio/hound/audio_device.c

@@ -54 +54 @@
 static int get_buffer(audio_device_t *dev);
 static int release_buffer(audio_device_t *dev);
+static void fill_buffer(audio_device_t *dev, size_t size);
 
 
@@ -74 +75 @@
 
         /* Init buffer members */
-        fibril_mutex_initialize(&dev->buffer.guard);
-        fibril_condvar_initialize(&dev->buffer.wc);
         dev->buffer.base = NULL;
         dev->buffer.position = NULL;
@@ -108 +107 @@
                 // TODO set formats
 
-                /* Fill the buffer first */
-                audio_sink_mix_inputs(&dev->sink,
-                    dev->buffer.base, dev->buffer.size);
+                /* Fill the buffer first. Fill the first two fragments,
+                 * so that we stay one fragment ahead */
+                fill_buffer(dev, dev->buffer.fragment_size * 2);
 
                 const unsigned frames = dev->buffer.fragment_size /
@@ -204 +203 @@
                         struct timeval time1;
                         getuptime(&time1);
-                        //TODO add underrun protection.
-                        if (dev->buffer.position) {
-                                dev->buffer.position +=
-                                    dev->buffer.fragment_size;
-                        }
-                        if ((!dev->buffer.position) ||
-                            (dev->buffer.position >=
-                                (dev->buffer.base + dev->buffer.size)))
-                        {
-                                dev->buffer.position = dev->buffer.base;
-                        }
-                        audio_sink_mix_inputs(&dev->sink, dev->buffer.position,
-                            dev->buffer.fragment_size);
+                        fill_buffer(dev, dev->buffer.fragment_size);
                         struct timeval time2;
                         getuptime(&time2);
@@ -236 +223 @@
         }
 }
+
 static int device_check_format(audio_sink_t* sink)
 {
@@ -258 +246 @@
         }
 
-        dev->buffer.size = 0;
+        /* Ask for largest buffer possible */
+        size_t preferred_size = 0;
 
         const int ret = audio_pcm_get_buffer(dev->sess, &dev->buffer.base,
-            &dev->buffer.size);
-        if (ret == EOK)
+            &preferred_size);
+        if (ret == EOK) {
+                dev->buffer.size = preferred_size;
                 dev->buffer.fragment_size = dev->buffer.size / BUFFER_PARTS;
+                dev->buffer.position = dev->buffer.base;
+        }
         return ret;
 
@@ -283 +275 @@
         return ret;
 }
+
+static void fill_buffer(audio_device_t *dev, size_t size)
+{
+        assert(dev);
+        assert(dev->buffer.position >= dev->buffer.base);
+        assert(dev->buffer.position < (dev->buffer.base + dev->buffer.size));
+
+        //TODO add underrun detection.
+        audio_sink_mix_inputs(&dev->sink, dev->buffer.position, size);
+        dev->buffer.position += size;
+        if (dev->buffer.position == (dev->buffer.base + dev->buffer.size))
+                dev->buffer.position = dev->buffer.base;
+}
 /**
  * @}

uspace/srv/audio/hound/audio_device.h

@@ -53 +53 @@
         char *name;
         struct {
-                fibril_mutex_t guard;
-                fibril_condvar_t wc;
                 void *base;
                 size_t size;