Changeset d988ef2 in mainline for uspace/srv/audio/hound/audio_data.h

Timestamp:

2013-04-05T12:02:45Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f1438e5

Parents:

4b33db8e

Message:

hound: audio pipe class

This will be used by both streams and connections

File:

• uspace/srv/audio/hound/audio_data.h (modified) (4 diffs)

uspace/srv/audio/hound/audio_data.h

@@ -37 +37 @@
 #define AUDIO_DATA_H_
 
-#include <pcm/format.h>
 #include <adt/list.h>
 #include <atomic.h>
+#include <errno.h>
+#include <fibril_synch.h>
+#include <pcm/format.h>
 
 typedef struct {
@@ -54 +56 @@
 } audio_data_link_t;
 
+typedef struct {
+        list_t list;
+        size_t bytes;
+        size_t frames;
+        fibril_mutex_t guard;
+} audio_pipe_t;
+
 static inline audio_data_link_t * audio_data_link_list_instance(link_t *l)
 {
@@ -61 +70 @@
 audio_data_t * audio_data_create(const void *data, size_t size,
     pcm_format_t format);
+void audio_data_addref(audio_data_t *adata);
 void audio_data_unref(audio_data_t *adata);
 
@@ -83 +93 @@
         return alink->adata->size - alink->position;
 }
+
+void audio_pipe_init(audio_pipe_t *pipe);
+void audio_pipe_fini(audio_pipe_t *pipe);
+
+int audio_pipe_push(audio_pipe_t *pipe, audio_data_t *data);
+audio_data_t *audio_pipe_pop(audio_pipe_t *pipe);
+
+ssize_t audio_pipe_mix_data(audio_pipe_t *pipe, void *buffer, size_t size,
+    const pcm_format_t *f);
+
+static inline size_t audio_pipe_bytes(audio_pipe_t *pipe)
+{
+        assert(pipe);
+        return pipe->bytes;
+}
+
+static inline size_t audio_pipe_frames(audio_pipe_t *pipe)
+{
+        assert(pipe);
+        return pipe->frames;
+}
+
+static inline int audio_pipe_push_data(audio_pipe_t *pipe,
+    const void *data, size_t size, pcm_format_t f)
+{
+        audio_data_t *adata = audio_data_create(data, size, f);
+        if (adata) {
+                const int ret = audio_pipe_push(pipe, adata);
+                audio_data_unref(adata);
+                return ret;
+        }
+        return ENOMEM;
+}
+
+
 #endif