Changeset 389ef25 in mainline

Timestamp:

2012-07-17T06:53:55Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

950110ee

Parents:

bb67def

Message:

hound: Check format before starting playback.

Location:

uspace/srv/audio/hound

Files:

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

uspace/srv/audio/hound/audio_client.c

@@ -80 +80 @@
         init_common(client, name, f, sess);
         audio_sink_init(&client->sink, name, client,
-            client_sink_connection_change, f);
+            client_sink_connection_change, NULL, f);
         client->is_recording = true;
         return client;

uspace/srv/audio/hound/audio_device.c

@@ -51 +51 @@
 static int device_source_connection_callback(audio_source_t *source);
 static void device_event_callback(ipc_callid_t iid, ipc_call_t *icall, void *arg);
+static int device_check_format(audio_sink_t* sink);
 static int get_buffer(audio_device_t *dev);
 static int release_buffer(audio_device_t *dev);
@@ -68 +69 @@
 
         audio_sink_init(&dev->sink, name, dev, device_sink_connection_callback,
-            &AUDIO_FORMAT_ANY);
+            device_check_format, &AUDIO_FORMAT_ANY);
         audio_source_init(&dev->source, name, dev,
             device_source_connection_callback, NULL, &AUDIO_FORMAT_ANY);
@@ -222 +223 @@
         }
 }
+static int device_check_format(audio_sink_t* sink)
+{
+        assert(sink);
+        audio_device_t *dev = sink->private_data;
+        assert(dev);
+        log_verbose("Checking format on sink %s", sink->name);
+        return audio_pcm_test_format(dev->sess, &sink->format.channels,
+            &sink->format.sampling_rate, &sink->format.sample_format);
+}
 
 static int get_buffer(audio_device_t *dev)

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),
-    const audio_format_t *f)
+    int (*check_format)(audio_sink_t *sink), const audio_format_t *f)
 {
         assert(sink);
@@ -59 +59 @@
         sink->format = *f;
         sink->connection_change = connection_change;
+        sink->check_format = check_format;
         log_verbose("Initialized sink (%p) '%s'", sink, sink->name);
         return EOK;
@@ -70 +71 @@
         sink->name = NULL;
 }
-
 
 int audio_sink_add_source(audio_sink_t *sink, audio_source_t *source)
@@ -85 +85 @@
                 /* Set audio format according to the first source */
                 if (audio_format_is_any(&sink->format)) {
-                        /* Source does not care */
-                        if (audio_format_is_any(&source->format)) {
-                                log_verbose("Set default format for sink %s.",
-                                    sink->name);
-                                sink->format = AUDIO_FORMAT_DEFAULT;
-                        } else {
-                                log_verbose("Set format based on the first "
-                                    "source(%s): %u channel(s), %uHz, %s for "
-                                    "sink %s.", source->name,
-                                    source->format.channels,
-                                    source->format.sampling_rate,
-                                    pcm_sample_format_str(
-                                        source->format.sample_format),
-                                    sink->name);
-                                sink->format = source->format;
-                        }
+                        int ret = audio_sink_set_format(sink, &source->format);
+                        if (ret != EOK)
+                                return ret;
                 }
         }
@@ -120 +107 @@
             source->name, sink->name);
 
+        return EOK;
+}
+
+int audio_sink_set_format(audio_sink_t *sink, const audio_format_t *format)
+{
+        assert(sink);
+        assert(format);
+        if (!audio_format_is_any(&sink->format)) {
+                log_debug("Sink %s already has a format", sink->name);
+                return EEXISTS;
+        }
+        const audio_format_t old_format;
+
+        if (audio_format_is_any(format)) {
+                log_verbose("Setting DEFAULT format for sink %s", sink->name);
+                sink->format = AUDIO_FORMAT_DEFAULT;
+        } else {
+                sink->format = *format;
+        }
+        if (sink->check_format) {
+                const int ret = sink->check_format(sink);
+                if (ret != EOK && ret != ELIMIT) {
+                        log_debug("Format check failed on sink %s", sink->name);
+                        sink->format = old_format;
+                        return ret;
+                }
+        }
+        log_verbose("Set format for sink %s: %u channel(s), %uHz, %s",
+            sink->name, format->channels, format->sampling_rate,
+            pcm_sample_format_str(format->sample_format));
         return EOK;
 }

uspace/srv/audio/hound/audio_sink.h

@@ -54 +54 @@
         void *private_data;
         int (*connection_change)(audio_sink_t *, bool);
+        int (*check_format)(audio_sink_t *);
 };
 
@@ -63 +64 @@
 int audio_sink_init(audio_sink_t *sink, const char *name,
     void *private_data, int (*connection_change)(audio_sink_t *, bool),
-    const audio_format_t *f);
+    int (*check_format)(audio_sink_t *), const audio_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_add_source(audio_sink_t *sink, audio_source_t *source);
 int audio_sink_remove_source(audio_sink_t *sink, audio_source_t *source);