Changeset 2305

Timestamp:

Sep 22, 2008 9:29:50 AM (16 years ago)

Author:

bennylp

Message:

More ticket #619: disable fade-in and fade-out if the tone off duration is zero. We assume that application wants to play continuous tone in this case, and the fade in/out feature will cause click noise to be generated

File:

• pjproject/trunk/pjmedia/src/pjmedia/tonegen.c (modified) (6 diffs)

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

@@ -350 +350 @@
     unsigned            options;
     unsigned            playback_options;
+    pj_bool_t           has_fading;     /* Enable fade-in and fade-out   */
     unsigned            fade_in_len;    /* fade in for this # of samples */
     unsigned            fade_out_len;   /* fade out for this # of samples*/
@@ -438 +439 @@
     tonegen->digit_map = &digit_map;
 
+    tonegen->has_fading = PJ_TRUE;
     tonegen->fade_in_len = PJMEDIA_TONEGEN_FADE_IN_TIME * clock_rate / 1000;
     tonegen->fade_out_len = PJMEDIA_TONEGEN_FADE_OUT_TIME * clock_rate / 1000;
@@ -644 +646 @@
             required -= cnt;
 
-            if (tonegen->dig_samples == cnt) {
+            if (tonegen->has_fading && tonegen->dig_samples == cnt) {
                 /* Fade in */
                 short *samp = (dst - cnt);
@@ -661 +663 @@
                     }
                 }
-            } else if (tonegen->dig_samples == on_samp) {
+            } else if (tonegen->has_fading && tonegen->dig_samples==on_samp) {
                 /* Fade out */
                 if (cnt > tonegen->fade_out_len)
@@ -766 +768 @@
               tones, count * sizeof(pjmedia_tone_desc));
     
-    /* Normalize volume */
+    /* Normalize volume, and check if we need to disable fading.
+     * Disable fading if tone off time is zero. Application probably
+     * wants to play this tone continuously (e.g. dial tone).
+     */
+    tonegen->has_fading = PJ_TRUE;
     for (i=0; i<count; ++i) {
         pjmedia_tone_desc *t = &tonegen->digits[i+tonegen->count];
@@ -773 +779 @@
         else if (t->volume < 0)
             t->volume = (short) -t->volume;
+        if (t->off_msec == 0)
+            tonegen->has_fading = PJ_FALSE;
     }