Changeset 693

Timestamp:

Sep 2, 2006 11:45:18 PM (18 years ago)

Author:

bennylp

Message:

Added multi-purpose tone generator in PJMEDIA (tonegen.[hc])

Location:

pjproject/trunk

Files:

• pjmedia/build/Makefile (modified) (1 diff)
• pjmedia/build/pjmedia.dsp (modified) (2 diffs)
• pjmedia/include/pjmedia.h (modified) (1 diff)
• pjmedia/include/pjmedia/config.h (modified) (1 diff)
• pjmedia/include/pjmedia/tonegen.h (added)
• pjmedia/src/pjmedia/stream.c (modified) (1 diff)
• pjmedia/src/pjmedia/tonegen.c (added)
• pjsip-apps/build/Samples-vc.mak (modified) (1 diff)
• pjsip-apps/build/Samples.mak (modified) (1 diff)
• pjsip-apps/build/samples.dsp (modified) (1 diff)
• pjsip-apps/src/samples/debug.c (modified) (1 diff)
• pjsip-apps/src/samples/tonegen.c (added)

pjproject/trunk/pjmedia/build/Makefile

@@ -75 +75 @@
                         resample_port.o rtcp.o rtp.o sdp.o sdp_cmp.o sdp_neg.o \
                         session.o silencedet.o sound_port.o stream.o \
-                        transport_udp.o wav_player.o wav_writer.o wave.o \
+                        tonegen.o transport_udp.o \
+                        wav_player.o wav_writer.o wave.o \
                         $(SOUND_OBJS) $(NULLSOUND_OBJS)
 

pjproject/trunk/pjmedia/build/pjmedia.dsp

@@ -228 +228 @@
 # Begin Source File
 
+SOURCE=..\src\pjmedia\tonegen.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\src\pjmedia\transport_udp.c
 # End Source File
@@ -361 +365 @@
 
 SOURCE=..\include\pjmedia\stream.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\include\pjmedia\tonegen.h
 # End Source File
 # Begin Source File

pjproject/trunk/pjmedia/include/pjmedia.h

@@ -51 +51 @@
 #include <pjmedia/sound_port.h>
 #include <pjmedia/splitcomb.h>
+#include <pjmedia/tonegen.h>
 #include <pjmedia/transport.h>
 #include <pjmedia/transport_udp.h>

pjproject/trunk/pjmedia/include/pjmedia/config.h

@@ -242 +242 @@
 
 
+/**
+ * Maximum tones/digits that can be enqueued in the tone generator.
+ */
+#ifndef PJMEDIA_TONEGEN_MAX_DIGITS
+#   define PJMEDIA_TONEGEN_MAX_DIGITS               32
+#endif
+
+
 
 /**

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -1274 +1274 @@
         for (i=0; i<digit_char->slen; ++i) {
             unsigned pt;
-
-            if (digit_char->ptr[i] >= '0' &&
-                digit_char->ptr[i] <= '9')
+            int dig = pj_tolower(digit_char->ptr[i]);
+
+            if (dig >= '0' && dig <= '9')
             {
-                pt = digit_char->ptr[i] - '0';
+                pt = dig - '0';
             } 
-            else if (pj_tolower(digit_char->ptr[i]) >= 'a' &&
-                     pj_tolower(digit_char->ptr[i]) <= 'd')
+            else if (dig >= 'a' && dig <= 'd')
             {
-                pt = pj_tolower(digit_char->ptr[i]) - 'a' + 12;
+                pt = dig - 'a' + 12;
             }
-            else if (digit_char->ptr[i] == '*')
+            else if (dig == '*')
             {
                 pt = 10;
             }
-            else if (digit_char->ptr[i] == '#')
+            else if (dig == '#')
             {
                 pt = 11;

pjproject/trunk/pjsip-apps/build/Samples-vc.mak

@@ -49 +49 @@
           $(BINDIR)\sndinfo.exe \
           $(BINDIR)\sndtest.exe \
-          $(BINDIR)\streamutil.exe
+          $(BINDIR)\streamutil.exe \
+          $(BINDIR)\tonegen.exe
 
 

pjproject/trunk/pjsip-apps/build/Samples.mak

@@ -52 +52 @@
            sndinfo \
            sndtest \
-           streamutil
+           streamutil \
+           tonegen
 
 EXES := $(foreach file, $(SAMPLES), $(BINDIR)/$(file)-$(TARGET_NAME)$(HOST_EXE))

pjproject/trunk/pjsip-apps/build/samples.dsp

@@ -153 +153 @@
 SOURCE=..\src\samples\streamutil.c
 # End Source File
+# Begin Source File
+
+SOURCE=..\src\samples\tonegen.c
+# End Source File
 # End Group
 # Begin Group "Header Files"

pjproject/trunk/pjsip-apps/src/samples/debug.c

@@ -28 +28 @@
  *  #include "playfile.c"
  */
-#include "aectest.c"
-
+#include "tonegen.c"