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

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

Issue 2813543005: Revert of Initialize default audio device ID with explicit device ID. (Closed)
Patch Set: Created 3 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
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 cb5d7bea7d4721eac62b9bff3df0c7986ece2f9f..100cb5368675761e28b8168000a964df5c0f47ee 100644
--- a/content/renderer/media/user_media_client_impl.cc
+++ b/content/renderer/media/user_media_client_impl.cc
@@ -31,7 +31,6 @@
#include "content/renderer/media/webrtc_logging.h"
#include "content/renderer/media/webrtc_uma_histograms.h"
#include "content/renderer/render_thread_impl.h"
-#include "media/audio/audio_device_description.h"
#include "media/capture/video_capture_types.h"
#include "third_party/WebKit/public/platform/WebMediaConstraints.h"
#include "third_party/WebKit/public/platform/WebMediaDeviceInfo.h"
@@ -86,7 +85,7 @@
const MediaDeviceInfoArray& device_infos,
std::string* device_id) {
DCHECK(!constraints.IsNull());
- DCHECK(media::AudioDeviceDescription::IsDefaultDevice(*device_id));
+ DCHECK(device_id->empty());
if (constraints.Basic().device_id.Exact().size() > 1) {
LOG(ERROR) << "Only one required device ID is supported";
@@ -399,12 +398,6 @@
current_request_info_->request().AudioConstraints(),
&current_request_info_->stream_controls()->audio,
&request_audio_input_devices);
- // Explicitly initialize the requested device ID to the default.
- if (IsDeviceSource(
- current_request_info_->stream_controls()->audio.stream_source)) {
- current_request_info_->stream_controls()->audio.device_id =
- std::string(media::AudioDeviceDescription::kDefaultDeviceId);
- }
CopyHotwordAndLocalEchoToStreamControls(
current_request_info_->request().AudioConstraints(),
current_request_info_->stream_controls());
« no previous file with comments | « content/browser/renderer_host/media/media_stream_manager.cc ('k') | content/renderer/media/user_media_client_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698