diff options
| author | Liong Sauw Ming <ming@teluu.com> | 2014-11-13 01:48:34 +0000 |
|---|---|---|
| committer | Liong Sauw Ming <ming@teluu.com> | 2014-11-13 01:48:34 +0000 |
| commit | be363d5c0dbcbc1e2005236eec6d35543b40eea5 (patch) | |
| tree | a094d8640750604a2bdc331e02909d78cfbf8691 /pjmedia | |
| parent | 9a001ba4ca77ed836b78d535c47e6312221f2509 (diff) | |
Re #1803: (Add support for Android 64 bit compilation)
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4960 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia')
| -rw-r--r-- | pjmedia/src/pjmedia-audiodev/android_jni_dev.c | 9 | ||||
| -rw-r--r-- | pjmedia/src/pjmedia-audiodev/opensl_dev.c | 6 |
2 files changed, 13 insertions, 2 deletions
diff --git a/pjmedia/src/pjmedia-audiodev/android_jni_dev.c b/pjmedia/src/pjmedia-audiodev/android_jni_dev.c index 4a4fc48f..fff847fe 100644 --- a/pjmedia/src/pjmedia-audiodev/android_jni_dev.c +++ b/pjmedia/src/pjmedia-audiodev/android_jni_dev.c @@ -674,7 +674,11 @@ static pj_status_t android_create_stream(pjmedia_aud_dev_factory *f, } 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; @@ -682,7 +686,8 @@ static pj_status_t android_create_stream(pjmedia_aud_dev_factory *f, pj_sdk_version = pj_str(sdk_version); 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)); diff --git a/pjmedia/src/pjmedia-audiodev/opensl_dev.c b/pjmedia/src/pjmedia-audiodev/opensl_dev.c index a9dcd266..9f0e89c6 100644 --- a/pjmedia/src/pjmedia-audiodev/opensl_dev.c +++ b/pjmedia/src/pjmedia-audiodev/opensl_dev.c @@ -646,6 +646,12 @@ static pj_status_t opensl_create_stream(pjmedia_aud_dev_factory *f, if (result == SL_RESULT_SUCCESS) { 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; int sdk_v; |