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

Avoids crashes in Java-based InitRecording().

Browse Source 
This CL ensures that we return -1 in cases where InitRecording() fails. It ensures that we don't crash applications.

BUG=b/22849644
R=magjed@webrtc.org

Review URL: https://codereview.webrtc.org/1323243012 .

Cr-Commit-Position: refs/heads/master@{#9918}
This commit is contained in:
henrika
2015-09-10 15:18:19 +02:00
parent 39720f2669
commit 4ed3658b78
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -145,6 +145,10 @@ class WebRtcAudioRecord {
Loge("RECORD_AUDIO permission is missing");
return -1;
}
if (audioRecord != null) {
Loge("InitRecording() called twice without StopRecording()");
return -1;
}
final int bytesPerFrame = channels * (BITS_PER_SAMPLE / 8);
final int framesPerBuffer = sampleRate / BUFFERS_PER_SECOND;
byteBuffer = ByteBuffer.allocateDirect(bytesPerFrame * framesPerBuffer);
@ -164,11 +168,6 @@ class WebRtcAudioRecord {
AudioFormat.ENCODING_PCM_16BIT);
Logd("AudioRecord.getMinBufferSize: " + minBufferSize);
if (aec != null) {
aec.release();
aec = null;
}
assertTrue(audioRecord == null);
int bufferSizeInBytes = Math.max(byteBuffer.capacity(), minBufferSize);
Logd("bufferSizeInBytes: " + bufferSizeInBytes);
@ -180,10 +179,14 @@ class WebRtcAudioRecord {
bufferSizeInBytes);
} catch (IllegalArgumentException e) {
Logd(e.getMessage());
Loge(e.getMessage());
return -1;
}
if (audioRecord == null ||
audioRecord.getState() != AudioRecord.STATE_INITIALIZED) {
Loge("Failed to create a new AudioRecord instance");
return -1;
}
assertTrue(audioRecord.getState() == AudioRecord.STATE_INITIALIZED);
Logd("AudioRecord " +
"session ID: " + audioRecord.getAudioSessionId() + ", " +