Changeset 57e8b3b in mainline for uspace/srv/audio/hound/audio_device.c

Timestamp:

2012-07-15T15:25:43Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

5cd5079

Parents:

2cc5c835

Message:

Add frame count to event report.

This enables applications to detect underruns.

File:

• uspace/srv/audio/hound/audio_device.c (modified) (6 diffs)

uspace/srv/audio/hound/audio_device.c

@@ -46 +46 @@
 #include "log.h"
 
-#define BUFFER_BLOCKS 2
+#define BUFFER_PARTS 2
 
 static int device_sink_connection_callback(audio_sink_t *sink, bool new);
@@ -107 +107 @@
                     dev->buffer.base, dev->buffer.size);
 
-                ret = audio_pcm_start_playback(dev->sess, BUFFER_BLOCKS,
+                const unsigned frames = dev->buffer.size /
+                    (BUFFER_PARTS * audio_format_frame_size(&dev->sink.format));
+                ret = audio_pcm_start_playback(dev->sess, frames,
                     dev->sink.format.channels, dev->sink.format.sampling_rate,
                     dev->sink.format.sample_format);
@@ -148 +150 @@
                         return ret;
                 }
-                ret = audio_pcm_start_record(dev->sess, BUFFER_BLOCKS,
+                const unsigned frames = dev->buffer.size /
+                    (BUFFER_PARTS * audio_format_frame_size(&dev->sink.format));
+                ret = audio_pcm_start_record(dev->sess, frames,
                     dev->sink.format.channels, dev->sink.format.sampling_rate,
                     dev->sink.format.sample_format);
@@ -187 +191 @@
                 async_answer_0(callid, EOK);
                 switch(IPC_GET_IMETHOD(call)) {
-                case PCM_EVENT_PLAYBACK_DONE: {
+                case PCM_EVENT_FRAMES_PLAYED: {
+                        //TODO add underrun protection.
                         if (dev->buffer.position) {
                                 dev->buffer.position +=
-                                    (dev->buffer.size / BUFFER_BLOCKS);
+                                    (dev->buffer.size / BUFFER_PARTS);
                         }
                         if ((!dev->buffer.position) ||
@@ -199 +204 @@
                         }
                         audio_sink_mix_inputs(&dev->sink, dev->buffer.position,
-                            dev->buffer.size / BUFFER_BLOCKS);
+                            dev->buffer.size / BUFFER_PARTS);
                         break;
                 }
@@ -206 +211 @@
                         return;
                 }
-                case PCM_EVENT_RECORDING_DONE: {
+                case PCM_EVENT_FRAMES_RECORDED: {
                         //TODO implement
                         break;