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

Unified Diff: content/common/media/media_stream_options.cc

Issue 11783059: Ensures that WebRTC works for device selection using a different sample rate than default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix after review from Chris Created 7 years, 11 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/common/media/media_stream_options.h ('k') | content/public/common/media_stream_request.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/media/media_stream_options.cc
diff --git a/content/common/media/media_stream_options.cc b/content/common/media/media_stream_options.cc
index 95ced6fde1ba78538be55c6cf14cad24e140883e..fba8cb409c2cc81631587d64048300e23f8808f3 100644
--- a/content/common/media/media_stream_options.cc
+++ b/content/common/media/media_stream_options.cc
@@ -36,7 +36,20 @@ StreamDeviceInfo::StreamDeviceInfo(MediaStreamType service_param,
bool opened)
: device(service_param, device_param, name_param),
in_use(opened),
- session_id(kNoId) {}
+ session_id(kNoId) {
+}
+
+StreamDeviceInfo::StreamDeviceInfo(MediaStreamType service_param,
+ const std::string& name_param,
+ const std::string& device_param,
+ int sample_rate,
+ int channel_layout,
+ bool opened)
+ : device(service_param, device_param, name_param, sample_rate,
+ channel_layout),
+ in_use(opened),
+ session_id(kNoId) {
+}
// static
bool StreamDeviceInfo::IsEqual(const StreamDeviceInfo& first,
@@ -44,6 +57,8 @@ bool StreamDeviceInfo::IsEqual(const StreamDeviceInfo& first,
return first.device.type == second.device.type &&
first.device.name == second.device.name &&
first.device.id == second.device.id &&
+ first.device.sample_rate == second.device.sample_rate &&
+ first.device.channel_layout == second.device.channel_layout &&
first.in_use == second.in_use &&
first.session_id == second.session_id;
}
« no previous file with comments | « content/common/media/media_stream_options.h ('k') | content/public/common/media_stream_request.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698