Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-14 22:05:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 820978: keep reference to MediaManager singleton r=derf

Browse Source
This commit is contained in:
Randell Jesup 2012-12-28 15:29:52 -05:00
parent 3a903f1837
commit a4250e5b65
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
dom/media/MediaManager.cpp
View File

@ -59,7 +59,8 @@ public:
: mSuccess(aSuccess)
, mError(aError)
, mErrorMsg(aErrorMsg)
, mWindowID(aWindowID) {}
, mWindowID(aWindowID)
, mManager(MediaManager::GetInstance()) {}
NS_IMETHOD
Run()
@ -70,7 +71,7 @@ public:
nsCOMPtr<nsIDOMGetUserMediaSuccessCallback> success(mSuccess);
nsCOMPtr<nsIDOMGetUserMediaErrorCallback> error(mError);
if (!(MediaManager::Get()->IsWindowStillActive(mWindowID))) {
if (!(mManager->IsWindowStillActive(mWindowID))) {
return NS_OK;
}
// This is safe since we're on main-thread, and the windowlist can only
@ -84,6 +85,7 @@ private:
already_AddRefed<nsIDOMGetUserMediaErrorCallback> mError;
const nsString mErrorMsg;
uint64_t mWindowID;
nsRefPtr<MediaManager> mManager; // get ref to this when creating the runnable
};
/**
@ -102,7 +104,8 @@ public:
: mSuccess(aSuccess)
, mError(aError)
, mFile(aFile)
, mWindowID(aWindowID) {}
, mWindowID(aWindowID)
, mManager(MediaManager::GetInstance()) {}
NS_IMETHOD
Run()
@ -113,7 +116,7 @@ public:
nsCOMPtr<nsIDOMGetUserMediaSuccessCallback> success(mSuccess);
nsCOMPtr<nsIDOMGetUserMediaErrorCallback> error(mError);
if (!(MediaManager::Get()->IsWindowStillActive(mWindowID))) {
if (!(mManager->IsWindowStillActive(mWindowID))) {
return NS_OK;
}
// This is safe since we're on main-thread, and the windowlist can only
@ -127,6 +130,7 @@ private:
already_AddRefed<nsIDOMGetUserMediaErrorCallback> mError;
nsCOMPtr<nsIDOMFile> mFile;
uint64_t mWindowID;
nsRefPtr<MediaManager> mManager; // get ref to this when creating the runnable
};
/**
@ -244,7 +248,8 @@ public:
, mError(aError)
, mAudioSource(aAudioSource)
, mVideoSource(aVideoSource)
, mWindowID(aWindowID) {}
, mWindowID(aWindowID)
, mManager(MediaManager::GetInstance()) {}
~GetUserMediaStreamRunnable() {}
@ -255,7 +260,7 @@ public:
// We're on main-thread, and the windowlist can only
// be invalidated from the main-thread (see OnNavigation)
StreamListeners* listeners = MediaManager::Get()->GetWindowListeners(mWindowID);
StreamListeners* listeners = mManager->GetWindowListeners(mWindowID);
if (!listeners) {
// This window is no longer live.
return NS_OK;
@ -306,7 +311,7 @@ public:
nsCOMPtr<nsIDOMGetUserMediaSuccessCallback> success(mSuccess);
nsCOMPtr<nsIDOMGetUserMediaErrorCallback> error(mError);
if (!(MediaManager::Get()->IsWindowStillActive(mWindowID))) {
if (!(mManager->IsWindowStillActive(mWindowID))) {
return NS_OK;
}
// This is safe since we're on main-thread, and the windowlist can only
@ -323,6 +328,7 @@ private:
nsRefPtr<MediaEngineSource> mAudioSource;
nsRefPtr<MediaEngineSource> mVideoSource;
uint64_t mWindowID;
nsRefPtr<MediaManager> mManager; // get ref to this when creating the runnable
};
/**
@ -353,6 +359,7 @@ public:
, mWindowID(aWindowID)
, mDeviceChosen(true)
, mBackendChosen(false)
, mManager(MediaManager::GetInstance())
{
if (mAudio) {
mAudioDevice = aAudioDevice;
@ -373,7 +380,8 @@ public:
, mError(aError)
, mWindowID(aWindowID)
, mDeviceChosen(false)
, mBackendChosen(false) {}
, mBackendChosen(false)
, mManager(MediaManager::GetInstance()) {}
/**
* The caller can also choose to provide their own backend instead of
@ -391,7 +399,8 @@ public:
, mWindowID(aWindowID)
, mDeviceChosen(false)
, mBackendChosen(true)
, mBackend(aBackend) {}
, mBackend(aBackend)
, mManager(MediaManager::GetInstance()) {}
~GetUserMediaRunnable() {
if (mBackendChosen) {
@ -404,8 +413,6 @@ public:
{
NS_ASSERTION(!NS_IsMainThread(), "Don't call on main thread");
mManager = MediaManager::Get();
// Was a backend provided?
if (!mBackendChosen) {
mBackend = mManager->GetBackend();
@ -623,7 +630,7 @@ private:
bool mBackendChosen;
MediaEngine* mBackend;
MediaManager* mManager;
nsRefPtr<MediaManager> mManager; // get ref to this when creating the runnable
};
/**
@ -639,7 +646,9 @@ public:
already_AddRefed<nsIGetUserMediaDevicesSuccessCallback> aSuccess,
already_AddRefed<nsIDOMGetUserMediaErrorCallback> aError)
: mSuccess(aSuccess)
, mError(aError) {}
, mError(aError)
, mManager(MediaManager::GetInstance())
{}
~GetUserMediaDevicesRunnable() {}
NS_IMETHOD
@ -648,14 +657,13 @@ public:
NS_ASSERTION(!NS_IsMainThread(), "Don't call on main thread");
uint32_t audioCount, videoCount, i;
MediaManager* manager = MediaManager::Get();
nsTArray<nsRefPtr<MediaEngineVideoSource> > videoSources;
manager->GetBackend()->EnumerateVideoDevices(&videoSources);
mManager->GetBackend()->EnumerateVideoDevices(&videoSources);
videoCount = videoSources.Length();
nsTArray<nsRefPtr<MediaEngineAudioSource> > audioSources;
manager->GetBackend()->EnumerateAudioDevices(&audioSources);
mManager->GetBackend()->EnumerateAudioDevices(&audioSources);
audioCount = audioSources.Length();
nsTArray<nsCOMPtr<nsIMediaDevice> > *devices =
@ -689,6 +697,7 @@ public:
private:
already_AddRefed<nsIGetUserMediaDevicesSuccessCallback> mSuccess;
already_AddRefed<nsIDOMGetUserMediaErrorCallback> mError;
nsRefPtr<MediaManager> mManager;
};
NS_IMPL_THREADSAFE_ISUPPORTS2(MediaManager, nsIMediaManagerService, nsIObserver)