zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Deinit() to the destructors of Voice/Video/RtpDataChannel.

Browse Source 
This is a follow up CL of
https://webrtc-review.googlesource.com/c/src/+/59586.

The Deinit() method is not added because of some merging issue.

Bug: none
Change-Id: If23b0619a027379b920d4113ec507bff087d44fd
Reviewed-on: https://webrtc-review.googlesource.com/65787
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Zhi Huang <zhihuang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22694}
This commit is contained in:
Zhi Huang
2018-03-30 13:17:42 -07:00
committed by Commit Bot
parent e830e683c4
commit 0ffe03d2ef
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pc/channel.cc
View File

@ -704,6 +704,7 @@ VoiceChannel::~VoiceChannel() {
TRACE_EVENT0("webrtc", "VoiceChannel::~VoiceChannel");
// this can't be done in the base class, since it calls a virtual
DisableMedia_w();
Deinit();
}
void BaseChannel::UpdateMediaSendRecvState() {
@ -835,6 +836,7 @@ VideoChannel::~VideoChannel() {
TRACE_EVENT0("webrtc", "VideoChannel::~VideoChannel");
// this can't be done in the base class, since it calls a virtual
DisableMedia_w();
Deinit();
}
void VideoChannel::UpdateMediaSendRecvState_w() {
@ -965,6 +967,7 @@ RtpDataChannel::~RtpDataChannel() {
TRACE_EVENT0("webrtc", "RtpDataChannel::~RtpDataChannel");
// this can't be done in the base class, since it calls a virtual
DisableMedia_w();
Deinit();
}
void RtpDataChannel::Init_w(webrtc::RtpTransportInternal* rtp_transport) {