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

Timestamp:

2012-07-11T12:05:30Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

039337e8

Parents:

94694a4

Message:

audio: Use enum for sample format.

File:

• uspace/drv/audio/sb16/dsp.c (modified) (11 diffs)

uspace/drv/audio/sb16/dsp.c

@@ -147 +147 @@
 }
 
-static inline size_t sample_count(unsigned sample_size, size_t byte_count)
-{
-        if (sample_size == 16) {
-                return byte_count / 2;
-        }
-        return byte_count;
+static inline size_t sample_count(pcm_sample_format_t format, size_t byte_count)
+{
+        return byte_count / pcm_sample_format_size(format);
 }
 
@@ -261 +258 @@
 
 int sb_dsp_start_playback(sb_dsp_t *dsp, unsigned id, unsigned parts,
-    unsigned sampling_rate, unsigned sample_size, unsigned channels, bool sign)
+    unsigned channels, unsigned sampling_rate, pcm_sample_format_t format)
 {
         assert(dsp);
@@ -276 +273 @@
         /* Check supported parameters */
         ddf_log_debug("Requested playback on buffer \"%u\" (%u parts): %uHz, "
-            "%ssinged %u bit, %u channel(s).", id, parts, sampling_rate,
-            sign ? "" : "un", sample_size, channels);
-        if (id != BUFFER_ID)
-                return ENOENT;
-        if (sample_size != 16) // FIXME We only support 16 bit playback
-                return ENOTSUP;
+            "%s, %u channel(s).", id, parts, sampling_rate,
+            pcm_sample_format_str(format), channels);
+        if (id != BUFFER_ID)
+                return ENOENT;
         if (channels != 1 && channels != 2)
                 return ENOTSUP;
         if (sampling_rate > 44100)
+                return ENOTSUP;
+        // FIXME We only support 16 bit playback
+        if (format != PCM_SAMPLE_UINT16_LE && format != PCM_SAMPLE_SINT16_LE)
                 return ENOTSUP;
 
@@ -291 +289 @@
                 return ENOMEM;
 
+        const bool sign = (format == PCM_SAMPLE_SINT16_LE);
+
         sb_dsp_write(dsp, SET_SAMPLING_RATE_OUTPUT);
         sb_dsp_write(dsp, sampling_rate >> 8);
         sb_dsp_write(dsp, sampling_rate & 0xff);
 
-        ddf_log_verbose("Sampling rate: %hhx:%hhx.",
+        ddf_log_verbose("Sample rate: %hhx:%hhx.",
             sampling_rate >> 8, sampling_rate & 0xff);
 
@@ -308 +308 @@
         sb_dsp_write(dsp, dsp->active.mode);
 
-        dsp->active.samples = sample_count(sample_size, play_block_size);
+        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);
@@ -314 +314 @@
         ddf_log_verbose("Playback started, interrupt every %u samples "
             "(~1/%u sec)", dsp->active.samples,
-            sampling_rate / dsp->active.samples);
+            sampling_rate / (dsp->active.samples * channels));
 
         dsp->active.playing = true;
@@ -332 +332 @@
 
 int sb_dsp_start_record(sb_dsp_t *dsp, unsigned id, unsigned parts,
-    unsigned sampling_rate, unsigned sample_size, unsigned channels, bool sign)
+    unsigned channels, unsigned sampling_rate, pcm_sample_format_t format)
 {
         assert(dsp);
@@ -347 +347 @@
         /* Check supported parameters */
         ddf_log_debug("Requested recording on buffer \"%u\" (%u parts): %uHz, "
-            "%ssinged %u bit, %u channel(s).", id, parts, sampling_rate,
-            sign ? "" : "un", sample_size, channels);
-        if (id != BUFFER_ID)
-                return ENOENT;
-        if (sample_size != 16) // FIXME We only support 16 bit playback
-                return ENOTSUP;
+            "%s, %u channel(s).", id, parts, sampling_rate,
+            pcm_sample_format_str(format), channels);
+        if (id != BUFFER_ID)
+                return ENOENT;
         if (channels != 1 && channels != 2)
                 return ENOTSUP;
         if (sampling_rate > 44100)
+                return ENOTSUP;
+        // FIXME We only support 16 bit recording
+        if (format != PCM_SAMPLE_UINT16_LE && format != PCM_SAMPLE_SINT16_LE)
                 return ENOTSUP;
 
@@ -361 +362 @@
         if (!dsp->event_exchange)
                 return ENOMEM;
+
+        const bool sign = (format == PCM_SAMPLE_SINT16_LE);
 
         sb_dsp_write(dsp, SET_SAMPLING_RATE_OUTPUT);
@@ -379 +382 @@
         sb_dsp_write(dsp, dsp->active.mode);
 
-        dsp->active.samples = sample_count(sample_size, play_block_size);
+        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);
@@ -385 +388 @@
         ddf_log_verbose("Recording started started, interrupt every %u samples "
             "(~1/%u sec)", dsp->active.samples,
-            sampling_rate / dsp->active.samples);
+            sampling_rate / (dsp->active.samples * channels));
         dsp->active.playing = false;