Fixes several NPE exceptions. Fix when there is no device specified for desktop share use desktop media use case when choosing video device.

cusax-fix
Damian Minkov 15 years ago
parent b818927b85
commit 4b266e70d6

@ -1318,7 +1318,8 @@ public boolean isPartialStreaming(MediaDevice mediaDevice)
MediaDeviceImpl dev = (MediaDeviceImpl)mediaDevice;
CaptureDeviceInfo devInfo = dev.getCaptureDeviceInfo();
return devInfo.getName().startsWith("Partial desktop streaming");
return (devInfo != null
&& devInfo.getName().startsWith("Partial desktop streaming"));
}
/**

@ -880,7 +880,9 @@ public void sendModifyVideoResolutionContent()
return;
}
content.setSenders(senders);
// if we are only receiving video senders is null
if(senders != null)
content.setSenders(senders);
JingleIQ contentIQ = JinglePacketFactory
.createContentModify(getProtocolProvider().getOurJID(),

@ -194,10 +194,14 @@ public void setLocalVideoAllowed(Call call,
CallJabberImpl callJabberImpl = (CallJabberImpl) call;
if (mediaDevice == null)
mediaDevice = callJabberImpl.getDefaultDevice(MediaType.VIDEO);
{
MediaService mediaService = ProtocolMediaActivator.getMediaService();
mediaDevice = mediaService.getDefaultDevice(MediaType.VIDEO,
getMediaUseCase());
}
callJabberImpl.setLocalVideoAllowed(allowed, MediaUseCase.DESKTOP);
callJabberImpl.setVideoDevice(mediaDevice);
callJabberImpl.setLocalVideoAllowed(allowed, getMediaUseCase());
MediaFormat mediaDeviceFormat = mediaDevice.getFormat();

Loading…
Cancel
Save