Changeset 76ea1b7 in mainline

Timestamp:

2013-04-04T13:38:38Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5a6f362

Parents:

23878dc

Message:

hound: make audio data reference counted

Location:

uspace/srv/audio/hound

Files:

• Makefile (modified) (1 diff)
• audio_data.c (added)
• audio_data.h (modified) (1 diff)
• hound_ctx.c (modified) (3 diffs)
• hound_ctx.h (modified) (1 diff)

uspace/srv/audio/hound/Makefile

@@ -43 +43 @@
 SOURCES = \
         audio_client.c \
+        audio_data.c \
         audio_device.c \
         audio_sink.c \

uspace/srv/audio/hound/audio_data.h

@@ -38 +38 @@
 
 #include <adt/list.h>
+#include <atomic.h>
 
 typedef struct {
         const void *data;
         size_t size;
-        link_t link;
+        atomic_t refcount;
 } audio_data_t;
 
-static inline audio_data_t * audio_data_list_instance(link_t *l)
+typedef struct {
+        link_t link;
+        audio_data_t *adata;
+        size_t position;
+} audio_data_link_t;
+
+static inline audio_data_link_t * audio_data_link_list_instance(link_t *l)
 {
-        return l ? list_get_instance(l, audio_data_t, link) : NULL;
+        return l ? list_get_instance(l, audio_data_link_t, link) : NULL;
 }
 
+audio_data_link_t * audio_data_link_create(const void *data, size_t size);
+audio_data_link_t *audio_data_link_clone(audio_data_t *adata);
+void audio_data_link_destroy(audio_data_link_t *link);
 
 #endif

uspace/srv/audio/hound/hound_ctx.c

@@ -143 +143 @@
                 while (!list_empty(&stream->fifo)) {
                         link_t *l = list_first(&stream->fifo);
-                        audio_data_t *data = audio_data_list_instance(l);
+                        audio_data_link_t *data =
+                            audio_data_link_list_instance(l);
                         list_remove(l);
-                        free(data->data);
-                        free(data);
+                        audio_data_link_destroy(data);
                 }
                 log_verbose("CTX: %p remove stream (%zu/%zu); "
@@ -172 +172 @@
                 return EBUSY;
 
-        audio_data_t *adata = malloc(sizeof(audio_data_t));
-        if (adata) {
-                adata->data = data;
-                adata->size = size;
-                link_initialize(&adata->link);
-                list_append(&adata->link, &stream->fifo);
+        audio_data_link_t *adatalink = audio_data_link_create(data, size);
+        if (adatalink) {
+                list_append(&adatalink->link, &stream->fifo);
                 stream->current_size += size;
                 return EOK;
@@ -191 +188 @@
 }
 
+void hound_ctx_stream_drain(hound_ctx_stream_t *stream)
+{
+        assert(stream);
+        while (!list_empty(&stream->fifo))
+                async_usleep(10000);
+}
+
+int hound_ctx_stream_add(hound_ctx_stream_t *stream, void *buffer, size_t size,
+    pcm_format_t format)
+{
+        return ENOTSUP;
+}
+
 /**
  * @}

uspace/srv/audio/hound/hound_ctx.h

@@ -71 +71 @@
     size_t size);
 int hound_ctx_stream_read(hound_ctx_stream_t *stream, void *buffer, size_t size);
+void hound_ctx_stream_drain(hound_ctx_stream_t *stream);
+int hound_ctx_stream_add(hound_ctx_stream_t *stream, void *buffer, size_t size,
+    pcm_format_t format);
 
 #endif