Changeset 5c98bb28 in mainline

Timestamp:

2013-04-06T12:43:54Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

599034e

Parents:

afd4fc7

Message:

hound: use fragment_size param instead of macro

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

@@ -79 +79 @@
         dev->buffer.position = NULL;
         dev->buffer.size = 0;
+        dev->buffer.fragment_size = 0;
 
         log_verbose("Initialized device (%p) '%s' with id %u.",
@@ -111 +112 @@
                     dev->buffer.base, dev->buffer.size);
 
-                log_verbose("Mixed inputs: %zu/(%u * %u)",
-                    dev->buffer.size, BUFFER_PARTS, pcm_format_frame_size(&dev->sink.format));
-                const unsigned frames = dev->buffer.size /
-                    (BUFFER_PARTS * pcm_format_frame_size(&dev->sink.format));
-                log_verbose("FRAME COUNT %u", frames);
+                const unsigned frames = dev->buffer.fragment_size /
+                    pcm_format_frame_size(&dev->sink.format);
+                log_verbose("Fragment frame count %u", frames);
                 ret = audio_pcm_start_playback_fragment(dev->sess, frames,
                     dev->sink.format.channels, dev->sink.format.sampling_rate,
@@ -151 +150 @@
         assert(source);
         audio_device_t *dev = source->private_data;
-        if (new && list_count(&source->connections)) {
+        if (new && list_count(&source->connections) == 1) {
                 int ret = get_buffer(dev);
                 if (ret != EOK) {
@@ -158 +157 @@
                         return ret;
                 }
-                const unsigned frames = dev->buffer.size /
-                    (BUFFER_PARTS * pcm_format_frame_size(&dev->sink.format));
+                const unsigned frames = dev->buffer.fragment_size /
+                    pcm_format_frame_size(&dev->sink.format);
                 ret = audio_pcm_start_capture_fragment(dev->sess, frames,
                     dev->sink.format.channels, dev->sink.format.sampling_rate,
@@ -208 +207 @@
                         if (dev->buffer.position) {
                                 dev->buffer.position +=
-                                    (dev->buffer.size / BUFFER_PARTS);
+                                    dev->buffer.fragment_size;
                         }
                         if ((!dev->buffer.position) ||
@@ -217 +216 @@
                         }
                         audio_sink_mix_inputs(&dev->sink, dev->buffer.position,
-                            dev->buffer.size / BUFFER_PARTS);
+                            dev->buffer.fragment_size);
                         struct timeval time2;
                         getuptime(&time2);
@@ -261 +260 @@
         dev->buffer.size = 0;
 
-        return audio_pcm_get_buffer(dev->sess, &dev->buffer.base,
+        const int ret = audio_pcm_get_buffer(dev->sess, &dev->buffer.base,
             &dev->buffer.size);
+        if (ret == EOK)
+                dev->buffer.fragment_size = dev->buffer.size / BUFFER_PARTS;
+        return ret;
+
 }
 

uspace/srv/audio/hound/audio_device.h

@@ -58 +58 @@
                 size_t size;
                 void *position;
+                size_t fragment_size;
         } buffer;
         audio_source_t source;