Changeset 4960


Ignore:
Timestamp:
Nov 13, 2014 1:48:34 AM (6 years ago)
Author:
ming
Message:

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

Location:
pjproject/trunk/pjmedia/src/pjmedia-audiodev
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjmedia/src/pjmedia-audiodev/android_jni_dev.c

    r4927 r4960  
    675675         
    676676        if (mic_source == 0) { 
    677             char sdk_version[PROP_VALUE_MAX]; 
     677            /* Android-L (android-21) removes __system_property_get 
     678             * from the NDK. 
     679             */ 
     680            /*            
     681            char sdk_version[PROP_VALUE_MAX]; 
    678682            pj_str_t pj_sdk_version; 
    679683            int sdk_v; 
     
    683687            sdk_v = pj_strtoul(&pj_sdk_version); 
    684688            if (sdk_v > 10) 
    685                 mic_source = 7; /* VOICE_COMMUNICATION */ 
     689            */ 
     690            mic_source = 7; /* VOICE_COMMUNICATION */ 
    686691        } 
    687692        PJ_LOG(4, (THIS_FILE, "Using audio input source : %d", mic_source)); 
  • pjproject/trunk/pjmedia/src/pjmedia-audiodev/opensl_dev.c

    r4731 r4960  
    647647            SLint32 streamType = SL_ANDROID_RECORDING_PRESET_GENERIC; 
    648648#if __ANDROID_API__ >= 14 
     649            streamType = SL_ANDROID_RECORDING_PRESET_VOICE_COMMUNICATION; 
     650#endif 
     651#if 0 
     652            /* Android-L (android-21) removes __system_property_get 
     653             * from the NDK. 
     654             */ 
    649655            char sdk_version[PROP_VALUE_MAX]; 
    650656            pj_str_t pj_sdk_version; 
Note: See TracChangeset for help on using the changeset viewer.