Bug 1483926 - Fix Android device enumeration. r=pehrsons
☠☠ backed out by 9648d9afdd2a ☠ ☠
authorPaul Adenot <paul@paul.cx>
Fri, 17 Aug 2018 15:34:16 +0000
changeset 487418 655d8b94c8f1f78185f51a11ff0d30f929ac5016
parent 487412 41993cf46d6ab0a21976edc9bbb3b69891684fb4
child 487419 2c023d39fa5a5163e828fc9702f14e4d6b46e6db
push id9719
push userffxbld-merge
push dateFri, 24 Aug 2018 17:49:46 +0000
treeherdermozilla-beta@719ec98fba77 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspehrsons
bugs1483926
milestone63.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 1483926 - Fix Android device enumeration. r=pehrsons Not having a return here means that we end up clearing our device list. Differential Revision: https://phabricator.services.mozilla.com/D3613
dom/media/webrtc/MediaEngineWebRTC.cpp
--- a/dom/media/webrtc/MediaEngineWebRTC.cpp
+++ b/dom/media/webrtc/MediaEngineWebRTC.cpp
@@ -414,16 +414,17 @@ CubebDeviceEnumerator::EnumerateAudioInp
                                                        CUBEB_DEVICE_FMT_S16NE,
                                                        1,
                                                        44100,
                                                        44100,
                                                        41000,
                                                        410,
                                                        128);
     mDevices.AppendElement(info);
+    return;
   }
 #else
   if (mDevices.IsEmpty() || mManualInvalidation) {
     mDevices.Clear();
     CubebUtils::GetDeviceCollection(mDevices, CubebUtils::Input);
   }
 #endif