Bug 799191: incorrect audioCount in GetUserMediaDevicesRunnable r=derf
authorRandell Jesup <rjesup@jesup.org>
Tue, 09 Oct 2012 17:56:22 -0400
changeset 109811 1e021104715a6da8e5ebb11efe2ea5fe1f6b9e70
parent 109810 4aa947bc63649784572b771a3359e5b5c574e4cd
child 109812 298753178aea6b187409baeb4bec3fbb8738f961
push id23657
push useremorley@mozilla.com
push dateThu, 11 Oct 2012 13:47:00 +0000
treeherdermozilla-central@2fae8bd461da [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersderf
bugs799191
milestone19.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 799191: incorrect audioCount in GetUserMediaDevicesRunnable r=derf
dom/media/MediaManager.cpp
--- a/dom/media/MediaManager.cpp
+++ b/dom/media/MediaManager.cpp
@@ -549,17 +549,17 @@ public:
     MediaManager* manager = MediaManager::Get();
 
     nsTArray<nsRefPtr<MediaEngineVideoSource> > videoSources;
     manager->GetBackend()->EnumerateVideoDevices(&videoSources);
     videoCount = videoSources.Length();
 
     nsTArray<nsRefPtr<MediaEngineAudioSource> > audioSources;
     manager->GetBackend()->EnumerateAudioDevices(&audioSources);
-    audioCount = videoSources.Length();
+    audioCount = audioSources.Length();
 
     nsTArray<nsCOMPtr<nsIMediaDevice> > *devices =
       new nsTArray<nsCOMPtr<nsIMediaDevice> >;
 
     for (i = 0; i < videoCount; i++) {
       devices->AppendElement(new MediaDevice(videoSources[i]));
     }
     for (i = 0; i < audioCount; i++) {