Changeset 5553:a17285dc6fd6 in roaraudio

Timestamp:

07/05/12 16:12:28 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some random improvements to DTMF stuff

Files:

• include/libroardsp/dtmf.h (modified) (2 diffs)
• libroardsp/dtmf.c (modified) (4 diffs)
• roarclients/roardtmf.c (modified) (1 diff)

include/libroardsp/dtmf.h

@@ -41 +41 @@
 #define ROAR_DTMF_OPTIONS_NONE 0
 
-#define ROAR_DTMF_CHAR_DTMF(x) (((x) & 0xFF) + 0x0000)
-#define ROAR_DTMF_CHAR_ROAR(x) (((x) & 0xFF) + 0x0100)
-#define ROAR_DTMF_CHAR_BYTE(x) (((x) & 0xFF) + 0x0200)
+#define ROAR_DTMF_CHAR_DTMF(x) (((x) & 0x00FF) + 0x0000)
+#define ROAR_DTMF_CHAR_ROAR(x) (((x) & 0x00FF) + 0x0100)
+#define ROAR_DTMF_CHAR_BYTE(x) (((x) & 0x00FF) + 0x0200)
 
+#define ROAR_DTMF_CHAR_BREAK   ((uint16_t)0)
 #define ROAR_DTMF_CHAR_NOOP    ROAR_DTMF_CHAR_ROAR(0)
 #define ROAR_DTMF_CHAR_ESCAPE  ROAR_DTMF_CHAR_ROAR(27)
@@ -53 +54 @@
 int roar_dtmf_tone (int16_t * samples, const size_t len, const uint32_t rate, const int options, const uint16_t c);
 
+uint16_t roar_dtmf_freqs2char(const int options, float f0, float f1);
+
 #endif
 

libroardsp/dtmf.c

@@ -158 +158 @@
 };
 
-static const struct tone * __lookup_tone(const int options, uint16_t c) {
+static const struct tone * __lookup_tone_by_char(const int options, uint16_t c) {
  size_t i;
 
  (void)options;
 
- if ( c >= 'a' )
+ if ( (c >= ROAR_DTMF_CHAR_DTMF('a') && c <= ROAR_DTMF_CHAR_DTMF('z')) ||
+      (c >= ROAR_DTMF_CHAR_ROAR('a') && c <= ROAR_DTMF_CHAR_ROAR('z'))
+    )
   c -= 'a' - 'A';
 
@@ -170 +172 @@
    return &(_roardsp_tones[i]);
   }
+ }
+
+ roar_err_set(ROAR_ERROR_NOENT);
+ return NULL;
+}
+
+static const struct tone * __lookup_tone_by_freq(const int options, float f0, float f1) {
+ const struct tone * ct;
+ size_t i;
+ float tmp;
+
+ (void)options;
+
+ if ( f0 > f1 ) {
+  tmp = f0;
+  f0 = f1;
+  f1 = tmp;
+ }
+
+ for (i = 0; _roardsp_tones[i].c != 0; i++) {
+  ct = &(_roardsp_tones[i]);
+
+  // allow 3.5% freq error as defined in ITU-T Q.23 and Q.24.
+
+  if ( ct->f0 < f0*.965 || ct->f0 > f0*1.035 )
+   continue;
+  if ( ct->f1 < f1*.965 || ct->f1 > f1*1.035 )
+   continue;
+  return ct;
  }
 
@@ -190 +221 @@
  }
 
- ct = __lookup_tone(options, c);
+ if ( c == ROAR_DTMF_CHAR_BREAK )
+  return roar_dtmf_break(samples, len, rate, options);
+
+ ct = __lookup_tone_by_char(options, c);
 
  if ( ct == NULL ) {
@@ -209 +243 @@
 }
 
+uint16_t roar_dtmf_freqs2char(const int options, float f0, float f1) {
+ const struct tone * ct = __lookup_tone_by_freq(options, f0, f1);
+
+ if ( ct == NULL )
+  return ROAR_DTMF_CHAR_BREAK;
+ return ct->c;
+}
 
 //ll

roarclients/roardtmf.c

@@ -137 +137 @@
    }
   }
-  roar_dtmf_break(buf+len_tone*sizeof(int16_t), len_break, rate, ROAR_DTMF_OPTIONS_NONE);
+  roar_dtmf_tone(buf+len_tone*sizeof(int16_t), len_break, rate, ROAR_DTMF_OPTIONS_NONE,
+                 mode == MODE_DTMF ? ROAR_DTMF_CHAR_BREAK : ROAR_DTMF_CHAR_NOOP);
   if ( roar_vs_write(vss, buf, len, &err) != (ssize_t)len ) {
    fprintf(stderr, "Error: can not write data: %s\n", roar_vs_strerr(err));