| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2011 Ericsson AB. All rights reserved. | 3 * Copyright (C) 2011 Ericsson AB. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions | 6 * modification, are permitted provided that the following conditions |
| 7 * are met: | 7 * are met: |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 if (platformSettings.hasFrameRate()) { | 222 if (platformSettings.hasFrameRate()) { |
| 223 settings.setFrameRate(platformSettings.frameRate); | 223 settings.setFrameRate(platformSettings.frameRate); |
| 224 } | 224 } |
| 225 if (platformSettings.hasWidth()) { | 225 if (platformSettings.hasWidth()) { |
| 226 settings.setWidth(platformSettings.width); | 226 settings.setWidth(platformSettings.width); |
| 227 } | 227 } |
| 228 if (platformSettings.hasHeight()) { | 228 if (platformSettings.hasHeight()) { |
| 229 settings.setHeight(platformSettings.height); | 229 settings.setHeight(platformSettings.height); |
| 230 } | 230 } |
| 231 settings.setDeviceId(platformSettings.deviceId); | 231 settings.setDeviceId(platformSettings.deviceId); |
| 232 if (platformSettings.hasEchoCancellation()) { |
| 233 settings.setEchoCancellation(platformSettings.echoCancellation); |
| 234 } |
| 232 } | 235 } |
| 233 | 236 |
| 234 bool MediaStreamTrack::ended() const { | 237 bool MediaStreamTrack::ended() const { |
| 235 return m_stopped || (m_readyState == MediaStreamSource::ReadyStateEnded); | 238 return m_stopped || (m_readyState == MediaStreamSource::ReadyStateEnded); |
| 236 } | 239 } |
| 237 | 240 |
| 238 void MediaStreamTrack::sourceChangedState() { | 241 void MediaStreamTrack::sourceChangedState() { |
| 239 if (ended()) | 242 if (ended()) |
| 240 return; | 243 return; |
| 241 | 244 |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 314 } | 317 } |
| 315 | 318 |
| 316 DEFINE_TRACE(MediaStreamTrack) { | 319 DEFINE_TRACE(MediaStreamTrack) { |
| 317 visitor->trace(m_registeredMediaStreams); | 320 visitor->trace(m_registeredMediaStreams); |
| 318 visitor->trace(m_component); | 321 visitor->trace(m_component); |
| 319 EventTargetWithInlineData::trace(visitor); | 322 EventTargetWithInlineData::trace(visitor); |
| 320 ContextLifecycleObserver::trace(visitor); | 323 ContextLifecycleObserver::trace(visitor); |
| 321 } | 324 } |
| 322 | 325 |
| 323 } // namespace blink | 326 } // namespace blink |
| OLD | NEW |