Replace capabilities with extraCapabilities.

The relationship of each properties in capabilities is OR. When simulcast
is enabled, transcoding will be disabled. In this case, capabilities cannot
represent a stream's settings, which should be included in capabilites.
extraCapabilities doesn't include settings, it only includes transcoding
formats for now. "Transcoding formats" means the formats described in
optional property of a stream.

Author: jianjunz

src/samples/conference/public/scripts/index.js

@@ -65,7 +65,8 @@ const runSocketIOSample = function() {
             });
         }
         let $p = $(`<div id=${stream.id}resolutions> </div>`)
-        for (const resolution of stream.capabilities.video.resolutions) {
+        // TODO: Add resolutions from settings.
+        for (const resolution of stream.extraCapabilities.video.resolutions) {
             const button = $('<button/>', {
                 text: resolution.width + 'x' +
                     resolution.height,
@@ -180,7 +181,8 @@ const runSocketIOSample = function() {
                                 console.log('Subscription error: ' + err.error.message);
                             })
                         });
-                        for (const resolution of stream.capabilities.video.resolutions) {
+                        // TODO: Add resolutions from settings.
+                        for (const resolution of stream.extraCapabilities.video.resolutions) {
                             const button = $('<button/>', {
                                 text: resolution.width + 'x' +
                                     resolution.height,

src/sdk/base/stream.js

@@ -168,12 +168,12 @@ export class RemoteStream extends Stream {
      */
     this.settings = undefined;
     /**
-     * @member {Owt.Conference.SubscriptionCapabilities} capabilities
+     * @member {Owt.Conference.SubscriptionCapabilities} extraCapabilities
      * @instance
      * @memberof Owt.Base.RemoteStream
-     * @desc Capabilities remote endpoint provides for subscription. This property is only valid in conference mode.
+     * @desc Extra capabilities remote endpoint provides for subscription. Extra capabilities don't include original settings. This property is only valid in conference mode.
      */
-    this.capabilities = undefined;
+    this.extraCapabilities = undefined;
   }
 }
 

src/sdk/conference/channel.js

@@ -258,27 +258,27 @@ export class ConferencePeerConnectionChannel extends EventDispatcher {
   subscribe(stream, options) {
     if (options === undefined) {
       options = {
-        audio: !!stream.capabilities.audio,
-        video: !!stream.capabilities.video,
+        audio: !!stream.settings.audio,
+        video: !!stream.settings.video,
       };
     }
     if (typeof options !== 'object') {
       return Promise.reject(new TypeError('Options should be an object.'));
     }
     if (options.audio === undefined) {
-      options.audio = !!stream.capabilities.audio;
+      options.audio = !!stream.settings.audio;
     }
     if (options.video === undefined) {
-      options.video = !!stream.capabilities.video;
+      options.video = !!stream.settings.video;
     }
     if ((options.audio !== undefined && typeof options.audio !== 'object' &&
         typeof options.audio !== 'boolean' && options.audio !== null) || (
       options.video !== undefined && typeof options.video !== 'object' &&
         typeof options.video !== 'boolean' && options.video !== null)) {
       return Promise.reject(new TypeError('Invalid options type.'));
     }
-    if (options.audio && !stream.capabilities.audio || (options.video &&
-        !stream.capabilities.video)) {
+    if (options.audio && !stream.settings.audio || (options.video &&
+        !stream.settings.video)) {
       return Promise.reject(new ConferenceError(
           'options.audio/video cannot be true or an object if there is no '
           + 'audio/video track in remote stream.'

src/sdk/conference/client.js

@@ -260,7 +260,8 @@ export const ConferenceClient = function(config, signalingImpl) {
     const stream = remoteStreams.get(streamInfo.id);
     stream.settings = StreamUtilsModule.convertToPublicationSettings(streamInfo
         .media);
-    stream.capabilities = StreamUtilsModule.convertToSubscriptionCapabilities(
+    stream.extraCapabilities = StreamUtilsModule
+      .convertToSubscriptionCapabilities(
         streamInfo.media);
     const streamEvent = new EventModule.OwtEvent('updated');
     stream.dispatchEvent(streamEvent);
@@ -283,7 +284,8 @@ export const ConferenceClient = function(config, signalingImpl) {
               audioSourceInfo, videoSourceInfo), streamInfo.info.attributes);
       stream.settings = StreamUtilsModule.convertToPublicationSettings(
           streamInfo.media);
-      stream.capabilities = StreamUtilsModule.convertToSubscriptionCapabilities(
+      stream.extraCapabilities = StreamUtilsModule
+        .convertToSubscriptionCapabilities(
           streamInfo.media);
       return stream;
     }

src/sdk/conference/mixedstream.js

@@ -33,7 +33,8 @@ export class RemoteMixedStream extends StreamModule.RemoteStream {
 
     this.settings = StreamUtilsModule.convertToPublicationSettings(info.media);
 
-    this.capabilities = new StreamUtilsModule.convertToSubscriptionCapabilities(
+    this.extraCapabilities = new StreamUtilsModule
+      .convertToSubscriptionCapabilities(
         info.media);
   }
 }

src/sdk/conference/streamutils.js

@@ -92,11 +92,6 @@ export function convertToSubscriptionCapabilities(mediaInfo) {
   let audio; let video;
   if (mediaInfo.audio) {
     const audioCodecs = [];
-    if (mediaInfo.audio && mediaInfo.audio.format) {
-      audioCodecs.push(new CodecModule.AudioCodecParameters(
-          mediaInfo.audio.format.codec, mediaInfo.audio.format.channelNum,
-          mediaInfo.audio.format.sampleRate));
-    }
     if (mediaInfo.audio && mediaInfo.audio.optional &&
       mediaInfo.audio.optional.format) {
       for (const audioCodecInfo of mediaInfo.audio.optional.format) {
@@ -111,10 +106,6 @@ export function convertToSubscriptionCapabilities(mediaInfo) {
   }
   if (mediaInfo.video) {
     const videoCodecs = [];
-    if (mediaInfo.video && mediaInfo.video.format) {
-      videoCodecs.push(new CodecModule.VideoCodecParameters(
-          mediaInfo.video.format.codec, mediaInfo.video.format.profile));
-    }
     if (mediaInfo.video && mediaInfo.video.optional &&
       mediaInfo.video.optional.format) {
       for (const videoCodecInfo of mediaInfo.video.optional.format) {
@@ -127,12 +118,6 @@ export function convertToSubscriptionCapabilities(mediaInfo) {
     const resolutions = Array.from(
         mediaInfo.video.optional.parameters.resolution,
         (r) => new MediaFormatModule.Resolution(r.width, r.height));
-    if (mediaInfo.video && mediaInfo.video.parameters &&
-      mediaInfo.video.parameters.resolution) {
-      resolutions.push(new MediaFormatModule.Resolution(
-          mediaInfo.video.parameters.resolution.width,
-          mediaInfo.video.parameters.resolution.height));
-    }
     resolutions.sort(sortResolutions);
     const bitrates = Array.from(
         mediaInfo.video.optional.parameters.bitrate,
@@ -141,17 +126,9 @@ export function convertToSubscriptionCapabilities(mediaInfo) {
     bitrates.sort(sortNumbers);
     const frameRates = JSON.parse(
         JSON.stringify(mediaInfo.video.optional.parameters.framerate));
-    if (mediaInfo.video && mediaInfo.video.parameters &&
-        mediaInfo.video.parameters.framerate) {
-      frameRates.push(mediaInfo.video.parameters.framerate);
-    }
     frameRates.sort(sortNumbers);
     const keyFrameIntervals = JSON.parse(
         JSON.stringify(mediaInfo.video.optional.parameters.keyFrameInterval));
-    if (mediaInfo.video && mediaInfo.video.parameters &&
-        mediaInfo.video.parameters.keyFrameInterval) {
-      keyFrameIntervals.push(mediaInfo.video.parameters.keyFrameInterval);
-    }
     keyFrameIntervals.sort(sortNumbers);
     video = new SubscriptionModule.VideoSubscriptionCapabilities(
         videoCodecs, resolutions, frameRates, bitrates, keyFrameIntervals);