Changeset 231c770 in mainline

Timestamp:

2018-04-06T21:29:11Z (6 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

105fcf0

Parents:

2f1c88e

git-author:

Jakub Jermar <jakub@…> (2018-04-06 20:59:41)

git-committer:

Jakub Jermar <jakub@…> (2018-04-06 21:29:11)

Message:

Fix handling of hound audio data

Commit 33b8d024bc268f2773c26e74a40dada11bb71e58 broke audio.

Hound needs to modify the buffer even after audio_data_create() returns.
The original buffer also needs to be eventually deallocated. Lastly,
the extra data copy may introduce undesired latencies.

This commit reverts the offending parts of
33b8d024bc268f2773c26e74a40dada11bb71e58.

Location:

uspace/srv/audio/hound

Files:

• audio_data.c (modified) (3 diffs)
• audio_data.h (modified) (2 diffs)

uspace/srv/audio/hound/audio_data.c

@@ -36 +36 @@
 #include <macros.h>
 #include <stdlib.h>
-#include <str.h>
 
 #include "audio_data.h"
@@ -57 +56 @@
                         log_warning("Data not a multiple of frame size, "
                             "clipping.");
-                uint8_t *d = ((uint8_t *)adata) + offsetof(audio_data_t, data);
-                memcpy(d, data, size);
+                adata->data = data;
                 adata->size = size - overflow;
                 adata->format = format;
@@ -87 +85 @@
         atomic_count_t refc = atomic_predec(&adata->refcount);
         if (refc == 0) {
+                free((void *) adata->data);
                 free(adata);
         }

uspace/srv/audio/hound/audio_data.h

@@ -45 +45 @@
 /** Reference counted audio buffer */
 typedef struct {
+        /** Audio data */
+        const void *data;
         /** Size of the buffer pointer to by data */
         size_t size;
@@ -51 +53 @@
         /** Reference counter */
         atomic_t refcount;
-        /** Audio data */
-        const uint8_t data[];
 } audio_data_t;