generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 79205306-> 79244016

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7633 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org
2014-11-05 13:25:48 +00:00
parent 72fd339352
commit a22a628356
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
talk/media/webrtc/webrtcvideoengine.cc
View File

@@ -1661,10 +1661,12 @@ bool WebRtcVideoMediaChannel::Init() {
} }
WebRtcVideoMediaChannel::~WebRtcVideoMediaChannel() { WebRtcVideoMediaChannel::~WebRtcVideoMediaChannel() {
const bool send = false; Terminate();
SetSend(send); }
const bool render = false;
SetRender(render); void WebRtcVideoMediaChannel::Terminate() {
SetSend(false);
SetRender(false);
while (!send_channels_.empty()) { while (!send_channels_.empty()) {
if (!DeleteSendChannel(send_channels_.begin()->first)) { if (!DeleteSendChannel(send_channels_.begin()->first)) {

1
talk/media/webrtc/webrtcvideoengine.h
View File

@@ -330,6 +330,7 @@ class WebRtcVideoMediaChannel : public rtc::MessageHandler,
virtual void OnMessage(rtc::Message* msg) OVERRIDE; virtual void OnMessage(rtc::Message* msg) OVERRIDE;
protected: protected:
void Terminate();
int GetLastEngineError() { return engine()->GetLastEngineError(); } int GetLastEngineError() { return engine()->GetLastEngineError(); }
// webrtc::Transport: // webrtc::Transport: