From 52ef9d77386e8d3e40c8d3d07b93f06950aede72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Fri, 24 Apr 2015 18:06:52 +0200 Subject: [PATCH] Stop IncomingVideoStream on delete. Fixes race between VideoReceiveStream destruction and pending IncomingVideoStream frames. BUG= TBR=mflodman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/45259004 Cr-Commit-Position: refs/heads/master@{#9084} --- webrtc/video/video_receive_stream.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/webrtc/video/video_receive_stream.cc b/webrtc/video/video_receive_stream.cc index bcb42c6679..344577afb0 100644 --- a/webrtc/video/video_receive_stream.cc +++ b/webrtc/video/video_receive_stream.cc @@ -263,6 +263,7 @@ VideoReceiveStream::VideoReceiveStream(webrtc::VideoEngine* video_engine, } VideoReceiveStream::~VideoReceiveStream() { + incoming_video_stream_->Stop(); vie_channel_->RegisterPreRenderCallback(nullptr); vie_channel_->RegisterPreDecodeImageCallback(nullptr);