Changeset 3392 for pjproject/branches/projects/2.0-dev/pjsip-apps/src/samples/playsine.c

Timestamp:

Dec 10, 2010 11:04:30 AM (13 years ago)

Author:

bennylp

Message:

Migration of current video works from private repository to this repository. This closed #1176

File:

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

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

@@ -87 +87 @@
 
     /* Get number of samples */
-    count = frame->size / 2 / port->info.channel_count;
+    count = frame->size / 2 / PJMEDIA_PIA_CCNT(&port->info);
 
     left = 0;
@@ -96 +96 @@
         ++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. */
@@ -127 +127 @@
     unsigned i;
     unsigned count;
+    pj_str_t name;
     port_data *sine;
 
@@ -136 +137 @@
 
     /* 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 * 20 / 1000 * channel_count;
-    port->info.bytes_per_frame = port->info.samples_per_frame * 2;
-    port->info.type = PJMEDIA_TYPE_AUDIO;
+    name = pj_str("sine generator");
+    pjmedia_port_info_init(&port->info, &name,
+                           PJMEDIA_PORT_SIGNATURE('s', 'i', 'n', 'e'),
+                           sampling_rate,
+                           channel_count,
+                           16, sampling_rate * 20 / 1000 * channel_count);
     
     /* Set the function to feed frame */
@@ -155 +151 @@
 
     /* 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);
@@ -245 +241 @@
                  pool,                              /* pool                 */
                  -1,                                /* use default dev.     */
-                 sine_port->info.clock_rate,        /* clock rate.          */
-                 sine_port->info.channel_count,     /* # of channels.       */
-                 sine_port->info.samples_per_frame, /* samples per frame.   */
-                 sine_port->info.bits_per_sample,   /* bits per sample.     */
+                 PJMEDIA_PIA_SRATE(&sine_port->info),/* clock rate.         */
+                 PJMEDIA_PIA_CCNT(&sine_port->info),/* # of channels.       */
+                 PJMEDIA_PIA_SPF(&sine_port->info), /* samples per frame.   */
+                 PJMEDIA_PIA_BITS(&sine_port->info),/* bits per sample.     */
                  0,                                 /* options              */
                  &snd_port                          /* returned port        */