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

Unified Diff: webrtc/video_engine/vie_channel.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/video_engine/vie_channel.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video_engine/vie_channel.cc
diff --git a/webrtc/video_engine/vie_channel.cc b/webrtc/video_engine/vie_channel.cc
index 6befe1f88ee3f8bec68e35f5f230db475f727aef..681f72cc06bde2f4d5d2f487f76d2d96a0a30d4f 100644
--- a/webrtc/video_engine/vie_channel.cc
+++ b/webrtc/video_engine/vie_channel.cc
@@ -187,7 +187,8 @@ ViEChannel::~ViEChannel() {
module_process_thread_->DeRegisterModule(rtp_rtcp);
delete rtp_rtcp;
}
- StopDecodeThread();
+ if (!sender_)
+ StopDecodeThread();
// Release modules.
VideoCodingModule::Destroy(vcm_);
}
@@ -439,20 +440,6 @@ int32_t ViEChannel::RegisterExternalDecoder(const uint8_t pl_type,
return vcm_->SetRenderDelay(render_delay);
}
-int32_t ViEChannel::DeRegisterExternalDecoder(const uint8_t pl_type) {
- RTC_DCHECK(!sender_);
- VideoCodec current_receive_codec;
- int32_t result = 0;
- result = vcm_->ReceiveCodec(&current_receive_codec);
- vcm_->RegisterExternalDecoder(NULL, pl_type, false);
-
- if (result == 0 && current_receive_codec.plType == pl_type) {
- result = vcm_->RegisterReceiveCodec(&current_receive_codec,
- number_of_cores_, false);
- }
- return result;
-}
-
int32_t ViEChannel::ReceiveCodecStatistics(uint32_t* num_key_frames,
uint32_t* num_delta_frames) {
CriticalSectionScoped cs(crit_.get());
« no previous file with comments | « webrtc/video_engine/vie_channel.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698