Avoids crashes in Java-based InitRecording()

webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java

 /*
  *  Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 127 matching lines @@
   }
 
   private int InitRecording(int sampleRate, int channels) {
     Logd("InitRecording(sampleRate=" + sampleRate + ", channels=" +
         channels + ")");
     if (!WebRtcAudioUtils.hasPermission(
         context, android.Manifest.permission.RECORD_AUDIO)) {
       Loge("RECORD_AUDIO permission is missing");
       return -1;
     }
+    if (audioRecord != null) {
+      Loge("InitRecording() called twice without StopRecording()");
+      return -1;
+    }
+    if (aec != null) {

[magjed_webrtc, 2015/09/10 07:23:08]

When can this ever happen? Doesn't |aec| have the same lifetime as audioRecord?
|aec| is also released in StopRecording(). If you want to avoid assertTrue(),
maybe just change if-statement above to:
if (audioRecord != null || aec != null) ?

[henrika_webrtc, 2015/09/10 11:27:07]

You are correct. They are correlated. Should be enough to just check
audioRecord.

+      aec.release();
+      aec = null;
+    }
     final int bytesPerFrame = channels * (BITS_PER_SAMPLE / 8);
     final int framesPerBuffer = sampleRate / BUFFERS_PER_SECOND;
     byteBuffer = ByteBuffer.allocateDirect(bytesPerFrame * framesPerBuffer);
     Logd("byteBuffer.capacity: " + byteBuffer.capacity());
     // Rather than passing the ByteBuffer with every callback (requiring
     // the potentially expensive GetDirectBufferAddress) we simply have the
     // the native class cache the address to the memory once.
     nativeCacheDirectBufferAddress(byteBuffer, nativeAudioRecord);
 
     // Get the minimum buffer size required for the successful creation of
     // an AudioRecord object, in byte units.
     // Note that this size doesn't guarantee a smooth recording under load.
     // TODO(henrika): Do we need to make this larger to avoid underruns?
     int minBufferSize = AudioRecord.getMinBufferSize(
           sampleRate,
           AudioFormat.CHANNEL_IN_MONO,
           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);
     try {
       audioRecord = new AudioRecord(AudioSource.VOICE_COMMUNICATION,
                                     sampleRate,
                                     AudioFormat.CHANNEL_IN_MONO,
                                     AudioFormat.ENCODING_PCM_16BIT,
                                     bufferSizeInBytes);
 
     } catch (IllegalArgumentException e) {
-      Logd(e.getMessage());
+      Loge(e.getMessage());
       return -1;
     }
-    assertTrue(audioRecord.getState() == AudioRecord.STATE_INITIALIZED);
+    if (audioRecord == null ||
+        audioRecord.getState() != AudioRecord.STATE_INITIALIZED) {
+      Loge("Failed to create a new AudioRecord instance");
+      return -1;
+    }
 
     Logd("AudioRecord " +
           "session ID: " + audioRecord.getAudioSessionId() + ", " +
           "audio format: " + audioRecord.getAudioFormat() + ", " +
           "channels: " + audioRecord.getChannelCount() + ", " +
           "sample rate: " + audioRecord.getSampleRate());
     Logd("AcousticEchoCanceler.isAvailable: " + builtInAECIsAvailable());
     if (!builtInAECIsAvailable()) {
       return framesPerBuffer;
     }
@@ skipping 76 matching lines @@
 
   private static void Loge(String msg) {
     Log.e(TAG, msg);
   }
 
   private native void nativeCacheDirectBufferAddress(
       ByteBuffer byteBuffer, long nativeAudioRecord);
 
   private native void nativeDataIsRecorded(int bytes, long nativeAudioRecord);
 }