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

Side by Side Diff: webrtc/audio/audio_send_stream.cc

Issue 2473663002: Fix crash when registering abs-send-time to AudioSend/ReceiveStream. (Closed)
Patch Set: Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « webrtc/audio/audio_receive_stream.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 channel_proxy_->SetNACKStatus(config_.rtp.nack.rtp_history_ms != 0, 72 channel_proxy_->SetNACKStatus(config_.rtp.nack.rtp_history_ms != 0,
73 config_.rtp.nack.rtp_history_ms / 20); 73 config_.rtp.nack.rtp_history_ms / 20);
74 74
75 channel_proxy_->RegisterExternalTransport(config.send_transport); 75 channel_proxy_->RegisterExternalTransport(config.send_transport);
76 76
77 for (const auto& extension : config.rtp.extensions) { 77 for (const auto& extension : config.rtp.extensions) {
78 if (extension.uri == RtpExtension::kAudioLevelUri) { 78 if (extension.uri == RtpExtension::kAudioLevelUri) {
79 channel_proxy_->SetSendAudioLevelIndicationStatus(true, extension.id); 79 channel_proxy_->SetSendAudioLevelIndicationStatus(true, extension.id);
80 } else if (extension.uri == RtpExtension::kTransportSequenceNumberUri) { 80 } else if (extension.uri == RtpExtension::kTransportSequenceNumberUri) {
81 channel_proxy_->EnableSendTransportSequenceNumber(extension.id); 81 channel_proxy_->EnableSendTransportSequenceNumber(extension.id);
82 } else if (extension.uri == RtpExtension::kAbsSendTimeUri) {
83 LOG(LS_WARNING) << RtpExtension::kAbsSendTimeUri
84 << " is no longer supported for audio.";
82 } else { 85 } else {
83 RTC_NOTREACHED() << "Registering unsupported RTP extension."; 86 RTC_NOTREACHED() << "Registering unsupported RTP extension.";
84 } 87 }
85 } 88 }
86 if (!SetupSendCodec()) { 89 if (!SetupSendCodec()) {
87 LOG(LS_ERROR) << "Failed to set up send codec state."; 90 LOG(LS_ERROR) << "Failed to set up send codec state.";
88 } 91 }
89 } 92 }
90 93
91 AudioSendStream::~AudioSendStream() { 94 AudioSendStream::~AudioSendStream() {
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 LOG(LS_WARNING) << "SetVADStatus() failed: " << base->LastError(); 386 LOG(LS_WARNING) << "SetVADStatus() failed: " << base->LastError();
384 return false; 387 return false;
385 } 388 }
386 } 389 }
387 } 390 }
388 return true; 391 return true;
389 } 392 }
390 393
391 } // namespace internal 394 } // namespace internal
392 } // namespace webrtc 395 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/audio/audio_receive_stream.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698