Changeset 2474 for pjproject/branches/projects/aps-direct

Timestamp:

Feb 23, 2009 10:21:33 AM (15 years ago)

Author:

bennylp

Message:

• Disable EC in sound port when codec is used in sound device
• Added log verbosity in wmme_dev.c
• Tested aps-direct with WMME

Location:

pjproject/branches/projects/aps-direct/pjmedia/src

Files:

• pjmedia-audiodev/wmme_dev.c (modified) (8 diffs)
• pjmedia/sound_port.c (modified) (5 diffs)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/wmme_dev.c

@@ -584 +584 @@
 
     /* Done setting up play device. */
-    PJ_LOG(5, (THIS_FILE, 
+    PJ_LOG(4, (THIS_FILE, 
                " WaveAPI Sound player \"%s\" initialized ("
                "format=%s, clock_rate=%d, "
@@ -664 +664 @@
 
     /* Done setting up play device. */
-    PJ_LOG(5,(THIS_FILE, 
+    PJ_LOG(4,(THIS_FILE, 
         " WaveAPI Sound recorder \"%s\" initialized "
         "(format=%s, clock_rate=%d, "
@@ -789 +789 @@
 
                 /* Get frame from application. */
-                PJ_LOG(5,(THIS_FILE, "xxx %u play_cb", play_cnt++));
+                //PJ_LOG(5,(THIS_FILE, "xxx %u play_cb", play_cnt++));
                 status = (*strm->play_cb)(strm->user_data, frame);
 
@@ -934 +934 @@
 
                 /* Call callback */
-                PJ_LOG(5,(THIS_FILE, "xxx %u rec_cb", rec_cnt++));
+                //PJ_LOG(5,(THIS_FILE, "xxx %u rec_cb", rec_cnt++));
                 status = (*strm->rec_cb)(strm->user_data, frame);
                 if (status != PJ_SUCCESS)
@@ -1198 +1198 @@
             return CONVERT_MM_ERROR(mr);
         }
-        PJ_LOG(5,(THIS_FILE, "WMME playback stream started"));
+        PJ_LOG(4,(THIS_FILE, "WMME playback stream started"));
     }
 
@@ -1207 +1207 @@
             return CONVERT_MM_ERROR(mr);
         }
-        PJ_LOG(5,(THIS_FILE, "WMME capture stream started"));
+        PJ_LOG(4,(THIS_FILE, "WMME capture stream started"));
     }
 
@@ -1227 +1227 @@
             return CONVERT_MM_ERROR(mr);
         }
-        PJ_LOG(5,(THIS_FILE, "Stopped WMME playback stream"));
+        PJ_LOG(4,(THIS_FILE, "Stopped WMME playback stream"));
     }
 
@@ -1236 +1236 @@
             return CONVERT_MM_ERROR(mr);
         }
-        PJ_LOG(5,(THIS_FILE, "Stopped WMME capture stream"));
+        PJ_LOG(4,(THIS_FILE, "Stopped WMME capture stream"));
     }
 

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

@@ -253 +253 @@
 
     /* Create software EC if parameter specifies EC but device 
-     * doesn't support EC
+     * doesn't support EC. Only do this if the format is PCM!
      */
     if ((snd_port->aud_param.flags & PJMEDIA_AUD_DEV_CAP_EC) &&
-        (snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC)==0)
+        (snd_port->aud_caps & PJMEDIA_AUD_DEV_CAP_EC)==0 &&
+        param_copy.ext_fmt.id == PJMEDIA_FORMAT_PCM)
     {
         if ((snd_port->aud_param.flags & PJMEDIA_AUD_DEV_CAP_EC_TAIL)==0) {
@@ -532 +533 @@
     } else {
         /* We use software EC */
-        /* Sound port must have 16bits per sample */
-        PJ_ASSERT_RETURN(snd_port->bits_per_sample == 16,
-                         PJ_EINVALIDOP);
 
         /* Check if there is change in parameters */
@@ -543 +541 @@
         }
 
+        status = pjmedia_aud_stream_get_param(snd_port->aud_stream, &prm);
+        if (status != PJ_SUCCESS)
+            return status;
+
+        /* Audio stream must be in PCM format */
+        PJ_ASSERT_RETURN(prm.ext_fmt.id == PJMEDIA_FORMAT_PCM,
+                         PJ_EINVALIDOP);
+
         /* Destroy AEC */
         if (snd_port->ec_state) {
@@ -549 +555 @@
         }
 
-        snd_port->ec_options = options;
-        snd_port->ec_tail_len = tail_ms;
-
         if (tail_ms != 0) {
             unsigned delay_ms;
-
-            status = pjmedia_aud_stream_get_param(snd_port->aud_stream, &prm);
-            if (status != PJ_SUCCESS)
-                prm.input_latency_ms = prm.output_latency_ms = 0;
 
             //No need to add input latency in the latency calculation,
@@ -578 +577 @@
             status = PJ_SUCCESS;
         }
+
+        snd_port->ec_options = options;
+        snd_port->ec_tail_len = tail_ms;
     }