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

Side by Side Diff: webrtc/call/call.cc

Issue 2856063003: Replace AudioSendStream::Config with rtclog::StreamConfig. (Closed)
Patch Set: Rebased Created 3 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
« no previous file with comments | « no previous file | webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h » ('j') | 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 126
127 rtclog::StreamConfig CreateRtcLogStreamConfig( 127 rtclog::StreamConfig CreateRtcLogStreamConfig(
128 const AudioReceiveStream::Config& config) { 128 const AudioReceiveStream::Config& config) {
129 rtclog::StreamConfig rtclog_config; 129 rtclog::StreamConfig rtclog_config;
130 rtclog_config.remote_ssrc = config.rtp.remote_ssrc; 130 rtclog_config.remote_ssrc = config.rtp.remote_ssrc;
131 rtclog_config.local_ssrc = config.rtp.local_ssrc; 131 rtclog_config.local_ssrc = config.rtp.local_ssrc;
132 rtclog_config.rtp_extensions = config.rtp.extensions; 132 rtclog_config.rtp_extensions = config.rtp.extensions;
133 return rtclog_config; 133 return rtclog_config;
134 } 134 }
135 135
136 rtclog::StreamConfig CreateRtcLogStreamConfig(
137 const AudioSendStream::Config& config) {
138 rtclog::StreamConfig rtclog_config;
139 rtclog_config.local_ssrc = config.rtp.ssrc;
140 rtclog_config.rtp_extensions = config.rtp.extensions;
141 if (config.send_codec_spec) {
142 rtclog_config.codecs.emplace_back(config.send_codec_spec->format.name,
143 config.send_codec_spec->payload_type, 0);
144 }
145 return rtclog_config;
146 }
147
136 } // namespace 148 } // namespace
137 149
138 namespace internal { 150 namespace internal {
139 151
140 class Call : public webrtc::Call, 152 class Call : public webrtc::Call,
141 public PacketReceiver, 153 public PacketReceiver,
142 public RecoveredPacketReceiver, 154 public RecoveredPacketReceiver,
143 public SendSideCongestionController::Observer, 155 public SendSideCongestionController::Observer,
144 public BitrateAllocator::LimitObserver { 156 public BitrateAllocator::LimitObserver {
145 public: 157 public:
(...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
542 // TODO(solenberg): Some test cases in EndToEndTest use this from a different 554 // TODO(solenberg): Some test cases in EndToEndTest use this from a different
543 // thread. Re-enable once that is fixed. 555 // thread. Re-enable once that is fixed.
544 // RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); 556 // RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread());
545 return this; 557 return this;
546 } 558 }
547 559
548 webrtc::AudioSendStream* Call::CreateAudioSendStream( 560 webrtc::AudioSendStream* Call::CreateAudioSendStream(
549 const webrtc::AudioSendStream::Config& config) { 561 const webrtc::AudioSendStream::Config& config) {
550 TRACE_EVENT0("webrtc", "Call::CreateAudioSendStream"); 562 TRACE_EVENT0("webrtc", "Call::CreateAudioSendStream");
551 RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); 563 RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread());
552 event_log_->LogAudioSendStreamConfig(config); 564 event_log_->LogAudioSendStreamConfig(CreateRtcLogStreamConfig(config));
553 AudioSendStream* send_stream = new AudioSendStream( 565 AudioSendStream* send_stream = new AudioSendStream(
554 config, config_.audio_state, &worker_queue_, transport_send_.get(), 566 config, config_.audio_state, &worker_queue_, transport_send_.get(),
555 bitrate_allocator_.get(), event_log_, call_stats_->rtcp_rtt_stats()); 567 bitrate_allocator_.get(), event_log_, call_stats_->rtcp_rtt_stats());
556 { 568 {
557 WriteLockScoped write_lock(*send_crit_); 569 WriteLockScoped write_lock(*send_crit_);
558 RTC_DCHECK(audio_send_ssrcs_.find(config.rtp.ssrc) == 570 RTC_DCHECK(audio_send_ssrcs_.find(config.rtp.ssrc) ==
559 audio_send_ssrcs_.end()); 571 audio_send_ssrcs_.end());
560 audio_send_ssrcs_[config.rtp.ssrc] = send_stream; 572 audio_send_ssrcs_[config.rtp.ssrc] = send_stream;
561 } 573 }
562 { 574 {
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after
1281 (use_send_side_bwe && header.extension.hasTransportSequenceNumber)) { 1293 (use_send_side_bwe && header.extension.hasTransportSequenceNumber)) {
1282 receive_side_cc_.OnReceivedPacket( 1294 receive_side_cc_.OnReceivedPacket(
1283 packet.arrival_time_ms(), packet.payload_size() + packet.padding_size(), 1295 packet.arrival_time_ms(), packet.payload_size() + packet.padding_size(),
1284 header); 1296 header);
1285 } 1297 }
1286 } 1298 }
1287 1299
1288 } // namespace internal 1300 } // namespace internal
1289 1301
1290 } // namespace webrtc 1302 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/logging/rtc_event_log/mock/mock_rtc_event_log.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698