Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "red5pro-html-sdk-testbed",
"version": "5.6.0-RC1",
"version": "5.6.0-RC4",
"description": "Testbed examples for Red5 Pro HTML SDK",
"main": "src/js/index.js",
"repository": {
Expand Down
7 changes: 5 additions & 2 deletions src/page/sm-test/TwoWayStreamManagerProxy/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
}
function onUnsubscribeFail (message) {
Expand Down Expand Up @@ -346,6 +346,9 @@
function unsubscribe () {
return new Promise(function(resolve, reject) {
var subscriber = targetSubscriber;
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(subscriber);
}
subscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@
document.getElementById(replacement.id).parentNode.classList.remove('hidden');
document.getElementById(replacement.id).parentNode.dataset.activeVideo = replacement.id;
replacement.isActive = true;
window.exposeSubscriberGlobally(replacement.subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(replacement.subscriber);
}
replacement.subscriber.play();
replacement.subscriber.disableStandby();
var options = replacement.subscriber._options;
Expand Down Expand Up @@ -219,8 +221,8 @@
new red5prosdk.RTCSubscriber()
.init(config)
.then(function (subscriber) {
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
return subscriber.subscribe();
})
Expand Down
7 changes: 5 additions & 2 deletions src/page/sm-test/subscribeStreamManager/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
if (subscriber.getType().toLowerCase() === 'rtc') {
try {
Expand Down Expand Up @@ -225,6 +225,9 @@
function unsubscribe () {
return new Promise(function(resolve, reject) {
var subscriber = targetSubscriber
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(subscriber);
}
subscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
7 changes: 5 additions & 2 deletions src/page/sm-test/subscribeStreamManagerProxy/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
if (subscriber.getType().toLowerCase() === 'rtc') {
try {
Expand Down Expand Up @@ -263,6 +263,9 @@
function unsubscribe () {
return new Promise(function(resolve, reject) {
var subscriber = targetSubscriber
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(subscriber);
}
subscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
if (subscriber.getType().toLowerCase() === 'rtc') {
try {
Expand Down Expand Up @@ -274,6 +274,9 @@
function unsubscribe () {
return new Promise(function(resolve, reject) {
var subscriber = targetSubscriber
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(subscriber);
}
subscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
if (subscriber.getType().toLowerCase() === 'rtc') {
try {
Expand Down Expand Up @@ -181,6 +181,9 @@
// Request to unsubscribe.
function unsubscribe (subscriber) {
return new Promise(function(resolve, reject) {
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(subscriber);
}
subscriber.unscubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
try {
window.trackBitrate(subscriber.getPeerConnection(), onBitrateUpdate, onResolutionUpdate, true);
Expand Down Expand Up @@ -219,6 +219,9 @@
function unsubscribe () {
return new Promise(function(resolve, reject) {
var subscriber = targetSubscriber
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(subscriber);
}
subscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
try {
window.trackBitrate(subscriber.getPeerConnection(), onBitrateUpdate, onResolutionUpdate, true);
Expand Down Expand Up @@ -252,6 +252,9 @@
function unsubscribe () {
return new Promise(function(resolve, reject) {
var subscriber = targetSubscriber
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(subscriber);
}
subscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
}
function onUnsubscribeFail (message) {
Expand Down Expand Up @@ -252,6 +252,9 @@
function unsubscribe () {
return new Promise(function(resolve, reject) {
var subscriber = targetSubscriber
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(subscriber);
}
subscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
7 changes: 5 additions & 2 deletions src/page/sm-test/subscribeStreamManagerProxyVP8/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
}
function onUnsubscribeFail (message) {
Expand Down Expand Up @@ -233,6 +233,9 @@
function unsubscribe () {
return new Promise(function(resolve, reject) {
var subscriber = targetSubscriber
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(subscriber);
}
subscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,8 +184,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
if (subscriber.getType().toLowerCase() === 'rtc') {
try {
Expand Down Expand Up @@ -266,6 +266,9 @@
function unsubscribe () {
return new Promise(function(resolve, reject) {
var subscriber = targetSubscriber
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(subscriber);
}
subscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
7 changes: 5 additions & 2 deletions src/page/test/subscribe/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
if (subscriber.getType().toLowerCase() === 'rtc') {
try {
Expand Down Expand Up @@ -123,6 +123,9 @@
function unsubscribe () {
return new Promise(function(resolve, reject) {
var subscriber = targetSubscriber
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(subscriber);
}
subscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
7 changes: 5 additions & 2 deletions src/page/test/subscribeAudioOnly/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
if (subscriber.getType().toLowerCase() === 'rtc') {
try {
Expand All @@ -136,6 +136,9 @@
function unsubscribe () {
return new Promise(function(resolve, reject) {
var subscriber = targetSubscriber
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(subscriber);
}
subscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
7 changes: 5 additions & 2 deletions src/page/test/subscribeAuth/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
if (subscriber.getType().toLowerCase() === 'rtc') {
try {
Expand All @@ -110,6 +110,9 @@
// Request to unsubscribe.
function unsubscribe () {
return new Promise(function(resolve, reject) {
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(targetSubscriber);
}
targetSubscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
7 changes: 5 additions & 2 deletions src/page/test/subscribeCall/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
}
function onUnsubscribeFail (message) {
Expand All @@ -130,6 +130,9 @@
function unsubscribe () {
return new Promise(function(resolve, reject) {
var subscriber = targetSubscriber
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(subscriber);
}
subscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
7 changes: 5 additions & 2 deletions src/page/test/subscribeCluster/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
if (subscriber.getType().toLowerCase() === 'rtc') {
try {
Expand Down Expand Up @@ -219,6 +219,9 @@
// Request to unsubscribe.
function unsubscribe () {
return new Promise(function(resolve, reject) {
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(targetSubscriber);
}
targetSubscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
7 changes: 5 additions & 2 deletions src/page/test/subscribeHLS/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@
function unsubscribe () {
return new Promise(function(resolve, reject) {
var subscriber = targetSubscriber
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(subscriber);
}
subscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down Expand Up @@ -138,8 +141,8 @@
targetSubscriber = subscriberImpl
// Subscribe to events.
targetSubscriber.on('*', onSubscriberEvent);
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(targetSubscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(targetSubscriber);
}
return targetSubscriber.subscribe()
})
Expand Down
7 changes: 5 additions & 2 deletions src/page/test/subscribeImageCapture/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@
}
function onSubscribeSuccess (subscriber) {
console.log('[Red5ProSubsriber] Subscribe Complete.');
if (window.exposeSubscriberGlobally) {
window.exposeSubscriberGlobally(subscriber);
if (window.handleSubscriberSetupGlobally) {
window.handleSubscriberSetupGlobally(subscriber);
}
if (subscriber.getType().toLowerCase() === 'rtc') {
try {
Expand Down Expand Up @@ -137,6 +137,9 @@
// Request to unsubscribe.
function unsubscribe () {
return new Promise(function(resolve, reject) {
if (window.handleSubscriberTeardownGlobally) {
window.handleSubscriberTeardownGlobally(targetSubscriber);
}
targetSubscriber.unsubscribe()
.then(function () {
targetSubscriber.off('*', onSubscriberEvent);
Expand Down
Loading