Changeset 2590:3b00e11c57b1 in roaraudio

Timestamp:

09/10/09 00:12:32 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

better RIFF/WAVE support

Location:

roard

Files:

• codecfilter_wave.c (modified) (2 diffs)
• include/codecfilter_wave.h (modified) (1 diff)

roard/codecfilter_wave.c

@@ -60 +60 @@
  char tbuf[44];
  struct roar_stream * s = ROAR_STREAM(self->stream);
+ uint16_t tmp16;
+ uint32_t tmp32;
+ int codec = -1;
 
  if ( self->opened ) {
@@ -70 +73 @@
   // TODO: write better code here!
 
-  memcpy(&(s->info.rate    ), tbuf+24, 4);
-  memcpy(&(s->info.channels), tbuf+22, 2);
-  memcpy(&(s->info.bits    ), tbuf+34, 2);
+  memcpy(&tmp32, tbuf+24, 4);
+  s->info.rate = ROAR_LE2HOST32(tmp32);
+
+  memcpy(&tmp16, tbuf+22, 2);
+  s->info.channels = ROAR_LE2HOST16(tmp16);
+
+  memcpy(&tmp16, tbuf+34, 2);
+  s->info.bits = ROAR_LE2HOST16(tmp16);
+
+  memcpy(&tmp16, tbuf+20, 2);
+
+  switch (ROAR_LE2HOST16(tmp16)) {
+   case ROAR_RIFF_WAVE_CID_PCM:
+     if ( s->info.bits == 8 ) {
+      codec = ROAR_CODEC_PCM_U_LE;
+     } else {
+      codec = ROAR_CODEC_PCM_S_LE;
+     }
+    break;
+   case ROAR_RIFF_WAVE_CID_ALAW:
+     codec = ROAR_CODEC_ALAW;
+    break;
+   case ROAR_RIFF_WAVE_CID_MULAW:
+     codec = ROAR_CODEC_MULAW;
+    break;
+   case ROAR_RIFF_WAVE_CID_IEEE_FLOAT:
+   default:
+     return -1;
+  }
+
+  s->info.codec = codec;
 
   self->opened = 1;

roard/include/codecfilter_wave.h

@@ -30 +30 @@
 #ifndef ROAR_WITHOUT_CF_WAVE
 
+// most important codec IDs:
+#define ROAR_RIFF_WAVE_CID_PCM        0x0001
+#define ROAR_RIFF_WAVE_CID_IEEE_FLOAT 0x0003
+#define ROAR_RIFF_WAVE_CID_ALAW       0x0006
+#define ROAR_RIFF_WAVE_CID_MULAW      0x0007
+
 struct codecfilter_wave_inst {
  struct roar_stream_server * stream;