Modifies invalid DCHECK in AudioRecordJni::OnCacheDirectBufferAddress()

webrtc/modules/audio_device/android/audio_track_jni.cc

 /*
  *  Copyright (c) 2013 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 102 matching lines @@
   ALOGD("Terminate%s", GetThreadInfo().c_str());
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   StopPlayout();
   return 0;
 }
 
 int32_t AudioTrackJni::InitPlayout() {
   ALOGD("InitPlayout%s", GetThreadInfo().c_str());
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   RTC_DCHECK(!initialized_);
+  RTC_DCHECK(!direct_buffer_address_);
   RTC_DCHECK(!playing_);
   j_audio_track_->InitPlayout(
       audio_parameters_.sample_rate(), audio_parameters_.channels());
   initialized_ = true;
   return 0;
 }
 
 int32_t AudioTrackJni::StartPlayout() {
   ALOGD("StartPlayout%s", GetThreadInfo().c_str());
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 16 matching lines @@
   if (!j_audio_track_->StopPlayout()) {
     ALOGE("StopPlayout failed!");
     return -1;
   }
   // If we don't detach here, we will hit a RTC_DCHECK in OnDataIsRecorded()
   // next time StartRecording() is called since it will create a new Java
   // thread.
   thread_checker_java_.DetachFromThread();
   initialized_ = false;
   playing_ = false;
+  direct_buffer_address_ = nullptr;
   return 0;
 }
 
 int AudioTrackJni::SpeakerVolumeIsAvailable(bool& available) {
   available = true;
   return 0;
 }
 
 int AudioTrackJni::SetSpeakerVolume(uint32_t volume) {
   ALOGD("SetSpeakerVolume(%d)%s", volume, GetThreadInfo().c_str());
@@ skipping 39 matching lines @@
     JNIEnv* env, jobject obj, jobject byte_buffer, jlong nativeAudioTrack) {
   webrtc::AudioTrackJni* this_object =
       reinterpret_cast<webrtc::AudioTrackJni*> (nativeAudioTrack);
   this_object->OnCacheDirectBufferAddress(env, byte_buffer);
 }
 
 void AudioTrackJni::OnCacheDirectBufferAddress(
     JNIEnv* env, jobject byte_buffer) {
   ALOGD("OnCacheDirectBufferAddress");
   RTC_DCHECK(thread_checker_.CalledOnValidThread());
   direct_buffer_address_ =

[magjed_webrtc, 2015/09/25 09:54:07]

Add a check here as well?

[henrika_webrtc, 2015/09/25 10:38:43]

Done.

       env->GetDirectBufferAddress(byte_buffer);
   jlong capacity = env->GetDirectBufferCapacity(byte_buffer);
   ALOGD("direct buffer capacity: %lld", capacity);
   direct_buffer_capacity_in_bytes_ = static_cast<size_t>(capacity);
   frames_per_buffer_ = direct_buffer_capacity_in_bytes_ / kBytesPerFrame;
   ALOGD("frames_per_buffer: %" PRIuS, frames_per_buffer_);
 }
 
 void JNICALL AudioTrackJni::GetPlayoutData(
   JNIEnv* env, jobject obj, jint length, jlong nativeAudioTrack) {
@@ skipping 18 matching lines @@
     return;
   }
   RTC_DCHECK_EQ(static_cast<size_t>(samples), frames_per_buffer_);
   // Copy decoded data into common byte buffer to ensure that it can be
   // written to the Java based audio track.
   samples = audio_device_buffer_->GetPlayoutData(direct_buffer_address_);
   RTC_DCHECK_EQ(length, kBytesPerFrame * samples);
 }
 
 }  // namespace webrtc