Changeset 3394 for pjproject/branches/projects/2.0-dev/pjsip-apps/src/samples/confbench.c

Timestamp:

Dec 10, 2010 8:55:13 PM (13 years ago)

Author:

nanang

Message:

Re #1176: fixed build config for MSVC2005

File:

• pjproject/branches/projects/2.0-dev/pjsip-apps/src/samples/confbench.c (modified) (5 diffs)

pjproject/branches/projects/2.0-dev/pjsip-apps/src/samples/confbench.c

@@ -148 +148 @@
 
     /* Get number of samples */
-    count = frame->size / 2 / port->info.channel_count;
+    count = frame->size / 2 / PJMEDIA_PIA_CCNT(&port->info);
 
     left = 0;
@@ -157 +157 @@
         ++left;
 
-        if (port->info.channel_count == 2) {
+        if (PJMEDIA_PIA_CCNT(&port->info) == 2) {
             *samples++ = sine->samples[right];
             right += 2; /* higher pitch so we can distinguish left and right. */
@@ -188 +188 @@
     unsigned i;
     unsigned count;
+    pj_str_t port_name;
     port_data *sine;
 
@@ -197 +198 @@
 
     /* Fill in port info. */
-    port->info.bits_per_sample = 16;
-    port->info.channel_count = channel_count;
-    port->info.encoding_name = pj_str("pcm");
-    port->info.has_info = 1;
-    port->info.name = pj_str("sine generator");
-    port->info.need_info = 0;
-    port->info.pt = 0xFF;
-    port->info.clock_rate = sampling_rate;
-    port->info.samples_per_frame = sampling_rate * SINE_PTIME / 1000 * channel_count;
-    port->info.bytes_per_frame = port->info.samples_per_frame * 2;
-    port->info.type = PJMEDIA_TYPE_AUDIO;
+    port_name = pj_str("sine generator");
+    pjmedia_port_info_init(&port->info, &port_name,
+                           12345, sampling_rate, channel_count, 16, 
+                           sampling_rate * SINE_PTIME / 1000 * channel_count);
     
     /* Set the function to feed frame */
@@ -216 +210 @@
 
     /* Create samples */
-    count = port->info.samples_per_frame / channel_count;
+    count = PJMEDIA_PIA_SPF(&port->info) / channel_count;
     sine->samples = pj_pool_alloc(pool, count * sizeof(pj_int16_t));
     PJ_ASSERT_RETURN(sine->samples != NULL, PJ_ENOMEM);