Changeset 2498

Timestamp:

Mar 10, 2009 1:32:09 PM (16 years ago)

Author:

nanang

Message:

• updated APS set_cap() to store output volume setting into stream param.
• updated APS get_param() to return actual volume setting.
• updated symbian_ua application to use the new pjsua-lib APIs: snd_set/get_setting().

Location:

pjproject/branches/projects/aps-direct

Files:

• pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp (modified) (9 diffs)
• pjsip-apps/src/symbian_ua/ua.cpp (modified) (1 diff)

pjproject/branches/projects/aps-direct/pjmedia/src/pjmedia-audiodev/symb_aps_dev.cpp

@@ -1131 +1131 @@
     af->dev_info.default_samples_per_sec = 8000;
     af->dev_info.caps = PJMEDIA_AUD_DEV_CAP_EXT_FORMAT |
-                        PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING |
+                        //PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING |
                         PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING |
                         PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE |
@@ -1141 +1141 @@
     af->dev_info.output_count = 1;
 
-    af->dev_info.ext_fmt_cnt = 6;
+    af->dev_info.ext_fmt_cnt = 5;
+
     af->dev_info.ext_fmt[0].id = PJMEDIA_FORMAT_AMR;
+    af->dev_info.ext_fmt[0].bitrate = 7400;
+    af->dev_info.ext_fmt[0].vad = PJ_TRUE;
+
     af->dev_info.ext_fmt[1].id = PJMEDIA_FORMAT_G729;
+    af->dev_info.ext_fmt[1].bitrate = 8000;
+    af->dev_info.ext_fmt[1].vad = PJ_FALSE;
+
     af->dev_info.ext_fmt[2].id = PJMEDIA_FORMAT_ILBC;
+    af->dev_info.ext_fmt[2].bitrate = 13333;
+    af->dev_info.ext_fmt[2].vad = PJ_TRUE;
+
     af->dev_info.ext_fmt[3].id = PJMEDIA_FORMAT_PCMU;
+    af->dev_info.ext_fmt[3].bitrate = 64000;
+    af->dev_info.ext_fmt[3].vad = PJ_FALSE;
+
     af->dev_info.ext_fmt[4].id = PJMEDIA_FORMAT_PCMA;
-    af->dev_info.ext_fmt[5].id = PJMEDIA_FORMAT_L16;
+    af->dev_info.ext_fmt[4].bitrate = 64000;
+    af->dev_info.ext_fmt[4].vad = PJ_FALSE;
     
     PJ_LOG(4, (THIS_FILE, "APS initialized"));
@@ -1207 +1221 @@
     param->bits_per_sample = BITS_PER_SAMPLE;
     param->flags = PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE;
-    param->ext_fmt.id = PJMEDIA_FORMAT_L16;
     param->output_route = PJMEDIA_AUD_DEV_ROUTE_EARPIECE;
 
@@ -1359 +1372 @@
 
     pj_memcpy(pi, &strm->param, sizeof(*pi));
+
+    /* Update the output volume setting */
+    if (stream_get_cap(s, PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING,
+                       &pi->output_vol) == PJ_SUCCESS)
+    {
+        pi->flags |= PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING;
+    }
     
     return PJ_SUCCESS;
@@ -1380 +1400 @@
         }
         break;
+    
+    /* There is a case that GetMaxGain() stucks, e.g: in N95. */ 
+    /*
     case PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING:
         if (strm->param.dir & PJMEDIA_DIR_CAPTURE) {
@@ -1395 +1418 @@
         }
         break;
+    */
+
     case PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING:
         if (strm->param.dir & PJMEDIA_DIR_PLAYBACK) {
@@ -1453 +1478 @@
         }
         break;
+
+    /* There is a case that GetMaxGain() stucks, e.g: in N95. */ 
+    /*
     case PJMEDIA_AUD_DEV_CAP_INPUT_VOLUME_SETTING:
         if (strm->param.dir & PJMEDIA_DIR_CAPTURE) {
@@ -1467 +1495 @@
                 status = PJMEDIA_EAUD_NOTREADY;
             }
-        }
-        break;
+            if (status == PJ_SUCCESS)
+                strm->param.input_vol = *(unsigned*)pval;
+        }
+        break;
+    */
+
     case PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING:
-        if (strm->param.dir & PJMEDIA_DIR_CAPTURE) {
+        if (strm->param.dir & PJMEDIA_DIR_PLAYBACK) {
             PJ_ASSERT_RETURN(strm->engine, PJ_EINVAL);
             
@@ -1483 +1515 @@
                 status = PJMEDIA_EAUD_NOTREADY;
             }
+            if (status == PJ_SUCCESS)
+                strm->param.output_vol = *(unsigned*)pval;
         }
         break;

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

@@ -535 +535 @@
     case 't':
         {
-            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."));
+            pjmedia_aud_dev_route route;
+            pj_status_t status;
+            
+            status = pjsua_snd_get_setting(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 = pjsua_snd_set_setting(
+                                    PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE,
+                                    &route, PJ_TRUE);
             }
+
+            if (status != PJ_SUCCESS)
+                pjsua_perror(THIS_FILE, "Error switch audio route", status);
         }
         break;