Changeset 3402 for pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/sound_port.c

Timestamp:

Dec 30, 2010 4:31:16 PM (13 years ago)

Author:

ming

Message:

Re #1184: Adding pjmedia_clock_src for the purpose of audio and video synchronization and also to provide synchronization mechanism between two medias in general.

File:

• pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/sound_port.c (modified) (7 diffs)

pjproject/branches/projects/2.0-dev/pjmedia/src/pjmedia/sound_port.c

@@ -45 +45 @@
     pjmedia_port        *port;
 
+    pjmedia_clock_src    cap_clocksrc,
+                         play_clocksrc;
+
     unsigned             clock_rate;
     unsigned             channel_count;
@@ -70 +73 @@
     pj_status_t status;
 
+    pjmedia_clock_src_update(&snd_port->play_clocksrc, &frame->timestamp);
+
     port = snd_port->port;
     if (port == NULL)
@@ -127 +132 @@
     pjmedia_port *port;
 
+    pjmedia_clock_src_update(&snd_port->cap_clocksrc, &frame->timestamp);
+
     port = snd_port->port;
     if (port == NULL)
@@ -137 +144 @@
 
     pjmedia_port_put_frame(port, frame);
+
 
     return PJ_SUCCESS;
@@ -418 +426 @@
     pjmedia_snd_port *snd_port;
     pj_status_t status;
+    unsigned ptime_usec;
 
     PJ_ASSERT_RETURN(pool && prm && p_port, PJ_EINVAL);
@@ -433 +442 @@
     snd_port->bits_per_sample = prm->bits_per_sample;
     pj_memcpy(&snd_port->aud_param, prm, sizeof(*prm));
+
+    ptime_usec = prm->samples_per_frame * 1000 / prm->channel_count /
+                 prm->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.
@@ -633 +649 @@
 
 /*
+ * 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.
  */