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

Timestamp:

Feb 17, 2009 3:19:45 PM (14 years ago)

Author:

bennylp

Message:

Added bitrate and vad info in pjmedia_format, and changed audio route to use enumeration rather than boolean

File:

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

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

@@ -589 +589 @@
 
     /* Source and sink format must match. */
-    if (src_port->info->format.u32 != dst_port->info->format.u32) {
+    if (src_port->info->format.fmt_id != dst_port->info->format.fmt_id) {
         pj_mutex_unlock(conf->mutex);
         return PJMEDIA_ENOTCOMPATIBLE;
@@ -952 +952 @@
 
     /* Level adjustment is applicable only for ports that work with raw PCM. */
-    PJ_ASSERT_RETURN(conf_port->info->format.u32 == PJMEDIA_FORMAT_L16,
+    PJ_ASSERT_RETURN(conf_port->info->format.fmt_id == PJMEDIA_FORMAT_L16,
                      PJ_EIGNORED);
 
@@ -986 +986 @@
 
     /* Level adjustment is applicable only for ports that work with raw PCM. */
-    PJ_ASSERT_RETURN(conf_port->info->format.u32 == PJMEDIA_FORMAT_L16,
+    PJ_ASSERT_RETURN(conf_port->info->format.fmt_id == PJMEDIA_FORMAT_L16,
                      PJ_EIGNORED);
 
@@ -1111 +1111 @@
         /* Check port format. */
         if (cport_dst->port &&
-            cport_dst->port->info.format.u32 == PJMEDIA_FORMAT_L16)
+            cport_dst->port->info.format.fmt_id == PJMEDIA_FORMAT_L16)
         {
             /* When there is already some samples in listener's TX buffer,