openstack/deb-spice-html5
Code Issues Proposed changes

If MediaSource is not available, do not report the vp8 or opus caps.

Browse Source
This commit is contained in:
Jeremy White
2016-09-28 10:01:43 -05:00
parent b474c300a8
commit dd3fb12678
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
spiceconn.js
View File

@@ -127,21 +127,28 @@ SpiceConn.prototype =
); );
if (msg.channel_type == SPICE_CHANNEL_PLAYBACK) if (msg.channel_type == SPICE_CHANNEL_PLAYBACK)
msg.channel_caps.push( {
(1 << SPICE_PLAYBACK_CAP_OPUS) var caps = 0;
); if ('MediaSource' in window && MediaSource.isTypeSupported(SPICE_PLAYBACK_CODEC))
caps |= (1 << SPICE_PLAYBACK_CAP_OPUS);
msg.channel_caps.push(caps);
}
else if (msg.channel_type == SPICE_CHANNEL_MAIN) else if (msg.channel_type == SPICE_CHANNEL_MAIN)
{
msg.channel_caps.push( msg.channel_caps.push(
(1 << SPICE_MAIN_CAP_AGENT_CONNECTED_TOKENS) (1 << SPICE_MAIN_CAP_AGENT_CONNECTED_TOKENS)
); );
}
else if (msg.channel_type == SPICE_CHANNEL_DISPLAY) else if (msg.channel_type == SPICE_CHANNEL_DISPLAY)
msg.channel_caps.push( {
(1 << SPICE_DISPLAY_CAP_SIZED_STREAM) | var caps = (1 << SPICE_DISPLAY_CAP_SIZED_STREAM) |
(1 << SPICE_DISPLAY_CAP_STREAM_REPORT) | (1 << SPICE_DISPLAY_CAP_STREAM_REPORT) |
(1 << SPICE_DISPLAY_CAP_MULTI_CODEC) | (1 << SPICE_DISPLAY_CAP_MULTI_CODEC) |
(1 << SPICE_DISPLAY_CAP_CODEC_MJPEG) | (1 << SPICE_DISPLAY_CAP_CODEC_MJPEG);
(1 << SPICE_DISPLAY_CAP_CODEC_VP8) if ('MediaSource' in window && MediaSource.isTypeSupported(SPICE_VP8_CODEC))
); caps |= (1 << SPICE_DISPLAY_CAP_CODEC_VP8);
msg.channel_caps.push(caps);
}
hdr.size = msg.buffer_size(); hdr.size = msg.buffer_size();