Bug 1249313 - Don't shut down the entire Cameras IPC if a single source is shut down. r=jesup
authorGian-Carlo Pascutto <gcp@mozilla.com>
Tue, 23 Feb 2016 15:20:26 +0100
changeset 285342 b1b50935ab45f360774e75a4d814b2f9bf02d916
parent 285341 3a0d8138b2775d90aea43ecdc89e11b19688a92f
child 285343 824e64d7a817197e244b8d6ec064c8562f6327ef
push id72329
push usergpascutto@mozilla.com
push dateWed, 24 Feb 2016 16:23:15 +0000
treeherdermozilla-inbound@b1b50935ab45 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1249313
milestone47.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1249313 - Don't shut down the entire Cameras IPC if a single source is shut down. r=jesup
dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
--- a/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
+++ b/dom/media/webrtc/MediaEngineRemoteVideoSource.cpp
@@ -85,18 +85,16 @@ MediaEngineRemoteVideoSource::Shutdown()
     }
     MOZ_ASSERT(mState == kStopped);
   }
 
   if (mState == kAllocated || mState == kStopped) {
     Deallocate();
   }
 
-  mozilla::camera::Shutdown();
-
   mState = kReleased;
   mInitDone = false;
   return;
 }
 
 nsresult
 MediaEngineRemoteVideoSource::Allocate(const dom::MediaTrackConstraints& aConstraints,
                                        const MediaEnginePrefs& aPrefs,