Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 22:32:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset ef2bf9308ed7 (bug 1056213)

Browse Source
This commit is contained in:
Randell Jesup 2014-08-30 12:11:27 -04:00
parent f36ccb7397
commit 10774030a9
3 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/media/webrtc/MediaEngineWebRTC.cpp
View File

@ -267,8 +267,7 @@ MediaEngineWebRTC::EnumerateVideoDevices(MediaSourceType aMediaSource,
nsRefPtr<MediaEngineWebRTCVideoSource> vSource;
NS_ConvertUTF8toUTF16 uuid(uniqueId);
if (mVideoSources.Get(uuid, getter_AddRefs(vSource))) {
// We've already seen this device, just refresh and append.
vSource->Refresh(i);
// We've already seen this device, just append.
aVSources->AppendElement(vSource.get());
} else {
vSource = new MediaEngineWebRTCVideoSource(videoEngine, i, aMediaSource);

2
content/media/webrtc/MediaEngineWebRTC.h
View File

@ -214,8 +214,6 @@ public:
return NS_OK;
}
void Refresh(int aIndex);
protected:
~MediaEngineWebRTCVideoSource() { Shutdown(); }

18
content/media/webrtc/MediaEngineWebRTCVideo.cpp
View File

@ -700,24 +700,6 @@ MediaEngineWebRTCVideoSource::Shutdown()
mInitDone = false;
}
void MediaEngineWebRTCVideoSource::Refresh(int aIndex) {
mCaptureIndex = aIndex;
#ifdef MOZ_B2G_CAMERA
// Caller looked up this source by uniqueId; since deviceName == uniqueId nothing else changes
#else
// Caller looked up this source by uniqueId, so it shouldn't change
const uint32_t KMaxDeviceNameLength = 128;
char deviceName[KMaxDeviceNameLength];
if (mViECapture->GetCaptureDevice(mCaptureIndex,
deviceName, KMaxDeviceNameLength,
nullptr, 0)) {
return;
}
CopyUTF8toUTF16(deviceName, mDeviceName);
#endif
}
#ifdef MOZ_B2G_CAMERA
// All these functions must be run on MainThread!