Changeset 57e8b3b in mainline for uspace/drv/audio/sb16/dsp.c

Timestamp:

2012-07-15T15:25:43Z (13 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/drv/audio/sb16/dsp.c (modified) (7 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -188 +188 @@
 {
         assert(dsp);
+        dsp->active.frame_count +=
+            dsp->active.samples / ((dsp->active.mode & DSP_MODE_STEREO) ? 2 : 1);
+
         if (dsp->event_exchange) {
                 switch (dsp->status) {
                 case DSP_PLAYBACK:
-                        async_msg_0(dsp->event_exchange,
-                            PCM_EVENT_PLAYBACK_DONE);
+                        async_msg_1(dsp->event_exchange,
+                            PCM_EVENT_FRAMES_PLAYED, dsp->active.frame_count);
                         break;
                 case DSP_RECORDING:
-                        async_msg_0(dsp->event_exchange,
-                            PCM_EVENT_RECORDING_DONE);
+                        async_msg_1(dsp->event_exchange,
+                            PCM_EVENT_FRAMES_RECORDED, dsp->active.frame_count);
                         break;
                 default:
@@ -267 +270 @@
 }
 
-int sb_dsp_start_playback(sb_dsp_t *dsp, unsigned parts,
+int sb_dsp_start_playback(sb_dsp_t *dsp, unsigned frames,
     unsigned channels, unsigned sampling_rate, pcm_sample_format_t format)
 {
@@ -275 +278 @@
                 return EINVAL;
 
-        /* Play block size must be even number (we use DMA 16)*/
-        if (dsp->buffer.size % (parts * 2))
-                return EINVAL;
-
-        const unsigned play_block_size = dsp->buffer.size / parts;
-
         /* Check supported parameters */
-        ddf_log_debug("Requested playback (%u parts): %uHz, %s, %u channel(s).",
-            parts, sampling_rate, pcm_sample_format_str(format), channels);
+        ddf_log_debug("Requested playback: %u frames, %uHz, %s, %u channel(s).",
+            frames, sampling_rate, pcm_sample_format_str(format), channels);
         if (channels != 1 && channels != 2)
                 return ENOTSUP;
@@ -311 +308 @@
 #endif
 
-        dsp->active.mode = 0 |
-            (sign ? DSP_MODE_SIGNED : 0) | (channels == 2 ? DSP_MODE_STEREO : 0);
+        dsp->active.mode = 0
+            | (sign ? DSP_MODE_SIGNED : 0)
+            | (channels == 2 ? DSP_MODE_STEREO : 0);
+        dsp->active.samples = frames * channels;
+        dsp->active.frame_count = 0;
+
         sb_dsp_write(dsp, dsp->active.mode);
-
-        dsp->active.samples = sample_count(format, play_block_size);
         sb_dsp_write(dsp, (dsp->active.samples - 1) & 0xff);
         sb_dsp_write(dsp, (dsp->active.samples - 1) >> 8);
@@ -339 +338 @@
 }
 
-int sb_dsp_start_record(sb_dsp_t *dsp, unsigned parts,
+int sb_dsp_start_record(sb_dsp_t *dsp, unsigned frames,
     unsigned channels, unsigned sampling_rate, pcm_sample_format_t format)
 {
@@ -347 +346 @@
                 return EINVAL;
 
-        /* Play block size must be even number (we use DMA 16)*/
-        if (dsp->buffer.size % (parts * 2))
-                return EINVAL;
-
-        const unsigned play_block_size = dsp->buffer.size / parts;
-
         /* Check supported parameters */
-        ddf_log_debug("Requested record (%u parts): %uHz, %s, %u channel(s).",
-            parts, sampling_rate, pcm_sample_format_str(format), channels);
+        ddf_log_debug("Requested record: %u frames, %uHz, %s, %u channel(s).",
+            frames, sampling_rate, pcm_sample_format_str(format), channels);
         if (channels != 1 && channels != 2)
                 return ENOTSUP;
@@ -384 +377 @@
 
         dsp->active.mode = 0 |
-            (sign ? DSP_MODE_SIGNED : 0) | (channels == 2 ? DSP_MODE_STEREO : 0);
+            (sign ? DSP_MODE_SIGNED : 0) |
+            (channels == 2 ? DSP_MODE_STEREO : 0);
+        dsp->active.samples = frames * channels;
+        dsp->active.frame_count = 0;
+
         sb_dsp_write(dsp, dsp->active.mode);
-
-        dsp->active.samples = sample_count(format, play_block_size);
         sb_dsp_write(dsp, (dsp->active.samples - 1) & 0xff);
         sb_dsp_write(dsp, (dsp->active.samples - 1) >> 8);