Changeset 2460 for pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/conf_switch.c

Timestamp:

Feb 18, 2009 2:28:49 PM (14 years ago)

Author:

nanang

Message:

• Added APS-direct sound device management into pjsua-lib (and removed it from apps).
• Fixed bug in conf_switch.c to always update ts_rx (even if port is not transmitting).
• Minor updates: 'fmt_id' to 'id', added transmitter_Cnt in conf port info, explicit mapping in Symbian audio APS impl from pjmedia_format_id to Symbian APS fourcc.

File:

• pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/conf_switch.c (modified) (8 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia/conf_switch.c

@@ -588 +588 @@
     dst_port = conf->ports[sink_slot];
 
-    /* Source and sink format must match. */
-    if (src_port->info->format.fmt_id != dst_port->info->format.fmt_id) {
+    /* Format must match. */
+    if (src_port->info->format.id != dst_port->info->format.id ||
+        src_port->info->format.bitrate != dst_port->info->format.bitrate) 
+    {
         pj_mutex_unlock(conf->mutex);
         return PJMEDIA_ENOTCOMPATIBLE;
+    }
+
+    /* Clock rate must match. */
+    if (src_port->info->clock_rate != dst_port->info->clock_rate) {
+        pj_mutex_unlock(conf->mutex);
+        return PJMEDIA_ENCCLOCKRATE;
+    }
+
+    /* Channel count must match. */
+    if (src_port->info->channel_count != dst_port->info->channel_count) {
+        pj_mutex_unlock(conf->mutex);
+        return PJMEDIA_ENCCLOCKRATE;
     }
 
@@ -866 +880 @@
     info->listener_cnt = conf_port->listener_cnt;
     info->listener_slots = conf_port->listener_slots;
+    info->transmitter_cnt = conf_port->transmitter_cnt;
     info->clock_rate = conf_port->info->clock_rate;
     info->channel_count = conf_port->info->channel_count;
@@ -952 +967 @@
 
     /* Level adjustment is applicable only for ports that work with raw PCM. */
-    PJ_ASSERT_RETURN(conf_port->info->format.fmt_id == PJMEDIA_FORMAT_L16,
+    PJ_ASSERT_RETURN(conf_port->info->format.id == PJMEDIA_FORMAT_L16,
                      PJ_EIGNORED);
 
@@ -986 +1001 @@
 
     /* Level adjustment is applicable only for ports that work with raw PCM. */
-    PJ_ASSERT_RETURN(conf_port->info->format.fmt_id == PJMEDIA_FORMAT_L16,
+    PJ_ASSERT_RETURN(conf_port->info->format.id == PJMEDIA_FORMAT_L16,
                      PJ_EIGNORED);
 
@@ -1050 +1065 @@
         f_start = (pj_int16_t*)frm_src->buf;
         f_end   = f_start + (frm_src->size >> 1);
+
         while (f_start < f_end) {
             unsigned nsamples_to_copy, nsamples_req;
@@ -1111 +1127 @@
         /* Check port format. */
         if (cport_dst->port &&
-            cport_dst->port->info.format.fmt_id == PJMEDIA_FORMAT_L16)
+            cport_dst->port->info.format.id == PJMEDIA_FORMAT_L16)
         {
             /* When there is already some samples in listener's TX buffer, 
@@ -1210 +1226 @@
         {
             cport->rx_level = 0;
+            pj_add_timestamp32(&cport->ts_rx, 
+                               conf->master_port->info.samples_per_frame);
             continue;
         }
@@ -1226 +1244 @@
             
             f->buf = &conf->buf[sizeof(pjmedia_frame)];
-            f->size = BUFFER_SIZE - sizeof(pjmedia_frame);
+            f->size = cport->info->samples_per_frame<<1;
 
             /* Get frame from port. */