Changeset ec49085 in mainline

Timestamp:

2012-07-12T17:21:08Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

992ef56

Parents:

737b4c0

Message:

hound: Move mixing to audio_source.

Location:

uspace/srv/audio/hound

Files:

• audio_sink.c (modified) (1 diff)
• audio_source.c (modified) (2 diffs)
• audio_source.h (modified) (1 diff)

uspace/srv/audio/hound/audio_sink.c

@@ -150 +150 @@
         list_foreach(sink->sources, it) {
                 audio_source_t *source = audio_source_list_instance(it);
-                assert(audio_format_same(&sink->format, audio_source_format(source)));
-                const void *source_buffer;
-                size_t source_buffer_size = size;
-                int ret = audio_source_get_buffer(source, &source_buffer,
-                    &source_buffer_size);
-                if (ret != EOK) {
-                        log_warning("Could not get buffer from source %s",
-                            source->name);
-                        continue;
-                }
-                assert(source_buffer_size == size);
-                ret = audio_format_mix(dest, source_buffer, size, &sink->format);
+                const int ret =
+                    audio_source_add_self(source, dest, size, &sink->format);
                 if (ret != EOK) {
                         log_warning("Failed to mix source %s: %s",

uspace/srv/audio/hound/audio_source.c

@@ -36 +36 @@
 #include <assert.h>
 #include <errno.h>
+#include <macros.h>
 #include <stdlib.h>
 #include <str.h>
@@ -76 +77 @@
 }
 
-int audio_source_get_buffer(audio_source_t *source, const void **buffer, size_t *size)
+int audio_source_add_self(audio_source_t *source, void *buffer, size_t size,
+    const audio_format_t *f)
 {
         assert(source);
-        if (!buffer || !size) {
-                log_debug("Incorrect parameters.");
+        if (!buffer) {
+                log_debug("Non-existent buffer");
+                return EBADMEM;
+        }
+        if (!f || size == 0) {
+                log_debug("No format or zero size");
+        }
+        if (size % (pcm_sample_format_size(f->sample_format) * f->channels)) {
+                log_debug("Buffer does not fit integer number of frames");
                 return EINVAL;
         }
-        if (source->get_data.hook)
-                source->get_data.hook(source->get_data.arg);
-        if (!source->available.base || !source->available.size)
-                return EOVERFLOW; /* In fact it's underflow */
+        if (!audio_format_same(&source->format, f)) {
+                log_debug("Format conversion is not supported yet");
+                return ENOTSUP;
+        }
 
-        const size_t requested_size =
-            (*size == 0) || (*size > source->available.size)
-            ? source->available.size : *size;
-        *buffer = source->available.base;
-        *size = requested_size;
-        source->available.size -= requested_size;
-        source->available.base += requested_size;
+        if (source->available.size == 0) {
+                log_debug("No data to add");
+                return EOVERFLOW; /* In fact this is underflow... */
+        }
+
+        const size_t real_size = min(size, source->available.size);
+        const int ret =
+            audio_format_mix(buffer, source->available.base, real_size, f);
+        if (ret != EOK) {
+                log_debug("Mixing failed");
+                return ret;
+        }
+        source->available.base += real_size;
+        source->available.size -= real_size;
         return EOK;
 }
+
 /**
  * @}

uspace/srv/audio/hound/audio_source.h

@@ -76 +76 @@
 }
 int audio_source_connected(audio_source_t *source, const audio_format_t *f);
-int audio_source_get_buffer(audio_source_t *source, const void **buffer, size_t *size);
+int audio_source_add_self(audio_source_t *source, void *buffer, size_t size,
+    const audio_format_t *f);
 static inline const audio_format_t *audio_source_format(const audio_source_t *s)
 {