Changeset 2313

Timestamp:

Sep 24, 2008 9:38:55 AM (16 years ago)

Author:

bennylp

Message:

Ticket #642: Discontinuous tone generation (thanks Olle Frimanson for the report)

Location:

pjproject/trunk/pjmedia

Files:

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

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

@@ -66 +66 @@
     short   volume;         /**< Volume (1-32767), or 0 for default, which
                                  PJMEDIA_TONEGEN_VOLUME will be used.       */
+    short   flags;          /**< Currently internal flags, must be 0        */
 } pjmedia_tone_desc;
 

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

@@ -343 +343 @@
 #endif
 
+enum flags
+{
+    PJMEDIA_TONE_INITIALIZED    = 1,
+    PJMEDIA_TONE_ENABLE_FADE    = 2
+};
+
 struct tonegen
 {
@@ -350 +356 @@
     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*/
@@ -439 +444 @@
     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;
@@ -596 +600 @@
     }
 
-    if (tonegen->cur_digit > tonegen->count) {
+    if (tonegen->cur_digit >= tonegen->count) {
         /* After we're finished with the last digit, we have played all 
          * the digits 
@@ -621 +625 @@
 
     while (dst < end) {
-        const pjmedia_tone_desc *dig = &tonegen->digits[tonegen->cur_digit];
+        pjmedia_tone_desc *dig = &tonegen->digits[tonegen->cur_digit];
         unsigned required, cnt, on_samp, off_samp;
 
@@ -629 +633 @@
 
         /* Init tonegen */
-        if (tonegen->dig_samples == 0) {
+        if (tonegen->dig_samples == 0 && 
+            (tonegen->count!=1 || !(dig->flags & PJMEDIA_TONE_INITIALIZED)))
+        {
             init_generate_tone(&tonegen->state, port->info.clock_rate,
                                dig->freq1, dig->freq2, dig->volume);
+            dig->flags |= PJMEDIA_TONE_INITIALIZED;
+            if (tonegen->cur_digit > 0) {
+                /* Clear initialized flag of previous digit */
+                tonegen->digits[tonegen->cur_digit-1].flags &= 
+                                                (~PJMEDIA_TONE_INITIALIZED);
+            }
         }
 
@@ -646 +658 @@
             required -= cnt;
 
-            if (tonegen->has_fading && tonegen->dig_samples == cnt) {
+            if ((dig->flags & PJMEDIA_TONE_ENABLE_FADE) && 
+                tonegen->dig_samples == cnt) 
+            {
                 /* Fade in */
                 short *samp = (dst - cnt);
@@ -663 +677 @@
                     }
                 }
-            } else if (tonegen->has_fading && tonegen->dig_samples==on_samp) {
+            } else if ((dig->flags & PJMEDIA_TONE_ENABLE_FADE) &&
+                        tonegen->dig_samples==on_samp) 
+            {
                 /* Fade out */
                 if (cnt > tonegen->fade_out_len)
@@ -772 +788 @@
      * 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];
@@ -779 +794 @@
         else if (t->volume < 0)
             t->volume = (short) -t->volume;
-        if (t->off_msec == 0)
-            tonegen->has_fading = PJ_FALSE;
+        /* Reset flags */
+        t->flags = 0;
+        if (t->off_msec != 0)
+            t->flags |= PJMEDIA_TONE_ENABLE_FADE;
     }