OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/common/media/media_stream_options.h" | 5 #include "content/common/media/media_stream_options.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 | 8 |
9 namespace content { | 9 namespace content { |
10 | 10 |
(...skipping 29 matching lines...) Expand all Loading... |
40 const std::string& device_param) | 40 const std::string& device_param) |
41 : device(service_param, device_param, name_param), | 41 : device(service_param, device_param, name_param), |
42 session_id(kNoId) { | 42 session_id(kNoId) { |
43 } | 43 } |
44 | 44 |
45 StreamDeviceInfo::StreamDeviceInfo(MediaStreamType service_param, | 45 StreamDeviceInfo::StreamDeviceInfo(MediaStreamType service_param, |
46 const std::string& name_param, | 46 const std::string& name_param, |
47 const std::string& device_param, | 47 const std::string& device_param, |
48 int sample_rate, | 48 int sample_rate, |
49 int channel_layout, | 49 int channel_layout, |
50 int frames_per_buffer) | 50 int frames_per_buffer, |
| 51 bool use_platform_aec) |
51 : device(service_param, device_param, name_param, sample_rate, | 52 : device(service_param, device_param, name_param, sample_rate, |
52 channel_layout, frames_per_buffer), | 53 channel_layout, frames_per_buffer, use_platform_aec), |
53 session_id(kNoId) { | 54 session_id(kNoId) { |
54 } | 55 } |
55 | 56 |
56 // static | 57 // static |
57 bool StreamDeviceInfo::IsEqual(const StreamDeviceInfo& first, | 58 bool StreamDeviceInfo::IsEqual(const StreamDeviceInfo& first, |
58 const StreamDeviceInfo& second) { | 59 const StreamDeviceInfo& second) { |
59 return first.device.IsEqual(second.device) && | 60 return first.device.IsEqual(second.device) && |
60 first.session_id == second.session_id; | 61 first.session_id == second.session_id; |
61 } | 62 } |
62 | 63 |
63 } // namespace content | 64 } // namespace content |
OLD | NEW |