Add MediaType

JitsiMeetJS.js

@@ -7,6 +7,7 @@ var JitsiConferenceErrors = require("./JitsiConferenceErrors");
 var JitsiTrackEvents = require("./JitsiTrackEvents");
 var JitsiTrackErrors = require("./JitsiTrackErrors");
 var Logger = require("jitsi-meet-logger");
+var MediaType = require("./service/RTC/MediaType");
 var RTC = require("./modules/RTC/RTC");
 var RTCUIHelper = require("./modules/RTC/RTCUIHelper");
 var Statistics = require("./modules/statistics/statistics");
@@ -102,7 +103,7 @@ var LibJitsiMeet = {
                     for(var i = 0; i < tracks.length; i++) {
                         var track = tracks[i];
                         var mStream = track.getOriginalStream();
-                        if(track.getType() === "audio"){
+                        if(track.getType() === MediaType.AUDIO){
                             Statistics.startLocalStats(mStream,
                                 track.setAudioLevel.bind(track));
                             track.addEventListener(

modules/RTC/JitsiLocalTrack.js

@@ -95,7 +95,7 @@ JitsiLocalTrack.prototype._setMute = function (mute, resolve, reject) {
         resolve();
         return;
     }
-    var isAudio = this.type === JitsiTrack.AUDIO;
+    var isAudio = this.isAudioTrack();
     this.dontFireRemoveEvent = false;
 
     var setStreamToNull = false;
@@ -220,7 +220,7 @@ JitsiLocalTrack.prototype.isMuted = function () {
     if (!this.stream)
         return true;
     var tracks = [];
-    var isAudio = this.type === JitsiTrack.AUDIO;
+    var isAudio = this.isAudioTrack();
     if (isAudio) {
         tracks = this.stream.getAudioTracks();
     } else {

modules/RTC/JitsiRemoteTrack.js

@@ -20,8 +20,8 @@ function JitsiRemoteTrack(RTC, data, sid, ssrc) {
     this.videoType = data.videoType;
     this.ssrc = ssrc;
     this.muted = false;
-    if((this.type === JitsiTrack.AUDIO && data.audiomuted)
-      || (this.type === JitsiTrack.VIDEO && data.videomuted)) {
+    if((this.isAudioTrack() && data.audiomuted)
+      || (this.isVideoTrack() && data.videomuted)) {
         this.muted = true;
     }
 }

modules/RTC/JitsiTrack.js

@@ -5,6 +5,7 @@ var RTCEvents = require("../../service/RTC/RTCEvents");
 var RTCUtils = require("./RTCUtils");
 var JitsiTrackEvents = require("../../JitsiTrackEvents");
 var EventEmitter = require("events");
+var MediaType = require("../../service/RTC/MediaType");
 
 /**
  * This implements 'onended' callback normally fired by WebRTC after the stream
@@ -63,8 +64,8 @@ function JitsiTrack(rtc, stream, streamInactiveHandler, jitsiTrackType)
     this.eventEmitter = new EventEmitter();
     this.audioLevel = -1;
     this.type = jitsiTrackType || ((this.stream.getVideoTracks().length > 0)?
-        JitsiTrack.VIDEO : JitsiTrack.AUDIO);
-    if(this.type == JitsiTrack.AUDIO) {
+        MediaType.VIDEO : MediaType.AUDIO);
+    if(this.isAudioTrack()) {
         this._getTracks = function () {
             return this.stream? this.stream.getAudioTracks() : [];
         }.bind(this);
@@ -82,18 +83,6 @@ function JitsiTrack(rtc, stream, streamInactiveHandler, jitsiTrackType)
     }
 }
 
-/**
- * JitsiTrack video type.
- * @type {string}
- */
-JitsiTrack.VIDEO = "video";
-
-/**
- * JitsiTrack audio type.
- * @type {string}
- */
-JitsiTrack.AUDIO = "audio";
-
 /**
  * Returns the type (audio or video) of this track.
  */
@@ -105,14 +94,14 @@ JitsiTrack.prototype.getType = function() {
  * Check if this is audiotrack.
  */
 JitsiTrack.prototype.isAudioTrack = function () {
-    return this.getType() === JitsiTrack.AUDIO;
+    return this.getType() === MediaType.AUDIO;
 };
 
 /**
  * Check if this is videotrack.
  */
 JitsiTrack.prototype.isVideoTrack = function () {
-    return this.getType() === JitsiTrack.VIDEO;
+    return this.getType() === MediaType.VIDEO;
 };
 
 /**
@@ -128,7 +117,7 @@ JitsiTrack.prototype.getOriginalStream = function() {
  * @returns {string}
  */
 JitsiTrack.prototype.getUsageLabel = function () {
-    if (this.type == JitsiTrack.AUDIO) {
+    if (this.isAudioTrack()) {
         return "mic";
     } else {
         return this.videoType ? this.videoType : "default";

modules/RTC/RTC.js

@@ -6,14 +6,14 @@ var JitsiTrack = require("./JitsiTrack");
 var JitsiLocalTrack = require("./JitsiLocalTrack.js");
 var DataChannels = require("./DataChannels");
 var JitsiRemoteTrack = require("./JitsiRemoteTrack.js");
-var MediaStreamType = require("../../service/RTC/MediaStreamTypes");
+var MediaType = require("../../service/RTC/MediaType");
 var RTCEvents = require("../../service/RTC/RTCEvents.js");
 
 function createLocalTracks(streams, options) {
     var newStreams = []
     var deviceId = null;
     for (var i = 0; i < streams.length; i++) {
-        if (streams[i].type === 'audio') {
+        if (streams[i].type === MediaType.AUDIO) {
           deviceId = options.micDeviceId;
         } else if (streams[i].videoType === 'camera'){
           deviceId = options.cameraDeviceId;
@@ -40,31 +40,31 @@ function RTC(room, options) {
             // If there is no video track, but we receive it is muted,
             // we need to create a dummy track which we will mute, so we can
             // notify interested about the muting
-            if(!self.remoteStreams[from][JitsiTrack.VIDEO]) {
+            if(!self.remoteStreams[from][MediaType.VIDEO]) {
                 var track = self.createRemoteStream(
                     {peerjid:room.roomjid + "/" + from,
                      videoType:"camera",
-                     jitsiTrackType:JitsiTrack.VIDEO},
+                     jitsiTrackType: MediaType.VIDEO},
                     null, null);
                 self.eventEmitter
                     .emit(RTCEvents.FAKE_VIDEO_TRACK_CREATED, track);
             }
 
-            self.remoteStreams[from][JitsiTrack.VIDEO]
+            self.remoteStreams[from][MediaType.VIDEO]
                 .setMute(values.value == "true");
         }
     });
     room.addPresenceListener("audiomuted", function (values, from) {
         if(self.remoteStreams[from]) {
-            self.remoteStreams[from][JitsiTrack.AUDIO]
+            self.remoteStreams[from][MediaType.AUDIO]
                 .setMute(values.value == "true");
         }
     });
     room.addPresenceListener("videoType", function(data, from) {
         if(!self.remoteStreams[from] ||
-            (!self.remoteStreams[from][JitsiTrack.VIDEO]))
+            (!self.remoteStreams[from][MediaType.VIDEO]))
             return;
-        self.remoteStreams[from][JitsiTrack.VIDEO]._setVideoType(data.value);
+        self.remoteStreams[from][MediaType.VIDEO]._setVideoType(data.value);
     });
 }
 
@@ -98,7 +98,7 @@ RTC.prototype.onIncommingCall = function(event) {
         {
             var ssrcInfo = null;
             if(this.localStreams[i].isMuted() &&
-                this.localStreams[i].getType() === "video") {
+                this.localStreams[i].getType() === MediaType.VIDEO) {
                 /**
                  * Handles issues when the stream is added before the peerconnection is created.
                  * The peerconnection is created when second participant enters the call. In
@@ -194,7 +194,7 @@ RTC.prototype.setAudioMute = function (value) {
     var mutePromises = [];
     for(var i = 0; i < this.localStreams.length; i++) {
         var stream = this.localStreams[i];
-        if(stream.getType() !== "audio") {
+        if(stream.getType() !== MediaType.AUDIO) {
             continue;
         }
         // this is a Promise
@@ -227,7 +227,7 @@ RTC.prototype.createRemoteStream = function (data, sid, thessrc) {
     if(!this.remoteStreams[resource]) {
         this.remoteStreams[resource] = {};
     }
-    this.remoteStreams[resource][remoteStream.type]= remoteStream;
+    this.remoteStreams[resource][remoteStream.getType()]= remoteStream;
     return remoteStream;
 };
 
@@ -314,8 +314,10 @@ RTC.prototype.switchVideoStreams = function (newStream) {
 RTC.prototype.setAudioLevel = function (resource, audioLevel) {
     if(!resource)
         return;
-    if(this.remoteStreams[resource] && this.remoteStreams[resource][JitsiTrack.AUDIO])
-        this.remoteStreams[resource][JitsiTrack.AUDIO].setAudioLevel(audioLevel);
+    if(this.remoteStreams[resource] &&
+        this.remoteStreams[resource][MediaType.AUDIO]) {
+        this.remoteStreams[resource][MediaType.AUDIO].setAudioLevel(audioLevel);
+    }
 };
 
 /**
@@ -331,10 +333,10 @@ RTC.prototype.getResourceBySSRC = function (ssrc) {
 
     var resultResource = null;
     $.each(this.remoteStreams, function (resource, remoteTracks) {
-        if((remoteTracks[JitsiTrack.AUDIO]
-                && remoteTracks[JitsiTrack.AUDIO].getSSRC() == ssrc)
-            || (remoteTracks[JitsiTrack.VIDEO]
-                && remoteTracks[JitsiTrack.VIDEO].getSSRC() == ssrc))
+        if((remoteTracks[MediaType.AUDIO]
+                && remoteTracks[MediaType.AUDIO].getSSRC() == ssrc)
+            || (remoteTracks[MediaType.VIDEO]
+                && remoteTracks[MediaType.VIDEO].getSSRC() == ssrc))
             resultResource = resource;
     });
 

modules/RTC/RTCUtils.js

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

service/RTC/MediaStreamTypes.js

@@ -1,6 +0,0 @@
-var MediaStreamType = {
-    VIDEO_TYPE: "Video",
-
-    AUDIO_TYPE: "Audio"
-};
-module.exports = MediaStreamType;

service/RTC/MediaType.js

@@ -0,0 +1,15 @@
+/**
+ * Enumeration of RTC media stream types
+ * @type {{AUDIO: string, VIDEO: string}}
+ */
+var MediaType = {
+    /**
+     * The audio type.
+     */
+    AUDIO: "audio",
+    /**
+     * The video type.
+     */
+    VIDEO: "video"
+};
+module.exports = MediaType;