Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 02:57:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1404977 - Part 11 - Make sure the default device is the first element in the list. r=pehrsons

Browse Source 
MozReview-Commit-ID: LTJErFTm1wN

--HG--
extra : rebase_source : 5abdb58774a0011a2990d1f71c733181eed3c656
This commit is contained in:
Paul Adenot 2018-05-29 15:20:47 +02:00
parent 28fa83d1b5
commit 0bf09992fd
3 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dom/media/AudioDeviceInfo.cpp
View File

@ -101,6 +101,11 @@ uint32_t AudioDeviceInfo::State() const
return mState;
}
bool AudioDeviceInfo::Preferred() const
{
return mPreferred;
}
/* readonly attribute DOMString name; */
NS_IMETHODIMP
AudioDeviceInfo::GetName(nsAString& aName)

1
dom/media/AudioDeviceInfo.h
View File

@ -41,6 +41,7 @@ public:
uint32_t MaxChannels() const;
uint32_t Type() const;
uint32_t State() const;
bool Preferred() const;
private:
virtual ~AudioDeviceInfo() = default;

38
dom/media/webrtc/MediaEngineWebRTC.cpp
View File

@ -206,14 +206,31 @@ MediaEngineWebRTC::EnumerateMicrophoneDevices(uint64_t aWindowId,
MOZ_ASSERT(devices[i]->Type() == CUBEB_DEVICE_TYPE_INPUT);
RefPtr<MediaEngineSource> source =
new MediaEngineWebRTCMicrophoneSource(
devices[i],
devices[i]->Name(),
// Lie and provide the name as UUID
NS_LossyConvertUTF16toASCII(devices[i]->Name()),
devices[i]->MaxChannels(),
mDelayAgnostic,
mExtendedFilter);
aDevices->AppendElement(source);
devices[i],
devices[i]->Name(),
// Lie and provide the name as UUID
NS_ConvertUTF16toUTF8(devices[i]->Name()),
devices[i]->MaxChannels(),
mDelayAgnostic,
mExtendedFilter);
RefPtr<MediaDevice> device = MakeRefPtr<MediaDevice>(
source,
source->GetName(),
NS_ConvertUTF8toUTF16(source->GetUUID()));
if (devices[i]->Preferred()) {
#ifdef DEBUG
if (!foundPreferredDevice) {
foundPreferredDevice = true;
} else {
MOZ_ASSERT(!foundPreferredDevice,
"Found more than one preferred audio input device"
"while enumerating");
}
#endif
aDevices->InsertElementAt(0, device);
} else {
aDevices->AppendElement(device);
}
}
}
}
@ -225,16 +242,15 @@ MediaEngineWebRTC::EnumerateSpeakerDevices(uint64_t aWindowId,
nsTArray<RefPtr<AudioDeviceInfo>> devices;
CubebUtils::GetDeviceCollection(devices, CubebUtils::Output);
for (auto& device : devices) {
MOZ_ASSERT(device->GetDeviceID().isSome());
if (device->State() == CUBEB_DEVICE_STATE_ENABLED) {
MOZ_ASSERT(device->Type() == CUBEB_DEVICE_TYPE_OUTPUT);
nsString uuid(device->FriendlyName());
nsString uuid(device->Name());
// If, for example, input and output are in the same device, uuid
// would be the same for both which ends up to create the same
// deviceIDs (in JS).
uuid.Append(NS_LITERAL_STRING("_Speaker"));
aDevices->AppendElement(MakeRefPtr<MediaDevice>(
device->FriendlyName(),
device->Name(),
dom::MediaDeviceKind::Audiooutput,
uuid));
}