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/call/call.cc

Issue 1479023002: Prepare the AudioSendStream to be hooked up to send-side BWE. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Remove incorrect thread check. Created 5 years 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_send_stream.h ('k') | webrtc/call/call_perf_tests.cc » ('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 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
293 // TODO(solenberg): Some test cases in EndToEndTest use this from a different 293 // TODO(solenberg): Some test cases in EndToEndTest use this from a different
294 // thread. Re-enable once that is fixed. 294 // thread. Re-enable once that is fixed.
295 // RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); 295 // RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread());
296 return this; 296 return this;
297 } 297 }
298 298
299 webrtc::AudioSendStream* Call::CreateAudioSendStream( 299 webrtc::AudioSendStream* Call::CreateAudioSendStream(
300 const webrtc::AudioSendStream::Config& config) { 300 const webrtc::AudioSendStream::Config& config) {
301 TRACE_EVENT0("webrtc", "Call::CreateAudioSendStream"); 301 TRACE_EVENT0("webrtc", "Call::CreateAudioSendStream");
302 RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); 302 RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread());
303 AudioSendStream* send_stream = 303 AudioSendStream* send_stream = new AudioSendStream(
304 new AudioSendStream(config, config_.audio_state); 304 config, config_.audio_state, congestion_controller_.get());
305 if (!network_enabled_) 305 if (!network_enabled_)
306 send_stream->SignalNetworkState(kNetworkDown); 306 send_stream->SignalNetworkState(kNetworkDown);
307 { 307 {
308 WriteLockScoped write_lock(*send_crit_); 308 WriteLockScoped write_lock(*send_crit_);
309 RTC_DCHECK(audio_send_ssrcs_.find(config.rtp.ssrc) == 309 RTC_DCHECK(audio_send_ssrcs_.find(config.rtp.ssrc) ==
310 audio_send_ssrcs_.end()); 310 audio_send_ssrcs_.end());
311 audio_send_ssrcs_[config.rtp.ssrc] = send_stream; 311 audio_send_ssrcs_[config.rtp.ssrc] = send_stream;
312 } 312 }
313 return send_stream; 313 return send_stream;
314 } 314 }
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 // thread. Then this check can be enabled. 735 // thread. Then this check can be enabled.
736 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread()); 736 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread());
737 if (RtpHeaderParser::IsRtcp(packet, length)) 737 if (RtpHeaderParser::IsRtcp(packet, length))
738 return DeliverRtcp(media_type, packet, length); 738 return DeliverRtcp(media_type, packet, length);
739 739
740 return DeliverRtp(media_type, packet, length, packet_time); 740 return DeliverRtp(media_type, packet, length, packet_time);
741 } 741 }
742 742
743 } // namespace internal 743 } // namespace internal
744 } // namespace webrtc 744 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/audio_send_stream.h ('k') | webrtc/call/call_perf_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698