Changeset 5029c788 in mainline for uspace/srv/audio/hound/audio_data.c

Timestamp:

2013-04-04T16:21:41Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9e40d443

Parents:

5a6f362

Message:

hound: add connection fifo, implement stream mixing

File:

• uspace/srv/audio/hound/audio_data.c (modified) (3 diffs)

uspace/srv/audio/hound/audio_data.c

@@ -55 +55 @@
 }
 
-audio_data_link_t *audio_data_link_clone(audio_data_t *adata)
+audio_data_t *audio_data_create(const void *data, size_t size,
+    pcm_format_t format)
+{
+        audio_data_t *adata = malloc(sizeof(audio_data_t));
+        if (adata) {
+                adata->data = data;
+                adata->size = size;
+                adata->format = format;
+                atomic_set(&adata->refcount, 1);
+        }
+        return adata;
+}
+
+void audio_data_unref(audio_data_t *adata)
+{
+        ref_dec(adata);
+}
+
+audio_data_link_t *audio_data_link_create(audio_data_t *adata)
 {
         assert(adata);
@@ -67 +85 @@
 }
 
-audio_data_link_t * audio_data_link_create(const void *data, size_t size)
+audio_data_link_t * audio_data_link_create_data(const void *data, size_t size,
+    pcm_format_t format)
 {
         audio_data_link_t *link = NULL;
-        audio_data_t *adata = malloc(sizeof(audio_data_t));
+        audio_data_t *adata = audio_data_create(data, size, format);
         if (adata) {
-                adata->data = data;
-                adata->size = size;
-                atomic_set(&adata->refcount, 1);
-                link = audio_data_link_clone(adata);
+                link = audio_data_link_create(adata);
                 /* This will either return refcount to 1 or clean adata if
                  * cloning failed */
-                ref_dec(adata);
+                audio_data_unref(adata);
         }
         return link;
@@ -91 +107 @@
 }
 
+size_t audio_data_link_available_frames(audio_data_link_t *alink)
+{
+        assert(alink);
+        assert(alink->adata);
+        return pcm_format_size_to_frames(alink->adata->size - alink->position,
+            &alink->adata->format);
+}
+
 /**
  * @}