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

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

Issue 2165743003: Variable audio bitrate. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase Created 4 years, 4 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 | « webrtc/audio_send_stream.h ('k') | webrtc/call/rampup_tests.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 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 // thread. Re-enable once that is fixed. 341 // thread. Re-enable once that is fixed.
342 // RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); 342 // RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread());
343 return this; 343 return this;
344 } 344 }
345 345
346 webrtc::AudioSendStream* Call::CreateAudioSendStream( 346 webrtc::AudioSendStream* Call::CreateAudioSendStream(
347 const webrtc::AudioSendStream::Config& config) { 347 const webrtc::AudioSendStream::Config& config) {
348 TRACE_EVENT0("webrtc", "Call::CreateAudioSendStream"); 348 TRACE_EVENT0("webrtc", "Call::CreateAudioSendStream");
349 RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread()); 349 RTC_DCHECK(configuration_thread_checker_.CalledOnValidThread());
350 AudioSendStream* send_stream = new AudioSendStream( 350 AudioSendStream* send_stream = new AudioSendStream(
351 config, config_.audio_state, congestion_controller_.get()); 351 config, config_.audio_state, congestion_controller_.get(),
352 bitrate_allocator_.get());
352 { 353 {
353 WriteLockScoped write_lock(*send_crit_); 354 WriteLockScoped write_lock(*send_crit_);
354 RTC_DCHECK(audio_send_ssrcs_.find(config.rtp.ssrc) == 355 RTC_DCHECK(audio_send_ssrcs_.find(config.rtp.ssrc) ==
355 audio_send_ssrcs_.end()); 356 audio_send_ssrcs_.end());
356 audio_send_ssrcs_[config.rtp.ssrc] = send_stream; 357 audio_send_ssrcs_[config.rtp.ssrc] = send_stream;
357 } 358 }
358 send_stream->SignalNetworkState(audio_network_state_); 359 send_stream->SignalNetworkState(audio_network_state_);
359 UpdateAggregateNetworkState(); 360 UpdateAggregateNetworkState();
360 return send_stream; 361 return send_stream;
361 } 362 }
(...skipping 517 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 // thread. Then this check can be enabled. 880 // thread. Then this check can be enabled.
880 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread()); 881 // RTC_DCHECK(!configuration_thread_checker_.CalledOnValidThread());
881 if (RtpHeaderParser::IsRtcp(packet, length)) 882 if (RtpHeaderParser::IsRtcp(packet, length))
882 return DeliverRtcp(media_type, packet, length); 883 return DeliverRtcp(media_type, packet, length);
883 884
884 return DeliverRtp(media_type, packet, length, packet_time); 885 return DeliverRtp(media_type, packet, length, packet_time);
885 } 886 }
886 887
887 } // namespace internal 888 } // namespace internal
888 } // namespace webrtc 889 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/audio_send_stream.h ('k') | webrtc/call/rampup_tests.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698