From fe7fff8f6cafee599d762ce62f6da82c30e9d801 Mon Sep 17 00:00:00 2001 From: bustardcelly Date: Thu, 6 Jun 2019 22:46:16 +0200 Subject: [PATCH 1/2] fix for camera select clearing on publisher source. --- .../sm-test/publishStreamManagerProxyCamera/index.js | 11 +++++++++++ src/page/test/publishCameraSource/index.js | 10 ++++++++++ 2 files changed, 21 insertions(+) diff --git a/src/page/sm-test/publishStreamManagerProxyCamera/index.js b/src/page/sm-test/publishStreamManagerProxyCamera/index.js index f225864d..dc7b64a8 100644 --- a/src/page/sm-test/publishStreamManagerProxyCamera/index.js +++ b/src/page/sm-test/publishStreamManagerProxyCamera/index.js @@ -274,6 +274,17 @@ resolve(); return; } + var stream = publisher.getMediaStream(); + if (stream) { + var i; + var track; + var tracks = stream.getTracks(); + for (i = 0; i < tracks.length; i++) { + track = tracks[i]; + track.stop(); + } + } + document.getElementById('red5pro-publisher').srcObject = null; publisher.unpublish() .then(function () { onUnpublishSuccess(); diff --git a/src/page/test/publishCameraSource/index.js b/src/page/test/publishCameraSource/index.js index 4d276c2a..4dc109e8 100644 --- a/src/page/test/publishCameraSource/index.js +++ b/src/page/test/publishCameraSource/index.js @@ -189,6 +189,16 @@ function unpublish () { return new Promise(function (resolve, reject) { if (targetPublisher) { + var stream = targetPublisher.getMediaStream(); + if (stream) { + var i; + var track; + var tracks = stream.getTracks(); + for (i = 0; i < tracks.length; i++) { + track = tracks[i]; + track.stop(); + } + } targetPublisher.unpublish() .then(function () { onUnpublishSuccess(); From 10e1322b7de91896e14463ef3a46c45cb671375e Mon Sep 17 00:00:00 2001 From: bustardcelly Date: Tue, 11 Jun 2019 17:57:30 +0200 Subject: [PATCH 2/2] bump of version. --- package.json | 2 +- src/page/test/publishCameraSource/index.js | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 34481611..867e33f0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "red5pro-html-sdk-testbed", - "version": "5.6.0-RC1", + "version": "5.6.0-RC2", "description": "Testbed examples for Red5 Pro HTML SDK", "main": "src/js/index.js", "repository": { diff --git a/src/page/test/publishCameraSource/index.js b/src/page/test/publishCameraSource/index.js index 4dc109e8..28a2831b 100644 --- a/src/page/test/publishCameraSource/index.js +++ b/src/page/test/publishCameraSource/index.js @@ -199,6 +199,7 @@ track.stop(); } } + document.getElementById('red5pro-publisher').srcObject = null; targetPublisher.unpublish() .then(function () { onUnpublishSuccess();