Fix video HA issue 791 (#832)

* Fix video HA issue 791

* Fix sip connection issue 757

Author: qwu16

source/agent/conference/conference.js

@@ -312,6 +312,9 @@ var Conference = function (rpcClient, selfRpcId) {
   };
 
   var initRoom = function(roomId, origin) {
+    if (origin === undefined) {
+        origin = {isp:"isp", region:"region"};
+    }
     if (is_initializing) {
       return new Promise(function(resolve, reject) {
         var interval = setInterval(function() {

source/agent/conference/roomController.js

@@ -1463,7 +1463,7 @@ module.exports.create = function (spec, on_init_ok, on_init_failed) {
                                 rpcClient,
                                 terminals[t_id].locality.node,
                                 'linkup',
-                                [sub_id, undefined, streamId],
+                                [sub_id, undefined, streamId, undefined],
                                 function () {
                                     log.debug('resumed sub_id:', sub_id, 'for streamId:', streamId);
                                     streams[streamId].video.subscribers = streams[streamId].video.subscribers || [];
@@ -2104,7 +2104,7 @@ module.exports.create = function (spec, on_init_ok, on_init_failed) {
                                                     rpcClient,
                                                     terminals[t_id].locality.node,
                                                     'linkup',
-                                                    [sub_id, undefined, stream_id],
+                                                    [sub_id, undefined, stream_id, undefined],
                                                     function () {
                                                         streams[stream_id].video.subscribers = streams[stream_id].video.subscribers || [];
                                                         streams[stream_id].video.subscribers.push(t_id);
@@ -2193,7 +2193,7 @@ module.exports.create = function (spec, on_init_ok, on_init_failed) {
                                                     rpcClient,
                                                     terminals[t_id].locality.node,
                                                     'linkup',
-                                                    [sub_id, undefined, stream_id],
+                                                    [sub_id, undefined, stream_id, undefined],
                                                     function () {
                                                         streams[stream_id].video.subscribers = streams[stream_id].video.subscribers || [];
                                                         streams[stream_id].video.subscribers.push(t_id);
@@ -2324,7 +2324,7 @@ module.exports.create = function (spec, on_init_ok, on_init_failed) {
                                                         rpcClient,
                                                         terminals[t_id].locality.node,
                                                         'linkup',
-                                                        [sub_id, stream_id, undefined],
+                                                        [sub_id, stream_id, undefined, undefined],
                                                         function () {
                                                             streams[stream_id].audio.subscribers = streams[stream_id].audio.subscribers || [];
                                                             streams[stream_id].audio.subscribers.push(t_id);
@@ -2411,7 +2411,7 @@ module.exports.create = function (spec, on_init_ok, on_init_failed) {
                                                     rpcClient,
                                                     terminals[t_id].locality.node,
                                                     'linkup',
-                                                    [sub_id, stream_id, undefined],
+                                                    [sub_id, stream_id, undefined, undefined],
                                                     function () {
                                                         streams[stream_id].audio.subscribers = streams[stream_id].audio.subscribers || [];
                                                         streams[stream_id].audio.subscribers.push(t_id);

source/agent/sip/index.js

@@ -355,7 +355,7 @@ module.exports = function (rpcC, selfRpcId, parentRpcId, clusterWorkerIP) {
                     //check resolution
                     var fmtp = info.videoResolution,
                         preferred_resolution,
-                        optional_resolutions = calls[client_id].videoSource.media.video.optional.parameters.resolution;
+                        optional_resolutions = calls[client_id].videoSource.media.tracks.find(t => t.type === "video").optional.parameters.resolution;
 
                     const isResolutionEqual = (r1, r2) => {return r1.width === r2.width && r1.height === r2.height;};
                     //TODO: currently we only check CIF/QCIF, there might be other options in fmtp from other devices.