Changeset 3664 for pjproject/trunk/pjmedia/src/pjmedia/sound_port.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/sound_port.c (modified) (8 diffs)

pjproject/trunk/pjmedia/src/pjmedia/sound_port.c

@@ -45 +45 @@
     pjmedia_port        *port;
 
+    pjmedia_clock_src    cap_clocksrc,
+                         play_clocksrc;
+
     unsigned             clock_rate;
     unsigned             channel_count;
@@ -71 +74 @@
     pj_status_t status;
 
+    pjmedia_clock_src_update(&snd_port->play_clocksrc, &frame->timestamp);
+
     port = snd_port->port;
     if (port == NULL)
@@ -128 +133 @@
     pjmedia_port *port;
 
+    pjmedia_clock_src_update(&snd_port->cap_clocksrc, &frame->timestamp);
+
     port = snd_port->port;
     if (port == NULL)
@@ -138 +145 @@
 
     pjmedia_port_put_frame(port, frame);
+
 
     return PJ_SUCCESS;
@@ -424 +432 @@
     pjmedia_snd_port *snd_port;
     pj_status_t status;
+    unsigned ptime_usec;
 
     PJ_ASSERT_RETURN(pool && prm && p_port, PJ_EINVAL);
@@ -440 +449 @@
     pj_memcpy(&snd_port->aud_param, prm, sizeof(snd_port->aud_param));
     snd_port->options = prm->options;
+
+    ptime_usec = prm->base.samples_per_frame * 1000 / prm->base.channel_count /
+                 prm->base.clock_rate * 1000;
+    pjmedia_clock_src_init(&snd_port->cap_clocksrc, PJMEDIA_TYPE_AUDIO,
+                           snd_port->clock_rate, ptime_usec);
+    pjmedia_clock_src_init(&snd_port->play_clocksrc, PJMEDIA_TYPE_AUDIO,
+                           snd_port->clock_rate, ptime_usec);
     
     /* Start sound device immediately.
@@ -640 +656 @@
 
 /*
+ * Get clock source.
+ */
+PJ_DEF(pjmedia_clock_src *)
+pjmedia_snd_port_get_clock_src( pjmedia_snd_port *snd_port,
+                                pjmedia_dir dir )
+{
+    return (dir == PJMEDIA_DIR_CAPTURE? &snd_port->cap_clocksrc:
+            &snd_port->play_clocksrc);
+}
+
+
+/*
  * Connect a port.
  */
@@ -645 +673 @@
                                               pjmedia_port *port)
 {
-    pjmedia_port_info *pinfo;
+    pjmedia_audio_format_detail *afd;
 
     PJ_ASSERT_RETURN(snd_port && port, PJ_EINVAL);
+
+    afd = pjmedia_format_get_audio_format_detail(&port->info.fmt, PJ_TRUE);
 
     /* Check that port has the same configuration as the sound device
      * port.
      */
-    pinfo = &port->info;
-    if (pinfo->clock_rate != snd_port->clock_rate)
+    if (afd->clock_rate != snd_port->clock_rate)
         return PJMEDIA_ENCCLOCKRATE;
 
-    if (pinfo->samples_per_frame != snd_port->samples_per_frame)
+    if (PJMEDIA_AFD_SPF(afd) != snd_port->samples_per_frame)
         return PJMEDIA_ENCSAMPLESPFRAME;
 
-    if (pinfo->channel_count != snd_port->channel_count)
+    if (afd->channel_count != snd_port->channel_count)
         return PJMEDIA_ENCCHANNEL;
 
-    if (pinfo->bits_per_sample != snd_port->bits_per_sample)
+    if (afd->bits_per_sample != snd_port->bits_per_sample)
         return PJMEDIA_ENCBITS;