Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-01 03:21:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 817141 - Call EndTrack()/Finish() from StopPreview() (as well) to prevent deadlock. r=kchen

Browse Source
This commit is contained in:
Mike Habicher 2012-12-04 21:00:39 -05:00
parent 9d63415c7d
commit f9756fe293
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dom/camera/DOMCameraPreview.cpp
View File

@ -251,6 +251,8 @@ DOMCameraPreview::StopPreview()
DOM_CAMERA_LOGI("Stopping preview stream\n");
mState = STOPPING;
mCameraControl->StopPreview();
mInput->EndTrack(TRACK_VIDEO);
mInput->Finish();
}
void
@ -258,8 +260,11 @@ DOMCameraPreview::SetStateStopped()
{
NS_ASSERTION(NS_IsMainThread(), "SetStateStopped() not called from main thread");
mInput->EndTrack(TRACK_VIDEO);
mInput->Finish();
// see bug 809259 and bug 817367.
if (mState != STOPPING) {
mInput->EndTrack(TRACK_VIDEO);
mInput->Finish();
}
mState = STOPPED;
DOM_CAMERA_LOGI("Preview stream stopped\n");