diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 4ff6781641..dd3f2b5591 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -8,6 +8,7 @@ The changelog for SRS. ## SRS 5.0 Changelog +* v5.0, 2023-05-14, Support the publishing of RTP plaintext packets using WHIP. v5.0.155 * v5.0, 2023-05-13, Merge [#3541](https://github.com/ossrs/srs/pull/3541): asan: Fix memory leak in asan by releasing global IPs when run_directly_or_daemon fails. v5.0.154 (#3541) * v5.0, 2023-05-12, Merge [#3539](https://github.com/ossrs/srs/pull/3539): WHIP: Improve HTTP DELETE for notifying server unpublish event. v5.0.153 (#3539) * v5.0, 2023-03-27, Merge [#3450](https://github.com/ossrs/srs/pull/3450): WebRTC: Error message carries the SDP when failed. v5.0.151 (#3450) diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js index 26b50a8503..db12ee56c5 100755 --- a/trunk/research/players/js/srs.page.js +++ b/trunk/research/players/js/srs.page.js @@ -35,6 +35,7 @@ function user_extra_params(query, params, rtc) { || key === 'http_port' || key === 'pathname' || key === 'port' || key === 'server' || key === 'stream' || key === 'buffer' || key === 'schema' || key === 'vhost' || key === 'api' + || key === 'path' ) { continue; } @@ -123,12 +124,14 @@ function build_default_whip_whep_url(query, apiPath) { console.log('?eip=x.x.x.x to overwrite candidate. 覆盖服务器candidate(外网IP)配置'); console.log('?api=x to overwrite WebRTC API(1985).'); console.log('?schema=http|https to overwrite WebRTC API protocol.'); + console.log(`?path=xxx to overwrite default ${apiPath}`); var server = (!query.server)? window.location.hostname:query.server; var vhost = (!query.vhost)? window.location.hostname:query.vhost; var app = (!query.app)? "live":query.app; var stream = (!query.stream)? "livestream":query.stream; var api = ':' + (query.api || (window.location.protocol === 'http:' ? '1985' : '1990')); + const realApiPath = query.path || apiPath; var queries = []; if (server !== vhost && vhost !== "__defaultVhost__") { @@ -139,7 +142,7 @@ function build_default_whip_whep_url(query, apiPath) { } queries = user_extra_params(query, queries, true); - var uri = window.location.protocol + "//" + server + api + apiPath + "?app=" + app + "&stream=" + stream + "&" + queries.join('&'); + var uri = window.location.protocol + "//" + server + api + realApiPath + "?app=" + app + "&stream=" + stream + "&" + queries.join('&'); while (uri.lastIndexOf("?") === uri.length - 1) { uri = uri.slice(0, uri.length - 1); } diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index cc807fec47..e1dc0dd477 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -217,6 +217,16 @@ srs_error_t SrsSemiSecurityTransport::protect_rtcp(void* packet, int* nb_cipher) return srs_success; } +srs_error_t SrsSemiSecurityTransport::unprotect_rtp(void* packet, int* nb_plaintext) +{ + return srs_success; +} + +srs_error_t SrsSemiSecurityTransport::unprotect_rtcp(void* packet, int* nb_plaintext) +{ + return srs_success; +} + SrsPlaintextTransport::SrsPlaintextTransport(ISrsRtcNetwork* s) { network_ = s; diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index e47ba6f015..ce3f407ad5 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -134,6 +134,8 @@ class SrsSemiSecurityTransport : public SrsSecurityTransport public: srs_error_t protect_rtp(void* packet, int* nb_cipher); srs_error_t protect_rtcp(void* packet, int* nb_cipher); + srs_error_t unprotect_rtp(void* packet, int* nb_plaintext); + srs_error_t unprotect_rtcp(void* packet, int* nb_plaintext); }; // Plaintext transport, without DTLS or SRTP. diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index 59e6836af2..fe7b6beebd 100644 --- a/trunk/src/core/srs_core_version5.hpp +++ b/trunk/src/core/srs_core_version5.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 5 #define VERSION_MINOR 0 -#define VERSION_REVISION 154 +#define VERSION_REVISION 155 #endif