Changeset ab07cf0 in mainline

Timestamp:

2012-07-13T16:11:05Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

13df13c8

Parents:

6424800

Message:

hound: Use buffer position in source available data.

Location:

uspace/srv/audio/hound

Files:

• audio_client.c (modified) (1 diff)
• audio_device.c (modified) (2 diffs)
• audio_format.c (modified) (2 diffs)
• audio_source.c (modified) (4 diffs)
• audio_source.h (modified) (1 diff)

uspace/srv/audio/hound/audio_client.c

@@ -139 +139 @@
         }
         void *old_buffer = source->available_data.base;
+        source->available_data.position = buffer;
         source->available_data.base = buffer;
         source->available_data.size = size;

uspace/srv/audio/hound/audio_device.c

@@ -187 +187 @@
                         if (dev->buffer.position) {
                                 dev->buffer.position +=
-                                    dev->buffer.size / BUFFER_BLOCKS;
+                                    (dev->buffer.size / BUFFER_BLOCKS);
                         }
-                        if (!dev->buffer.position ||
-                            dev->buffer.position >=
-                                dev->buffer.base + dev->buffer.size)
+                        if ((!dev->buffer.position) ||
+                            (dev->buffer.position >=
+                                (dev->buffer.base + dev->buffer.size)))
                         {
                                 dev->buffer.position = dev->buffer.base;
@@ -202 +202 @@
                         log_verbose("Playback terminated!");
                         return;
-                        break;
                 }
                 case PCM_EVENT_RECORDING_DONE: {
+                        //TODO implement
                         break;
                 }
                 case PCM_EVENT_RECORDING_TERMINATED:
                         log_verbose("Recording terminated!");
-                        break;
-                }
-
-        }
-        //TODO implement
+                        return;
+                }
+
+        }
 }
 

uspace/srv/audio/hound/audio_format.c

@@ -55 +55 @@
                 return EINVAL;
         const size_t sample_size = pcm_sample_format_size(f->sample_format);
-        if (!(size % sample_size == 0))
+        if ((size % sample_size) != 0)
                 return EINVAL;
 
@@ -65 +65 @@
         const type *src_buff = src; \
         type *dst_buff = dst; \
-        for (size_t i = 0; i < size / sample_size; ++i) { \
-                type a = type ## _ ## endian ##2host(dst_buff[i]); \
-                type b = type ## _ ## endian ##2host(src_buff[i]); \
-                type c = a + b; \
+        for (size_t i = 0; i < size / sizeof(type); ++i) { \
+                const type a = type ## _ ## endian ##2host(dst_buff[i]); \
+                const type b = type ## _ ## endian ##2host(src_buff[i]); \
+                const type c = a + b; \
                 dst_buff[i] = host2 ## type ## _ ## endian(c); \
         } \

uspace/srv/audio/hound/audio_source.c

@@ -64 +64 @@
         source->format = *f;
         source->available_data.base = NULL;
+        source->available_data.position = NULL;
         source->available_data.size = 0;
         log_verbose("Initialized source (%p) '%s'", source, source->name);
@@ -119 +120 @@
                 return ENOTSUP;
         }
-        if (source->available_data.base == NULL ||
+        if (source->available_data.position == NULL ||
             source->available_data.size == 0) {
                 int ret = EOVERFLOW; /* In fact this is underflow... */
@@ -125 +126 @@
                         ret = source->update_available_data(source, size);
                 if (ret != EOK) {
-                        log_debug("No data to add");
+                        log_debug("No data to add to %p(%zu)", buffer, size);
                         return ret;
                 }
@@ -132 +133 @@
         const size_t real_size = min(size, source->available_data.size);
         const int ret =
-            audio_format_mix(buffer, source->available_data.base, real_size, f);
+            audio_format_mix(buffer, source->available_data.position, real_size, f);
         if (ret != EOK) {
-                log_debug("Mixing failed");
+                log_debug("Mixing failed %p <= %p, %zu",
+                    buffer, source->available_data.position, real_size);
                 return ret;
         }
-        source->available_data.base += real_size;
+
+        source->available_data.position += real_size;
         source->available_data.size -= real_size;
+
+        log_verbose("Mixing successful %p <= %p, %zu",
+            buffer, source->available_data.position, real_size);
+
         buffer += real_size;
         size -= real_size;

uspace/srv/audio/hound/audio_source.h

@@ -56 +56 @@
         struct audio_sink *connected_sink;
         struct {
+                void *position;
                 void *base;
                 size_t size;