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

CaptureManager: Don't stop a capturer at UnregisterVideoCapturer if it did not start in the first place.

Browse Source 
This fixes a bug where, if the VideoCapturer failed to start under certain circumstances, the capture manager would cause a callback saying that the capturer stopped even though it never started in the first place. A VERIFY check in VideoSource::SetState would then cause a crash since the state was set to kEnded when it was already in state kEnded (SetState only allows being called when the state changes).

I only noticed this bug while doing a mistake in a separate CL. Not sure how to reliably reproduce said bug on a working build, but I have previously had camera hardware issues where it couldn't start the camera which resulted in the SetState kEnded -> kEnded crash. Hopefully this will fix that.

R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/51039004

Cr-Commit-Position: refs/heads/master@{#9259}
This commit is contained in:
Henrik Boström
2015-05-22 09:43:26 +02:00
parent 9a416bd14e
commit 915df4fc30
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
talk/media/base/capturemanager.cc
View File

@@ -375,8 +375,10 @@ void CaptureManager::UnregisterVideoCapturer(
// for the CaptureManager it doesn't matter as it will no longer receive any
// frames from the VideoCapturer.
SignalCapturerStateChange.stop(video_capturer->SignalStateChange);
video_capturer->Stop();
SignalCapturerStateChange(video_capturer, CS_STOPPED);
if (video_capturer->IsRunning()) {
video_capturer->Stop();
SignalCapturerStateChange(video_capturer, CS_STOPPED);
}
}
bool CaptureManager::StartWithBestCaptureFormat(