Changeset 0a4ad7d in mainline

Timestamp:

2013-04-10T18:14:40Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

76e863c

Parents:

e1d2f0e

Message:

wavplay: Add direct recording functionality

Location:

uspace/app/wavplay

Files:

• Makefile (modified) (1 diff)
• drec.c (added)
• drec.h (added)
• main.c (modified) (2 diffs)
• wave.c (modified) (2 diffs)
• wave.h (modified) (2 diffs)

uspace/app/wavplay/Makefile

@@ -42 +42 @@
 SOURCES = \
         dplay.c \
+        drec.c \
         main.c \
         wave.c

uspace/app/wavplay/main.c

@@ -45 +45 @@
 
 #include "dplay.h"
+#include "drec.h"
 #include "wave.h"
 
@@ -252 +253 @@
                     i - optind + 1, argc - optind, file);
                 if (record) {
-                        printf("Recording is not supported yet.\n");
-                        return 1;
+                        if (direct) {
+                                drecord(device, file);
+                        } else {
+                                printf("Indirect recording is not supported "
+                                    "yet.\n");
+                                break;
+                        }
                 }
                 if (direct) {

uspace/app/wavplay/wave.c

@@ -39 +39 @@
 #include "wave.h"
 
-int wav_parse_header(void *file, const void **data, size_t *data_size,
+/**
+ * Parse wav header data.
+ * @param[in] hdata Header data to parse.
+ * @param[out] data Pointer to audio data.
+ * @param[out] data_size Size of the data after the header.
+ * @param[out] channels Number of channels in stored audio format.
+ * @param[out] sampling_rate Sampling rate of the store data.
+ * @param[out] format Sample format.
+ * @param[out] error String representatoin of error, if any.
+ * @return Error code.
+ *
+ * Does sanity checks and endian conversion.
+ */
+int wav_parse_header(const void *hdata, const void **data, size_t *data_size,
     unsigned *channels, unsigned *sampling_rate, pcm_sample_format_t *format,
     const char **error)
 {
-        if (!file) {
+        if (!hdata) {
                 if (error)
-                        *error = "file not present";
+                        *error = "no header";
                 return EINVAL;
         }
 
-        const wave_header_t *header = file;
+        const wave_header_t *header = hdata;
         if (str_lcmp(header->chunk_id, CHUNK_ID, 4) != 0) {
                 if (error)
@@ -113 +126 @@
         return EOK;
 }
+
+/**
+ * Initialize wave fromat ehader structure.
+ * @param header Structure to initialize.
+ * @param format Desired PCM format
+ * @param size Size of the stored data.
+ *
+ * Initializes format specific elements and covnerts endian
+ */
+void wav_init_header(wave_header_t *header, pcm_format_t format, size_t size)
+{
+        assert(header);
+#define COPY_STR(dst, src)   memcpy(dst, src, str_size(src))
+
+        COPY_STR(&header->chunk_id, CHUNK_ID);
+        COPY_STR(&header->format, FORMAT_STR);
+        COPY_STR(&header->subchunk1_id, SUBCHUNK1_ID);
+        header->subchunk1_size = host2uint16_t_le(PCM_SUBCHUNK1_SIZE);
+        header->audio_format = host2uint16_t_le(FORMAT_LINEAR_PCM);
+
+        COPY_STR(&header->subchunk2_id, SUBCHUNK2_ID);
+        header->subchunk2_size = host2uint32_t_le(size);
+        header->sampling_rate = host2uint32_t_le(format.sampling_rate);
+        header->channels = host2uint32_t_le(format.channels);
+        header->sample_size =
+            host2uint32_t_le(pcm_sample_format_size(format.sample_format));
+}
 /**
  * @}

uspace/app/wavplay/wave.h

@@ -36 +36 @@
 
 #include <stdint.h>
+#include <pcm/format.h>
 #include <pcm/sample_format.h>
 
@@ -89 +90 @@
 } wave_header_t;
 
-int wav_parse_header(void *, const void**, size_t *, unsigned *, unsigned *,
-    pcm_sample_format_t *, const char **);
+int wav_parse_header(const void *, const void**, size_t *, unsigned *,
+    unsigned *, pcm_sample_format_t *, const char **);
 
+void wav_init_header(wave_header_t *, pcm_format_t , size_t);
 #endif
 /**