Bug 1435670 - Remove assert when there's no capability for a device. r?jib draft
authorAndreas Pehrson <pehrsons@mozilla.com>
Thu, 08 Feb 2018 11:23:53 +0100
changeset 752470 ab53fe9155dda6f00ac3a9387170d6747290bfb7
parent 750475 841512e696b91825d24c6dd1a18d277c5f7d2be4
push id98281
push userbmo:apehrson@mozilla.com
push dateThu, 08 Feb 2018 10:43:26 +0000
reviewersjib
bugs1435670
milestone60.0a1
Bug 1435670 - Remove assert when there's no capability for a device. r?jib Not all devices have capabilities. Our code is already setup to handle that case by defaulting to a capability with width,height,maxFPS=0 and propagating the failure to start. MozReview-Commit-ID: AZJKZeBrYC2
dom/media/systemservices/CamerasParent.cpp
--- a/dom/media/systemservices/CamerasParent.cpp
+++ b/dom/media/systemservices/CamerasParent.cpp
@@ -880,18 +880,16 @@ CamerasParent::RecvStartCapture(const Ca
                   capability.height, sAllRequestedCapabilities[it.first].height);
                 capability.maxFPS = std::max(
                   capability.maxFPS, sAllRequestedCapabilities[it.first].maxFPS);
               }
             }
 
             auto candidateCapabilities = self->mAllCandidateCapabilities.find(
               nsCString(cap.VideoCapture()->CurrentDeviceName()));
-            MOZ_DIAGNOSTIC_ASSERT(candidateCapabilities != self->mAllCandidateCapabilities.end());
-            MOZ_DIAGNOSTIC_ASSERT(!candidateCapabilities->second.empty());
             if ((candidateCapabilities != self->mAllCandidateCapabilities.end()) &&
                 (!candidateCapabilities->second.empty())) {
               int32_t minIdx = -1;
               uint64_t minDistance = UINT64_MAX;
 
               for (auto & candidateCapability : candidateCapabilities->second) {
                 if (candidateCapability.second.rawType != capability.rawType) {
                   continue;