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 298828 cf13730eeda2777a93b457243e089916f0e26d45
parent 298827 d1e07fc30c3c699a3e6457b3aa0ad300e5f909fc
child 298829 5191bafd5e34d392785f5114dcbaa6d0a3b2ed2e
push id30285
push usercbook@mozilla.com
push dateWed, 25 May 2016 13:06:07 +0000
treeherdermozilla-central@d6d4e8417d2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjesup
bugs1249313
milestone49.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
@@ -86,18 +86,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,