Skip to content

Commit

Permalink
add depth stream playback support
Browse files Browse the repository at this point in the history
  • Loading branch information
ara4n committed Feb 2, 2018
1 parent a3c7e06 commit f3f1524
Show file tree
Hide file tree
Showing 2 changed files with 75 additions and 3 deletions.
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -70,7 +70,7 @@
"rimraf": "^2.5.4",
"source-map-support": "^0.4.11",
"sourceify": "^0.1.0",
"uglifyjs": "^2.4.10",
"uglify-js": "^2.8.26",
"watchify": "^3.2.1"
},
"optionalDependencies": {
Expand Down
76 changes: 74 additions & 2 deletions src/webrtc/call.js
Expand Up @@ -145,11 +145,13 @@ MatrixCall.prototype.placeVoiceCall = function() {
* to render the local camera preview.
* @throws If you have not specified a listener for 'error' events.
*/
MatrixCall.prototype.placeVideoCall = function(remoteVideoElement, localVideoElement) {
MatrixCall.prototype.placeVideoCall = function(remoteVideoElement, localVideoElement, remoteDepthElement) {
this._debuglog("placeVideoCall");
checkForErrorListener(this);
this.localVideoElement = localVideoElement;
this.remoteVideoElement = remoteVideoElement;
this.remoteDepthElement = remoteDepthElement;

_placeCallWithConstraints(this, _getUserMediaVideoContraints('video'));
this.type = 'video';
_tryPlayRemoteStream(this);
Expand Down Expand Up @@ -291,6 +293,15 @@ MatrixCall.prototype.getRemoteVideoElement = function() {
return this.remoteVideoElement;
};

/**
* Retrieve the remote <code>&lt;video&gt;</code> DOM element
* used for playing back depth capable streams.
* @return {Element} The dom element
*/
MatrixCall.prototype.getRemoteDepthElement = function() {
return this.remoteDepthElement;
};

/**
* Retrieve the remote <code>&lt;audio&gt;</code> DOM element
* used for playing back audio only streams.
Expand Down Expand Up @@ -332,6 +343,17 @@ MatrixCall.prototype.setRemoteVideoElement = function(element) {
_tryPlayRemoteStream(this);
};

/**
* Set the remote <code>&lt;video&gt;</code> DOM element used for depth streams.
* If this call is active, the first received depth-capable video stream will be
* rendered to it immediately.
* @param {Element} element The <code>&lt;video&gt;</code> DOM element for depth.
*/
MatrixCall.prototype.setRemoteDepthElement = function(element) {
this.remoteDepthElement = element;
_tryPlayRemoteStream(this);
};

/**
* Set the remote <code>&lt;audio&gt;</code> DOM element. If this call is active,
* the first received audio-only stream will be rendered to it immediately.
Expand Down Expand Up @@ -914,10 +936,34 @@ MatrixCall.prototype._onAddStream = function(event) {

const s = event.stream;

if (s.getVideoTracks().length > 0) {
const videoTracks = s.getVideoTracks();
if (videoTracks.length > 0) {
this.type = 'video';
this.remoteAVStream = s;
this.remoteDepthStream = undefined;
this.remoteAStream = s;

let depthIndex;
for (let i = 0; i < videoTracks.length; i++) {
let t = videoTracks[i];
if (t.label == 'MATRIXd0') {
depthIndex = i;
}
}

if (depthIndex != undefined) {
this.remoteDepthStream = s.clone();
for (let i = 0; i < videoTracks.length; i++) {
if (i == depthIndex) {
// remove the depth track from the video stream...
this.remoteAVStream.removeTrack(this.remoteAVStream.getVideoTracks()[i]);
}
else {
// ...and the video track from the depth stream.
this.remoteDepthStream.removeTrack(this.remoteDepthStream.getVideoTracks()[i]);
}
}
}
} else {
this.type = 'voice';
this.remoteAStream = s;
Expand Down Expand Up @@ -1056,6 +1102,12 @@ const terminate = function(self, hangupParty, hangupReason, shouldEmit) {
}
self.assignElement(self.getRemoteVideoElement(), null, "remoteVideo");
}
if (self.getRemoteDepthElement()) {
if (self.getRemoteDepthElement().pause) {
self.pauseElement(self.getRemoteDepthElement(), "remoteDepth");
}
self.assignElement(self.getRemoteDepthElement(), null, "remoteDepth");
}
if (self.getRemoteAudioElement()) {
if (self.getRemoteAudioElement().pause) {
self.pauseElement(self.getRemoteAudioElement(), "remoteAudio");
Expand Down Expand Up @@ -1111,6 +1163,13 @@ const stopAllMedia = function(self) {
}
});
}
if (self.remoteDepthStream) {
forAllTracksOnStream(self.remoteDepthStream, function(t) {
if (t.stop) {
t.stop();
}
});
}
if (self.remoteAStream) {
forAllTracksOnStream(self.remoteAStream, function(t) {
if (t.stop) {
Expand All @@ -1136,6 +1195,19 @@ const _tryPlayRemoteStream = function(self) {
}
}, 0);
}

// try to play the depth too.
if (self.getRemoteDepthElement() && self.remoteDepthStream) {
const player = self.getRemoteDepthElement();
player.autoplay = true;
self.assignElement(player, self.remoteDepthStream, "remoteDepth");
setTimeout(function() {
const vel = self.getRemoteDepthElement();
if (vel.play) {
self.playElement(vel, "remoteDepth");
}
}, 0);
}
};

const _tryPlayRemoteAudioStream = function(self) {
Expand Down

0 comments on commit f3f1524

Please sign in to comment.