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/public/common/media_stream_request.h" | 5 #include "content/public/common/media_stream_request.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 | 8 |
9 namespace content { | 9 namespace content { |
10 | 10 |
(...skipping 30 matching lines...) Expand all Loading... |
41 } | 41 } |
42 #endif | 42 #endif |
43 } | 43 } |
44 | 44 |
45 MediaStreamDevice::MediaStreamDevice( | 45 MediaStreamDevice::MediaStreamDevice( |
46 MediaStreamType type, | 46 MediaStreamType type, |
47 const std::string& id, | 47 const std::string& id, |
48 const std::string& name, | 48 const std::string& name, |
49 int sample_rate, | 49 int sample_rate, |
50 int channel_layout, | 50 int channel_layout, |
51 int frames_per_buffer) | 51 int frames_per_buffer, |
| 52 bool use_platform_aec) |
52 : type(type), | 53 : type(type), |
53 id(id), | 54 id(id), |
54 video_facing(MEDIA_VIDEO_FACING_NONE), | 55 video_facing(MEDIA_VIDEO_FACING_NONE), |
55 name(name), | 56 name(name), |
56 input(sample_rate, channel_layout, frames_per_buffer) { | 57 input(sample_rate, channel_layout, frames_per_buffer, |
| 58 use_platform_aec) { |
57 } | 59 } |
58 | 60 |
59 MediaStreamDevice::~MediaStreamDevice() {} | 61 MediaStreamDevice::~MediaStreamDevice() {} |
60 | 62 |
61 bool MediaStreamDevice::IsEqual(const MediaStreamDevice& second) const { | 63 bool MediaStreamDevice::IsEqual(const MediaStreamDevice& second) const { |
62 const AudioDeviceParameters& input_second = second.input; | 64 const AudioDeviceParameters& input_second = second.input; |
63 return type == second.type && | 65 return type == second.type && |
64 name == second.name && | 66 name == second.name && |
65 id == second.id && | 67 id == second.id && |
66 input.sample_rate == input_second.sample_rate && | 68 input.sample_rate == input_second.sample_rate && |
(...skipping 17 matching lines...) Expand all Loading... |
84 request_type(request_type), | 86 request_type(request_type), |
85 requested_audio_device_id(requested_audio_device_id), | 87 requested_audio_device_id(requested_audio_device_id), |
86 requested_video_device_id(requested_video_device_id), | 88 requested_video_device_id(requested_video_device_id), |
87 audio_type(audio_type), | 89 audio_type(audio_type), |
88 video_type(video_type) { | 90 video_type(video_type) { |
89 } | 91 } |
90 | 92 |
91 MediaStreamRequest::~MediaStreamRequest() {} | 93 MediaStreamRequest::~MediaStreamRequest() {} |
92 | 94 |
93 } // namespace content | 95 } // namespace content |
OLD | NEW |