Changeset 2816:b9e357b0dc43 in roaraudio for roard/codecfilter.c

Timestamp:

09/29/09 18:04:39 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added prethru support and updated list of codecs a bit

File:

• roard/codecfilter.c (modified) (9 diffs)

roard/codecfilter.c

@@ -36 +36 @@
  {-1,                     "null", "null codec filter", NULL, NULL, ROAR_CODECFILTER_NONE, ROAR_SUBSYS_NONE,
                                           NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+ {-1,                     "PCM", "Native PCM Support", NULL, NULL,
+                          ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE|ROAR_CODECFILTER_PRETHRU_NN, ROAR_SUBSYS_WAVEFORM,
+                                          NULL, NULL, NULL, NULL, NULL, NULL, cf_alaw_delay, NULL},
+ {ROAR_CODEC_MIDI,        "MIDI", "Native MIDI Support", NULL, NULL,
+                          ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE|ROAR_CODECFILTER_PRETHRU_NN, ROAR_SUBSYS_MIDI,
+                                          NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+ {ROAR_CODEC_DMX512,      "DMX512", "Native DMX512 Support", NULL, NULL,
+                          ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE|ROAR_CODECFILTER_PRETHRU_NN, ROAR_SUBSYS_LIGHT,
+                                          NULL, NULL, NULL, NULL, NULL, NULL, cf_alaw_delay, NULL},
 
 /*
@@ -45 +54 @@
 #ifndef ROAR_WITHOUT_CF_WAVE
  {ROAR_CODEC_RIFF_WAVE, "RIFF/WAVE", "RIFF/WAVE", NULL, NULL,
-  ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE, ROAR_SUBSYS_WAVEFORM,
+  ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE|ROAR_CODECFILTER_PRETHRU, ROAR_SUBSYS_WAVEFORM,
   cf_wave_open, cf_wave_close, NULL, cf_wave_write, cf_wave_read, NULL, NULL, cf_wave_ctl},
 #endif
@@ -56 +65 @@
 #endif
 
+#ifdef ROAR_HAVE_LIBOGG
+ {ROAR_CODEC_OGG, "Ogg", "Ogg Container Format", NULL, NULL, ROAR_CODECFILTER_NONE,
+  ROAR_SUBSYS_WAVEFORM|ROAR_SUBSYS_MIDI,
+  NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+#endif
+
 #ifdef ROAR_SUPPORT_ALAW
  {ROAR_CODEC_ALAW, "alaw", "A-Law", NULL, NULL,
 #ifdef ROAR_SUPPORT_ALAW_RW
-  ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE,
-#else
-  ROAR_CODECFILTER_READ,
+  ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE|ROAR_CODECFILTER_PRETHRU_NN,
+#else
+  ROAR_CODECFILTER_READ|ROAR_CODECFILTER_PRETHRU_NN,
 #endif
   ROAR_SUBSYS_WAVEFORM,
@@ -76 +91 @@
  {ROAR_CODEC_MULAW, "mulaw", "mu-Law", NULL, NULL,
 #ifdef ROAR_SUPPORT_MULAW_RW
-  ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE,
-#else
-  ROAR_CODECFILTER_READ,
+  ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE|ROAR_CODECFILTER_PRETHRU_NN,
+#else
+  ROAR_CODECFILTER_READ|ROAR_CODECFILTER_PRETHRU_NN,
 #endif
   ROAR_SUBSYS_WAVEFORM,
@@ -101 +116 @@
  {ROAR_CODEC_OGG_VORBIS, "oggvorbis", "Ogg Vorbis decoder", NULL, NULL,
 #ifdef ROAR_HAVE_LIBVORBISENC
- ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE,
+ ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE|ROAR_CODECFILTER_PRETHRU,
 #else
  ROAR_CODECFILTER_READ,
@@ -136 +151 @@
 
 #ifdef ROAR_HAVE_LIBCELT
- {ROAR_CODEC_ROAR_CELT, "RoarCELT", "RoarAudio CELT", NULL, NULL, ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE,
+ {ROAR_CODEC_ROAR_CELT, "RoarCELT", "RoarAudio CELT", NULL, NULL,
+  ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE|ROAR_CODECFILTER_PRETHRU,
   ROAR_SUBSYS_WAVEFORM,
   cf_celt_open, cf_celt_close, NULL, cf_celt_write, cf_celt_read, NULL, cf_celt_delay, NULL},
@@ -142 +158 @@
 
 #ifdef ROAR_HAVE_LIBSPEEX
- {ROAR_CODEC_ROAR_SPEEX, "RoarSpeex", "RoarAudio Speex", NULL, NULL, ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE,
+ {ROAR_CODEC_ROAR_SPEEX, "RoarSpeex", "RoarAudio Speex", NULL, NULL,
+  ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE|ROAR_CODECFILTER_PRETHRU,
   ROAR_SUBSYS_WAVEFORM,
   cf_speex_open, cf_speex_close, NULL, cf_speex_write, cf_speex_read, NULL, NULL, NULL},
@@ -161 +178 @@
 #endif
 #endif
+
+ {ROAR_CODEC_ROARDMX, "RoarDMX", "Native RoarDMX Support", NULL, NULL,
+                          ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE|ROAR_CODECFILTER_PRETHRU_NN, ROAR_SUBSYS_LIGHT,
+                                          NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
 
  {-1, NULL, NULL, NULL, NULL, ROAR_CODECFILTER_NONE, ROAR_SUBSYS_NONE,
@@ -203 +224 @@
    if ( flags & ROAR_CODECFILTER_WRITE )
     mode[1] = 'w';
+   if ( flags & ROAR_CODECFILTER_PRETHRU )
+    mode[2] = 'P';
+   if ( flags & ROAR_CODECFILTER_PRETHRU_NN )
+    mode[2] = 'p';
   }