Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1543)

Unified Diff: content/renderer/media/webrtc_audio_device_impl.cc

Issue 2038053002: Change audio render thread checking to use new AudioRendererSink::BelongsToRendererThread() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Code review fixes (dalecurtis@). Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webrtc_audio_device_impl.cc
diff --git a/content/renderer/media/webrtc_audio_device_impl.cc b/content/renderer/media/webrtc_audio_device_impl.cc
index 7f46506fada893b16edde60a8ebd81d4042d7cc5..57fa53c6437a68bb00dc41027dc7f963109143bc 100644
--- a/content/renderer/media/webrtc_audio_device_impl.cc
+++ b/content/renderer/media/webrtc_audio_device_impl.cc
@@ -62,7 +62,20 @@ void WebRtcAudioDeviceImpl::RenderData(media::AudioBus* audio_bus,
int sample_rate,
int audio_delay_milliseconds,
base::TimeDelta* current_time) {
- DCHECK(audio_renderer_thread_checker_.CalledOnValidThread());
+#if (!defined(NDEBUG) || defined(DCHECK_ALWAYS_ON))
+ {
+ base::AutoLock auto_lock(lock_);
tommi (sloooow) - chröme 2016/06/13 14:15:20 we grab this lock right after this block. Can we
Henrik Grunell 2016/06/13 20:38:35 Yeah, that's better locking wise (in builds with D
Henrik Grunell 2016/06/14 11:30:00 Done.
+ bool on_rendering_thread = renderer_->BelongsToRenderingThread();
+ DCHECK(on_rendering_thread);
tommi (sloooow) - chröme 2016/06/13 14:15:20 doesn't look like you need this variable. Just do
Henrik Grunell 2016/06/14 11:30:00 Oops, left by mistake. Done.
+ if (!audio_renderer_thread_checker_.CalledOnValidThread()) {
+ for (PlayoutDataSinkList::const_iterator it = playout_sinks_.begin();
tommi (sloooow) - chröme 2016/06/13 14:15:21 range based loop?
Henrik Grunell 2016/06/14 11:30:00 Done.
+ it != playout_sinks_.end(); ++it) {
+ (*it)->OnRenderThreadChanged();
+ }
+ }
+ }
+#endif
+
{
base::AutoLock auto_lock(lock_);
if (!playing_) {

Powered by Google App Engine
This is Rietveld 408576698