Changeset 2284

Timestamp:

Sep 16, 2008 4:28:40 PM (16 years ago)

Author:

bennylp

Message:

More ticket #619: fix the difference of volume in the fixed point version of the tone generator, added PJMEDIA_TONEGEN_VOLUME setting to control the default amplitude, and increase default tone volume by about 50%

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/config.h (modified) (1 diff)
• include/pjmedia/tonegen.h (modified) (2 diffs)
• src/pjmedia/tonegen.c (modified) (2 diffs)

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

@@ -605 +605 @@
 
 /**
+ * The default tone generator amplitude (1-32767).
+ *
+ * Default value: 12288
+ */
+#ifndef PJMEDIA_TONEGEN_VOLUME
+#   define PJMEDIA_TONEGEN_VOLUME                   12288
+#endif
+
+
+/**
  * Enable support for SRTP media transport. This will require linking
  * with libsrtp from the third_party directory.

pjproject/trunk/pjmedia/include/pjmedia/tonegen.h

@@ -64 +64 @@
     short   on_msec;        /**< Playback ON duration, in miliseconds.      */
     short   off_msec;       /**< Playback OFF duration, ini miliseconds.    */
-    short   volume;         /**< Volume (1-16383), or 0 for default.        */
+    short   volume;         /**< Volume (1-32767), or 0 for default, which
+                                 PJMEDIA_TONEGEN_VOLUME will be used.       */
 } pjmedia_tone_desc;
 
@@ -78 +79 @@
     short   on_msec;        /**< Playback ON duration, in miliseconds.      */
     short   off_msec;       /**< Playback OFF duration, ini miliseconds.    */
-    short   volume;         /**< Volume (1-16383), or 0 for default.        */
+    short   volume;         /**< Volume (1-32767), or 0 for default, which
+                                 PJMEDIA_TONEGEN_VOLUME will be used.       */
 } pjmedia_tone_digit;
 

pjproject/trunk/pjmedia/src/pjmedia/tonegen.c

@@ -31 +31 @@
 
 /* amplitude */
-#define AMP     8192
+#define AMP     PJMEDIA_TONEGEN_VOLUME
 
 
@@ -116 +116 @@
 #   define SIN                  approximate_sin3
 #   if 1    /* set this to 0 to disable volume adjustment */
-#       define VOL(var,v)       (((v) * var.vol) >> 16)
+#       define VOL(var,v)       (((v) * var.vol) >> 15)
 #   else
 #       define VOL(var,v)       (v)