From 0b62216999b4a20a5292263a50bc1526c8f556ca Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 30 Apr 2021 08:13:38 +0800 Subject: [PATCH] SquashSRS4: Support av1 for Chrome M90 enabled it. --- README.md | 1 + trunk/research/players/js/srs.page.js | 285 +--------- trunk/research/players/js/srs.sdk.js | 501 ++++++++++++++++++ trunk/research/players/rtc_player.html | 217 +------- trunk/research/players/rtc_publisher.html | 239 +-------- trunk/research/players/srs_bwt.html | 29 + .../research/players/srs_publisher_flash.html | 201 +++++++ trunk/scripts/git2unix.sh | 26 - trunk/src/app/srs_app_rtc_api.cpp | 98 ++-- trunk/src/app/srs_app_rtc_conn.cpp | 247 ++++----- trunk/src/app/srs_app_rtc_conn.hpp | 10 +- trunk/src/app/srs_app_rtc_server.cpp | 58 +- trunk/src/app/srs_app_rtc_server.hpp | 31 +- trunk/src/core/srs_core_version4.hpp | 2 +- 14 files changed, 980 insertions(+), 965 deletions(-) create mode 100644 trunk/research/players/js/srs.sdk.js delete mode 100755 trunk/scripts/git2unix.sh diff --git a/README.md b/README.md index 6e6daf59c..00820e063 100755 --- a/README.md +++ b/README.md @@ -163,6 +163,7 @@ Other important wiki: ## V4 changes +* v4.0, 2021-04-29, RTC: Support av1 for Chrome M90. 4.0.91 * v4.0, 2021-04-24, Change push-RTSP as deprecated feature. * v4.0, 2021-04-24, Player: Change the default from RTMP to HTTP-FLV. * v4.0, 2021-04-24, Disable CherryPy by --cherrypy=off. 4.0.90 diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js index dbf4e7b6e..26b3971e1 100755 --- a/trunk/research/players/js/srs.page.js +++ b/trunk/research/players/js/srs.page.js @@ -1,6 +1,3 @@ -////////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////////// // to query the swf anti cache. function srs_get_version_code() { return "1.33"; } @@ -12,10 +9,6 @@ function srs_get_player_modal() { return 740; } function srs_get_player_width() { return srs_get_player_modal() - 30; } function srs_get_player_height() { return srs_get_player_width() * 9 / 19; } -////////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////////// -////////////////////////////////////////////////////////////////////////////////// - /** * update the navigator, add same query string. */ @@ -93,34 +86,10 @@ function build_default_flv_url() { return uri; } -// for the bandwidth tool to init page -function build_default_bandwidth_rtmp_url() { - var query = parse_query_string(); - - var schema = 'rtmp'; - var server = (!query.server)? window.location.hostname:query.server; - var port = (!query.port)? 1935:query.port; - var vhost = "bandcheck.srs.com"; - var app = (!query.app)? "app":query.app; - var key = (!query.key)? "35c9b402c12a7246868752e2878f7e0e":query.key; - - var uri = schema + "://" + server; - if (!is_default_port(schema, port)) { - uri += ":" + port; - } - uri += "/" + app + "?key=" + key + "&vhost=" + vhost; - - return uri; -} function build_default_rtc_url(query) { - // Use target to overwrite server, vhost and eip. - console.log('?target=x.x.x.x to overwrite server, vhost and eip.'); - if (query.target) { - query.server = query.vhost = query.eip = query.target; - query.user_query.eip = query.target; - delete query.target; - } + // The format for query string to overwrite configs of server. + console.log('?eip=x.x.x.x to overwrite candidate. 覆盖服务器candidate(外网IP)配置'); var server = (!query.server)? window.location.hostname:query.server; var vhost = (!query.vhost)? window.location.hostname:query.vhost; @@ -165,253 +134,3 @@ function srs_init_rtc(id, query) { update_nav(); $(id).val(build_default_rtc_url(query)); } -// for bw to init url -// url: scheme://host:port/path?query#fragment -function srs_init_bwt(rtmp_url, hls_url) { - update_nav(); - - if (rtmp_url) { - $(rtmp_url).val(build_default_bandwidth_rtmp_url()); - } -} - -// check whether can republish -function srs_can_republish() { - var browser = get_browser_agents(); - - if (browser.Chrome || browser.Firefox) { - return true; - } - - if (browser.MSIE || browser.QQBrowser) { - return false; - } - - return false; -} - -// without default values set. -function srs_initialize_codec_page( - cameras, microphones, - sl_cameras, sl_microphones, sl_vcodec, sl_profile, sl_level, sl_gop, sl_size, sl_fps, sl_bitrate, - sl_acodec -) { - $(sl_cameras).empty(); - for (var i = 0; i < cameras.length; i++) { - $(sl_cameras).append("