From 440f29b7580d04edcb2d3d0ea9a14206c419617e Mon Sep 17 00:00:00 2001 From: winlin Date: Sun, 14 Nov 2021 21:50:58 +0800 Subject: [PATCH] Squash: Merge #2732 --- trunk/3rdparty/signaling/www/demos/one2one.html | 3 ++- trunk/3rdparty/signaling/www/demos/room.html | 3 ++- trunk/research/players/rtc_publisher.html | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/trunk/3rdparty/signaling/www/demos/one2one.html b/trunk/3rdparty/signaling/www/demos/one2one.html index 5bef9a4ba..aa953074b 100644 --- a/trunk/3rdparty/signaling/www/demos/one2one.html +++ b/trunk/3rdparty/signaling/www/demos/one2one.html @@ -295,8 +295,9 @@ }); $("#btn_start").click(startDemo); + // Never play util windows loaded @see https://github.com/ossrs/srs/issues/2732 if (conf.autostart) { - startDemo(); + window.addEventListener("load", function(){ startDemo(); }); } }); diff --git a/trunk/3rdparty/signaling/www/demos/room.html b/trunk/3rdparty/signaling/www/demos/room.html index 5d75f7fbf..164213d95 100644 --- a/trunk/3rdparty/signaling/www/demos/room.html +++ b/trunk/3rdparty/signaling/www/demos/room.html @@ -199,8 +199,9 @@ }); $("#btn_start").click(startDemo); + // Never play util windows loaded @see https://github.com/ossrs/srs/issues/2732 if (conf.autostart) { - startDemo(); + window.addEventListener("load", function(){ startDemo(); }); } }); \ No newline at end of file diff --git a/trunk/research/players/rtc_publisher.html b/trunk/research/players/rtc_publisher.html index 6b102a289..4c1fe76dd 100644 --- a/trunk/research/players/rtc_publisher.html +++ b/trunk/research/players/rtc_publisher.html @@ -110,12 +110,12 @@ $(function(){ srs_init_rtc("#txt_url", query); $("#btn_publish").click(startPublish); + // Never play util windows loaded @see https://github.com/ossrs/srs/issues/2732 if (query.autostart === 'true') { - startPublish(); + window.addEventListener("load", function(){ startPublish(); }); } }); -