Changeset 3915 for pjproject

Timestamp:

Dec 20, 2011 9:52:19 AM (12 years ago)

Author:

nanang

Message:

Fix #1425:

• Updating port info of the switchboard master port (after reopening audio device) with the audio device param should care about PJMEDIA_AUD_DEV_CAP_EXT_FORMAT flag, i.e: only copy from audio device extended format info when the flag is set.
• Fixed switchboard to update the master port info shortcut in connecting ports, as master port info may get updated to match to the connecting ports.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/conf_switch.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/conf_switch.c

@@ -591 +591 @@
     }
 
+    /* Update master port info shortcut, note that application may update
+     * the master port info when the audio device needs to be reopened with
+     * a new format to match to ports connection format.
+     */
+    conf->ports[0]->samples_per_frame = PJMEDIA_PIA_SPF(conf->ports[0]->info);
+
     if (i == src_port->listener_cnt) {
         src_port->listener_slots[src_port->listener_cnt] = sink_slot;

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

@@ -3718 +3718 @@
      */
     if (pjsua_var.is_mswitch) {
-        pj_memcpy(&conf_port->info.fmt, &param->base.ext_fmt,
-                  sizeof(conf_port->info.fmt));
-        conf_port->info.fmt.det.aud.clock_rate = param->base.clock_rate;
-        conf_port->info.fmt.det.aud.frame_time_usec = param->base.samples_per_frame*
-                                                      1000000 /
-                                                      param->base.clock_rate;
-        conf_port->info.fmt.det.aud.channel_count = param->base.channel_count;
-        conf_port->info.fmt.det.aud.bits_per_sample = 16;
+        if (param->base.flags & PJMEDIA_AUD_DEV_CAP_EXT_FORMAT) {
+            conf_port->info.fmt = param->base.ext_fmt;
+        } else {
+            unsigned bps, ptime_usec;
+            bps = param->base.clock_rate * param->base.bits_per_sample;
+            ptime_usec = param->base.samples_per_frame /
+                         param->base.channel_count * 1000000 /
+                         param->base.clock_rate;
+            pjmedia_format_init_audio(&conf_port->info.fmt,
+                                      PJMEDIA_FORMAT_PCM,
+                                      param->base.clock_rate,
+                                      param->base.channel_count,
+                                      param->base.bits_per_sample,
+                                      ptime_usec,
+                                      bps, bps);
+        }
     }