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

Unified Diff: media/audio/audio_manager_base.cc

Issue 1097753002: patch from 1011683002 w/o audio thread fix (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@1011683002_thread
Patch Set: Created 5 years, 8 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
« no previous file with comments | « content/public/test/test_browser_thread.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_manager_base.cc
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index edaabf4c22771e71ef38a1fba14f4969e587141e..4083d3fec312b10d61a27e713071d94b1fc167ff 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -95,7 +95,15 @@ AudioManagerBase::AudioManagerBase(AudioLogFactory* audio_log_factory)
}
#endif
+#if defined(OS_WIN)
+ // We check COM initializer status right after calling this, so wait here
+ // until we finish audio thread initialization (where we also run COM
+ // initializer).
+// CHECK(audio_thread_.StartAndWait());
+ CHECK(audio_thread_.Start()); // XXX for testing
+#else
CHECK(audio_thread_.Start());
+#endif
task_runner_ = audio_thread_.message_loop_proxy();
}
« no previous file with comments | « content/public/test/test_browser_thread.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698