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

Side by Side Diff: webrtc/video/video_receive_stream.cc

Issue 1964473002: Potential fix for rtx/red issue where red is removed only from the remote description. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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) 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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 congestion_controller_->GetRemoteBitrateEstimator( 169 congestion_controller_->GetRemoteBitrateEstimator(
170 UseSendSideBwe(config_)), 170 UseSendSideBwe(config_)),
171 &transport_adapter_, 171 &transport_adapter_,
172 call_stats_->rtcp_rtt_stats(), 172 call_stats_->rtcp_rtt_stats(),
173 congestion_controller_->pacer(), 173 congestion_controller_->pacer(),
174 congestion_controller_->packet_router()), 174 congestion_controller_->packet_router()),
175 vie_channel_(&video_receiver_, 175 vie_channel_(&video_receiver_,
176 &rtp_stream_receiver_), 176 &rtp_stream_receiver_),
177 vie_sync_(&video_receiver_), 177 vie_sync_(&video_receiver_),
178 rtp_rtcp_(vie_channel_.rtp_rtcp()) { 178 rtp_rtcp_(vie_channel_.rtp_rtcp()) {
179 LOG(LS_INFO) << "VideoReceiveStream: " << config_.ToString(); 179 LOG(LS_WARNING) << "VideoReceiveStream: " << config_.ToString();
180 180
181 RTC_DCHECK(process_thread_); 181 RTC_DCHECK(process_thread_);
182 RTC_DCHECK(congestion_controller_); 182 RTC_DCHECK(congestion_controller_);
183 RTC_DCHECK(call_stats_); 183 RTC_DCHECK(call_stats_);
184 RTC_DCHECK(remb_); 184 RTC_DCHECK(remb_);
185 RTC_CHECK(vie_channel_.Init() == 0); 185 RTC_CHECK(vie_channel_.Init() == 0);
186 186
187 // Register the channel to receive stats updates. 187 // Register the channel to receive stats updates.
188 call_stats_->RegisterStatsObserver(vie_channel_.GetStatsObserver()); 188 call_stats_->RegisterStatsObserver(vie_channel_.GetStatsObserver());
189 189
(...skipping 246 matching lines...) Expand 10 before | Expand all | Expand 10 after
436 436
437 void VideoReceiveStream::SendNack( 437 void VideoReceiveStream::SendNack(
438 const std::vector<uint16_t>& sequence_numbers) { 438 const std::vector<uint16_t>& sequence_numbers) {
439 rtp_rtcp_->SendNack(sequence_numbers); 439 rtp_rtcp_->SendNack(sequence_numbers);
440 } 440 }
441 441
442 void VideoReceiveStream::RequestKeyFrame() { 442 void VideoReceiveStream::RequestKeyFrame() {
443 rtp_rtcp_->RequestKeyFrame(); 443 rtp_rtcp_->RequestKeyFrame();
444 } 444 }
445 445
446 void VideoReceiveStream::DisableFec() {
447 rtp_stream_receiver_.DisableFec();
448 }
449
446 } // namespace internal 450 } // namespace internal
447 } // namespace webrtc 451 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698