Change audio render thread checking to use new AudioRendererSink::BelongsToRendererThread()

content/renderer/media/webrtc_audio_device_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/webrtc_audio_device_impl.h"
 
+#include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/win/windows_version.h"
 #include "content/renderer/media/webrtc/processed_local_audio_source.h"
 #include "content/renderer/media/webrtc_audio_renderer.h"
 #include "media/audio/sample_rates.h"
 #include "media/base/audio_bus.h"
 #include "media/base/audio_parameters.h"
 
 using media::AudioParameters;
@@ skipping 38 matching lines @@
   if (ret == 0) {
     delete this;
   }
   return ret;
 }
 
 void WebRtcAudioDeviceImpl::RenderData(media::AudioBus* audio_bus,
                                        int sample_rate,
                                        int audio_delay_milliseconds,
                                        base::TimeDelta* current_time) {
-  DCHECK(audio_renderer_thread_checker_.CalledOnValidThread());
   {
     base::AutoLock auto_lock(lock_);
+#if DCHECK_IS_ON()
+    DCHECK(renderer_->CurrentThreadIsRenderingThread());
+    if (!audio_renderer_thread_checker_.CalledOnValidThread()) {
+      for (const auto& sink : playout_sinks_)
+        sink->OnRenderThreadChanged();

[tommi (sloooow) - chröme, 2016/06/15 19:29:11]

should this method only exist if DCHECK_IS_ON()?

[Henrik Grunell, 2016/06/16 12:19:16]

I don't have strong opinions on this either. I slightly prefer not to clutter
too much with ifdefs.

+    }
+#endif
     if (!playing_) {
       // Force silence to AudioBus after stopping playout in case
       // there is lingering audio data in AudioBus.
       audio_bus->Zero();
       return;
     }
     DCHECK(audio_transport_callback_);
     // Store the reported audio delay locally.
     output_delay_ms_ = audio_delay_milliseconds;
   }
@@ skipping 402 matching lines @@
 
   *session_id = device_info.session_id;
   *output_sample_rate = device_info.device.matched_output.sample_rate;
   *output_frames_per_buffer =
       device_info.device.matched_output.frames_per_buffer;
 
   return true;
 }
 
 }  // namespace content