Changeset 2480 for pjproject

Timestamp:

Feb 27, 2009 5:37:35 PM (16 years ago)

Author:

nanang

Message:

Added one new pjsua-lib API to get audio device stream instance, also added its usage sample for audio routing in symbian_ua.

Location:

pjproject/branches/projects/aps-direct

Files:

• pjsip-apps/src/symbian_ua/ua.cpp (modified) (3 diffs)
• pjsip/include/pjsua-lib/pjsua.h (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/branches/projects/aps-direct/pjsip-apps/src/symbian_ua/ua.cpp

@@ -491 +491 @@
             "  a    Answer call\n"
             "  g    Hangup all calls\n"
-#if PJMEDIA_SOUND_IMPLEMENTATION == PJMEDIA_SOUND_SYMB_APS_SOUND
-            "  t    Switch audio route\n"
-#endif
+            "  t    Toggle audio route\n"
 #if !defined(PJMEDIA_CONF_USE_SWITCH_BOARD) || PJMEDIA_CONF_USE_SWITCH_BOARD==0
-            "  j    Start/stop loopback audio device\n"
+            "  j    Toggle loopback audio\n"
 #endif
             "  s    Subscribe " SIP_DST_URI "\n"
@@ -523 +521 @@
     switch (kc) {
     
-#   if 0  && PJMEDIA_SOUND_IMPLEMENTATION == PJMEDIA_SOUND_SYMB_APS_SOUND
     case 't':
-        do {
-            static pjmedia_snd_route route = PJMEDIA_AUD_DEV_ROUTE_DEFAULT;
-            
-            if (route == PJMEDIA_AUD_DEV_ROUTE_LOUDSPEAKER)
-                route = PJMEDIA_AUD_DEV_ROUTE_EARPIECE;
-            else
-                route = PJMEDIA_AUD_DEV_ROUTE_LOUDSPEAKER;
-
-            pjsua_set_snd_route(route);
-        } while(0);
+        {
+            pjmedia_aud_stream *aud_stream = pjsua_get_aud_stream();
+
+            if (aud_stream) {
+                pjmedia_aud_dev_route route;
+                pj_status_t status;
+                
+                status = pjmedia_aud_stream_get_cap(
+                                            aud_stream,
+                                            PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE,
+                                            &route);
+                if (status == PJ_SUCCESS) {
+                    if (route == PJMEDIA_AUD_DEV_ROUTE_LOUDSPEAKER)
+                        route = PJMEDIA_AUD_DEV_ROUTE_EARPIECE;
+                    else
+                        route = PJMEDIA_AUD_DEV_ROUTE_LOUDSPEAKER;
+
+                    status = pjmedia_aud_stream_set_cap(
+                                        aud_stream,
+                                        PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE,
+                                        &route);
+                }
+
+                if (status != PJ_SUCCESS)
+                    pjsua_perror(THIS_FILE, "Error switch audio route", status);
+            } else {
+                PJ_LOG(3,(THIS_FILE, "No active sound device."));
+            }
+        }
         break;
-#   endif
         
     case 'j':
-        do {
+        {
             static pj_bool_t loopback_active = PJ_FALSE;
             if (!loopback_active)
@@ -546 +561 @@
                 pjsua_conf_disconnect(0, 0);
             loopback_active = !loopback_active;
-        } while (0);
+        }
         break;
         

pjproject/branches/projects/aps-direct/pjsip/include/pjsua-lib/pjsua.h

@@ -4944 +4944 @@
 
 
+/**
+ * Get active audio device stream instance.
+ *
+ * @return              Audio device stream instance if any, otherwise 
+ *                      NULL will be returned.
+ */
+PJ_DECL(pjmedia_aud_stream*) pjsua_get_aud_stream();
+
+
 /*****************************************************************************
  * Codecs.

pjproject/branches/projects/aps-direct/pjsip/src/pjsua-lib/pjsua_media.c

@@ -2652 +2652 @@
 
 
+/*
+ * Get active sound port instance.
+ */
+PJ_DEF(pjmedia_aud_stream*) pjsua_get_aud_stream()
+{
+    pjmedia_aud_stream *aud_stream = NULL;
+
+    if (pjsua_var.snd_port)
+        aud_stream = pjmedia_snd_port_get_snd_stream(pjsua_var.snd_port);
+
+    return aud_stream;
+}
+
+
 /*****************************************************************************
  * Codecs.