Changeset 904 for pjproject/trunk/pjmedia/src/pjmedia/tonegen.c

Timestamp:

Jan 24, 2007 2:02:09 AM (17 years ago)

Author:

bennylp

Message:

Implement ticket #62: option to play tones continuously, and added --play-tone option in pjsua

File:

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

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

@@ -28 +28 @@
 
 /* amplitude */
-#define AMP     16383
+#define AMP     8192
 
 
@@ -234 +234 @@
     pjmedia_port        base;
 
+    /* options */
+    unsigned            options;
+    unsigned            playback_options;
+
     /* Digit map */
     pjmedia_tone_digit_map  *digit_map;
@@ -281 +285 @@
  * default digit map.
  */
+PJ_DEF(pj_status_t) pjmedia_tonegen_create2(pj_pool_t *pool,
+                                            const pj_str_t *name,
+                                            unsigned clock_rate,
+                                            unsigned channel_count,
+                                            unsigned samples_per_frame,
+                                            unsigned bits_per_sample,
+                                            unsigned options,
+                                            pjmedia_port **p_port)
+{
+    const pj_str_t STR_TONE_GEN = pj_str("tone-gen");
+    struct tonegen  *tonegen;
+    pj_status_t status;
+
+    PJ_ASSERT_RETURN(pool && clock_rate && channel_count && 
+                     samples_per_frame && bits_per_sample == 16 && 
+                     p_port != NULL, PJ_EINVAL);
+
+    /* Only support mono and stereo */
+    PJ_ASSERT_RETURN(channel_count==1 || channel_count==2, PJ_EINVAL);
+
+    /* Create and initialize port */
+    tonegen = pj_pool_zalloc(pool, sizeof(struct tonegen));
+    if (name == NULL || name->slen == 0) name = &STR_TONE_GEN;
+    status = pjmedia_port_info_init(&tonegen->base.info, name, 
+                                    SIGNATURE, clock_rate, channel_count, 
+                                    bits_per_sample, samples_per_frame);
+    if (status != PJ_SUCCESS)
+        return status;
+
+    tonegen->options = options;
+    tonegen->base.get_frame = &tonegen_get_frame;
+    tonegen->digit_map = &digit_map;
+
+    /* Done */
+    *p_port = &tonegen->base;
+    return PJ_SUCCESS;
+}
+
+
 PJ_DEF(pj_status_t) pjmedia_tonegen_create( pj_pool_t *pool,
                                             unsigned clock_rate,
@@ -289 +332 @@
                                             pjmedia_port **p_port)
 {
-    const pj_str_t STR_TONE_GEN = pj_str("tone-gen");
-    struct tonegen  *tonegen;
-    pj_status_t status;
-
-    PJ_ASSERT_RETURN(pool && clock_rate && channel_count && 
-                     samples_per_frame && bits_per_sample == 16 && 
-                     options == 0 && p_port != NULL, PJ_EINVAL);
-
-    /* Only support mono and stereo */
-    PJ_ASSERT_RETURN(channel_count==1 || channel_count==2, PJ_EINVAL);
-
-    /* Create and initialize port */
-    tonegen = pj_pool_zalloc(pool, sizeof(struct tonegen));
-    status = pjmedia_port_info_init(&tonegen->base.info, &STR_TONE_GEN, 
-                                    SIGNATURE, clock_rate, channel_count, 
-                                    bits_per_sample, samples_per_frame);
-    if (status != PJ_SUCCESS)
-        return status;
-
-    tonegen->base.get_frame = &tonegen_get_frame;
-    tonegen->digit_map = &digit_map;
-
-    /* Done */
-    *p_port = &tonegen->base;
-    return PJ_SUCCESS;
+    return pjmedia_tonegen_create2(pool, NULL, clock_rate, channel_count,
+                                   samples_per_frame, bits_per_sample, 
+                                   options, p_port);
 }
 
@@ -359 +380 @@
     if (tonegen->cur_digit > tonegen->count) {
         /* We have played all the digits */
-        tonegen->count = 0;
-        frame->type = PJMEDIA_FRAME_TYPE_NONE;
-        return PJ_SUCCESS;
+        if ((tonegen->options|tonegen->playback_options)&PJMEDIA_TONEGEN_LOOP)
+        {
+            /* Reset back to the first tone */
+            tonegen->cur_digit = 0;
+            tonegen->dig_samples = 0;
+
+        } else {
+            tonegen->count = 0;
+            frame->type = PJMEDIA_FRAME_TYPE_NONE;
+            return PJ_SUCCESS;
+        }
     }
 
@@ -377 +406 @@
          * the digits 
          */
-        tonegen->count = 0;
-        frame->type = PJMEDIA_FRAME_TYPE_NONE;
-        return PJ_SUCCESS;
+        if ((tonegen->options|tonegen->playback_options)&PJMEDIA_TONEGEN_LOOP)
+        {
+            /* Reset back to the first tone */
+            tonegen->cur_digit = 0;
+            tonegen->dig_samples = 0;
+
+        } else {
+            tonegen->count = 0;
+            frame->type = PJMEDIA_FRAME_TYPE_NONE;
+            return PJ_SUCCESS;
+        }
     }
     
@@ -385 +422 @@
     end = dst + port->info.samples_per_frame;
 
-    while (dst < end && tonegen->cur_digit < tonegen->count) {
+    while (dst < end) {
         const pjmedia_tone_desc *dig = &tonegen->digits[tonegen->cur_digit];
         unsigned required, cnt, on_samp, off_samp;
@@ -426 +463 @@
             tonegen->cur_digit++;
             tonegen->dig_samples = 0;
+
+            if (tonegen->cur_digit >= tonegen->count) {
+                /* All digits have been played */
+                if ((tonegen->options & PJMEDIA_TONEGEN_LOOP) ||
+                    (tonegen->playback_options & PJMEDIA_TONEGEN_LOOP))
+                {
+                    tonegen->cur_digit = 0;
+                } else {
+                    break;
+                }
+            }
         }
     }
@@ -435 +483 @@
     frame->size = port->info.bytes_per_frame;
 
-    if (tonegen->cur_digit >= tonegen->count)
-        tonegen->count = 0;
+    if (tonegen->cur_digit >= tonegen->count) {
+        if ((tonegen->options|tonegen->playback_options)&PJMEDIA_TONEGEN_LOOP)
+        {
+            /* Reset back to the first tone */
+            tonegen->cur_digit = 0;
+            tonegen->dig_samples = 0;
+
+        } else {
+            tonegen->count = 0;
+        }
+    }
 
     return PJ_SUCCESS;
@@ -454 +511 @@
 
     PJ_ASSERT_RETURN(port && port->info.signature == SIGNATURE &&
-                     count && tones && options==0, PJ_EINVAL);
+                     count && tones, PJ_EINVAL);
 
     /* Don't put more than available buffer */
@@ -460 +517 @@
                      PJ_ETOOMANY);
 
+    /* Set playback options */
+    tonegen->playback_options = options;
+    
     /* Copy digits */
     pj_memcpy(tonegen->digits + tonegen->count,
@@ -493 +553 @@
 
     PJ_ASSERT_RETURN(port && port->info.signature == SIGNATURE &&
-                     count && digits && options==0, PJ_EINVAL);
+                     count && digits, PJ_EINVAL);
     PJ_ASSERT_RETURN(count < PJMEDIA_TONEGEN_MAX_DIGITS, PJ_ETOOMANY);