Changeset 3686:9a6d918fb3a2 in roaraudio

Timestamp:

04/14/10 09:50:34 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

enable RIFF_WAVE codec filter to read RSound data

Location:

roard

Files:

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

roard/codecfilter_wave.c

@@ -115 +115 @@
      codec = ROAR_CODEC_MULAW;
     break;
+   case ROAR_RIFF_WAVE_CID_RSOUND:
+     memcpy(&tmp16, tbuf+42, 2);
+     switch (ROAR_LE2HOST16(tmp16)) {
+      case ROAR_RIFF_WAVE_RSID_S16_LE:
+        s->info.bits = 16;
+        codec        = ROAR_CODEC_PCM_S_LE;
+       break;
+      case ROAR_RIFF_WAVE_RSID_S16_BE:
+        s->info.bits = 16;
+        codec        = ROAR_CODEC_PCM_U_BE;
+       break;
+      case ROAR_RIFF_WAVE_RSID_U16_LE:
+        s->info.bits = 16;
+        codec        = ROAR_CODEC_PCM_U_LE;
+       break;
+      case ROAR_RIFF_WAVE_RSID_U16_BE:
+        s->info.bits = 16;
+        codec        = ROAR_CODEC_PCM_U_BE;
+       break;
+      case ROAR_RIFF_WAVE_RSID_S8:
+        s->info.bits = 8;
+        codec        = ROAR_CODEC_PCM_S_LE;
+       break;
+      case ROAR_RIFF_WAVE_RSID_U8:
+        s->info.bits = 8;
+        codec        = ROAR_CODEC_PCM_U_LE;
+       break;
+      default:
+        return -1;
+     }
+    break;
    case ROAR_RIFF_WAVE_CID_IEEE_FLOAT:
    default:

roard/emul_rsound.c

@@ -109 +109 @@
  memcpy(&(s->info), g_sa, sizeof(struct roar_audio_info));
 
- ss->codec_orgi = s->info.codec = ROAR_CODEC_DEFAULT;
+ ss->codec_orgi = s->info.codec = ROAR_CODEC_RIFF_WAVE;
 
  if ( streams_set_dir(stream, ROAR_DIR_PLAY, 1) == -1 ) {

roard/include/codecfilter_wave.h

@@ -37 +37 @@
 #define ROAR_RIFF_WAVE_CID_MULAW      0x0007
 
+// Invalid but used by RSound:
+#define ROAR_RIFF_WAVE_CID_RSOUND     0x0000
+
+// Type is encoded in length by RSound using the following values:
+#define ROAR_RIFF_WAVE_RSID_S16_LE    0x0001
+#define ROAR_RIFF_WAVE_RSID_S16_BE    0x0002
+#define ROAR_RIFF_WAVE_RSID_U16_LE    0x0004
+#define ROAR_RIFF_WAVE_RSID_U16_BE    0x0008
+#define ROAR_RIFF_WAVE_RSID_U8        0x0010
+#define ROAR_RIFF_WAVE_RSID_S8        0x0020
+
+
 struct codecfilter_wave_inst {
  struct roar_stream_server *  stream;