Upgrade conference protocol version to 1.1.

Author: jianjunz

docs/mdfiles/changelog.md

@@ -2,6 +2,7 @@ Change Log
 ==========
 # 4.3
 * The type of `conferenceClient.publish` method's option is changed from `AudioEncodingParameters` and `VideoEncodingParameters` to `RTCRtpSendParameters`.
+* `audio` and `video` of `PublicationSettings` is changed from `AudioPublicationSettings` and `VideoPublicationSettings` to `AudioPublicationSettings` array and `VideoPublicationSettings` array.
 
 # 4.0.2
 * Fix a compatibility issue for Chrome 69 beta.

src/sdk/base/publication.js

@@ -34,7 +34,7 @@ export class AudioPublicationSettings {
  */
 export class VideoPublicationSettings {
   // eslint-disable-next-line require-jsdoc
-  constructor(codec, resolution, frameRate, bitrate, keyFrameInterval) {
+  constructor(codec, resolution, frameRate, bitrate, keyFrameInterval, rid) {
     /**
      * @member {?Owt.Base.VideoCodecParameters} codec
      * @instance
@@ -67,6 +67,13 @@ export class VideoPublicationSettings {
      * @memberof Owt.Base.VideoPublicationSettings
      */
     this.keyFrameInterval=keyFrameInterval;
+    /**
+     * @member {?number} rid
+     * @instance
+     * @classDesc Restriction identifier to identify the RTP Streams within an RTP session.
+     * @memberof Owt.Base.VideoPublicationSettings
+     */
+    this.rid=rid;
   }
 }
 
@@ -80,13 +87,13 @@ export class PublicationSettings {
   // eslint-disable-next-line require-jsdoc
   constructor(audio, video) {
     /**
-     * @member {Owt.Base.AudioPublicationSettings} audio
+     * @member {Owt.Base.AudioPublicationSettings[]} audio
      * @instance
      * @memberof Owt.Base.PublicationSettings
      */
     this.audio=audio;
     /**
-     * @member {Owt.Base.VideoPublicationSettings} video
+     * @member {Owt.Base.VideoPublicationSettings[]} video
      * @instance
      * @memberof Owt.Base.PublicationSettings
      */

src/sdk/conference/client.js

@@ -29,7 +29,7 @@ const SignalingState = {
   CONNECTED: 3,
 };
 
-const protocolVersion = '1.0';
+const protocolVersion = '1.1';
 
 /* eslint-disable valid-jsdoc */
 /**

src/sdk/conference/streamutils.js

@@ -47,41 +47,38 @@ function sortResolutions(x, y) {
  * @private
  */
 export function convertToPublicationSettings(mediaInfo) {
-  let audio;
-  let audioCodec;
-  let video;
-  let videoCodec;
-  let resolution;
-  let framerate;
-  let bitrate;
-  let keyFrameInterval;
+  let audio = [],
+    video = [];
+  let audioCodec, videoCodec, resolution, framerate, bitrate, keyFrameInterval,
+    rid;
   if (mediaInfo.audio) {
     if (mediaInfo.audio.format) {
       audioCodec = new CodecModule.AudioCodecParameters(
-          mediaInfo.audio.format.codec, mediaInfo.audio.format.channelNum,
-          mediaInfo.audio.format.sampleRate
-      );
+        mediaInfo.audio.format.codec, mediaInfo.audio.format.channelNum,
+        mediaInfo.audio.format.sampleRate);
     }
-    audio = new PublicationModule.AudioPublicationSettings(audioCodec);
+    audio.push(new PublicationModule.AudioPublicationSettings(audioCodec));
   }
   if (mediaInfo.video) {
-    if (mediaInfo.video.format) {
-      videoCodec = new CodecModule.VideoCodecParameters(
-          mediaInfo.video.format.codec, mediaInfo.video.format.profile);
-    }
-    if (mediaInfo.video.parameters) {
-      if (mediaInfo.video.parameters.resolution) {
-        resolution = new MediaFormatModule.Resolution(
-            mediaInfo.video.parameters.resolution.width,
-            mediaInfo.video.parameters.resolution.height);
+    for (const videoInfo of mediaInfo.video.original) {
+      if (videoInfo.format) {
+        videoCodec = new CodecModule.VideoCodecParameters(
+          videoInfo.format.codec, videoInfo.format.profile);
+      }
+      if (videoInfo.parameters) {
+        if (videoInfo.parameters.resolution) {
+          resolution = new MediaFormatModule.Resolution(
+            videoInfo.parameters.resolution.width,
+            videoInfo.parameters.resolution.height);
+        }
+        framerate = videoInfo.parameters.framerate;
+        bitrate = videoInfo.parameters.bitrate * 1000;
+        keyFrameInterval = videoInfo.parameters.keyFrameInterval;
+        rid = videoInfo.parameters.simulcastRid;
       }
-      framerate = mediaInfo.video.parameters.framerate;
-      bitrate = mediaInfo.video.parameters.bitrate * 1000;
-      keyFrameInterval = mediaInfo.video.parameters.keyFrameInterval;
+      video.push(new PublicationModule.VideoPublicationSettings(
+        videoCodec, resolution, framerate, bitrate, keyFrameInterval, rid));
     }
-    video = new PublicationModule.VideoPublicationSettings(videoCodec,
-        resolution, framerate, bitrate, keyFrameInterval
-    );
   }
   return new PublicationModule.PublicationSettings(audio, video);
 }