Changeset 346643c in mainline for uspace/app/drec

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.

Location:

uspace/app/drec

Files:

• drec.c (modified) (4 diffs)
• wave.c (modified) (3 diffs)
• wave.h (modified) (2 diffs)

uspace/app/drec/drec.c

@@ -47 +47 @@
 #include <stdio.h>
 #include <macros.h>
+#include <pcm_sample_format.h>
 
 #include "wave.h"
@@ -53 +54 @@
 #define SUBBUFFERS 2
 
-const unsigned sampling_rate = 44100, sample_size = 16, channels = 2;
-bool sign = true;
+const unsigned sampling_rate = 44100, channels = 2, sample_size = 16;
+const pcm_sample_format_t format = PCM_SAMPLE_SINT16_LE;
 
 typedef struct {
@@ -104 +105 @@
 
 
-static void record(record_t *rec, unsigned sampling_rate, unsigned sample_size,
-    unsigned channels, bool sign)
+static void record(record_t *rec, unsigned channels, unsigned sampling_rate,
+    pcm_sample_format_t format)
 {
         assert(rec);
         assert(rec->device);
         rec->buffer.position = rec->buffer.base;
-        printf("Recording: %dHz, %d-bit %ssigned samples, %d channel(s).\n",
-            sampling_rate, sample_size, sign ? "": "un", channels);
+        printf("Recording: %dHz, %s, %d channel(s).\n",
+            sampling_rate, pcm_sample_format_str(format), channels);
         int ret = audio_pcm_start_record(rec->device, rec->buffer.id,
-            SUBBUFFERS, sampling_rate, sample_size, channels, sign);
+            SUBBUFFERS, channels, sampling_rate, format);
         if (ret != EOK) {
                 printf("Failed to start recording: %s.\n", str_error(ret));
@@ -201 +202 @@
                 .sampling_rate = sampling_rate,
                 .sample_size = sample_size,
-                .byte_rate = (sampling_rate / 8) * channels,
-                .block_align = (sampling_rate / 8) * channels,
+                .byte_rate = sampling_rate * (sample_size / 8) * channels,
+                .block_align = (sample_size / 8) * channels,
                 .subchunk2_id = SUBCHUNK2_ID,
         };
         fwrite(&header, sizeof(header), 1, rec.file);
-        record(&rec, sampling_rate, sample_size, channels, sign);
+        record(&rec, sampling_rate, channels, format);
         fclose(rec.file);
 

uspace/app/drec/wave.c

@@ -40 +40 @@
 
 int wav_parse_header(void *file, const void **data, size_t *data_size,
-    unsigned *sampling_rate, unsigned *sample_size, unsigned *channels,
-    bool *sign, const char **error)
+    unsigned *channels, unsigned *sampling_rate, pcm_sample_format_t *format,
+    const char **error)
 {
         if (!file) {
@@ -86 +86 @@
         }
 
+
         if (data)
                 *data = header->data;
@@ -93 +94 @@
         if (sampling_rate)
                 *sampling_rate = uint32_t_le2host(header->sampling_rate);
-        if (sample_size)
-                *sample_size = uint32_t_le2host(header->sample_size);
         if (channels)
                 *channels = uint16_t_le2host(header->channels);
-        if (sign)
-                *sign = uint32_t_le2host(header->sample_size) == 16
-                    ? true : false;
+        if (format) {
+                const unsigned size = uint32_t_le2host(header->sample_size);
+                switch (size) {
+                case 8: *format = PCM_SAMPLE_UINT8; break;
+                case 16: *format = PCM_SAMPLE_SINT16_LE; break;
+                case 24: *format = PCM_SAMPLE_SINT24_LE; break;
+                case 32: *format = PCM_SAMPLE_SINT32_LE; break;
+                default:
+                        *error = "Unknown format";
+                        return ENOTSUP;
+                }
+        }
         if (error)
                 *error = "no error";

uspace/app/drec/wave.h

@@ -37 +37 @@
 #include <stdint.h>
 #include <bool.h>
+#include <pcm_sample_format.h>
 
 /** Wave file header format.
@@ -90 +91 @@
 
 int wav_parse_header(void *, const void**, size_t *, unsigned *, unsigned *,
-    unsigned *, bool *, const char **error_str);
+    pcm_sample_format_t *, const char **);
 
 #endif