Changeset 1f440f5f in mainline

Timestamp:

2013-04-05T14:34:41Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

6d74977

Parents:

f04603e

Message:

hound: implement data update for hound_ctx

pushes data to every connection

File:

• uspace/srv/audio/hound/hound_ctx.c (modified) (8 diffs)

uspace/srv/audio/hound/hound_ctx.c

@@ -40 +40 @@
 #include "hound_ctx.h"
 #include "audio_data.h"
+#include "connection.h"
 #include "log.h"
+
+static int update_data(audio_source_t *source, size_t size);
 
 hound_ctx_t *hound_record_ctx_get(const char *name)
@@ -60 +63 @@
                 }
                 const int ret = audio_source_init(ctx->source, name, ctx, NULL,
-                    NULL, &AUDIO_FORMAT_ANY);
+                    update_data, &AUDIO_FORMAT_DEFAULT);
                 if (ret != EOK) {
                         free(ctx->source);
@@ -95 +98 @@
         return ctx->source == NULL;
 }
+
 
 /*
@@ -140 +144 @@
                 if (audio_pipe_bytes(&stream->fifo))
                         log_warning("Destroying stream with non empty buffer");
-                audio_pipe_fini(&stream->fifo);
                 log_verbose("CTX: %p remove stream (%zu/%zu); "
                     "flags:%#x ch: %u r:%u f:%s",
@@ -147 +150 @@
                     stream->format.channels, stream->format.sampling_rate,
                     pcm_sample_format_str(stream->format.sample_format));
+                audio_pipe_fini(&stream->fifo);
                 free(stream);
         }
@@ -156 +160 @@
 {
         assert(stream);
-        log_verbose("%p:, %zu", stream, size);
+        log_verbose("%p: %zu", stream, size);
 
         if (stream->allowed_size && size > stream->allowed_size)
@@ -188 +192 @@
 {
         assert(stream);
+        log_debug("Draining stream");
         while (audio_pipe_bytes(&stream->fifo))
                 async_usleep(10000);
@@ -198 +203 @@
 }
 
+
+int update_data(audio_source_t *source, size_t size)
+{
+        assert(source);
+        assert(source->private_data);
+        hound_ctx_t *ctx = source->private_data;
+        void *buffer = malloc(size);
+        if (!buffer)
+                return ENOMEM;
+        audio_data_t *adata = audio_data_create(buffer, size, source->format);
+        if (!adata) {
+                free(buffer);
+                return ENOMEM;
+        }
+        log_verbose("CTX: %p. Mixing %zu streams", ctx,
+            list_count(&ctx->streams));
+        pcm_format_silence(buffer, size, &source->format);
+        list_foreach(ctx->streams, it) {
+                hound_ctx_stream_t *stream = hound_ctx_stream_from_link(it);
+                hound_ctx_stream_add_self(stream, buffer, size, &source->format);
+        }
+        log_verbose("CTX: %p. Pushing audio to %zu connections", ctx,
+            list_count(&source->connections));
+        list_foreach(source->connections, it) {
+                connection_t *conn = connection_from_source_list(it);
+                connection_push_data(conn, adata);
+        }
+        return EOK;
+}
+
 /**
  * @}