zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempt to reduce AUDIO_RECORD_START_STATE_MISMATCH error rate on Android.

Browse Source 
Bug: b/63010674
Change-Id: I75ab10d43c13622084f5819bef7fbe2185f40b20
Reviewed-on: https://chromium-review.googlesource.com/549363
Commit-Queue: Alex Glaznev <glaznev@chromium.org>
Reviewed-by: Alex Glaznev <glaznev@chromium.org>
Cr-Commit-Position: refs/heads/master@{#18788}
This commit is contained in:
henrika
2017-06-27 14:10:55 +02:00
committed by Commit Bot
parent 471f63559f
commit 323197ab0c
1 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java
View File

@ -48,6 +48,7 @@ public class WebRtcAudioRecord {
private static final long AUDIO_RECORD_THREAD_JOIN_TIMEOUT_MS = 2000;
private final long nativeAudioRecord;
private final ThreadUtils.ThreadChecker threadChecker = new ThreadUtils.ThreadChecker();
private WebRtcAudioEffects effects = null;
@ -140,6 +141,7 @@ public class WebRtcAudioRecord {
}
WebRtcAudioRecord(long nativeAudioRecord) {
threadChecker.checkIsOnValidThread();
Logging.d(TAG, "ctor" + WebRtcAudioUtils.getThreadInfo());
this.nativeAudioRecord = nativeAudioRecord;
if (DEBUG) {
@ -149,6 +151,7 @@ public class WebRtcAudioRecord {
}
private boolean enableBuiltInAEC(boolean enable) {
threadChecker.checkIsOnValidThread();
Logging.d(TAG, "enableBuiltInAEC(" + enable + ')');
if (effects == null) {
Logging.e(TAG, "Built-in AEC is not supported on this platform");
@ -158,6 +161,7 @@ public class WebRtcAudioRecord {
}
private boolean enableBuiltInNS(boolean enable) {
threadChecker.checkIsOnValidThread();
Logging.d(TAG, "enableBuiltInNS(" + enable + ')');
if (effects == null) {
Logging.e(TAG, "Built-in NS is not supported on this platform");
@ -167,6 +171,7 @@ public class WebRtcAudioRecord {
}
private int initRecording(int sampleRate, int channels) {
threadChecker.checkIsOnValidThread();
Logging.d(TAG, "initRecording(sampleRate=" + sampleRate + ", channels=" + channels + ")");
if (!WebRtcAudioUtils.hasPermission(
ContextUtils.getApplicationContext(), android.Manifest.permission.RECORD_AUDIO)) {
@ -226,9 +231,12 @@ public class WebRtcAudioRecord {
}
private boolean startRecording() {
threadChecker.checkIsOnValidThread();
Logging.d(TAG, "startRecording");
assertTrue(audioRecord != null);
assertTrue(audioThread == null);
// Starts recording from the AudioRecord instance.
try {
audioRecord.startRecording();
} catch (IllegalStateException e) {
@ -236,6 +244,14 @@ public class WebRtcAudioRecord {
"AudioRecord.startRecording failed: " + e.getMessage());
return false;
}
// Verify the recording state up to two times (with a sleep in between)
// before returning false and reporting an error.
int numberOfStateChecks = 0;
while (audioRecord.getRecordingState() != AudioRecord.RECORDSTATE_RECORDING &&
++numberOfStateChecks < 2) {
threadSleep(200);
}
if (audioRecord.getRecordingState() != AudioRecord.RECORDSTATE_RECORDING) {
reportWebRtcAudioRecordStartError(
AudioRecordStartErrorCode.AUDIO_RECORD_START_STATE_MISMATCH,
@ -243,12 +259,17 @@ public class WebRtcAudioRecord {
+ audioRecord.getRecordingState());
return false;
}
// Create and start new high-priority thread which calls AudioRecord.read()
// and where we also call the native DataIsRecorded() callback to feed
// WebRTC with recorded audio.
audioThread = new AudioRecordThread("AudioRecordJavaThread");
audioThread.start();
return true;
}
private boolean stopRecording() {
threadChecker.checkIsOnValidThread();
Logging.d(TAG, "stopRecording");
assertTrue(audioThread != null);
audioThread.stopThread();
@ -330,4 +351,14 @@ public class WebRtcAudioRecord {
errorCallback.onWebRtcAudioRecordError(errorMessage);
}
}
// Causes the currently executing thread to sleep for the specified number
// of milliseconds.
private void threadSleep(long millis) {
try {
Thread.sleep(millis);
} catch (InterruptedException e) {
Logging.e(TAG, "Thread.sleep failed: " + e.getMessage());
}
}
}