Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| (...skipping 1340 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1351 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); | 1351 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
| 1352 if (stream_) { | 1352 if (stream_) { |
| 1353 call_->DestroyAudioSendStream(stream_); | 1353 call_->DestroyAudioSendStream(stream_); |
| 1354 stream_ = nullptr; | 1354 stream_ = nullptr; |
| 1355 } | 1355 } |
| 1356 RTC_DCHECK(!stream_); | 1356 RTC_DCHECK(!stream_); |
| 1357 if (webrtc::field_trial::FindFullName("WebRTC-AdaptAudioBitrate") == | 1357 if (webrtc::field_trial::FindFullName("WebRTC-AdaptAudioBitrate") == |
| 1358 "Enabled") { | 1358 "Enabled") { |
| 1359 // TODO(mflodman): Keep testing this and set proper values. | 1359 // TODO(mflodman): Keep testing this and set proper values. |
| 1360 // Note: This is an early experiment currently only supported by Opus. | 1360 // Note: This is an early experiment currently only supported by Opus. |
| 1361 config_.min_bitrate_kbps = kOpusMinBitrate; | 1361 config_.min_bitrate_bps = kOpusMinBitrate; |
| 1362 config_.max_bitrate_kbps = kOpusBitrateFb; | 1362 config_.max_bitrate_bps = kOpusBitrateFb; |
|
stefan-webrtc
2016/11/07 12:33:34
I would suggest adding units to the constants too.
| |
| 1363 } | 1363 } |
| 1364 stream_ = call_->CreateAudioSendStream(config_); | 1364 stream_ = call_->CreateAudioSendStream(config_); |
| 1365 RTC_CHECK(stream_); | 1365 RTC_CHECK(stream_); |
| 1366 UpdateSendState(); | 1366 UpdateSendState(); |
| 1367 } | 1367 } |
| 1368 | 1368 |
| 1369 rtc::ThreadChecker worker_thread_checker_; | 1369 rtc::ThreadChecker worker_thread_checker_; |
| 1370 rtc::RaceChecker audio_capture_race_checker_; | 1370 rtc::RaceChecker audio_capture_race_checker_; |
| 1371 webrtc::AudioTransport* const voe_audio_transport_ = nullptr; | 1371 webrtc::AudioTransport* const voe_audio_transport_ = nullptr; |
| 1372 webrtc::Call* call_ = nullptr; | 1372 webrtc::Call* call_ = nullptr; |
| (...skipping 1139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2512 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); | 2512 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); |
| 2513 const auto it = send_streams_.find(ssrc); | 2513 const auto it = send_streams_.find(ssrc); |
| 2514 if (it != send_streams_.end()) { | 2514 if (it != send_streams_.end()) { |
| 2515 return it->second->channel(); | 2515 return it->second->channel(); |
| 2516 } | 2516 } |
| 2517 return -1; | 2517 return -1; |
| 2518 } | 2518 } |
| 2519 } // namespace cricket | 2519 } // namespace cricket |
| 2520 | 2520 |
| 2521 #endif // HAVE_WEBRTC_VOICE | 2521 #endif // HAVE_WEBRTC_VOICE |
| OLD | NEW |