Changeset 5426 for pjproject

Timestamp:

Aug 23, 2016 9:13:28 AM (8 years ago)

Author:

ming

Message:

Fixed #1956: Support for setting audio input source capability in Android JNI audio device

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/audiodev.h (modified) (5 diffs)
• src/pjmedia-audiodev/android_jni_dev.c (modified) (2 diffs)

pjproject/trunk/pjmedia/include/pjmedia/audiodev.h

@@ -182 +182 @@
 
     /** 
-     * Support for audio input routing. The value of this capability is an 
-     * integer containing #pjmedia_aud_dev_route enumeration.
+     * Support for audio input routing/source. The value of this capability
+     * is an integer containing #pjmedia_aud_dev_route enumeration.
      */
     PJMEDIA_AUD_DEV_CAP_INPUT_ROUTE = 128,
+    PJMEDIA_AUD_DEV_CAP_INPUT_SOURCE = 128,
 
     /** 
@@ -237 +238 @@
 
 /**
- * This enumeration describes audio routing setting.
+ * This enumeration describes audio routing/source setting.
  */
 typedef enum pjmedia_aud_dev_route
 {
     /**
-     * Default route, it is the default audio route of the audio framework
-     * backend, as in opening audio device without specifying any route
-     * setting or with specifying neutral route setting.
+     * Default route/source, it is the default audio route/source of
+     * the audio framework backend, as in opening audio device without
+     * specifying any route/source setting or with specifying neutral
+     * route/source setting.
      */
     PJMEDIA_AUD_DEV_ROUTE_DEFAULT = 0,
@@ -255 +257 @@
 
     /** Route to paired Bluetooth device */
-    PJMEDIA_AUD_DEV_ROUTE_BLUETOOTH = 4
+    PJMEDIA_AUD_DEV_ROUTE_BLUETOOTH = 4,
+
+    /** 
+     * Custom audio route/source, specific to each audio device
+     * backend.
+     *
+     * For Android JNI audio device, the default is
+     * VOICE_COMMUNICATION (7). To change it to another value, set
+     * the input source capability of pjmedia_aud_param accordingly.
+     * For example:
+     *   pjmedia_aud_param_set_cap(&param, PJMEDIA_AUD_DEV_CAP_INPUT_SOURCE,
+     *                             // 4 is VOICE_CALL
+     *                             PJMEDIA_AUD_DEV_ROUTE_CUSTOM | 4);
+     */
+    PJMEDIA_AUD_DEV_ROUTE_CUSTOM = 128
 
 } pjmedia_aud_dev_route;
@@ -300 +316 @@
 
     /** 
-     * Supported audio device routes, as bitmask combination of 
+     * Supported audio device routes/sources, as bitmask combination of 
      * #pjmedia_aud_dev_route. The value may be zero if the device
-     * does not support audio routing.
+     * does not support changing audio routes/sources.
      */
     unsigned routes;
@@ -436 +452 @@
 
     /** 
-     * Set the audio input route. This setting is optional, and will only be
-     * used if PJMEDIA_AUD_DEV_CAP_INPUT_ROUTE is set in the flags.
+     * Set the audio input route/source. This setting is optional, and
+     * will only be used if PJMEDIA_AUD_DEV_CAP_INPUT_ROUTE/
+     * PJMEDIA_AUD_DEV_CAP_INPUT_SOURCE is set in the flags.
      */
     pjmedia_aud_dev_route input_route;

pjproject/trunk/pjmedia/src/pjmedia-audiodev/android_jni_dev.c

@@ -484 +484 @@
     pj_ansi_strcpy(info->name, "Android JNI");
     info->default_samples_per_sec = 8000;
-    info->caps = PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING;
+    info->caps = PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING |
+                 PJMEDIA_AUD_DEV_CAP_INPUT_SOURCE;
     info->input_count = 1;
     info->output_count = 1;
+    info->routes = PJMEDIA_AUD_DEV_ROUTE_CUSTOM;
     
     return PJ_SUCCESS;
@@ -666 +668 @@
         jobject record_obj;
         int mic_source = 0; /* DEFAULT: default audio source */
+
+        if ((param->flags & PJMEDIA_AUD_DEV_CAP_INPUT_SOURCE) &&
+            (param->input_route & PJMEDIA_AUD_DEV_ROUTE_CUSTOM))
+        {
+            mic_source = param->input_route & ~PJMEDIA_AUD_DEV_ROUTE_CUSTOM;
+        }
 
         /* Get pointer to the constructor */