Changeset ea6c838 in mainline for uspace/srv/audio

Timestamp:

2012-07-17T08:26:49Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

e6bba8f

Parents:

950110ee

Message:

Create libpcm.

Move pcm related functions and definitions there.
Make other stuff use this library.
Rename most of it on the way.

Location:

uspace/srv/audio/hound

Files:

• Makefile (modified) (1 diff)
• audio_client.c (modified) (3 diffs)
• audio_client.h (modified) (3 diffs)
• audio_device.c (modified) (2 diffs)
• audio_sink.c (modified) (3 diffs)
• audio_sink.h (modified) (3 diffs)
• audio_source.c (modified) (5 diffs)
• audio_source.h (modified) (3 diffs)
• hound.h (modified) (1 diff)
• main.c (modified) (1 diff)

uspace/srv/audio/hound/Makefile

@@ -33 +33 @@
         -DNAME="\"hound\"" \
         -I$(LIBDRV_PREFIX)/include \
-        -I$(LIBHOUND_PREFIX)/include
+        -I$(LIBHOUND_PREFIX)/include \
+        -I$(LIBPCM_PREFIX)/include
 
 LIBS = \
         $(LIBDRV_PREFIX)/libdrv.a \
-        $(LIBHOUND_PREFIX)/libhound.a
+        $(LIBHOUND_PREFIX)/libhound.a \
+        $(LIBPCM_PREFIX)/libpcm.a
 
 SOURCES = \
         audio_client.c \
         audio_device.c \
-        audio_format.c \
         audio_sink.c \
         audio_source.c \

uspace/srv/audio/hound/audio_client.c

@@ -43 +43 @@
 
 static void init_common(audio_client_t *client, const char *name,
-    const audio_format_t *f, async_sess_t *sess)
+    const pcm_format_t *f, async_sess_t *sess)
 {
         link_initialize(&client->link);
@@ -60 +60 @@
 
 audio_client_t *audio_client_get_playback(
-    const char *name, const audio_format_t *f, async_sess_t *sess)
+    const char *name, const pcm_format_t *f, async_sess_t *sess)
 {
         audio_client_t *client = malloc(sizeof(audio_client_t));
@@ -73 +73 @@
 
 audio_client_t *audio_client_get_recording(
-    const char *name, const audio_format_t *f, async_sess_t *sess)
+    const char *name, const pcm_format_t *f, async_sess_t *sess)
 {
         audio_client_t *client = malloc(sizeof(audio_client_t));

uspace/srv/audio/hound/audio_client.h

@@ -39 +39 @@
 #include <adt/list.h>
 #include <async.h>
+#include <pcm/format.h>
 
-#include "audio_format.h"
 #include "audio_source.h"
 #include "audio_sink.h"
@@ -49 +49 @@
         audio_source_t source;
         audio_sink_t sink;
-        audio_format_t format;
+        pcm_format_t format;
         async_sess_t *sess;
         async_exch_t *exch;
@@ -62 +62 @@
 
 audio_client_t *audio_client_get_playback(
-    const char *name, const audio_format_t *f, async_sess_t *sess);
+    const char *name, const pcm_format_t *f, async_sess_t *sess);
 audio_client_t *audio_client_get_recording(
-    const char *name, const audio_format_t *f, async_sess_t *sess);
+    const char *name, const pcm_format_t *f, async_sess_t *sess);
 void audio_client_destroy(audio_client_t *client);
 

uspace/srv/audio/hound/audio_device.c

@@ -109 +109 @@
 
                 const unsigned frames = dev->buffer.size /
-                    (BUFFER_PARTS * audio_format_frame_size(&dev->sink.format));
+                    (BUFFER_PARTS * pcm_format_frame_size(&dev->sink.format));
                 ret = audio_pcm_start_playback(dev->sess, frames,
                     dev->sink.format.channels, dev->sink.format.sampling_rate,
@@ -152 +152 @@
                 }
                 const unsigned frames = dev->buffer.size /
