Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RTP: Start AudioRecord before AudioTrack to avoid being disabled.

Browse Source 
Change-Id: I96be89fda41d77e2cf5bfc1c2f14e2b109001b57
This commit is contained in:
Chia-chi Yeh
2010-10-01 08:20:09 +08:00
parent 20cb2310cf
commit 67ecb5b90c
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
voip/jni/rtp/AudioGroup.cpp
View File

@@ -776,11 +776,14 @@ bool AudioGroup::DeviceThread::threadLoop()
char c;
while (recv(deviceSocket, &c, 1, MSG_DONTWAIT) == 1);
// Start your engine!
track.start();
// Start AudioRecord before AudioTrack. This prevents AudioTrack from being
// disabled due to buffer underrun while waiting for AudioRecord.
if (mode != MUTED) {
record.start();
int16_t one;
record.read(&one, sizeof(one));
}
track.start();
while (!exitPending()) {
int16_t output[sampleCount];
@@ -806,34 +809,30 @@ bool AudioGroup::DeviceThread::threadLoop()
track.releaseBuffer(&buffer);
} else if (status != TIMED_OUT && status != WOULD_BLOCK) {
LOGE("cannot write to AudioTrack");
break;
return true;
}
}
if (toRead > 0) {
AudioRecord::Buffer buffer;
buffer.frameCount = record.frameCount();
buffer.frameCount = toRead;
status_t status = record.obtainBuffer(&buffer, 1);
if (status == NO_ERROR) {
int count = ((int)buffer.frameCount < toRead) ?
buffer.frameCount : toRead;
memcpy(&input[sampleCount - toRead], buffer.i8, count * 2);
toRead -= count;
if (buffer.frameCount < record.frameCount()) {
buffer.frameCount = count;
}
int offset = sampleCount - toRead;
memcpy(&input[offset], buffer.i8, buffer.size);
toRead -= buffer.frameCount;
record.releaseBuffer(&buffer);
} else if (status != TIMED_OUT && status != WOULD_BLOCK) {
LOGE("cannot read from AudioRecord");
break;
return true;
}
}
}
if (chances <= 0) {
LOGE("device loop timeout");
break;
LOGW("device loop timeout");
while (recv(deviceSocket, &c, 1, MSG_DONTWAIT) == 1);
}
if (mode != MUTED) {