Changeset 3604:fa3d77894fcf in roaraudio

Timestamp:

02/28/10 16:07:46 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added codecfilter_delay_zero(), deleted abused cf_alaw_delay()

Location:

roard

Files:

• codecfilter.c (modified) (5 diffs)
• codecfilter_alaw.c (modified) (1 diff)
• include/codecfilter.h (modified) (2 diffs)

roard/codecfilter.c

@@ -39 +39 @@
 #define _PCM_FILTER(codec) _DUMMY_FILTER(codec, "PCM", "Native PCM Support", \
                                          ROAR_CODECFILTER_READ|ROAR_CODECFILTER_WRITE|ROAR_CODECFILTER_PRETHRU_NN, \
-                                         ROAR_SUBSYS_WAVEFORM, cf_alaw_delay)
+                                         ROAR_SUBSYS_WAVEFORM, codecfilter_delay_zero)
 
 struct roar_codecfilter g_codecfilter[] = {
@@ -56 +56 @@
  {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},
+                                          NULL, NULL, NULL, NULL, NULL, NULL, codecfilter_delay_zero, NULL},
 #endif
 #ifndef ROAR_WITHOUT_DCOMP_RDTCS
  {ROAR_CODEC_RDS,         "RDS", "Native RDS Support", NULL, NULL,
                           ROAR_CODECFILTER_WRITE|ROAR_CODECFILTER_PRETHRU_NN, ROAR_SUBSYS_RDTCS,
-                                          NULL, NULL, NULL, NULL, NULL, NULL, cf_alaw_delay, NULL},
+                                          NULL, NULL, NULL, NULL, NULL, NULL, codecfilter_delay_zero, NULL},
 #endif
 
@@ -103 +103 @@
   NULL,
 #endif
-  cf_alaw_read, NULL, cf_alaw_delay, NULL},
+  cf_alaw_read, NULL, codecfilter_delay_zero, NULL},
 #endif
 
@@ -120 +120 @@
   NULL,
 #endif
-  cf_mulaw_read, NULL, cf_alaw_delay, NULL},
+  cf_mulaw_read, NULL, codecfilter_delay_zero, NULL},
 #endif
 
@@ -396 +396 @@
 }
 
+int codecfilter_delay_zero(CODECFILTER_USERDATA_T   inst, uint_least32_t * delay) {
+ // this codec does not create any addition latency.
+
+ *delay = 0;
+ return 0;
+}
+
 //ll

roard/codecfilter_alaw.c

@@ -88 +88 @@
 #endif
 
-#if defined(ROAR_SUPPORT_ALAW) || defined(ROAR_SUPPORT_MULAW)
-int cf_alaw_delay(CODECFILTER_USERDATA_T   inst, uint_least32_t * delay) {
- // this codec does not create any addition latency.
-
- *delay = 0;
- return 0;
-}
-#endif
-
 //ll

roard/include/codecfilter.h

@@ -128 +128 @@
 
 int codecfilter_delay_fulldyn(CODECFILTER_USERDATA_T   inst, uint_least32_t * delay);
+int codecfilter_delay_zero(CODECFILTER_USERDATA_T   inst, uint_least32_t * delay);
 
 
@@ -139 +140 @@
 int cf_alaw_read(CODECFILTER_USERDATA_T   inst, char * buf, int len);
 int cf_alaw_write(CODECFILTER_USERDATA_T   inst, char * buf, int len);
-int cf_alaw_delay(CODECFILTER_USERDATA_T   inst, uint_least32_t * delay);
 
 int cf_mulaw_open(CODECFILTER_USERDATA_T * inst, int codec,