-                    (BUFFER_PARTS * audio_format_frame_size(&dev->sink.format));
+                    (BUFFER_PARTS * pcm_format_frame_size(&dev->sink.format));
                 ret = audio_pcm_start_record(dev->sess, frames,
                     dev->sink.format.channels, dev->sink.format.sampling_rate,

uspace/srv/audio/hound/audio_sink.c

@@ -46 +46 @@
 int audio_sink_init(audio_sink_t *sink, const char *name,
     void *private_data, int (*connection_change)(audio_sink_t *, bool),
-    int (*check_format)(audio_sink_t *sink), const audio_format_t *f)
+    int (*check_format)(audio_sink_t *sink), const pcm_format_t *f)
 {
         assert(sink);
@@ -79 +79 @@
         list_append(&source->link, &sink->sources);
 
-        const audio_format_t old_format = sink->format;
+        const pcm_format_t old_format = sink->format;
 
         /* The first source for me */
         if (list_count(&sink->sources) == 1) {
                 /* Set audio format according to the first source */
-                if (audio_format_is_any(&sink->format)) {
+                if (pcm_format_is_any(&sink->format)) {
                         int ret = audio_sink_set_format(sink, &source->format);
                         if (ret != EOK)
@@ -110 +110 @@
 }
 
-int audio_sink_set_format(audio_sink_t *sink, const audio_format_t *format)
+int audio_sink_set_format(audio_sink_t *sink, const pcm_format_t *format)
 {
         assert(sink);
         assert(format);
-        if (!audio_format_is_any(&sink->format)) {
+        if (!pcm_format_is_any(&sink->format)) {
                 log_debug("Sink %s already has a format", sink->name);
                 return EEXISTS;
         }
-        const audio_format_t old_format;
+        const pcm_format_t old_format;
 
-        if (audio_format_is_any(format)) {
+        if (pcm_format_is_any(format)) {
                 log_verbose("Setting DEFAULT format for sink %s", sink->name);
                 sink->format = AUDIO_FORMAT_DEFAULT;

uspace/srv/audio/hound/audio_sink.h

@@ -41 +41 @@
 #include <bool.h>
 #include <fibril.h>
+#include <pcm/format.h>
 
 #include "audio_source.h"
-#include "audio_format.h"
 
 typedef struct audio_sink audio_sink_t;
@@ -51 +51 @@
         list_t sources;
         const char *name;
-        audio_format_t format;
+        pcm_format_t format;
         void *private_data;
         int (*connection_change)(audio_sink_t *, bool);
@@ -64 +64 @@
 int audio_sink_init(audio_sink_t *sink, const char *name,
     void *private_data, int (*connection_change)(audio_sink_t *, bool),
-    int (*check_format)(audio_sink_t *), const audio_format_t *f);
+    int (*check_format)(audio_sink_t *), const pcm_format_t *f);
 void audio_sink_fini(audio_sink_t *sink);
 
-int audio_sink_set_format(audio_sink_t *sink, const audio_format_t *format);
+int audio_sink_set_format(audio_sink_t *sink, const pcm_format_t *format);
 int audio_sink_add_source(audio_sink_t *sink, audio_source_t *source);
 int audio_sink_remove_source(audio_sink_t *sink, audio_source_t *source);

uspace/srv/audio/hound/audio_source.c

@@ -49 +49 @@
     int (*connection_change)(audio_source_t *),
     int (*update_available_data)(audio_source_t *, size_t),
-    const audio_format_t *f)
+    const pcm_format_t *f)
 {
         assert(source);
@@ -82 +82 @@
         assert(source);
         audio_sink_t *old_sink = source->connected_sink;
-        const audio_format_t old_format = source->format;
+        const pcm_format_t old_format = source->format;
 
         source->connected_sink = sink;
-        if (audio_format_is_any(&source->format)) {
+        if (pcm_format_is_any(&source->format)) {
                 assert(sink);
-                assert(!audio_format_is_any(&sink->format));
+                assert(!pcm_format_is_any(&sink->format));
                 source->format = sink->format;
         }
@@ -102 +102 @@
 
 int audio_source_add_self(audio_source_t *source, void *buffer, size_t size,
-    const audio_format_t *f)
+    const pcm_format_t *f)
 {
         assert(source);
@@ -120 +120 @@
                 return ENOTSUP;
         }
-        const size_t src_frame_size = audio_format_frame_size(&source->format);
-        const size_t dst_frames = size / audio_format_frame_size(f);
+        const size_t src_frame_size = pcm_format_frame_size(&source->format);
+        const size_t dst_frames = size / pcm_format_frame_size(f);
 
         if (source->available_data.position == NULL ||
@@ -135 +135 @@
         }
 
-        const int ret = audio_format_convert_and_mix(buffer, size,
+        const int ret = pcm_format_convert_and_mix(buffer, size,
                source->available_data.position, source->available_data.size,
                &source->format, f);

uspace/srv/audio/hound/audio_source.h

@@ -39 +39 @@
 #include <adt/list.h>
 #include <bool.h>
-#include <pcm_sample_format.h>
-
-
-#include "audio_format.h"
+#include <pcm/format.h>
 
 struct audio_sink;
@@ -50 +47 @@
         link_t link;
         const char *name;
-        audio_format_t format;
+        pcm_format_t format;
         void *private_data;
         int (*connection_change)(audio_source_t *source);
@@ -70 +67 @@
     int (*connection_change)(audio_source_t *),
     int (*update_available_data)(audio_source_t *, size_t),
-    const audio_format_t *f);
+    const pcm_format_t *f);
 void audio_source_fini(audio_source_t *source);
 int audio_source_connected(audio_source_t *source, struct audio_sink *sink);
 int audio_source_add_self(audio_source_t *source, void *buffer, size_t size,
-    const audio_format_t *f);
-static inline const audio_format_t *audio_source_format(const audio_source_t *s)
+    const pcm_format_t *f);
+static inline const pcm_format_t *audio_source_format(const audio_source_t *s)
 {
         assert(s);

uspace/srv/audio/hound/hound.h

@@ -42 +42 @@
 #include <errno.h>
 #include <fibril_synch.h>
+#include <pcm/format.h>
 
 #include "audio_source.h"
 #include "audio_sink.h"
-#include "audio_format.h"
 
 

uspace/srv/audio/hound/main.c

@@ -71 +71 @@
         LIST_INITIALIZE(local_playback);
         LIST_INITIALIZE(local_recording);
-        audio_format_t format = {0};
+        pcm_format_t format = {0};
         const char *name = NULL;
         async_sess_t *sess = NULL;