зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1744346 simplify MediaDevice group id changes r=jib
Depends on D132879 Differential Revision: https://phabricator.services.mozilla.com/D132880
This commit is contained in:
Родитель
388a704752
Коммит
cbb8cb44e2
|
@ -892,10 +892,12 @@ MediaDevice::MediaDevice(const RefPtr<AudioDeviceInfo>& aAudioDeviceInfo,
|
|||
MOZ_ASSERT(mSinkInfo);
|
||||
}
|
||||
|
||||
MediaDevice::MediaDevice(const RefPtr<MediaDevice>& aOther, const nsString& aID,
|
||||
const nsString& aGroupID, const nsString& aRawID,
|
||||
const nsString& aRawGroupID)
|
||||
: MediaDevice(aOther, aID, aGroupID, aRawID, aRawGroupID, aOther->mName) {}
|
||||
/* static */
|
||||
RefPtr<MediaDevice> MediaDevice::CopyWithNewGroupId(
|
||||
const RefPtr<MediaDevice>& aOther, const nsString& aGroupID) {
|
||||
return new MediaDevice(aOther, aOther->mID, aGroupID, aOther->mRawID,
|
||||
aOther->mRawGroupID, aOther->mName);
|
||||
}
|
||||
|
||||
MediaDevice::MediaDevice(const RefPtr<MediaDevice>& aOther, const nsString& aID,
|
||||
const nsString& aGroupID, const nsString& aRawID,
|
||||
|
@ -1750,8 +1752,7 @@ void MediaManager::GuessVideoDeviceGroupIDs(MediaDeviceSet& aDevices,
|
|||
}
|
||||
}
|
||||
if (updateGroupId) {
|
||||
aVideo = new MediaDevice(aVideo, aVideo->mID, newVideoGroupID,
|
||||
aVideo->mRawID, aVideo->mRawGroupID);
|
||||
aVideo = MediaDevice::CopyWithNewGroupId(aVideo, newVideoGroupID);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
|
@ -75,9 +75,8 @@ class MediaDevice : public nsIMediaDevice {
|
|||
MediaDevice(const RefPtr<AudioDeviceInfo>& aAudioDeviceInfo,
|
||||
const nsString& aID, const nsString& aGroupID);
|
||||
|
||||
MediaDevice(const RefPtr<MediaDevice>& aOther, const nsString& aID,
|
||||
const nsString& aGroupID, const nsString& aRawID,
|
||||
const nsString& aRawGroupID);
|
||||
static RefPtr<MediaDevice> CopyWithNewGroupId(
|
||||
const RefPtr<MediaDevice>& aOther, const nsString& aGroupID);
|
||||
|
||||
MediaDevice(const RefPtr<MediaDevice>& aOther, const nsString& aID,
|
||||
const nsString& aGroupID, const nsString& aRawID,
|
||||
|
|
Загрузка…
Ссылка в новой задаче