external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Refine tid for sdk and demos. 4.0.106

Browse source
This commit is contained in:
winlin 2021-05-09 22:33:43 +08:00
parent 2ad24b2313
commit 3bf1b0cb7d
7 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -176,6 +176,7 @@ The ports used by SRS:
## V4 changes ## V4 changes
* v4.0, 2021-05-09, Refine tid for sdk and demos. 4.0.106
* v4.0, 2021-05-08, Refine shared fast timer. 4.0.105 * v4.0, 2021-05-08, Refine shared fast timer. 4.0.105
* v4.0, 2021-05-08, Refine global or thread-local variables initialize. 4.0.104 * v4.0, 2021-05-08, Refine global or thread-local variables initialize. 4.0.104
* v4.0, 2021-05-07, RTC: Support circuit breaker. 4.0.103 * v4.0, 2021-05-07, RTC: Support circuit breaker. 4.0.103

2
trunk/3rdparty/signaling/www/demos/index.html vendored
View file

@ -15,7 +15,7 @@
点击进入<a class="srs_demo" href="room.html?autostart=true">SRS多人通话演示</a> 点击进入<a class="srs_demo" href="room.html?autostart=true">SRS多人通话演示</a>
</p> </p>
<script> <script>
let roomName = Number(new Date().getTime() + parseInt(String(Math.random() * 10000000000))).toString(16).substr(3); let roomName = Number(parseInt(new Date().getTime()*Math.random()*100)).toString(16).substr(0, 7);
let elems = document.getElementsByClassName('srs_demo'); let elems = document.getElementsByClassName('srs_demo');
for (var i = 0; i < elems.length; i++) { for (var i = 0; i < elems.length; i++) {
let elem = elems.item(i); let elem = elems.item(i);

4
trunk/3rdparty/signaling/www/demos/js/srs.sdk.js vendored
View file

@ -144,7 +144,7 @@ function SrsRtcPublisherAsync() {
return { return {
apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port, apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port,
tid: Number(new Date().getTime() + parseInt(String(Math.random() * 10000000000))).toString(16) tid: Number(parseInt(new Date().getTime()*Math.random()*100)).toString(16).substr(0, 7)
}; };
}, },
parse: function (url) { parse: function (url) {
@ -361,7 +361,7 @@ function SrsRtcPlayerAsync() {
return { return {
apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port, apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port,
tid: Number(new Date().getTime() + parseInt(String(Math.random() * 10000000000))).toString(16) tid: Number(parseInt(new Date().getTime()*Math.random()*100)).toString(16).substr(0, 7)
}; };
}, },
parse: function (url) { parse: function (url) {

4
trunk/3rdparty/signaling/www/demos/js/srs.sig.js vendored
View file

@ -59,7 +59,7 @@ function SrsRtcSignalingAsync() {
// The message is a json object. // The message is a json object.
self.send = async function (message) { self.send = async function (message) {
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
var r = {tid: Number(new Date().getTime() + parseInt(String(Math.random() * 10000000000))).toString(16), msg: message}; var r = {tid: Number(parseInt(new Date().getTime()*Math.random()*100)).toString(16).substr(0, 7), msg: message};
self._internals.msgs[r.tid] = {resolve: resolve, reject: reject}; self._internals.msgs[r.tid] = {resolve: resolve, reject: reject};
self.ws.send(JSON.stringify(r)); self.ws.send(JSON.stringify(r));
}); });
@ -108,7 +108,7 @@ function SrsRtcSignalingParse(location) {
room = room? room.split('&')[0] : null; room = room? room.split('&')[0] : null;
let display = location.href.split('display=')[1]; let display = location.href.split('display=')[1];
display = display? display.split('&')[0] : Number(new Date().getTime() + parseInt(String(Math.random() * 10000000000))).toString(16).substr(3); display = display? display.split('&')[0] : Number(parseInt(new Date().getTime()*Math.random()*100)).toString(16).toString(16).substr(0, 7);
let autostart = location.href.split('autostart=')[1]; let autostart = location.href.split('autostart=')[1];
autostart = autostart && autostart.split('&')[0] === 'true'; autostart = autostart && autostart.split('&')[0] === 'true';

4
trunk/research/players/js/srs.sdk.js
View file

@ -144,7 +144,7 @@ function SrsRtcPublisherAsync() {
return { return {
apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port, apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port,
tid: new Date().getTime().toString(16) tid: Number(parseInt(new Date().getTime()*Math.random()*100)).toString(16).substr(0, 7)
}; };
}, },
parse: function (url) { parse: function (url) {
@ -361,7 +361,7 @@ function SrsRtcPlayerAsync() {
return { return {
apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port, apiUrl: apiUrl, streamUrl: streamUrl, schema: schema, urlObject: urlObject, port: port,
tid: new Date().getTime().toString(16) tid: Number(parseInt(new Date().getTime()*Math.random()*100)).toString(16).substr(0, 7)
}; };
}, },
parse: function (url) { parse: function (url) {

2
trunk/research/players/srs_publisher_flash.html
View file

@ -335,7 +335,7 @@
$("#btn_publish").click(on_user_publish); $("#btn_publish").click(on_user_publish);
// for publish, we use randome stream name. // for publish, we use randome stream name.
$("#txt_url").val($("#txt_url").val() + "." + Number(new Date().getTime() + parseInt(String(Math.random() * 10000000000))).toString(16)); $("#txt_url").val($("#txt_url").val() + "." + Number(parseInt(new Date().getTime()*Math.random()*100)).toString(16).substr(0, 7));
// start the publisher. // start the publisher.
srs_publisher = new SrsPublisher("local_publisher", 430, 185); srs_publisher = new SrsPublisher("local_publisher", 430, 185);

2
trunk/src/core/srs_core_version4.hpp
View file

@ -26,6 +26,6 @@
#define VERSION_MAJOR 4 #define VERSION_MAJOR 4
#define VERSION_MINOR 0 #define VERSION_MINOR 0
#define VERSION_REVISION 105 #define VERSION_REVISION 106
#endif #endif