Changeset 4960 for pjproject/trunk

Timestamp:

Nov 13, 2014 1:48:34 AM (10 years ago)

Author:

ming

Message:

Re #1803: (Add support for Android 64 bit compilation)

Location:

pjproject/trunk/pjmedia/src/pjmedia-audiodev

Files:

• android_jni_dev.c (modified) (2 diffs)
• opensl_dev.c (modified) (1 diff)

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

@@ -675 +675 @@
         
         if (mic_source == 0) {
-            char sdk_version[PROP_VALUE_MAX];
+            /* Android-L (android-21) removes __system_property_get
+             * from the NDK.
+             */
+            /*           
+            char sdk_version[PROP_VALUE_MAX];
             pj_str_t pj_sdk_version;
             int sdk_v;
@@ -683 +687 @@
             sdk_v = pj_strtoul(&pj_sdk_version);
             if (sdk_v > 10)
-                mic_source = 7; /* VOICE_COMMUNICATION */
+            */
+            mic_source = 7; /* VOICE_COMMUNICATION */
         }
         PJ_LOG(4, (THIS_FILE, "Using audio input source : %d", mic_source));

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

@@ -647 +647 @@
             SLint32 streamType = SL_ANDROID_RECORDING_PRESET_GENERIC;
 #if __ANDROID_API__ >= 14
+            streamType = SL_ANDROID_RECORDING_PRESET_VOICE_COMMUNICATION;
+#endif
+#if 0
+            /* Android-L (android-21) removes __system_property_get
+             * from the NDK.
+             */
             char sdk_version[PROP_VALUE_MAX];
             pj_str_t pj_sdk_version;