Add VideoType

modules/RTC/JitsiLocalTrack.js

@@ -4,6 +4,7 @@ var RTCBrowserType = require("./RTCBrowserType");
 var JitsiTrackEvents = require('../../JitsiTrackEvents');
 var JitsiTrackErrors = require("../../JitsiTrackErrors");
 var RTCUtils = require("./RTCUtils");
+var VideoType = require('../../service/RTC/VideoType');
 
 /**
  * Represents a single media track (either audio or video).
@@ -110,7 +111,7 @@ JitsiLocalTrack.prototype._setMute = function (mute, resolve, reject) {
     }.bind(this);
 
     if ((window.location.protocol != "https:") ||
-        (isAudio) || this.videoType === "desktop" ||
+        (isAudio) || this.videoType === VideoType.DESKTOP ||
         // FIXME FF does not support 'removeStream' method used to mute
         RTCBrowserType.isFirefox()) {
 
@@ -141,9 +142,9 @@ JitsiLocalTrack.prototype._setMute = function (mute, resolve, reject) {
                 resolution: self.resolution
             };
             if (isAudio) {
-              streamOptions['micDeviceId'] = self.deviceId;
-          } else if(self.videoType === 'camera') {
-              streamOptions['cameraDeviceId'] = self.deviceId;
+                streamOptions['micDeviceId'] = self.deviceId;
+            } else if(self.videoType === VideoType.CAMERA) {
+                streamOptions['cameraDeviceId'] = self.deviceId;
             }
             RTCUtils.obtainAudioAndVideoPermissions(streamOptions)
                 .then(function (streams) {

modules/RTC/RTC.js

@@ -1,13 +1,14 @@
-/* global APP */
+/* global APP, module */
 var EventEmitter = require("events");
 var RTCBrowserType = require("./RTCBrowserType");
+var RTCEvents = require("../../service/RTC/RTCEvents.js");
 var RTCUtils = require("./RTCUtils.js");
 var JitsiTrack = require("./JitsiTrack");
 var JitsiLocalTrack = require("./JitsiLocalTrack.js");
 var DataChannels = require("./DataChannels");
 var JitsiRemoteTrack = require("./JitsiRemoteTrack.js");
 var MediaType = require("../../service/RTC/MediaType");
-var RTCEvents = require("../../service/RTC/RTCEvents.js");
+var VideoType = require("../../service/RTC/VideoType");
 
 function createLocalTracks(streams, options) {
     var newStreams = []
@@ -15,7 +16,7 @@ function createLocalTracks(streams, options) {
     for (var i = 0; i < streams.length; i++) {
         if (streams[i].type === MediaType.AUDIO) {
           deviceId = options.micDeviceId;
-        } else if (streams[i].videoType === 'camera'){
+        } else if (streams[i].videoType === VideoType.CAMERA){
           deviceId = options.cameraDeviceId;
         }
         var localStream = new JitsiLocalTrack(streams[i].stream,
@@ -43,7 +44,7 @@ function RTC(room, options) {
             if(!self.remoteStreams[from][MediaType.VIDEO]) {
                 var track = self.createRemoteStream(
                     {peerjid:room.roomjid + "/" + from,
-                     videoType:"camera",
+                     videoType: VideoType.CAMERA,
                      jitsiTrackType: MediaType.VIDEO},
                     null, null);
                 self.eventEmitter

modules/RTC/RTCUtils.js

@@ -15,6 +15,7 @@ var EventEmitter = require("events");
 var screenObtainer = require("./ScreenObtainer");
 var JitsiTrackErrors = require("../../JitsiTrackErrors");
 var MediaType = require("../../service/RTC/MediaType");
+var VideoType = require("../../service/RTC/VideoType");
 
 var eventEmitter = new EventEmitter();
 
@@ -407,15 +408,26 @@ function handleLocalStream(streams, resolution) {
     }
 
     if (desktopStream)
-        res.push({stream: desktopStream,
-            type: MediaType.VIDEO, videoType: "desktop"});
+        res.push({
+            stream: desktopStream,
+            type: MediaType.VIDEO,
+            videoType: VideoType.DESKTOP
+        });
 
     if(audioStream)
-        res.push({stream: audioStream, type: MediaType.AUDIO, videoType: null});
+        res.push({
+            stream: audioStream,
+            type: MediaType.AUDIO,
+            videoType: null
+        });
 
     if(videoStream)
-        res.push({stream: videoStream, type: MediaType.VIDEO, videoType: "camera",
-            resolution: resolution});
+        res.push({
+            stream: videoStream,
+            type: MediaType.VIDEO,
+            videoType: VideoType.CAMERA,
+            resolution: resolution
+        });
 
     return res;
 }

service/RTC/VideoType.js

@@ -0,0 +1,16 @@
+/* global module */
+/**
+ * Enumeration of the video types
+ * @type {{CAMERA: string, DESKTOP: string}}
+ */
+var VideoType = {
+    /**
+     * The camera video type.
+     */
+    CAMERA: "camera",
+    /**
+     * The desktop video type.
+     */
+    DESKTOP: "desktop"
+};
+module.exports = VideoType;