From 22bc3f60ce0e0bcb7b44185ae6fd3048f20d2883 Mon Sep 17 00:00:00 2001
From: Tommi <tommi@webrtc.org>
Date: Thu, 15 Feb 2018 17:07:26 +0100
Subject: [PATCH] Explicitly stop frame delivery in FakePeriodicVideoCapturer.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There's currently a race while deleting an instance of the
class if frame delivery hasn't been explicitly stopped.

Bug: webrtc:8894
Change-Id: I1c60e6e3f9a3e51b16a21a610d21e33fcf58cc0e
Tbr: kthelgason@webrtc.org
Reviewed-on: https://webrtc-review.googlesource.com/53980
Reviewed-by: Tommi <tommi@webrtc.org>
Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
Commit-Queue: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22039}
---
 pc/test/fakeperiodicvideocapturer.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pc/test/fakeperiodicvideocapturer.h b/pc/test/fakeperiodicvideocapturer.h
index e236164a56..e9eb47587c 100644
--- a/pc/test/fakeperiodicvideocapturer.h
+++ b/pc/test/fakeperiodicvideocapturer.h
@@ -42,6 +42,7 @@ class FakePeriodicVideoCapturer
 
   ~FakePeriodicVideoCapturer() override {
     RTC_DCHECK(main_thread_checker_.CalledOnValidThread());
+    StopFrameDelivery();
   }
 
   // Workaround method for tests to allow stopping frame delivery directly.