Changeset 3664 for pjproject/trunk/pjsip-apps/src/samples/mix.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)
• pjsip-apps/src/samples/mix.c (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/samples/mix.c

@@ -182 +182 @@
         len = pjmedia_wav_player_get_len(wav_input[i].port);
         len = (pj_ssize_t)(len * 1.0 * clock_rate / 
-                            wav_input[i].port->info.clock_rate);
+                           PJMEDIA_PIA_SRATE(&wav_input[i].port->info));
         if (len > (pj_ssize_t)longest)
             longest = len;
@@ -200 +200 @@
 
         frame.buf = framebuf;
-        frame.size = cp->info.samples_per_frame * 2;
+        frame.size = PJMEDIA_PIA_SPF(&cp->info) * 2;
         pj_assert(frame.size <= sizeof(framebuf));