summaryrefslogtreecommitdiffstats
path: root/voip
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-03-21 07:22:40 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-21 07:22:40 -0700
commit32d72b2f538673466f6e0ebf01886412e803dc4f (patch)
tree167ad9eaf5aeaf25a60ea337b89b10dca4d23e60 /voip
parent85b51b8ae39a4aa3181d92e171baa86437475c0c (diff)
parentf743e1f6abdb018fc58c467cdf35cbb8b81cf8c4 (diff)
downloadframeworks_base-32d72b2f538673466f6e0ebf01886412e803dc4f.zip
frameworks_base-32d72b2f538673466f6e0ebf01886412e803dc4f.tar.gz
frameworks_base-32d72b2f538673466f6e0ebf01886412e803dc4f.tar.bz2
Merge "Whitespace"
Diffstat (limited to 'voip')
-rw-r--r--voip/jni/rtp/AudioGroup.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/voip/jni/rtp/AudioGroup.cpp b/voip/jni/rtp/AudioGroup.cpp
index 1139577..b9bbd16 100644
--- a/voip/jni/rtp/AudioGroup.cpp
+++ b/voip/jni/rtp/AudioGroup.cpp
@@ -809,9 +809,9 @@ bool AudioGroup::DeviceThread::threadLoop()
AudioTrack track;
AudioRecord record;
if (track.set(AUDIO_STREAM_VOICE_CALL, sampleRate, AUDIO_FORMAT_PCM_16_BIT,
- AUDIO_CHANNEL_OUT_MONO, output) != NO_ERROR || record.set(
- AUDIO_SOURCE_VOICE_COMMUNICATION, sampleRate, AUDIO_FORMAT_PCM_16_BIT,
- AUDIO_CHANNEL_IN_MONO, input) != NO_ERROR) {
+ AUDIO_CHANNEL_OUT_MONO, output) != NO_ERROR ||
+ record.set(AUDIO_SOURCE_VOICE_COMMUNICATION, sampleRate, AUDIO_FORMAT_PCM_16_BIT,
+ AUDIO_CHANNEL_IN_MONO, input) != NO_ERROR) {
ALOGE("cannot initialize audio device");
return false;
}