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

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

Issue 1483423002: Remove VideoReceiveStream deregister of decoders. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: 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/modules/video_coding/generic_decoder.cc ('k') | webrtc/video_engine/vie_channel.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 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 vie_channel_->RegisterPreDecodeImageCallback(this); 288 vie_channel_->RegisterPreDecodeImageCallback(this);
289 vie_channel_->RegisterPreRenderCallback(this); 289 vie_channel_->RegisterPreRenderCallback(this);
290 } 290 }
291 291
292 VideoReceiveStream::~VideoReceiveStream() { 292 VideoReceiveStream::~VideoReceiveStream() {
293 LOG(LS_INFO) << "~VideoReceiveStream: " << config_.ToString(); 293 LOG(LS_INFO) << "~VideoReceiveStream: " << config_.ToString();
294 incoming_video_stream_->Stop(); 294 incoming_video_stream_->Stop();
295 vie_channel_->RegisterPreRenderCallback(nullptr); 295 vie_channel_->RegisterPreRenderCallback(nullptr);
296 vie_channel_->RegisterPreDecodeImageCallback(nullptr); 296 vie_channel_->RegisterPreDecodeImageCallback(nullptr);
297 297
298 for (size_t i = 0; i < config_.decoders.size(); ++i)
299 vie_channel_->DeRegisterExternalDecoder(config_.decoders[i].payload_type);
300
301 call_stats_->DeregisterStatsObserver(vie_channel_->GetStatsObserver()); 298 call_stats_->DeregisterStatsObserver(vie_channel_->GetStatsObserver());
302 congestion_controller_->SetChannelRembStatus(false, false, 299 congestion_controller_->SetChannelRembStatus(false, false,
303 vie_channel_->rtp_rtcp()); 300 vie_channel_->rtp_rtcp());
304 301
305 uint32_t remote_ssrc = vie_channel_->GetRemoteSSRC(); 302 uint32_t remote_ssrc = vie_channel_->GetRemoteSSRC();
306 bool send_side_bwe = UseSendSideBwe(config_.rtp.extensions); 303 bool send_side_bwe = UseSendSideBwe(config_.rtp.extensions);
307 congestion_controller_->GetRemoteBitrateEstimator(send_side_bwe)-> 304 congestion_controller_->GetRemoteBitrateEstimator(send_side_bwe)->
308 RemoveStream(remote_ssrc); 305 RemoveStream(remote_ssrc);
309 } 306 }
310 307
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 return 0; 383 return 0;
387 } 384 }
388 385
389 void VideoReceiveStream::SignalNetworkState(NetworkState state) { 386 void VideoReceiveStream::SignalNetworkState(NetworkState state) {
390 vie_channel_->SetRTCPMode(state == kNetworkUp ? config_.rtp.rtcp_mode 387 vie_channel_->SetRTCPMode(state == kNetworkUp ? config_.rtp.rtcp_mode
391 : RtcpMode::kOff); 388 : RtcpMode::kOff);
392 } 389 }
393 390
394 } // namespace internal 391 } // namespace internal
395 } // namespace webrtc 392 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/generic_decoder.cc ('k') | webrtc/video_engine/vie_channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698