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

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

Issue 1984983002: Remove use of RtpHeaderExtension and clean up (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressed nit Created 4 years, 7 months 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
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 congestion_controller->pacer(), 72 congestion_controller->pacer(),
73 congestion_controller->GetTransportFeedbackObserver(), 73 congestion_controller->GetTransportFeedbackObserver(),
74 congestion_controller->packet_router()); 74 congestion_controller->packet_router());
75 channel_proxy_->SetRTCPStatus(true); 75 channel_proxy_->SetRTCPStatus(true);
76 channel_proxy_->SetLocalSSRC(config.rtp.ssrc); 76 channel_proxy_->SetLocalSSRC(config.rtp.ssrc);
77 channel_proxy_->SetRTCP_CNAME(config.rtp.c_name); 77 channel_proxy_->SetRTCP_CNAME(config.rtp.c_name);
78 78
79 channel_proxy_->RegisterExternalTransport(config.send_transport); 79 channel_proxy_->RegisterExternalTransport(config.send_transport);
80 80
81 for (const auto& extension : config.rtp.extensions) { 81 for (const auto& extension : config.rtp.extensions) {
82 if (extension.name == RtpExtension::kAbsSendTime) { 82 if (extension.uri == RtpExtension::kAbsSendTimeUri) {
83 channel_proxy_->SetSendAbsoluteSenderTimeStatus(true, extension.id); 83 channel_proxy_->SetSendAbsoluteSenderTimeStatus(true, extension.id);
84 } else if (extension.name == RtpExtension::kAudioLevel) { 84 } else if (extension.uri == RtpExtension::kAudioLevelUri) {
85 channel_proxy_->SetSendAudioLevelIndicationStatus(true, extension.id); 85 channel_proxy_->SetSendAudioLevelIndicationStatus(true, extension.id);
86 } else if (extension.name == RtpExtension::kTransportSequenceNumber) { 86 } else if (extension.uri == RtpExtension::kTransportSequenceNumberUri) {
87 channel_proxy_->EnableSendTransportSequenceNumber(extension.id); 87 channel_proxy_->EnableSendTransportSequenceNumber(extension.id);
88 } else { 88 } else {
89 RTC_NOTREACHED() << "Registering unsupported RTP extension."; 89 RTC_NOTREACHED() << "Registering unsupported RTP extension.";
90 } 90 }
91 } 91 }
92 } 92 }
93 93
94 AudioSendStream::~AudioSendStream() { 94 AudioSendStream::~AudioSendStream() {
95 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 95 RTC_DCHECK(thread_checker_.CalledOnValidThread());
96 LOG(LS_INFO) << "~AudioSendStream: " << config_.ToString(); 96 LOG(LS_INFO) << "~AudioSendStream: " << config_.ToString();
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 225
226 VoiceEngine* AudioSendStream::voice_engine() const { 226 VoiceEngine* AudioSendStream::voice_engine() const {
227 internal::AudioState* audio_state = 227 internal::AudioState* audio_state =
228 static_cast<internal::AudioState*>(audio_state_.get()); 228 static_cast<internal::AudioState*>(audio_state_.get());
229 VoiceEngine* voice_engine = audio_state->voice_engine(); 229 VoiceEngine* voice_engine = audio_state->voice_engine();
230 RTC_DCHECK(voice_engine); 230 RTC_DCHECK(voice_engine);
231 return voice_engine; 231 return voice_engine;
232 } 232 }
233 } // namespace internal 233 } // namespace internal
234 } // namespace webrtc 234 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698