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

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

Issue 23731007: Implicit audio output device selection for getUserMedia. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase Created 7 years, 3 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 e042d8c2d2852779b0e567cf1d105225d5f30fd2..4b48bdb7bf7050d80b0fc17ee23dbe8301705c21 100644
--- a/content/common/media/media_stream_options.cc
+++ b/content/common/media/media_stream_options.cc
@@ -48,9 +48,10 @@ StreamDeviceInfo::StreamDeviceInfo(MediaStreamType service_param,
const std::string& device_param,
int sample_rate,
int channel_layout,
+ int frames_per_buffer,
bool opened)
: device(service_param, device_param, name_param, sample_rate,
- channel_layout),
+ channel_layout, frames_per_buffer),
in_use(opened),
session_id(kNoId) {
}
@@ -58,11 +59,15 @@ StreamDeviceInfo::StreamDeviceInfo(MediaStreamType service_param,
// static
bool StreamDeviceInfo::IsEqual(const StreamDeviceInfo& first,
const StreamDeviceInfo& second) {
+ const MediaStreamDevice::AudioDeviceParameters& input_first =
+ first.device.input;
+ const MediaStreamDevice::AudioDeviceParameters& input_second =
+ second.device.input;
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 &&
+ input_first.sample_rate == input_second.sample_rate &&
+ input_first.channel_layout == input_second.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