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

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

Issue 1725213002: Fix hotword module constantly restarting on Pixel 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/user_media_client_impl.cc
diff --git a/content/renderer/media/user_media_client_impl.cc b/content/renderer/media/user_media_client_impl.cc
index 15e096b6469d9b1bc061d68be7d41c99bb18666c..faf827456d79393dea5a25196afdbacb2a66065c 100644
--- a/content/renderer/media/user_media_client_impl.cc
+++ b/content/renderer/media/user_media_client_impl.cc
@@ -69,8 +69,11 @@ void CopyBlinkRequestToStreamControls(const blink::WebUserMediaRequest& request,
// TODO(hta): Get alternatives only mentioned in advanced array.
CopyVector(audio_basic.deviceId.ideal(),
&controls->audio.alternate_device_ids);
- if (!audio_basic.hotwordEnabled.matches(false))
- controls->hotword_enabled = true;
+
+ for (const auto& audio_advanced : request.audioConstraints().advanced()) {
+ if (!audio_advanced.hotwordEnabled.matches(false))
+ controls->hotword_enabled = true;
hta - Chromium 2016/02/26 11:35:44 1) put a break in this loop. 2) instead use if
Anand Mistry (off Chromium) 2016/02/29 02:10:07 Done.
+ }
}
if (!request.videoConstraints().isNull()) {
const blink::WebMediaTrackConstraintSet& video_basic =
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698