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

Timestamp:

Jul 19, 2011 3:42:28 AM (13 years ago)

Author:

nanang

Message:

Re #1326: Initial code integration from branch 2.0-dev to trunk as "2.0-pre-alpha-svn".

Location:

pjproject/trunk

Files:

• . (modified) (1 prop)
• pjmedia/src/pjmedia/tonegen.c (modified) (6 diffs)

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

@@ -335 +335 @@
 /****************************************************************************/
 
-#define SIGNATURE   PJMEDIA_PORT_SIGNATURE('t', 'n', 'g', 'n')
+#define SIGNATURE   PJMEDIA_SIG_PORT_TONEGEN
 #define THIS_FILE   "tonegen.c"
 
@@ -559 +559 @@
     struct tonegen *tonegen = (struct tonegen*) port;
     short *dst, *end;
-    unsigned clock_rate = tonegen->base.info.clock_rate;
+    unsigned clock_rate = PJMEDIA_PIA_SRATE(&tonegen->base.info);
 
     PJ_ASSERT_RETURN(port->info.signature == SIGNATURE, PJ_EINVAL);
@@ -623 +623 @@
     
     dst = (short*) frame->buf;
-    end = dst + port->info.samples_per_frame;
+    end = dst + PJMEDIA_PIA_SPF(&port->info);
 
     while (dst < end) {
@@ -637 +637 @@
             (tonegen->count!=1 || !(dig->flags & PJMEDIA_TONE_INITIALIZED)))
         {
-            init_generate_tone(&tonegen->state, port->info.clock_rate,
+            init_generate_tone(&tonegen->state,
+                               PJMEDIA_PIA_SRATE(&port->info),
                                dig->freq1, dig->freq2, dig->volume);
             dig->flags |= PJMEDIA_TONE_INITIALIZED;
@@ -652 +653 @@
             if (cnt > required)
                 cnt = required;
-            generate_tone(&tonegen->state, port->info.channel_count,
+            generate_tone(&tonegen->state,
+                          PJMEDIA_PIA_CCNT(&port->info),
                           cnt, dst);
 
@@ -730 +732 @@
 
     frame->type = PJMEDIA_FRAME_TYPE_AUDIO;
-    frame->size = port->info.bytes_per_frame;
+    frame->size = PJMEDIA_PIA_AVG_FSZ(&port->info);
 
     TRACE_((THIS_FILE, "tonegen_get_frame(): frame created, level=%u",