diff options
Diffstat (limited to 'voip')
| -rw-r--r-- | voip/java/android/net/sip/SipAudioCall.java | 2 | ||||
| -rw-r--r-- | voip/jni/rtp/AmrCodec.cpp | 2 | ||||
| -rw-r--r-- | voip/jni/rtp/EchoSuppressor.cpp | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/voip/java/android/net/sip/SipAudioCall.java b/voip/java/android/net/sip/SipAudioCall.java index c23da20..7c1234a 100644 --- a/voip/java/android/net/sip/SipAudioCall.java +++ b/voip/java/android/net/sip/SipAudioCall.java @@ -717,6 +717,7 @@ public class SipAudioCall { } private void grabWifiHighPerfLock() { + /* not available in master yet if (mWifiHighPerfLock == null) { Log.v(TAG, "acquire wifi high perf lock"); mWifiHighPerfLock = ((WifiManager) @@ -724,6 +725,7 @@ public class SipAudioCall { .createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, TAG); mWifiHighPerfLock.acquire(); } + */ } private void releaseWifiHighPerfLock() { diff --git a/voip/jni/rtp/AmrCodec.cpp b/voip/jni/rtp/AmrCodec.cpp index f3ecac2..84c7166 100644 --- a/voip/jni/rtp/AmrCodec.cpp +++ b/voip/jni/rtp/AmrCodec.cpp @@ -73,7 +73,7 @@ int AmrCodec::set(int sampleRate, const char *fmtp) } // Handle mode-set and octet-align. - char *modes = strcasestr(fmtp, "mode-set="); + const char *modes = strcasestr(fmtp, "mode-set="); if (modes) { mMode = 0; mModeSet = 0; diff --git a/voip/jni/rtp/EchoSuppressor.cpp b/voip/jni/rtp/EchoSuppressor.cpp index 92015a9..2ceebdc 100644 --- a/voip/jni/rtp/EchoSuppressor.cpp +++ b/voip/jni/rtp/EchoSuppressor.cpp @@ -16,6 +16,7 @@ #include <stdio.h> #include <stdint.h> +#include <string.h> #include <math.h> #define LOG_TAG "Echo" |