Skip to content

Rework WebRTC sample #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 22 commits into from
Nov 19, 2015
Merged

Rework WebRTC sample #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
aad6e64
middle
Nov 10, 2015
491238a
rework sample (without filter, main video, volume)
Nov 12, 2015
35323af
add filters
Nov 12, 2015
9201295
delete volume-meter
Nov 12, 2015
3c7e492
Merge remote-tracking branch 'remotes/origin/develop.webrtc' into dev…
Nov 12, 2015
2a0fae4
some changes
Nov 12, 2015
db085cd
download cssgram because cdn not stable
Nov 12, 2015
da613ef
add Name without id
Nov 12, 2015
bdfdfad
add verification 'is WebRTC is avaible'
Nov 13, 2015
4b5b902
fix bugs (remove preloader when user is reject call)
Nov 13, 2015
be288cd
rework usernotanswer
Nov 13, 2015
a14a32c
QBWEBSDK-160
Nov 13, 2015
928b816
changes after answer [160]
Nov 16, 2015
8d52765
fixed after feedback [1]
Nov 17, 2015
aba3ea6
updated WebRTC listeners
Nov 17, 2015
adc1cdb
updated lables
Nov 17, 2015
692fe73
Merge branch 'develop.webrtc.rework_samples.06112015' of https://gith…
Nov 17, 2015
0f8ff64
fixed after feedback [2]
Nov 17, 2015
4df6a6f
fixed after feedback [5]
Nov 17, 2015
74bf825
fixed after feedback [4]
Nov 17, 2015
ecdd291
fixed after feedback - add filter only for current user
Nov 17, 2015
0181603
fixed after feedback [3]
Nov 18, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions js/modules/webrtc/qbWebRTCClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
/*
* User's callbacks (listener-functions):
* - onCallListener(session, extension)
* - onAcceptCallListener(session, extension)
* - onRejectCallListener(session, extension)
* - onStopCallListener(session, extension)
* - onUpdateCallListener(session, extension)
* - onAcceptCallListener(session, userID, extension)
* - onRejectCallListener(session, userID, extension)
* - onStopCallListener(session, userID, extension)
* - onUpdateCallListener(session, userID, extension)
*/

var WebRTCSession = require('./qbWebRTCSession');
Expand Down Expand Up @@ -159,7 +159,7 @@ WebRTCClient.prototype._onAcceptListener = function(userID, sessionID, extension
this._cleanupExtension(extensionClone);

if (typeof this.onAcceptCallListener === 'function'){
this.onAcceptCallListener(session, extensionClone);
this.onAcceptCallListener(session, userID, extensionClone);
}

session.processOnAccept(userID, extension);
Expand All @@ -178,7 +178,7 @@ WebRTCClient.prototype._onRejectListener = function(userID, sessionID, extension
this._cleanupExtension(extensionClone);

if (typeof this.onRejectCallListener === 'function'){
this.onRejectCallListener(session, extensionClone);
this.onRejectCallListener(session, userID, extensionClone);
}

session.processOnReject(userID, extension);
Expand All @@ -197,7 +197,7 @@ WebRTCClient.prototype._onStopListener = function(userID, sessionID, extension)
this._cleanupExtension(extensionClone);

if (typeof this.onStopCallListener === 'function'){
this.onStopCallListener(session, extensionClone);
this.onStopCallListener(session, userID, extensionClone);
}

session.processOnStop(userID, extension);
Expand All @@ -221,13 +221,11 @@ WebRTCClient.prototype._onIceCandidatesListener = function(userID, sessionID, ex
WebRTCClient.prototype._onUpdateListener = function(userID, sessionID, extension) {
Helpers.trace("onUpdate. UserID:" + userID + ". SessionID: " + sessionID + ". Extension: " + JSON.stringify(extension));

var session = WebRTCClient.sessions[sessionId];
var session = this.sessions[sessionID];

if (typeof this.onUpdateCallListener === 'function'){
this.onUpdateCallListener(session, extension);
this.onUpdateCallListener(session, userID, extension);
}

session.processOnUpdate(userID, extension);
};

WebRTCClient.prototype._cleanupExtension = function(extension){
Expand Down Expand Up @@ -273,4 +271,4 @@ function getOpponentsIdNASessions(sessions) {
}

return opponents;
}
}
6 changes: 1 addition & 5 deletions js/modules/webrtc/qbWebRTCSession.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ WebRTCSession.prototype.update = function(extension) {
}

ext = _prepareExtension(extension);
ext.sessionID = this.ID;

for (var key in self.peerConnections) {
var peerConnection = self.peerConnections[key];
Expand Down Expand Up @@ -526,11 +527,6 @@ WebRTCSession.prototype.processOnIceCandidates = function(userID, extension) {
}
};

WebRTCSession.prototype.processOnUpdate = function(userID, extension) {

};


//
///////////
//
Expand Down
8 changes: 4 additions & 4 deletions quickblox.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading