Android: Fixes crash when exiting WebRTCDemo.

BUG=2738
R=fischman@webrtc.org, niklas.enbom@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/6179004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5365 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/audio_device/android/audio_device_template.h

@@ -30,6 +30,12 @@ class AudioDeviceTemplate : public AudioDeviceGeneric {
     }
     return InputType::SetAndroidAudioDeviceObjects(javaVM, env, context);
   }
+
+  static void ClearAndroidAudioDeviceObjects() {
+    OutputType::ClearAndroidAudioDeviceObjects();
+    InputType::ClearAndroidAudioDeviceObjects();
+  }
+
   explicit AudioDeviceTemplate(const int32_t id)
       : output_(id),
         input_(id, &output_) {

webrtc/modules/audio_device/android/audio_record_jni.cc

@@ -37,9 +37,8 @@ jclass AudioRecordJni::globalScClass = NULL;
 
 int32_t AudioRecordJni::SetAndroidAudioDeviceObjects(void* javaVM, void* env,
                                                      void* context) {
+  assert(env);
   globalJvm = reinterpret_cast<JavaVM*>(javaVM);
-
-  if (env) {
   globalJNIEnv = reinterpret_cast<JNIEnv*>(env);
   // Get java class type (note path to class packet).
   jclass javaScClassLocal = globalJNIEnv->FindClass(
@@ -70,27 +69,28 @@ int32_t AudioRecordJni::SetAndroidAudioDeviceObjects(void* javaVM, void* env,
 
   // Delete local class ref, we only use the global ref
   globalJNIEnv->DeleteLocalRef(javaScClassLocal);
-  }
+
-  else { // User is resetting the env variable
+  return 0;
+}
+
+void AudioRecordJni::ClearAndroidAudioDeviceObjects() {
   WEBRTC_TRACE(kTraceStateInfo, kTraceAudioDevice, -1,
                "%s: env is NULL, assuming deinit", __FUNCTION__);
 
+  globalJvm = NULL;;
   if (!globalJNIEnv) {
     WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, -1,
                  "%s: saved env already NULL", __FUNCTION__);
-      return 0;
+    return;
   }
 
-    globalJNIEnv->DeleteGlobalRef(globalScClass);
-    globalScClass = reinterpret_cast<jclass>(NULL);
-
   globalJNIEnv->DeleteGlobalRef(globalContext);
   globalContext = reinterpret_cast<jobject>(NULL);
 
-    globalJNIEnv = reinterpret_cast<JNIEnv*>(NULL);
+  globalJNIEnv->DeleteGlobalRef(globalScClass);
-  }
+  globalScClass = reinterpret_cast<jclass>(NULL);
 
-  return 0;
+  globalJNIEnv = reinterpret_cast<JNIEnv*>(NULL);
 }
 
 AudioRecordJni::AudioRecordJni(

webrtc/modules/audio_device/android/audio_record_jni.h

@@ -31,6 +31,7 @@ class AudioRecordJni {
  public:
   static int32_t SetAndroidAudioDeviceObjects(void* javaVM, void* env,
                                               void* context);
+  static void ClearAndroidAudioDeviceObjects();
 
   AudioRecordJni(const int32_t id, PlayoutDelayProvider* delay_provider);
   ~AudioRecordJni();

webrtc/modules/audio_device/android/audio_track_jni.cc

@@ -36,9 +36,8 @@ jclass AudioTrackJni::globalScClass = NULL;
 
 int32_t AudioTrackJni::SetAndroidAudioDeviceObjects(void* javaVM, void* env,
                                                     void* context) {
+  assert(env);
   globalJvm = reinterpret_cast<JavaVM*>(javaVM);
-
-  if (env) {
   globalJNIEnv = reinterpret_cast<JNIEnv*>(env);
   // Get java class type (note path to class packet).
   jclass javaScClassLocal = globalJNIEnv->FindClass(
@@ -69,27 +68,27 @@ int32_t AudioTrackJni::SetAndroidAudioDeviceObjects(void* javaVM, void* env,
 
   // Delete local class ref, we only use the global ref
   globalJNIEnv->DeleteLocalRef(javaScClassLocal);
-  }
+  return 0;
-  else { // User is resetting the env variable
+}
+
+void AudioTrackJni::ClearAndroidAudioDeviceObjects() {
   WEBRTC_TRACE(kTraceStateInfo, kTraceAudioDevice, -1,
                "%s: env is NULL, assuming deinit", __FUNCTION__);
 
+  globalJvm = NULL;
   if (!globalJNIEnv) {
     WEBRTC_TRACE(kTraceWarning, kTraceAudioDevice, -1,
                  "%s: saved env already NULL", __FUNCTION__);
-      return 0;
+    return;
   }
 
-    globalJNIEnv->DeleteGlobalRef(globalScClass);
-    globalScClass = reinterpret_cast<jclass>(NULL);
-
   globalJNIEnv->DeleteGlobalRef(globalContext);
   globalContext = reinterpret_cast<jobject>(NULL);
 
-    globalJNIEnv = reinterpret_cast<JNIEnv*>(NULL);
+  globalJNIEnv->DeleteGlobalRef(globalScClass);
-  }
+  globalScClass = reinterpret_cast<jclass>(NULL);
 
-  return 0;
+  globalJNIEnv = reinterpret_cast<JNIEnv*>(NULL);
 }
 
 AudioTrackJni::AudioTrackJni(const int32_t id)

webrtc/modules/audio_device/android/audio_track_jni.h

@@ -30,7 +30,7 @@ class AudioTrackJni : public PlayoutDelayProvider {
  public:
   static int32_t SetAndroidAudioDeviceObjects(void* javaVM, void* env,
                                               void* context);
-
+  static void ClearAndroidAudioDeviceObjects();
   explicit AudioTrackJni(const int32_t id);
   virtual ~AudioTrackJni();
 

webrtc/modules/audio_device/android/opensles_input.cc

@@ -75,6 +75,9 @@ int32_t OpenSlesInput::SetAndroidAudioDeviceObjects(void* javaVM,
   return 0;
 }
 
+void OpenSlesInput::ClearAndroidAudioDeviceObjects() {
+}
+
 int32_t OpenSlesInput::Init() {
   assert(!initialized_);
 

webrtc/modules/audio_device/android/opensles_input.h

@@ -41,6 +41,7 @@ class OpenSlesInput {
   static int32_t SetAndroidAudioDeviceObjects(void* javaVM,
                                               void* env,
                                               void* context);
+  static void ClearAndroidAudioDeviceObjects();
 
   // Main initializaton and termination
   int32_t Init();

webrtc/modules/audio_device/android/opensles_output.cc

@@ -76,6 +76,10 @@ int32_t OpenSlesOutput::SetAndroidAudioDeviceObjects(void* javaVM,
   return 0;
 }
 
+void OpenSlesOutput::ClearAndroidAudioDeviceObjects() {
+  AudioManagerJni::ClearAndroidAudioDeviceObjects();
+}
+
 int32_t OpenSlesOutput::Init() {
   assert(!initialized_);
 

webrtc/modules/audio_device/android/opensles_output.h

@@ -41,6 +41,7 @@ class OpenSlesOutput : public PlayoutDelayProvider {
   static int32_t SetAndroidAudioDeviceObjects(void* javaVM,
                                               void* env,
                                               void* context);
+  static void ClearAndroidAudioDeviceObjects();
 
   // Main initializaton and termination
   int32_t Init();

webrtc/voice_engine/voice_engine_impl.cc

@@ -149,12 +149,18 @@ int VoiceEngine::SetAndroidObjects(void* javaVM, void* env, void* context)
 {
 #ifdef WEBRTC_ANDROID
 #ifdef WEBRTC_ANDROID_OPENSLES
-  return AudioDeviceTemplate<OpenSlesInput, OpenSlesOutput>::
+  typedef AudioDeviceTemplate<OpenSlesInput, OpenSlesOutput>
-      SetAndroidAudioDeviceObjects(javaVM, env, context);
+      AudioDeviceInstance;
 #else
-  return AudioDeviceTemplate<AudioRecordJni, AudioTrackJni>::
+  typedef AudioDeviceTemplate<AudioRecordJni, AudioTrackJni>
-      SetAndroidAudioDeviceObjects(javaVM, env, context);
+      AudioDeviceInstance;
 #endif
+  if (javaVM && env && context) {
+    AudioDeviceInstance::SetAndroidAudioDeviceObjects(javaVM, env, context);
+  } else {
+    AudioDeviceInstance::ClearAndroidAudioDeviceObjects();
+  }
+  return 0;
 #else
   return -1;
 #endif