From 0186dd7a8d55ccc345ca559f6b921491fd42169c Mon Sep 17 00:00:00 2001
From: Boris Grozev <boris@jitsi.org>
Date: Mon, 24 Sep 2012 08:14:55 +0000
Subject: [PATCH] Makes MediaServiceImpl#getDefaultDevice return non-null even
if no formats are enabled for the device. Updates some of it's usages
accordingly. This fixes a problem with SIP audio calls failing when all video
formats are disabled.
---
src/org/jitsi/impl/neomedia/MediaServiceImpl.java | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/org/jitsi/impl/neomedia/MediaServiceImpl.java b/src/org/jitsi/impl/neomedia/MediaServiceImpl.java
index 1835f133..c89747a5 100644
--- a/src/org/jitsi/impl/neomedia/MediaServiceImpl.java
+++ b/src/org/jitsi/impl/neomedia/MediaServiceImpl.java
@@ -419,15 +419,6 @@ public MediaDevice getDefaultDevice(
}
}
- /*
- * Don't use the device in case the user has disabled all codecs for
- * that kind of media.
- */
- if ((defaultDevice != null)
- && (defaultDevice.getSupportedFormats().isEmpty()))
- {
- defaultDevice = null;
- }
return defaultDevice;
}
@@ -1283,6 +1274,8 @@ public MediaDevice getMediaDeviceForPartialDesktopStreaming(
*/
public boolean isPartialStreaming(MediaDevice mediaDevice)
{
+ if(mediaDevice == null)
+ return false;
MediaDeviceImpl dev = (MediaDeviceImpl)mediaDevice;
CaptureDeviceInfo devInfo = dev.getCaptureDeviceInfo();
--
GitLab