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

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

Issue 2649323010: Revert of Make RTX pt/apt reconfigurable by calling WebRtcVideoChannel2::SetRecvParameters. (Closed)
Patch Set: Created 3 years, 10 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/call/rampup_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 631 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 num_cpu_cores_, congestion_controller_.get(), &packet_router_, 642 num_cpu_cores_, congestion_controller_.get(), &packet_router_,
643 std::move(configuration), voice_engine(), module_process_thread_.get(), 643 std::move(configuration), voice_engine(), module_process_thread_.get(),
644 call_stats_.get(), &remb_); 644 call_stats_.get(), &remb_);
645 645
646 const webrtc::VideoReceiveStream::Config& config = receive_stream->config(); 646 const webrtc::VideoReceiveStream::Config& config = receive_stream->config();
647 { 647 {
648 WriteLockScoped write_lock(*receive_crit_); 648 WriteLockScoped write_lock(*receive_crit_);
649 RTC_DCHECK(video_receive_ssrcs_.find(config.rtp.remote_ssrc) == 649 RTC_DCHECK(video_receive_ssrcs_.find(config.rtp.remote_ssrc) ==
650 video_receive_ssrcs_.end()); 650 video_receive_ssrcs_.end());
651 video_receive_ssrcs_[config.rtp.remote_ssrc] = receive_stream; 651 video_receive_ssrcs_[config.rtp.remote_ssrc] = receive_stream;
652 if (config.rtp.rtx_ssrc) 652 // TODO(pbos): Configure different RTX payloads per receive payload.
653 video_receive_ssrcs_[config.rtp.rtx_ssrc] = receive_stream; 653 VideoReceiveStream::Config::Rtp::RtxMap::const_iterator it =
654 config.rtp.rtx.begin();
655 if (it != config.rtp.rtx.end())
656 video_receive_ssrcs_[it->second.ssrc] = receive_stream;
654 video_receive_streams_.insert(receive_stream); 657 video_receive_streams_.insert(receive_stream);
655 ConfigureSync(config.sync_group); 658 ConfigureSync(config.sync_group);
656 } 659 }
657 receive_stream->SignalNetworkState(video_network_state_); 660 receive_stream->SignalNetworkState(video_network_state_);
658 UpdateAggregateNetworkState(); 661 UpdateAggregateNetworkState();
659 event_log_->LogVideoReceiveStreamConfig(config); 662 event_log_->LogVideoReceiveStreamConfig(config);
660 return receive_stream; 663 return receive_stream;
661 } 664 }
662 665
663 void Call::DestroyVideoReceiveStream( 666 void Call::DestroyVideoReceiveStream(
(...skipping 535 matching lines...) Expand 10 before | Expand all | Expand 10 after
1199 1202
1200 void Call::NotifyBweOfReceivedPacket(const RtpPacketReceived& packet) { 1203 void Call::NotifyBweOfReceivedPacket(const RtpPacketReceived& packet) {
1201 RTPHeader header; 1204 RTPHeader header;
1202 packet.GetHeader(&header); 1205 packet.GetHeader(&header);
1203 congestion_controller_->OnReceivedPacket(packet.arrival_time_ms(), 1206 congestion_controller_->OnReceivedPacket(packet.arrival_time_ms(),
1204 packet.payload_size(), header); 1207 packet.payload_size(), header);
1205 } 1208 }
1206 1209
1207 } // namespace internal 1210 } // namespace internal
1208 } // namespace webrtc 1211 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/call/rampup_tests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698