From 93aa0eb5ba7b089105f54080d02a891e8e8ae81b Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 13 Jan 2022 18:26:28 +0800 Subject: [PATCH 1/3] Squash: Fix bugs --- .github/workflows/release.yml | 8 +- README.md | 1 + trunk/Dockerfile | 2 + trunk/Dockerfile.pkg | 4 +- trunk/auto/auto_headers.sh | 1 + trunk/auto/options.sh | 4 + trunk/conf/vm.conf | 48 +++++++ trunk/configure | 4 +- trunk/doc/CHANGELOG.md | 9 +- trunk/etc/init.d/srs-api | 127 ------------------ .../research/api-server/static-dir/index.html | 82 ++++++++--- trunk/research/players/js/srs.page.js | 6 +- trunk/research/players/js/srs.sdk.js | 13 ++ trunk/scripts/install.sh | 2 +- trunk/src/app/srs_app_config.cpp | 2 +- trunk/src/app/srs_app_rtc_api.cpp | 9 +- trunk/src/app/srs_app_rtc_conn.cpp | 12 +- trunk/src/app/srs_app_rtc_source.cpp | 9 +- trunk/src/app/srs_app_rtc_source.hpp | 3 +- trunk/src/app/srs_app_source.cpp | 9 +- trunk/src/app/srs_app_source.hpp | 1 - trunk/src/core/srs_core_autofree.hpp | 18 ++- trunk/src/core/srs_core_version4.hpp | 2 +- trunk/src/core/srs_core_version5.hpp | 2 +- trunk/src/main/srs_main_server.cpp | 4 +- 25 files changed, 198 insertions(+), 184 deletions(-) create mode 100644 trunk/conf/vm.conf delete mode 100755 trunk/etc/init.d/srs-api diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9353fdf47..d1d398a41 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,8 +50,10 @@ jobs: # SRS_PACKAGE_ZIP=SRS-CentOS7-x86_64-4.0.145.zip # SRS_PACKAGE_MD5=3880a26e30b283edf05700a4e69956e5 - name: Create package zip + env: + PACKAGER: ${{ secrets.SRS_PACKAGER_BINARY }} run: | - docker build --tag srs:pkg --build-arg version=$SRS_VERSION -f trunk/Dockerfile.pkg . && + docker build --tag srs:pkg --build-arg version=$SRS_VERSION --build-arg SRS_AUTO_PACKAGER=$PACKAGER -f trunk/Dockerfile.pkg . && SRS_PACKAGE_ZIP=SRS-CentOS7-x86_64-$SRS_VERSION.zip && docker run --rm -v $(pwd):/output srs:pkg cp objs/$SRS_PACKAGE_ZIP /output/ && du -sh $SRS_PACKAGE_ZIP && @@ -73,9 +75,11 @@ jobs: # Build # Build SRS image - name: Build SRS docker image + env: + PACKAGER: ${{ secrets.SRS_PACKAGER_DOCKER }} run: | echo "Release ossrs/srs:$SRS_TAG" - docker build --tag ossrs/srs:$SRS_TAG -f trunk/Dockerfile . + docker build --tag ossrs/srs:$SRS_TAG --build-arg SRS_AUTO_PACKAGER=$PACKAGER -f trunk/Dockerfile . ################################################################ # Docker diff --git a/README.md b/README.md index 5884efe13..4d1e7fd75 100755 --- a/README.md +++ b/README.md @@ -125,6 +125,7 @@ A big `THANK YOU` also goes to: ## Releases +* 2022-01-13, Release [v4.0-b3](https://github.com/ossrs/srs/releases/tag/v4.0-b3), v4.0-b3, 4.0 beta3, v4.0.229, 144393 lines. * 2022-01-03, Release [v4.0-b2](https://github.com/ossrs/srs/releases/tag/v4.0-b2), v4.0-b2, 4.0 beta2, v4.0.215, 144278 lines. * 2021-12-19, Release [v4.0-b1](https://github.com/ossrs/srs/releases/tag/v4.0-b1), v4.0-b1, 4.0 beta1, v4.0.206, 144126 lines. * 2021-12-01, Release [v4.0-b0](https://github.com/ossrs/srs/releases/tag/v4.0-b0), v4.0-b0, 4.0 beta0, v4.0.201, 144022 lines. diff --git a/trunk/Dockerfile b/trunk/Dockerfile index bd37ef08c..922cf2eed 100644 --- a/trunk/Dockerfile +++ b/trunk/Dockerfile @@ -3,6 +3,8 @@ FROM ossrs/srs:dev AS build # Install depends tools. RUN yum install -y gcc make gcc-c++ patch unzip perl git +ARG SRS_AUTO_PACKAGER + # Build and install SRS. COPY . /srs WORKDIR /srs/trunk diff --git a/trunk/Dockerfile.pkg b/trunk/Dockerfile.pkg index ade5778cd..1fb3d600a 100644 --- a/trunk/Dockerfile.pkg +++ b/trunk/Dockerfile.pkg @@ -2,13 +2,11 @@ FROM ossrs/srs:dev # version=4.0.145 ARG version +ARG SRS_AUTO_PACKAGER # Install depends tools. RUN yum install -y zip -# Setup the packager env. -ENV SRS_AUTO_PACKAGER ossrs - # Build and install SRS. ADD srs-server-${version}.tar.gz /srs WORKDIR /srs/srs-server-${version}/trunk diff --git a/trunk/auto/auto_headers.sh b/trunk/auto/auto_headers.sh index 6c2125755..73bc0ae3f 100755 --- a/trunk/auto/auto_headers.sh +++ b/trunk/auto/auto_headers.sh @@ -177,6 +177,7 @@ fi # prefix echo "" >> $SRS_AUTO_HEADERS_H echo "#define SRS_PREFIX \"${SRS_PREFIX}\"" >> $SRS_AUTO_HEADERS_H +echo "#define SRS_DEFAULT_CONFIG \"${SRS_DEFAULT_CONFIG}\"" >> $SRS_AUTO_HEADERS_H echo "" >> $SRS_AUTO_HEADERS_H diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index 2152c4f08..59bc9f7d5 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -36,6 +36,7 @@ SRS_FFMPEG_TOOL=NO SRS_FFMPEG_FIT=RESERVED # arguments SRS_PREFIX=/usr/local/srs +SRS_DEFAULT_CONFIG=conf/srs.conf SRS_JOBS=1 SRS_STATIC=NO # If enabled, link shared libraries for libst.so which uses MPL license. @@ -127,6 +128,7 @@ Features: --ffmpeg-fit=on|off Whether enable the FFmpeg fit(source code). Default: $(value2switch $SRS_FFMPEG_FIT) --prefix= The absolute installation path. Default: $SRS_PREFIX + --config= The default config file for SRS. Default: $SRS_DEFAULT_CONFIG --gcov=on|off Whether enable the GCOV compiler options. Default: $(value2switch $SRS_GCOV) --debug=on|off Whether enable the debug code, may hurt performance. Default: $(value2switch $SRS_DEBUG) --debug-stats=on|off Whether enable the debug stats, may hurt performance. Default: $(value2switch $SRS_DEBUG_STATS) @@ -220,6 +222,7 @@ function parse_user_option() { --jobs) SRS_JOBS=${value} ;; --prefix) SRS_PREFIX=${value} ;; + --config) SRS_DEFAULT_CONFIG=${value} ;; --static) SRS_STATIC=$(switch2value $value) ;; --cpu) SRS_CROSS_BUILD_CPU=${value} ;; @@ -495,6 +498,7 @@ function regenerate_options() { SRS_AUTO_USER_CONFIGURE=`echo $opt` # regenerate the options for default values. SRS_AUTO_CONFIGURE="--prefix=${SRS_PREFIX}" + SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --config=$SRS_DEFAULT_CONFIG" SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --hls=$(value2switch $SRS_HLS)" SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --hds=$(value2switch $SRS_HDS)" SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --dvr=$(value2switch $SRS_DVR)" diff --git a/trunk/conf/vm.conf b/trunk/conf/vm.conf new file mode 100644 index 000000000..fd363e350 --- /dev/null +++ b/trunk/conf/vm.conf @@ -0,0 +1,48 @@ + +listen 1935; +max_connections 1000; +daemon on; +srs_log_tank file; + +# For LightHouse VM to run SRS, never enable docker. +in_docker off; +disable_daemon_for_docker off; +auto_reload_for_docker off; + +http_server { + enabled on; + listen 8080; + dir ./objs/nginx/html; +} + +http_api { + enabled on; + listen 1985; +} +stats { + network 0; +} +rtc_server { + enabled on; + listen 8000; # UDP port + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#config-candidate + candidate $CANDIDATE; +} + +vhost __defaultVhost__ { + hls { + enabled on; + } + http_remux { + enabled on; + mount [vhost]/[app]/[stream].flv; + } + rtc { + enabled on; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtmp-to-rtc + rtmp_to_rtc on; + # @see https://github.com/ossrs/srs/wiki/v4_CN_WebRTC#rtc-to-rtmp + rtc_to_rtmp on; + } +} + diff --git a/trunk/configure b/trunk/configure index efcdbf7bb..d71715c54 100755 --- a/trunk/configure +++ b/trunk/configure @@ -460,6 +460,7 @@ CXXFLAGS = ${CXXFLAGS} # install prefix. SRS_PREFIX=${SRS_PREFIX} +SRS_DEFAULT_CONFIG=${SRS_DEFAULT_CONFIG} __REAL_INSTALL=\$(DESTDIR)\$(SRS_PREFIX) default: server @@ -592,11 +593,12 @@ install: @mkdir -p \$(__REAL_INSTALL)/etc/init.d @cp -f etc/init.d/srs \$(__REAL_INSTALL)/etc/init.d @sed -i "s|^ROOT=.*|ROOT=\"\$(SRS_PREFIX)\"|g" \$(__REAL_INSTALL)/etc/init.d/srs + @sed -i "s|^CONFIG=.*|CONFIG=\"\$(SRS_DEFAULT_CONFIG)\"|g" \$(__REAL_INSTALL)/etc/init.d/srs @echo "Now copy systemctl service files" @mkdir -p \$(__REAL_INSTALL)/usr/lib/systemd/system @cp -f usr/lib/systemd/system/srs.service \$(__REAL_INSTALL)/usr/lib/systemd/system/srs.service @echo "" - @echo "@see: https://github.com/ossrs/srs/wiki/v3_CN_LinuxService" + @echo "@see: https://github.com/ossrs/srs/wiki/v4_CN_LinuxService" END diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 25d306570..47371c13b 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -30,7 +30,14 @@ The changelog for SRS. ## SRS 4.0 Changelog -* v4.0, 2022-01-20, Merge [#2863](https://github.com/ossrs/srs/pull/2863): RTC: fix play crash or no stream for rtmp2rtc tips.(#2863). v4.0.220 +* v4.0, 2022-01-13, Merge [#2872](https://github.com/ossrs/srs/pull/2872): RTC: fix play rtc judge for config rtc2rtmp on. (#2872). v4.0.229 +* v4.0, 2022-01-13, Support configure with --config as default config file. v4.0.227 +* v4.0, 2022-01-13, For [#2880](https://github.com/ossrs/srs/pull/2880): Add SrsAutoFreeH to release ptr with hooks. (#2880). v4.0.226 +* v4.0, 2022-01-13, Support api_port to specify the WebRTC API port. v4.0.224 +* v4.0, 2022-01-13, Merge [#2873](https://github.com/ossrs/srs/pull/2873): LiveSource: Refine fetch for external exposed interface. (#2873). v4.0.223 +* v4.0, 2022-01-13, Add conf/vm.conf for cloud virtual machine. v4.0.222 +* v4.0, 2022-01-12, Refine the running homepage. v4.0.221 +* v4.0, 2022-01-12, Merge [#2863](https://github.com/ossrs/srs/pull/2863): RTC: fix play crash or no stream for rtmp2rtc tips. (#2863). v4.0.220 * v4.0, 2022-01-05, For [#2717](https://github.com/ossrs/srs/issues/2717): When reopening segment, never update the duration. (#2717). v4.0.219 * v4.0, 2022-01-04, Discover api server and ip as candidates. v4.0.218 * v4.0, 2022-01-04, Install test-on self-sign certificate. v4.0.217 diff --git a/trunk/etc/init.d/srs-api b/trunk/etc/init.d/srs-api deleted file mode 100755 index 64e5413c7..000000000 --- a/trunk/etc/init.d/srs-api +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/bash - -### BEGIN INIT INFO -# Provides: ossrs-api(srs-api) -# Required-Start: $all -# Required-Stop: $all -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: ossrs-api(srs-api) -# Description: https://github.com/ossrs/srs -### END INIT INFO - -# the config of ROOT, user must modify it when start srs from other directory, -# it's ok to use the script by command ./etc/init.d/ossrs -ROOT="./" -APP="python ./research/api-server/server.py" -CONFIG="8085" - -######################################################################## -# utility functions -######################################################################## -RED="\\033[31m" -GREEN="\\033[32m" -YELLOW="\\033[33m" -BLACK="\\033[0m" -POS="\\033[60G" - -ok_msg(){ - echo -e "${1}${POS}${BLACK}[${GREEN} OK ${BLACK}]" -} - -failed_msg(){ - echo -e "${1}${POS}${BLACK}[${RED}FAILED${BLACK}]" -} - -# load process info of srs-api -# @set variable $srs_api_id to the process id. -# @return 0, if process exists; otherwise: -# 1, for srs-api not exists. -# @set variable $error_msg if error. -load_process_info() { - srs_api_id=`ps aux|grep python|grep research|grep "api-server"|awk '{print $2}'` - if [[ -z $srs_api_id ]]; then error_msg="srs-api process does not exists"; return 1; fi - - return 0; -} - -start() { - # if exists, exit. - load_process_info - if [[ 0 -eq $? ]]; then failed_msg "SRS-api started(pid ${srs_api_id}), should not start it again."; return 0; fi - - # not exists, start server - ok_msg "Starting SRS-api..." - # TODO: FIXME: set limit by, for instance, "ulimit -HSn 10000" - # TODO: FIXME: write log to, for instance, the same dir of log. - # TODO: FIXME: support daemon, without nohup. - (cd ${ROOT}; nohup ${APP} ${CONFIG} >/dev/null 2>&1 &) - - # check again after start server - load_process_info - ret=$?; if [[ 0 -eq $? ]]; then ok_msg "SRS-api started(pid ${srs_api_id})"; return 0; fi - - failed_msg "SRS-api not started" - return $ret -} - -stop() { - # not start, exit - load_process_info - if [[ 0 -ne $? ]]; then failed_msg "SRS-api not start."; return 0; fi - - ok_msg "Stopping SRS-api(pid ${srs_api_id})..." - - # process exists, kill util stop - for((;;)); do - load_process_info - if [[ 0 -eq $? ]]; then - kill -s SIGKILL ${srs_api_id} 2>/dev/null - ret=$?; if [[ 0 -ne $ret ]]; then failed_msg "send signal SIGKILL failed ret=$ret"; return $ret; fi - sleep 0.1 - else - ok_msg "SRS-api stopped" - break; - fi - done - - sleep 0.1 - return 0 -} - -# get the status of srs-api process -# @return 0 if srs-api is running; otherwise, 1 for stopped. -status() { - load_process_info - ret=$?; if [[ 0 -eq $ret ]]; then echo "SRS-api(pid ${srs_api_id}) is running."; return 0; fi - - echo "SRS-api is stopped" - return 1 -} - -menu() { - case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - status) - status - ;; - *) - echo "Usage: $0 {start|stop|status|restart}" - return 1 - ;; - esac -} - -menu $1 - -code=$? -exit ${code} diff --git a/trunk/research/api-server/static-dir/index.html b/trunk/research/api-server/static-dir/index.html index e73a6e75b..8d92fc12c 100755 --- a/trunk/research/api-server/static-dir/index.html +++ b/trunk/research/api-server/static-dir/index.html @@ -3,24 +3,70 @@ SRS + -

SRS works!

-

- Click here to enter SRS console.
- 点击进入SRS控制台 -

-

- Click here to start SRS player.
- 点击进入SRS播放器 -

-

SRS Team © 2021

- +
+

SRS works!

+

+ Click here to enter SRS console.
+ 点击进入SRS控制台 +

+

+ Publish stream by FFmpeg or OBS:
+ 请使用工具FFmpeg或者OBS推流到下面地址: +


+        

+

+ Click here to start SRS player.
+ 点击进入SRS播放器 +

+

SRS Team © 2022

+
+ diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js index 26b3971e1..d680f3cbd 100755 --- a/trunk/research/players/js/srs.page.js +++ b/trunk/research/players/js/srs.page.js @@ -24,7 +24,7 @@ function update_nav() { } // Special extra params, such as auth_key. -function user_extra_params(query, params) { +function user_extra_params(query, params, rtc) { var queries = params || []; for (var key in query.user_query) { @@ -90,6 +90,8 @@ function build_default_flv_url() { function build_default_rtc_url(query) { // The format for query string to overwrite configs of server. 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.'); var server = (!query.server)? window.location.hostname:query.server; var vhost = (!query.vhost)? window.location.hostname:query.vhost; @@ -104,7 +106,7 @@ function build_default_rtc_url(query) { if (query.schema && window.location.protocol !== query.schema + ':') { queries.push('schema=' + query.schema); } - queries = user_extra_params(query, queries); + queries = user_extra_params(query, queries, true); var uri = "webrtc://" + server + api + "/" + app + "/" + stream + "?" + queries.join('&'); while (uri.lastIndexOf("?") === uri.length - 1) { diff --git a/trunk/research/players/js/srs.sdk.js b/trunk/research/players/js/srs.sdk.js index ed5276b50..5cda7947c 100644 --- a/trunk/research/players/js/srs.sdk.js +++ b/trunk/research/players/js/srs.sdk.js @@ -185,6 +185,12 @@ function SrsRtcPublisherAsync() { var port = a.port; if (!port) { + // Finger out by webrtc url, if contains http or https port, to overwrite default 1985. + if (schema === 'webrtc' && url.indexOf(`webrtc://${a.host}:`) === 0) { + port = (url.indexOf(`webrtc://${a.host}:80`) === 0) ? 80 : 443; + } + + // Guess by schema. if (schema === 'http') { port = 80; } else if (schema === 'https') { @@ -267,6 +273,7 @@ function SrsRtcPlayerAsync() { // webrtc://r.ossrs.net/live/livestream // or specifies the API port: // webrtc://r.ossrs.net:11985/live/livestream + // webrtc://r.ossrs.net:80/live/livestream // or autostart the play: // webrtc://r.ossrs.net/live/livestream?autostart=true // or change the app from live to myapp: @@ -413,6 +420,12 @@ function SrsRtcPlayerAsync() { var port = a.port; if (!port) { + // Finger out by webrtc url, if contains http or https port, to overwrite default 1985. + if (schema === 'webrtc' && url.indexOf(`webrtc://${a.host}:`) === 0) { + port = (url.indexOf(`webrtc://${a.host}:80`) === 0) ? 80 : 443; + } + + // Guess by schema. if (schema === 'http') { port = 80; } else if (schema === 'https') { diff --git a/trunk/scripts/install.sh b/trunk/scripts/install.sh index 6f161b13f..416c6537d 100755 --- a/trunk/scripts/install.sh +++ b/trunk/scripts/install.sh @@ -129,7 +129,7 @@ else fi echo "" -echo "see: https://github.com/ossrs/srs/wiki/v3_CN_LinuxService" +echo "see: https://github.com/ossrs/srs/wiki/v4_CN_LinuxService" echo "install success, you can start SRS on CentOS6:" echo -e "${GREEN} sudo /etc/init.d/srs start${BLACK}" echo "or CentOS7:" diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 3f0a4469e..89212d521 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -50,7 +50,7 @@ const char* _srs_version = "XCORE-" RTMP_SIG_SRS_SERVER; #define SRS_CONF_PERFER_TRUE(conf_arg) conf_arg != "off" // default config file. -#define SRS_CONF_DEFAULT_COFNIG_FILE "conf/srs.conf" +#define SRS_CONF_DEFAULT_COFNIG_FILE SRS_DEFAULT_CONFIG // '\n' #define SRS_LF (char)SRS_CONSTS_LF diff --git a/trunk/src/app/srs_app_rtc_api.cpp b/trunk/src/app/srs_app_rtc_api.cpp index bce9c9b31..ddb38ae0f 100644 --- a/trunk/src/app/srs_app_rtc_api.cpp +++ b/trunk/src/app/srs_app_rtc_api.cpp @@ -186,8 +186,15 @@ srs_error_t SrsGoApiRtcPlay::do_serve_http(ISrsHttpResponseWriter* w, ISrsHttpMe server_enabled, rtc_enabled, ruc.req_->vhost.c_str()); } + // Whether RTC stream is active. + bool is_rtc_stream_active = false; + if (true) { + SrsRtcSource* source = _srs_rtc_sources->fetch(ruc.req_); + is_rtc_stream_active = (source && !source->can_publish()); + } + // For RTMP to RTC, fail if disabled and RTMP is active, see https://github.com/ossrs/srs/issues/2728 - if (!_srs_config->get_rtc_from_rtmp(ruc.req_->vhost)) { + if (!is_rtc_stream_active && !_srs_config->get_rtc_from_rtmp(ruc.req_->vhost)) { SrsLiveSource* rtmp = _srs_sources->fetch(ruc.req_); if (rtmp && !rtmp->inactive()) { return srs_error_new(ERROR_RTC_DISABLED, "Disabled rtmp_to_rtc of %s, see #2728", ruc.req_->vhost.c_str()); diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index c89df51a4..d264ab4c4 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1183,20 +1183,20 @@ srs_error_t SrsRtcPublishStream::initialize(SrsRequest* r, SrsRtcSourceDescripti } source->set_publish_stream(this); + // TODO: FIMXE: Check it in SrsRtcConnection::add_publisher? + SrsLiveSource *rtmp = _srs_sources->fetch(r); + if (rtmp && !rtmp->can_publish(false)) { + return srs_error_new(ERROR_SYSTEM_STREAM_BUSY, "rtmp stream %s busy", r->get_stream_url().c_str()); + } + // Bridge to rtmp #if defined(SRS_RTC) && defined(SRS_FFMPEG_FIT) bool rtc_to_rtmp = _srs_config->get_rtc_to_rtmp(req_->vhost); if (rtc_to_rtmp) { - SrsLiveSource *rtmp = NULL; if ((err = _srs_sources->fetch_or_create(r, _srs_hybrid->srs()->instance(), &rtmp)) != srs_success) { return srs_error_wrap(err, "create source"); } - // TODO: FIMXE: Check it in SrsRtcConnection::add_publisher? - if (!rtmp->can_publish(false)) { - return srs_error_new(ERROR_SYSTEM_STREAM_BUSY, "rtmp stream %s busy", r->get_stream_url().c_str()); - } - // Disable GOP cache for RTC2RTMP bridger, to keep the streams in sync, // especially for stream merging. rtmp->set_cache(false); diff --git a/trunk/src/app/srs_app_rtc_source.cpp b/trunk/src/app/srs_app_rtc_source.cpp index ae6c3f99d..d081027c5 100644 --- a/trunk/src/app/srs_app_rtc_source.cpp +++ b/trunk/src/app/srs_app_rtc_source.cpp @@ -256,6 +256,10 @@ srs_error_t SrsRtcSourceManager::fetch_or_create(SrsRequest* r, SrsRtcSource** p SrsRtcSource* source = NULL; if ((source = fetch(r)) != NULL) { + // we always update the request of resource, + // for origin auth is on, the token in request maybe invalid, + // and we only need to update the token of request, it's simple. + source->update_auth(r); *pps = source; return err; } @@ -291,11 +295,6 @@ SrsRtcSource* SrsRtcSourceManager::fetch(SrsRequest* r) source = pool[stream_url]; - // we always update the request of resource, - // for origin auth is on, the token in request maybe invalid, - // and we only need to update the token of request, it's simple. - source->update_auth(r); - return source; } diff --git a/trunk/src/app/srs_app_rtc_source.hpp b/trunk/src/app/srs_app_rtc_source.hpp index 10e1d97c5..4bfa21352 100644 --- a/trunk/src/app/srs_app_rtc_source.hpp +++ b/trunk/src/app/srs_app_rtc_source.hpp @@ -112,9 +112,8 @@ public: // @param r the client request. // @param pps the matched source, if success never be NULL. virtual srs_error_t fetch_or_create(SrsRequest* r, SrsRtcSource** pps); -private: +public: // Get the exists source, NULL when not exists. - // update the request and return the exists source. virtual SrsRtcSource* fetch(SrsRequest* r); }; diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index e5dc78c89..97534cbb5 100755 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -1713,6 +1713,10 @@ srs_error_t SrsLiveSourceManager::fetch_or_create(SrsRequest* r, ISrsLiveSourceH SrsLiveSource* source = NULL; if ((source = fetch(r)) != NULL) { + // we always update the request of resource, + // for origin auth is on, the token in request maybe invalid, + // and we only need to update the token of request, it's simple. + source->update_auth(r); *pps = source; return err; } @@ -1751,11 +1755,6 @@ SrsLiveSource* SrsLiveSourceManager::fetch(SrsRequest* r) source = pool[stream_url]; - // we always update the request of resource, - // for origin auth is on, the token in request maybe invalid, - // and we only need to update the token of request, it's simple. - source->update_auth(r); - return source; } diff --git a/trunk/src/app/srs_app_source.hpp b/trunk/src/app/srs_app_source.hpp index e0ecf1421..96cdf5950 100644 --- a/trunk/src/app/srs_app_source.hpp +++ b/trunk/src/app/srs_app_source.hpp @@ -450,7 +450,6 @@ public: virtual srs_error_t fetch_or_create(SrsRequest* r, ISrsLiveSourceHandler* h, SrsLiveSource** pps); public: // Get the exists source, NULL when not exists. - // update the request and return the exists source. virtual SrsLiveSource* fetch(SrsRequest* r); public: // dispose and cycle all sources. diff --git a/trunk/src/core/srs_core_autofree.hpp b/trunk/src/core/srs_core_autofree.hpp index db80c3e4b..48e40369d 100644 --- a/trunk/src/core/srs_core_autofree.hpp +++ b/trunk/src/core/srs_core_autofree.hpp @@ -30,13 +30,16 @@ // where the char* pstr = new char[size]. // To delete object. #define SrsAutoFree(className, instance) \ - impl_SrsAutoFree _auto_free_##instance(&instance, false, false) + impl_SrsAutoFree _auto_free_##instance(&instance, false, false, NULL) // To delete array. #define SrsAutoFreeA(className, instance) \ - impl_SrsAutoFree _auto_free_array_##instance(&instance, true, false) + impl_SrsAutoFree _auto_free_array_##instance(&instance, true, false, NULL) // Use free instead of delete. #define SrsAutoFreeF(className, instance) \ - impl_SrsAutoFree _auto_free_##instance(&instance, false, true) + impl_SrsAutoFree _auto_free_##instance(&instance, false, true, NULL) +// Use hook instead of delete. +#define SrsAutoFreeH(className, instance, hook) \ + impl_SrsAutoFree _auto_free_##instance(&instance, false, false, hook) // The template implementation. template class impl_SrsAutoFree @@ -45,11 +48,16 @@ private: T** ptr; bool is_array; bool _use_free; + void (*_hook)(T*); public: - impl_SrsAutoFree(T** p, bool array, bool use_free) { + // If use_free, use free(void*) to release the p. + // If specified hook, use hook(p) to release it. + // Use delete to release p, or delete[] if p is an array. + impl_SrsAutoFree(T** p, bool array, bool use_free, void (*hook)(T*)) { ptr = p; is_array = array; _use_free = use_free; + _hook = hook; } virtual ~impl_SrsAutoFree() { @@ -59,6 +67,8 @@ public: if (_use_free) { free(*ptr); + } else if (_hook) { + _hook(*ptr); } else { if (is_array) { delete[] *ptr; diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index 0b2bb6fc4..498acfafc 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 220 +#define VERSION_REVISION 229 #endif diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index 9f0c726af..c558b09eb 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 20 +#define VERSION_REVISION 21 #endif diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index d39783b3f..e4c54b374 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -126,8 +126,8 @@ srs_error_t do_main(int argc, char** argv) // config already applied to log. srs_trace2(TAG_MAIN, "%s, %s", RTMP_SIG_SRS_SERVER, RTMP_SIG_SRS_LICENSE); srs_trace("authors: %sand %s", RTMP_SIG_SRS_AUTHORS, SRS_CONSTRIBUTORS); - srs_trace("cwd=%s, work_dir=%s, build: %s, configure: %s, uname: %s, osx: %d", - _srs_config->cwd().c_str(), cwd.c_str(), SRS_BUILD_DATE, SRS_USER_CONFIGURE, SRS_UNAME, SRS_OSX_BOOL); + srs_trace("cwd=%s, work_dir=%s, build: %s, configure: %s, uname: %s, osx: %d, pkg: %s", + _srs_config->cwd().c_str(), cwd.c_str(), SRS_BUILD_DATE, SRS_USER_CONFIGURE, SRS_UNAME, SRS_OSX_BOOL, SRS_PACKAGER); srs_trace("configure detail: " SRS_CONFIGURE); #ifdef SRS_EMBEDED_TOOL_CHAIN srs_trace("crossbuild tool chain: " SRS_EMBEDED_TOOL_CHAIN); From d5c86dc5fa2d804c9286d90c2ddd82abf71d325c Mon Sep 17 00:00:00 2001 From: winlin Date: Thu, 13 Jan 2022 18:40:17 +0800 Subject: [PATCH 2/3] Switch LICENSE from MIT to **MIT or MulanPSL-2.0**. v5.0.21 --- LICENSE | 8 +++++++- README.md | 4 +++- trunk/doc/CHANGELOG.md | 1 + trunk/src/app/srs_app_async_call.cpp | 2 +- trunk/src/app/srs_app_async_call.hpp | 2 +- trunk/src/app/srs_app_bandwidth.cpp | 2 +- trunk/src/app/srs_app_bandwidth.hpp | 2 +- trunk/src/app/srs_app_caster_flv.cpp | 2 +- trunk/src/app/srs_app_caster_flv.hpp | 2 +- trunk/src/app/srs_app_config.cpp | 2 +- trunk/src/app/srs_app_config.hpp | 2 +- trunk/src/app/srs_app_conn.cpp | 2 +- trunk/src/app/srs_app_conn.hpp | 2 +- trunk/src/app/srs_app_coworkers.cpp | 2 +- trunk/src/app/srs_app_coworkers.hpp | 2 +- trunk/src/app/srs_app_dash.cpp | 2 +- trunk/src/app/srs_app_dash.hpp | 2 +- trunk/src/app/srs_app_dvr.cpp | 2 +- trunk/src/app/srs_app_dvr.hpp | 2 +- trunk/src/app/srs_app_edge.cpp | 2 +- trunk/src/app/srs_app_edge.hpp | 2 +- trunk/src/app/srs_app_empty.cpp | 2 +- trunk/src/app/srs_app_empty.hpp | 2 +- trunk/src/app/srs_app_encoder.cpp | 2 +- trunk/src/app/srs_app_encoder.hpp | 2 +- trunk/src/app/srs_app_ffmpeg.cpp | 2 +- trunk/src/app/srs_app_ffmpeg.hpp | 2 +- trunk/src/app/srs_app_forward.cpp | 2 +- trunk/src/app/srs_app_forward.hpp | 2 +- trunk/src/app/srs_app_fragment.cpp | 2 +- trunk/src/app/srs_app_fragment.hpp | 2 +- trunk/src/app/srs_app_hds.cpp | 2 +- trunk/src/app/srs_app_hds.hpp | 2 +- trunk/src/app/srs_app_heartbeat.cpp | 2 +- trunk/src/app/srs_app_heartbeat.hpp | 2 +- trunk/src/app/srs_app_hls.cpp | 2 +- trunk/src/app/srs_app_hls.hpp | 2 +- trunk/src/app/srs_app_hourglass.cpp | 2 +- trunk/src/app/srs_app_hourglass.hpp | 2 +- trunk/src/app/srs_app_http_api.cpp | 2 +- trunk/src/app/srs_app_http_api.hpp | 2 +- trunk/src/app/srs_app_http_client.cpp | 2 +- trunk/src/app/srs_app_http_client.hpp | 2 +- trunk/src/app/srs_app_http_conn.cpp | 2 +- trunk/src/app/srs_app_http_conn.hpp | 2 +- trunk/src/app/srs_app_http_hooks.cpp | 2 +- trunk/src/app/srs_app_http_hooks.hpp | 2 +- trunk/src/app/srs_app_http_static.cpp | 2 +- trunk/src/app/srs_app_http_static.hpp | 2 +- trunk/src/app/srs_app_http_stream.cpp | 2 +- trunk/src/app/srs_app_http_stream.hpp | 2 +- trunk/src/app/srs_app_hybrid.cpp | 2 +- trunk/src/app/srs_app_hybrid.hpp | 2 +- trunk/src/app/srs_app_ingest.cpp | 2 +- trunk/src/app/srs_app_ingest.hpp | 2 +- trunk/src/app/srs_app_latest_version.cpp | 2 +- trunk/src/app/srs_app_latest_version.hpp | 2 +- trunk/src/app/srs_app_listener.cpp | 2 +- trunk/src/app/srs_app_listener.hpp | 2 +- trunk/src/app/srs_app_log.cpp | 2 +- trunk/src/app/srs_app_log.hpp | 2 +- trunk/src/app/srs_app_mpegts_udp.cpp | 2 +- trunk/src/app/srs_app_mpegts_udp.hpp | 2 +- trunk/src/app/srs_app_ng_exec.cpp | 2 +- trunk/src/app/srs_app_ng_exec.hpp | 2 +- trunk/src/app/srs_app_pithy_print.cpp | 2 +- trunk/src/app/srs_app_pithy_print.hpp | 2 +- trunk/src/app/srs_app_process.cpp | 2 +- trunk/src/app/srs_app_process.hpp | 2 +- trunk/src/app/srs_app_recv_thread.cpp | 2 +- trunk/src/app/srs_app_recv_thread.hpp | 2 +- trunk/src/app/srs_app_refer.cpp | 2 +- trunk/src/app/srs_app_refer.hpp | 2 +- trunk/src/app/srs_app_reload.cpp | 2 +- trunk/src/app/srs_app_reload.hpp | 2 +- trunk/src/app/srs_app_rtc_api.cpp | 2 +- trunk/src/app/srs_app_rtc_api.hpp | 2 +- trunk/src/app/srs_app_rtc_codec.cpp | 2 +- trunk/src/app/srs_app_rtc_codec.hpp | 2 +- trunk/src/app/srs_app_rtc_conn.cpp | 2 +- trunk/src/app/srs_app_rtc_conn.hpp | 2 +- trunk/src/app/srs_app_rtc_dtls.cpp | 2 +- trunk/src/app/srs_app_rtc_dtls.hpp | 2 +- trunk/src/app/srs_app_rtc_queue.cpp | 2 +- trunk/src/app/srs_app_rtc_queue.hpp | 2 +- trunk/src/app/srs_app_rtc_sdp.cpp | 2 +- trunk/src/app/srs_app_rtc_sdp.hpp | 2 +- trunk/src/app/srs_app_rtc_server.cpp | 2 +- trunk/src/app/srs_app_rtc_server.hpp | 2 +- trunk/src/app/srs_app_rtc_source.cpp | 2 +- trunk/src/app/srs_app_rtc_source.hpp | 2 +- trunk/src/app/srs_app_rtmp_conn.cpp | 2 +- trunk/src/app/srs_app_rtmp_conn.hpp | 2 +- trunk/src/app/srs_app_security.cpp | 2 +- trunk/src/app/srs_app_security.hpp | 2 +- trunk/src/app/srs_app_server.cpp | 2 +- trunk/src/app/srs_app_server.hpp | 2 +- trunk/src/app/srs_app_source.cpp | 2 +- trunk/src/app/srs_app_source.hpp | 2 +- trunk/src/app/srs_app_st.cpp | 2 +- trunk/src/app/srs_app_st.hpp | 2 +- trunk/src/app/srs_app_statistic.cpp | 2 +- trunk/src/app/srs_app_statistic.hpp | 2 +- trunk/src/app/srs_app_threads.cpp | 2 +- trunk/src/app/srs_app_threads.hpp | 2 +- trunk/src/app/srs_app_utility.cpp | 2 +- trunk/src/app/srs_app_utility.hpp | 2 +- trunk/src/core/srs_core.cpp | 2 +- trunk/src/core/srs_core.hpp | 2 +- trunk/src/core/srs_core_autofree.cpp | 2 +- trunk/src/core/srs_core_autofree.hpp | 2 +- trunk/src/core/srs_core_performance.cpp | 2 +- trunk/src/core/srs_core_performance.hpp | 2 +- trunk/src/core/srs_core_platform.cpp | 2 +- trunk/src/core/srs_core_platform.hpp | 2 +- trunk/src/core/srs_core_time.cpp | 2 +- trunk/src/core/srs_core_time.hpp | 2 +- trunk/src/core/srs_core_version3.cpp | 2 +- trunk/src/core/srs_core_version3.hpp | 2 +- trunk/src/core/srs_core_version4.cpp | 2 +- trunk/src/core/srs_core_version4.hpp | 2 +- trunk/src/core/srs_core_version5.cpp | 2 +- trunk/src/core/srs_core_version5.hpp | 2 +- trunk/src/kernel/srs_kernel_aac.cpp | 2 +- trunk/src/kernel/srs_kernel_aac.hpp | 2 +- trunk/src/kernel/srs_kernel_balance.cpp | 2 +- trunk/src/kernel/srs_kernel_balance.hpp | 2 +- trunk/src/kernel/srs_kernel_buffer.cpp | 2 +- trunk/src/kernel/srs_kernel_buffer.hpp | 2 +- trunk/src/kernel/srs_kernel_codec.cpp | 2 +- trunk/src/kernel/srs_kernel_codec.hpp | 2 +- trunk/src/kernel/srs_kernel_consts.cpp | 2 +- trunk/src/kernel/srs_kernel_consts.hpp | 2 +- trunk/src/kernel/srs_kernel_error.cpp | 2 +- trunk/src/kernel/srs_kernel_error.hpp | 2 +- trunk/src/kernel/srs_kernel_file.cpp | 2 +- trunk/src/kernel/srs_kernel_file.hpp | 2 +- trunk/src/kernel/srs_kernel_flv.cpp | 2 +- trunk/src/kernel/srs_kernel_flv.hpp | 2 +- trunk/src/kernel/srs_kernel_io.cpp | 2 +- trunk/src/kernel/srs_kernel_io.hpp | 2 +- trunk/src/kernel/srs_kernel_kbps.cpp | 2 +- trunk/src/kernel/srs_kernel_kbps.hpp | 2 +- trunk/src/kernel/srs_kernel_log.cpp | 2 +- trunk/src/kernel/srs_kernel_log.hpp | 2 +- trunk/src/kernel/srs_kernel_mp3.cpp | 2 +- trunk/src/kernel/srs_kernel_mp3.hpp | 2 +- trunk/src/kernel/srs_kernel_mp4.cpp | 2 +- trunk/src/kernel/srs_kernel_mp4.hpp | 2 +- trunk/src/kernel/srs_kernel_rtc_rtcp.cpp | 2 +- trunk/src/kernel/srs_kernel_rtc_rtcp.hpp | 2 +- trunk/src/kernel/srs_kernel_rtc_rtp.cpp | 2 +- trunk/src/kernel/srs_kernel_rtc_rtp.hpp | 2 +- trunk/src/kernel/srs_kernel_stream.cpp | 2 +- trunk/src/kernel/srs_kernel_stream.hpp | 2 +- trunk/src/kernel/srs_kernel_ts.cpp | 2 +- trunk/src/kernel/srs_kernel_ts.hpp | 2 +- trunk/src/kernel/srs_kernel_utility.cpp | 2 +- trunk/src/kernel/srs_kernel_utility.hpp | 2 +- trunk/src/main/srs_main_ingest_hls.cpp | 2 +- trunk/src/main/srs_main_mp4_parser.cpp | 2 +- trunk/src/main/srs_main_server.cpp | 2 +- trunk/src/protocol/srs_http_stack.cpp | 2 +- trunk/src/protocol/srs_http_stack.hpp | 2 +- trunk/src/protocol/srs_protocol_amf0.cpp | 2 +- trunk/src/protocol/srs_protocol_amf0.hpp | 2 +- trunk/src/protocol/srs_protocol_format.cpp | 2 +- trunk/src/protocol/srs_protocol_format.hpp | 2 +- trunk/src/protocol/srs_protocol_io.cpp | 2 +- trunk/src/protocol/srs_protocol_io.hpp | 2 +- trunk/src/protocol/srs_protocol_json.cpp | 4 ++-- trunk/src/protocol/srs_protocol_json.hpp | 2 +- trunk/src/protocol/srs_protocol_kbps.cpp | 2 +- trunk/src/protocol/srs_protocol_kbps.hpp | 2 +- trunk/src/protocol/srs_protocol_stream.cpp | 2 +- trunk/src/protocol/srs_protocol_stream.hpp | 2 +- trunk/src/protocol/srs_protocol_utility.cpp | 2 +- trunk/src/protocol/srs_protocol_utility.hpp | 2 +- trunk/src/protocol/srs_raw_avc.cpp | 2 +- trunk/src/protocol/srs_raw_avc.hpp | 2 +- trunk/src/protocol/srs_rtc_stun_stack.cpp | 2 +- trunk/src/protocol/srs_rtc_stun_stack.hpp | 2 +- trunk/src/protocol/srs_rtmp_handshake.cpp | 2 +- trunk/src/protocol/srs_rtmp_handshake.hpp | 2 +- trunk/src/protocol/srs_rtmp_msg_array.cpp | 2 +- trunk/src/protocol/srs_rtmp_msg_array.hpp | 2 +- trunk/src/protocol/srs_rtmp_stack.cpp | 2 +- trunk/src/protocol/srs_rtmp_stack.hpp | 2 +- trunk/src/protocol/srs_rtsp_stack.cpp | 2 +- trunk/src/protocol/srs_rtsp_stack.hpp | 2 +- trunk/src/protocol/srs_service_conn.cpp | 2 +- trunk/src/protocol/srs_service_conn.hpp | 2 +- trunk/src/protocol/srs_service_http_client.cpp | 2 +- trunk/src/protocol/srs_service_http_client.hpp | 2 +- trunk/src/protocol/srs_service_http_conn.cpp | 2 +- trunk/src/protocol/srs_service_http_conn.hpp | 2 +- trunk/src/protocol/srs_service_log.cpp | 2 +- trunk/src/protocol/srs_service_log.hpp | 2 +- trunk/src/protocol/srs_service_rtmp_conn.cpp | 2 +- trunk/src/protocol/srs_service_rtmp_conn.hpp | 2 +- trunk/src/protocol/srs_service_st.cpp | 2 +- trunk/src/protocol/srs_service_st.hpp | 2 +- trunk/src/protocol/srs_service_utility.cpp | 2 +- trunk/src/protocol/srs_service_utility.hpp | 2 +- trunk/src/srt/srt_conn.cpp | 2 +- trunk/src/srt/srt_conn.hpp | 2 +- trunk/src/srt/srt_data.cpp | 2 +- trunk/src/srt/srt_data.hpp | 2 +- trunk/src/srt/srt_handle.cpp | 2 +- trunk/src/srt/srt_handle.hpp | 2 +- trunk/src/srt/srt_server.cpp | 2 +- trunk/src/srt/srt_server.hpp | 2 +- trunk/src/srt/srt_to_rtmp.cpp | 2 +- trunk/src/srt/srt_to_rtmp.hpp | 2 +- trunk/src/srt/stringex.hpp | 2 +- trunk/src/srt/time_help.hpp | 2 +- trunk/src/srt/ts_demux.cpp | 2 +- trunk/src/srt/ts_demux.hpp | 2 +- trunk/src/srt/ts_demux_test.cpp | 2 +- trunk/src/utest/srs_utest.cpp | 2 +- trunk/src/utest/srs_utest.hpp | 2 +- trunk/src/utest/srs_utest_amf0.cpp | 2 +- trunk/src/utest/srs_utest_amf0.hpp | 2 +- trunk/src/utest/srs_utest_app.cpp | 2 +- trunk/src/utest/srs_utest_app.hpp | 2 +- trunk/src/utest/srs_utest_avc.cpp | 2 +- trunk/src/utest/srs_utest_avc.hpp | 2 +- trunk/src/utest/srs_utest_config.cpp | 2 +- trunk/src/utest/srs_utest_config.hpp | 2 +- trunk/src/utest/srs_utest_core.cpp | 2 +- trunk/src/utest/srs_utest_core.hpp | 2 +- trunk/src/utest/srs_utest_http.cpp | 2 +- trunk/src/utest/srs_utest_http.hpp | 2 +- trunk/src/utest/srs_utest_kernel.cpp | 2 +- trunk/src/utest/srs_utest_kernel.hpp | 2 +- trunk/src/utest/srs_utest_mp4.cpp | 2 +- trunk/src/utest/srs_utest_mp4.hpp | 2 +- trunk/src/utest/srs_utest_protocol.cpp | 2 +- trunk/src/utest/srs_utest_protocol.hpp | 2 +- trunk/src/utest/srs_utest_reload.cpp | 2 +- trunk/src/utest/srs_utest_reload.hpp | 2 +- trunk/src/utest/srs_utest_rtc.cpp | 2 +- trunk/src/utest/srs_utest_rtc.hpp | 2 +- trunk/src/utest/srs_utest_rtmp.cpp | 2 +- trunk/src/utest/srs_utest_rtmp.hpp | 2 +- trunk/src/utest/srs_utest_service.cpp | 2 +- trunk/src/utest/srs_utest_service.hpp | 2 +- 247 files changed, 256 insertions(+), 247 deletions(-) diff --git a/LICENSE b/LICENSE index e395112fc..9195fee78 100644 --- a/LICENSE +++ b/LICENSE @@ -23,7 +23,13 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Note: Individual files contain the following tag instead of the full license text. - SPDX-License-Identifier: MIT + SPDX-License-Identifier: MIT or MulanPSL-2.0 This enables machine processing of license information based on the SPDX License Identifiers that are here available: http://spdx.org/licenses/ + +For MIT, please read https://spdx.org/licenses/MIT.html + +For MulanPSL-2.0, please read https://spdx.org/licenses/MulanPSL-2.0.html +and note that MulanPSL-2.0 is compatible with Apache-2.0, please see +https://www.apache.org/legal/resolved.html#category-a diff --git a/README.md b/README.md index 4d1e7fd75..37e50cfa3 100755 --- a/README.md +++ b/README.md @@ -19,7 +19,9 @@ SRS/5.0,[Bee](https://github.com/ossrs/srs/wiki/Product#release50) 是一个 SRS/5.0 is a simple, high efficiency and realtime video server, supports RTMP/WebRTC/HLS/HTTP-FLV/SRT. -SRS is licenced under [MIT](https://github.com/ossrs/srs/blob/develop/LICENSE), but some depended libraries are distributed using their [own licenses](https://github.com/ossrs/srs/wiki/LicenseMixing). +SRS is licenced under [MIT](https://github.com/ossrs/srs/blob/develop/LICENSE) or [MulanPSL-2.0](https://spdx.org/licenses/MulanPSL-2.0.html), +and note that [MulanPSL-2.0 is compatible with Apache-2.0](https://www.apache.org/legal/resolved.html#category-a), +but some third-party libraries are distributed using their [own licenses](https://github.com/ossrs/srs/wiki/LicenseMixing). [![SRS Overview](https://ossrs.net/wiki/images/SRS-Overview-4.0.png)](https://ossrs.net/wiki/images/SRS-Overview-4.0.png) diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 47371c13b..e49b352ea 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, 2022-01-13, Switch LICENSE from MIT to **MIT or MulanPSL-2.0**. v5.0.21 * v5.0, 2021-10-24, For [#2689](https://github.com/ossrs/srs/issues/2689): Support loongarch, loongson CPU. v5.0.19 * v5.0, 2021-10-17, Support daemon(fork twice) for Darwin/OSX [ST#23](https://github.com/ossrs/state-threads/issues/23). v5.0.18 * v5.0, 2021-10-16, DVR: support mp3 audio codec. (#2593) v5.0.17 diff --git a/trunk/src/app/srs_app_async_call.cpp b/trunk/src/app/srs_app_async_call.cpp index 96498effe..1786d3eeb 100644 --- a/trunk/src/app/srs_app_async_call.cpp +++ b/trunk/src/app/srs_app_async_call.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_async_call.hpp b/trunk/src/app/srs_app_async_call.hpp index cb2e431d3..8327cdf01 100644 --- a/trunk/src/app/srs_app_async_call.hpp +++ b/trunk/src/app/srs_app_async_call.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_ASYNC_CALL_HPP diff --git a/trunk/src/app/srs_app_bandwidth.cpp b/trunk/src/app/srs_app_bandwidth.cpp index 2b97291d1..2d8dbabd8 100644 --- a/trunk/src/app/srs_app_bandwidth.cpp +++ b/trunk/src/app/srs_app_bandwidth.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_bandwidth.hpp b/trunk/src/app/srs_app_bandwidth.hpp index d3c7b9916..cfa4d39aa 100644 --- a/trunk/src/app/srs_app_bandwidth.hpp +++ b/trunk/src/app/srs_app_bandwidth.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_BANDWIDTH_HPP diff --git a/trunk/src/app/srs_app_caster_flv.cpp b/trunk/src/app/srs_app_caster_flv.cpp index bf247bc4b..5fb8b6560 100644 --- a/trunk/src/app/srs_app_caster_flv.cpp +++ b/trunk/src/app/srs_app_caster_flv.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_caster_flv.hpp b/trunk/src/app/srs_app_caster_flv.hpp index 99482378f..dbd26b867 100644 --- a/trunk/src/app/srs_app_caster_flv.hpp +++ b/trunk/src/app/srs_app_caster_flv.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_CASTER_FLV_HPP diff --git a/trunk/src/app/srs_app_config.cpp b/trunk/src/app/srs_app_config.cpp index 89212d521..23d439a5c 100644 --- a/trunk/src/app/srs_app_config.cpp +++ b/trunk/src/app/srs_app_config.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_config.hpp b/trunk/src/app/srs_app_config.hpp index 1bb829d26..f48d71a6d 100644 --- a/trunk/src/app/srs_app_config.hpp +++ b/trunk/src/app/srs_app_config.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_CONFIG_HPP diff --git a/trunk/src/app/srs_app_conn.cpp b/trunk/src/app/srs_app_conn.cpp index 3e0cad59b..d3114e642 100644 --- a/trunk/src/app/srs_app_conn.cpp +++ b/trunk/src/app/srs_app_conn.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_conn.hpp b/trunk/src/app/srs_app_conn.hpp index c9fcb9c40..2b2a245b7 100644 --- a/trunk/src/app/srs_app_conn.hpp +++ b/trunk/src/app/srs_app_conn.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_CONN_HPP diff --git a/trunk/src/app/srs_app_coworkers.cpp b/trunk/src/app/srs_app_coworkers.cpp index 88e63150d..7e7376090 100644 --- a/trunk/src/app/srs_app_coworkers.cpp +++ b/trunk/src/app/srs_app_coworkers.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_coworkers.hpp b/trunk/src/app/srs_app_coworkers.hpp index 50448be52..142d8e5d9 100644 --- a/trunk/src/app/srs_app_coworkers.hpp +++ b/trunk/src/app/srs_app_coworkers.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_COWORKERS_HPP diff --git a/trunk/src/app/srs_app_dash.cpp b/trunk/src/app/srs_app_dash.cpp index e4c4ac11a..f889356f1 100644 --- a/trunk/src/app/srs_app_dash.cpp +++ b/trunk/src/app/srs_app_dash.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_dash.hpp b/trunk/src/app/srs_app_dash.hpp index 87fb210dc..bc870cd5c 100644 --- a/trunk/src/app/srs_app_dash.hpp +++ b/trunk/src/app/srs_app_dash.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_DASH_HPP diff --git a/trunk/src/app/srs_app_dvr.cpp b/trunk/src/app/srs_app_dvr.cpp index ca0ec64a6..6e53a2efa 100644 --- a/trunk/src/app/srs_app_dvr.cpp +++ b/trunk/src/app/srs_app_dvr.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_dvr.hpp b/trunk/src/app/srs_app_dvr.hpp index 8801d4686..924253436 100644 --- a/trunk/src/app/srs_app_dvr.hpp +++ b/trunk/src/app/srs_app_dvr.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_DVR_HPP diff --git a/trunk/src/app/srs_app_edge.cpp b/trunk/src/app/srs_app_edge.cpp index dd9322ab9..146c2269b 100644 --- a/trunk/src/app/srs_app_edge.cpp +++ b/trunk/src/app/srs_app_edge.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_edge.hpp b/trunk/src/app/srs_app_edge.hpp index e5529fa7b..741bde498 100644 --- a/trunk/src/app/srs_app_edge.hpp +++ b/trunk/src/app/srs_app_edge.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_EDGE_HPP diff --git a/trunk/src/app/srs_app_empty.cpp b/trunk/src/app/srs_app_empty.cpp index bf99b8b21..605360fb9 100644 --- a/trunk/src/app/srs_app_empty.cpp +++ b/trunk/src/app/srs_app_empty.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_empty.hpp b/trunk/src/app/srs_app_empty.hpp index b96f54d35..934905e63 100644 --- a/trunk/src/app/srs_app_empty.hpp +++ b/trunk/src/app/srs_app_empty.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_EMPTY_HPP diff --git a/trunk/src/app/srs_app_encoder.cpp b/trunk/src/app/srs_app_encoder.cpp index 3f8058a1e..922085449 100644 --- a/trunk/src/app/srs_app_encoder.cpp +++ b/trunk/src/app/srs_app_encoder.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_encoder.hpp b/trunk/src/app/srs_app_encoder.hpp index 3d8c36164..13d7ffede 100644 --- a/trunk/src/app/srs_app_encoder.hpp +++ b/trunk/src/app/srs_app_encoder.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_ENCODER_HPP diff --git a/trunk/src/app/srs_app_ffmpeg.cpp b/trunk/src/app/srs_app_ffmpeg.cpp index 672a627bf..3a956564e 100644 --- a/trunk/src/app/srs_app_ffmpeg.cpp +++ b/trunk/src/app/srs_app_ffmpeg.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_ffmpeg.hpp b/trunk/src/app/srs_app_ffmpeg.hpp index 019e4e8e5..a479ebd34 100644 --- a/trunk/src/app/srs_app_ffmpeg.hpp +++ b/trunk/src/app/srs_app_ffmpeg.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_FFMPEG_HPP diff --git a/trunk/src/app/srs_app_forward.cpp b/trunk/src/app/srs_app_forward.cpp index d9af04e90..93e663f00 100755 --- a/trunk/src/app/srs_app_forward.cpp +++ b/trunk/src/app/srs_app_forward.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_forward.hpp b/trunk/src/app/srs_app_forward.hpp index 74b58c2be..540b9235c 100644 --- a/trunk/src/app/srs_app_forward.hpp +++ b/trunk/src/app/srs_app_forward.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_FORWARD_HPP diff --git a/trunk/src/app/srs_app_fragment.cpp b/trunk/src/app/srs_app_fragment.cpp index 89bbf66bb..2ed085bad 100644 --- a/trunk/src/app/srs_app_fragment.cpp +++ b/trunk/src/app/srs_app_fragment.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_fragment.hpp b/trunk/src/app/srs_app_fragment.hpp index 2fcdf9fa3..a91dd201b 100644 --- a/trunk/src/app/srs_app_fragment.hpp +++ b/trunk/src/app/srs_app_fragment.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_FRAGMENT_HPP diff --git a/trunk/src/app/srs_app_hds.cpp b/trunk/src/app/srs_app_hds.cpp index 2c65ffe3f..726e021f2 100644 --- a/trunk/src/app/srs_app_hds.cpp +++ b/trunk/src/app/srs_app_hds.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_hds.hpp b/trunk/src/app/srs_app_hds.hpp index 53327b6cc..f5d847b3c 100644 --- a/trunk/src/app/srs_app_hds.hpp +++ b/trunk/src/app/srs_app_hds.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_HDS_HPP diff --git a/trunk/src/app/srs_app_heartbeat.cpp b/trunk/src/app/srs_app_heartbeat.cpp index 8bbae1c4e..09533ab98 100644 --- a/trunk/src/app/srs_app_heartbeat.cpp +++ b/trunk/src/app/srs_app_heartbeat.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_heartbeat.hpp b/trunk/src/app/srs_app_heartbeat.hpp index 5aa70fd96..a8d87e9ab 100644 --- a/trunk/src/app/srs_app_heartbeat.hpp +++ b/trunk/src/app/srs_app_heartbeat.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_HEARTBEAT_HPP diff --git a/trunk/src/app/srs_app_hls.cpp b/trunk/src/app/srs_app_hls.cpp index 042bf0043..3a46bd1b7 100644 --- a/trunk/src/app/srs_app_hls.cpp +++ b/trunk/src/app/srs_app_hls.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_hls.hpp b/trunk/src/app/srs_app_hls.hpp index 332eaa41f..cc6daa9f4 100644 --- a/trunk/src/app/srs_app_hls.hpp +++ b/trunk/src/app/srs_app_hls.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_HLS_HPP diff --git a/trunk/src/app/srs_app_hourglass.cpp b/trunk/src/app/srs_app_hourglass.cpp index 0ebf17d6e..4345908f4 100644 --- a/trunk/src/app/srs_app_hourglass.cpp +++ b/trunk/src/app/srs_app_hourglass.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_hourglass.hpp b/trunk/src/app/srs_app_hourglass.hpp index 6cad15fd8..37d4b85d3 100644 --- a/trunk/src/app/srs_app_hourglass.hpp +++ b/trunk/src/app/srs_app_hourglass.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_HOURGLASS_HPP diff --git a/trunk/src/app/srs_app_http_api.cpp b/trunk/src/app/srs_app_http_api.cpp index cf1643e44..151643062 100644 --- a/trunk/src/app/srs_app_http_api.cpp +++ b/trunk/src/app/srs_app_http_api.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_http_api.hpp b/trunk/src/app/srs_app_http_api.hpp index 7478b1f3a..3f4762be4 100644 --- a/trunk/src/app/srs_app_http_api.hpp +++ b/trunk/src/app/srs_app_http_api.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_HTTP_API_HPP diff --git a/trunk/src/app/srs_app_http_client.cpp b/trunk/src/app/srs_app_http_client.cpp index d1cd283d2..190db15eb 100644 --- a/trunk/src/app/srs_app_http_client.cpp +++ b/trunk/src/app/srs_app_http_client.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_http_client.hpp b/trunk/src/app/srs_app_http_client.hpp index d655317f2..9c1408618 100644 --- a/trunk/src/app/srs_app_http_client.hpp +++ b/trunk/src/app/srs_app_http_client.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_HTTP_CLIENT_HPP diff --git a/trunk/src/app/srs_app_http_conn.cpp b/trunk/src/app/srs_app_http_conn.cpp index b60098283..2a4042419 100644 --- a/trunk/src/app/srs_app_http_conn.cpp +++ b/trunk/src/app/srs_app_http_conn.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_http_conn.hpp b/trunk/src/app/srs_app_http_conn.hpp index 4369da243..e093992f2 100644 --- a/trunk/src/app/srs_app_http_conn.hpp +++ b/trunk/src/app/srs_app_http_conn.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_HTTP_CONN_HPP diff --git a/trunk/src/app/srs_app_http_hooks.cpp b/trunk/src/app/srs_app_http_hooks.cpp index d1f007abf..254116168 100644 --- a/trunk/src/app/srs_app_http_hooks.cpp +++ b/trunk/src/app/srs_app_http_hooks.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_http_hooks.hpp b/trunk/src/app/srs_app_http_hooks.hpp index 3f47c1aef..8e3e01663 100644 --- a/trunk/src/app/srs_app_http_hooks.hpp +++ b/trunk/src/app/srs_app_http_hooks.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_HTTP_HOOKS_HPP diff --git a/trunk/src/app/srs_app_http_static.cpp b/trunk/src/app/srs_app_http_static.cpp index bf851a4a6..c091f91b7 100644 --- a/trunk/src/app/srs_app_http_static.cpp +++ b/trunk/src/app/srs_app_http_static.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_http_static.hpp b/trunk/src/app/srs_app_http_static.hpp index 3149ec287..8864e6e8b 100644 --- a/trunk/src/app/srs_app_http_static.hpp +++ b/trunk/src/app/srs_app_http_static.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_HTTP_STATIC_HPP diff --git a/trunk/src/app/srs_app_http_stream.cpp b/trunk/src/app/srs_app_http_stream.cpp index 4022c8fc4..7911dd3ec 100755 --- a/trunk/src/app/srs_app_http_stream.cpp +++ b/trunk/src/app/srs_app_http_stream.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_http_stream.hpp b/trunk/src/app/srs_app_http_stream.hpp index caaceab03..861f6e851 100755 --- a/trunk/src/app/srs_app_http_stream.hpp +++ b/trunk/src/app/srs_app_http_stream.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_HTTP_STREAM_HPP diff --git a/trunk/src/app/srs_app_hybrid.cpp b/trunk/src/app/srs_app_hybrid.cpp index e027d6521..d1828e4f0 100644 --- a/trunk/src/app/srs_app_hybrid.cpp +++ b/trunk/src/app/srs_app_hybrid.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_hybrid.hpp b/trunk/src/app/srs_app_hybrid.hpp index d7248e9f9..637f34424 100644 --- a/trunk/src/app/srs_app_hybrid.hpp +++ b/trunk/src/app/srs_app_hybrid.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_HYBRID_HPP diff --git a/trunk/src/app/srs_app_ingest.cpp b/trunk/src/app/srs_app_ingest.cpp index f38e73d86..d263d5762 100644 --- a/trunk/src/app/srs_app_ingest.cpp +++ b/trunk/src/app/srs_app_ingest.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_ingest.hpp b/trunk/src/app/srs_app_ingest.hpp index c566d26fd..d50d1f9a9 100644 --- a/trunk/src/app/srs_app_ingest.hpp +++ b/trunk/src/app/srs_app_ingest.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_INGEST_HPP diff --git a/trunk/src/app/srs_app_latest_version.cpp b/trunk/src/app/srs_app_latest_version.cpp index cd1a1ba88..180575bef 100644 --- a/trunk/src/app/srs_app_latest_version.cpp +++ b/trunk/src/app/srs_app_latest_version.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_latest_version.hpp b/trunk/src/app/srs_app_latest_version.hpp index 19823095a..49be33493 100644 --- a/trunk/src/app/srs_app_latest_version.hpp +++ b/trunk/src/app/srs_app_latest_version.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_LATEST_VERSION_HPP diff --git a/trunk/src/app/srs_app_listener.cpp b/trunk/src/app/srs_app_listener.cpp index 20fdad419..d3cddf011 100755 --- a/trunk/src/app/srs_app_listener.cpp +++ b/trunk/src/app/srs_app_listener.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_listener.hpp b/trunk/src/app/srs_app_listener.hpp index 5b0ccc040..53e26852a 100644 --- a/trunk/src/app/srs_app_listener.hpp +++ b/trunk/src/app/srs_app_listener.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_LISTENER_HPP diff --git a/trunk/src/app/srs_app_log.cpp b/trunk/src/app/srs_app_log.cpp index 6679f2610..89885cd6a 100644 --- a/trunk/src/app/srs_app_log.cpp +++ b/trunk/src/app/srs_app_log.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_log.hpp b/trunk/src/app/srs_app_log.hpp index 165c5592c..f1f409ac3 100644 --- a/trunk/src/app/srs_app_log.hpp +++ b/trunk/src/app/srs_app_log.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_LOG_HPP diff --git a/trunk/src/app/srs_app_mpegts_udp.cpp b/trunk/src/app/srs_app_mpegts_udp.cpp index be4ad4aba..334a425c4 100644 --- a/trunk/src/app/srs_app_mpegts_udp.cpp +++ b/trunk/src/app/srs_app_mpegts_udp.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_mpegts_udp.hpp b/trunk/src/app/srs_app_mpegts_udp.hpp index 931eb3e96..a0844aca3 100644 --- a/trunk/src/app/srs_app_mpegts_udp.hpp +++ b/trunk/src/app/srs_app_mpegts_udp.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_MPEGTS_UDP_HPP diff --git a/trunk/src/app/srs_app_ng_exec.cpp b/trunk/src/app/srs_app_ng_exec.cpp index f7f83f1e3..5afb2d926 100644 --- a/trunk/src/app/srs_app_ng_exec.cpp +++ b/trunk/src/app/srs_app_ng_exec.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_ng_exec.hpp b/trunk/src/app/srs_app_ng_exec.hpp index e7e35d090..0b73b82d0 100644 --- a/trunk/src/app/srs_app_ng_exec.hpp +++ b/trunk/src/app/srs_app_ng_exec.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_NG_EXEC_HPP diff --git a/trunk/src/app/srs_app_pithy_print.cpp b/trunk/src/app/srs_app_pithy_print.cpp index d4a290bae..ecbb3306e 100644 --- a/trunk/src/app/srs_app_pithy_print.cpp +++ b/trunk/src/app/srs_app_pithy_print.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_pithy_print.hpp b/trunk/src/app/srs_app_pithy_print.hpp index f083e50b9..b0173f630 100644 --- a/trunk/src/app/srs_app_pithy_print.hpp +++ b/trunk/src/app/srs_app_pithy_print.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_PITHY_PRINT_HPP diff --git a/trunk/src/app/srs_app_process.cpp b/trunk/src/app/srs_app_process.cpp index cfc2f8138..2ca8438dd 100644 --- a/trunk/src/app/srs_app_process.cpp +++ b/trunk/src/app/srs_app_process.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_process.hpp b/trunk/src/app/srs_app_process.hpp index dceda3cd9..c0ab033b0 100644 --- a/trunk/src/app/srs_app_process.hpp +++ b/trunk/src/app/srs_app_process.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_PROCESS_HPP diff --git a/trunk/src/app/srs_app_recv_thread.cpp b/trunk/src/app/srs_app_recv_thread.cpp index 5542482fe..df87bbf4e 100644 --- a/trunk/src/app/srs_app_recv_thread.cpp +++ b/trunk/src/app/srs_app_recv_thread.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_recv_thread.hpp b/trunk/src/app/srs_app_recv_thread.hpp index b51055051..bffed7b3d 100644 --- a/trunk/src/app/srs_app_recv_thread.hpp +++ b/trunk/src/app/srs_app_recv_thread.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_RECV_THREAD_HPP diff --git a/trunk/src/app/srs_app_refer.cpp b/trunk/src/app/srs_app_refer.cpp index 292bc5155..7d8fca5dc 100644 --- a/trunk/src/app/srs_app_refer.cpp +++ b/trunk/src/app/srs_app_refer.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_refer.hpp b/trunk/src/app/srs_app_refer.hpp index b01903f32..2c1b73425 100644 --- a/trunk/src/app/srs_app_refer.hpp +++ b/trunk/src/app/srs_app_refer.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_REFER_HPP diff --git a/trunk/src/app/srs_app_reload.cpp b/trunk/src/app/srs_app_reload.cpp index dde75ee24..4d8a7af64 100644 --- a/trunk/src/app/srs_app_reload.cpp +++ b/trunk/src/app/srs_app_reload.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_reload.hpp b/trunk/src/app/srs_app_reload.hpp index 8d877c707..f417301a6 100644 --- a/trunk/src/app/srs_app_reload.hpp +++ b/trunk/src/app/srs_app_reload.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_RELOAD_HPP diff --git a/trunk/src/app/srs_app_rtc_api.cpp b/trunk/src/app/srs_app_rtc_api.cpp index ddb38ae0f..e524f6017 100644 --- a/trunk/src/app/srs_app_rtc_api.cpp +++ b/trunk/src/app/srs_app_rtc_api.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_rtc_api.hpp b/trunk/src/app/srs_app_rtc_api.hpp index 8ee99b40c..ef75b0a77 100644 --- a/trunk/src/app/srs_app_rtc_api.hpp +++ b/trunk/src/app/srs_app_rtc_api.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_RTC_API_HPP diff --git a/trunk/src/app/srs_app_rtc_codec.cpp b/trunk/src/app/srs_app_rtc_codec.cpp index 3aa84bb52..105b28c22 100644 --- a/trunk/src/app/srs_app_rtc_codec.cpp +++ b/trunk/src/app/srs_app_rtc_codec.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_rtc_codec.hpp b/trunk/src/app/srs_app_rtc_codec.hpp index 249641c18..79963b67f 100644 --- a/trunk/src/app/srs_app_rtc_codec.hpp +++ b/trunk/src/app/srs_app_rtc_codec.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_RTC_CODEC_HPP diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp index d264ab4c4..7e351a33f 100644 --- a/trunk/src/app/srs_app_rtc_conn.cpp +++ b/trunk/src/app/srs_app_rtc_conn.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp index 17e5a7155..34a9a98ae 100644 --- a/trunk/src/app/srs_app_rtc_conn.hpp +++ b/trunk/src/app/srs_app_rtc_conn.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_RTC_CONN_HPP diff --git a/trunk/src/app/srs_app_rtc_dtls.cpp b/trunk/src/app/srs_app_rtc_dtls.cpp index 19c831bdc..b7639d50c 100644 --- a/trunk/src/app/srs_app_rtc_dtls.cpp +++ b/trunk/src/app/srs_app_rtc_dtls.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_rtc_dtls.hpp b/trunk/src/app/srs_app_rtc_dtls.hpp index 894209724..c79028ba7 100644 --- a/trunk/src/app/srs_app_rtc_dtls.hpp +++ b/trunk/src/app/srs_app_rtc_dtls.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_RTC_DTLS_HPP diff --git a/trunk/src/app/srs_app_rtc_queue.cpp b/trunk/src/app/srs_app_rtc_queue.cpp index 4974b1fd0..a5a818d16 100644 --- a/trunk/src/app/srs_app_rtc_queue.cpp +++ b/trunk/src/app/srs_app_rtc_queue.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_rtc_queue.hpp b/trunk/src/app/srs_app_rtc_queue.hpp index bbc4db457..7e0a9116a 100644 --- a/trunk/src/app/srs_app_rtc_queue.hpp +++ b/trunk/src/app/srs_app_rtc_queue.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_RTC_QUEUE_HPP diff --git a/trunk/src/app/srs_app_rtc_sdp.cpp b/trunk/src/app/srs_app_rtc_sdp.cpp index 02ca2af31..2b437cc9d 100644 --- a/trunk/src/app/srs_app_rtc_sdp.cpp +++ b/trunk/src/app/srs_app_rtc_sdp.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_rtc_sdp.hpp b/trunk/src/app/srs_app_rtc_sdp.hpp index c0ed2d1e2..553418f55 100644 --- a/trunk/src/app/srs_app_rtc_sdp.hpp +++ b/trunk/src/app/srs_app_rtc_sdp.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_RTC_SDP_HPP diff --git a/trunk/src/app/srs_app_rtc_server.cpp b/trunk/src/app/srs_app_rtc_server.cpp index 1d262587c..76703730d 100644 --- a/trunk/src/app/srs_app_rtc_server.cpp +++ b/trunk/src/app/srs_app_rtc_server.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_rtc_server.hpp b/trunk/src/app/srs_app_rtc_server.hpp index d5c18be9e..b3ff45e45 100644 --- a/trunk/src/app/srs_app_rtc_server.hpp +++ b/trunk/src/app/srs_app_rtc_server.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_RTC_SERVER_HPP diff --git a/trunk/src/app/srs_app_rtc_source.cpp b/trunk/src/app/srs_app_rtc_source.cpp index d081027c5..d4145eb3d 100644 --- a/trunk/src/app/srs_app_rtc_source.cpp +++ b/trunk/src/app/srs_app_rtc_source.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_rtc_source.hpp b/trunk/src/app/srs_app_rtc_source.hpp index 4bfa21352..8b5a9d786 100644 --- a/trunk/src/app/srs_app_rtc_source.hpp +++ b/trunk/src/app/srs_app_rtc_source.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_RTC_SOURCE_HPP diff --git a/trunk/src/app/srs_app_rtmp_conn.cpp b/trunk/src/app/srs_app_rtmp_conn.cpp index a78e6e5df..6be2b6862 100644 --- a/trunk/src/app/srs_app_rtmp_conn.cpp +++ b/trunk/src/app/srs_app_rtmp_conn.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_rtmp_conn.hpp b/trunk/src/app/srs_app_rtmp_conn.hpp index 720dd4452..99dddccb3 100644 --- a/trunk/src/app/srs_app_rtmp_conn.hpp +++ b/trunk/src/app/srs_app_rtmp_conn.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_RTMP_CONN_HPP diff --git a/trunk/src/app/srs_app_security.cpp b/trunk/src/app/srs_app_security.cpp index c51b49cef..690707581 100644 --- a/trunk/src/app/srs_app_security.cpp +++ b/trunk/src/app/srs_app_security.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_security.hpp b/trunk/src/app/srs_app_security.hpp index 42652f4d8..f52e4b01a 100644 --- a/trunk/src/app/srs_app_security.hpp +++ b/trunk/src/app/srs_app_security.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_SECURITY_HPP diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp index 9ccb2e9bc..df2de9938 100644 --- a/trunk/src/app/srs_app_server.cpp +++ b/trunk/src/app/srs_app_server.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_server.hpp b/trunk/src/app/srs_app_server.hpp index 8e15ab6b0..aae93b308 100644 --- a/trunk/src/app/srs_app_server.hpp +++ b/trunk/src/app/srs_app_server.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_SERVER_HPP diff --git a/trunk/src/app/srs_app_source.cpp b/trunk/src/app/srs_app_source.cpp index 97534cbb5..a16d19015 100755 --- a/trunk/src/app/srs_app_source.cpp +++ b/trunk/src/app/srs_app_source.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_source.hpp b/trunk/src/app/srs_app_source.hpp index 96cdf5950..304303412 100644 --- a/trunk/src/app/srs_app_source.hpp +++ b/trunk/src/app/srs_app_source.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_SOURCE_HPP diff --git a/trunk/src/app/srs_app_st.cpp b/trunk/src/app/srs_app_st.cpp index e769a6ede..f5cebadd5 100755 --- a/trunk/src/app/srs_app_st.cpp +++ b/trunk/src/app/srs_app_st.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_st.hpp b/trunk/src/app/srs_app_st.hpp index 0fb838f6a..6b7eb701e 100644 --- a/trunk/src/app/srs_app_st.hpp +++ b/trunk/src/app/srs_app_st.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_ST_HPP diff --git a/trunk/src/app/srs_app_statistic.cpp b/trunk/src/app/srs_app_statistic.cpp index ad0af6445..fbbeb12c6 100644 --- a/trunk/src/app/srs_app_statistic.cpp +++ b/trunk/src/app/srs_app_statistic.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_statistic.hpp b/trunk/src/app/srs_app_statistic.hpp index 37a2edaa1..dc04987e8 100644 --- a/trunk/src/app/srs_app_statistic.hpp +++ b/trunk/src/app/srs_app_statistic.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_STATISTIC_HPP diff --git a/trunk/src/app/srs_app_threads.cpp b/trunk/src/app/srs_app_threads.cpp index 39014749d..bcfd78c73 100644 --- a/trunk/src/app/srs_app_threads.cpp +++ b/trunk/src/app/srs_app_threads.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_threads.hpp b/trunk/src/app/srs_app_threads.hpp index c35c341f4..7d5338c48 100644 --- a/trunk/src/app/srs_app_threads.hpp +++ b/trunk/src/app/srs_app_threads.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_THREADS_HPP diff --git a/trunk/src/app/srs_app_utility.cpp b/trunk/src/app/srs_app_utility.cpp index 61adc36c6..b76b9bf03 100644 --- a/trunk/src/app/srs_app_utility.cpp +++ b/trunk/src/app/srs_app_utility.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/app/srs_app_utility.hpp b/trunk/src/app/srs_app_utility.hpp index 613ee45a0..86566cc0a 100644 --- a/trunk/src/app/srs_app_utility.hpp +++ b/trunk/src/app/srs_app_utility.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_APP_UTILITY_HPP diff --git a/trunk/src/core/srs_core.cpp b/trunk/src/core/srs_core.cpp index 1b769a535..6a7b3b292 100644 --- a/trunk/src/core/srs_core.cpp +++ b/trunk/src/core/srs_core.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 9c5e35ac1..d26659394 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_CORE_HPP diff --git a/trunk/src/core/srs_core_autofree.cpp b/trunk/src/core/srs_core_autofree.cpp index 907b009b8..a2da00e24 100644 --- a/trunk/src/core/srs_core_autofree.cpp +++ b/trunk/src/core/srs_core_autofree.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/core/srs_core_autofree.hpp b/trunk/src/core/srs_core_autofree.hpp index 48e40369d..d5e692bcb 100644 --- a/trunk/src/core/srs_core_autofree.hpp +++ b/trunk/src/core/srs_core_autofree.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_CORE_AUTO_FREE_HPP diff --git a/trunk/src/core/srs_core_performance.cpp b/trunk/src/core/srs_core_performance.cpp index d6a406745..9a72d05e7 100644 --- a/trunk/src/core/srs_core_performance.cpp +++ b/trunk/src/core/srs_core_performance.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/core/srs_core_performance.hpp b/trunk/src/core/srs_core_performance.hpp index 049587730..776ee8c0f 100644 --- a/trunk/src/core/srs_core_performance.hpp +++ b/trunk/src/core/srs_core_performance.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_CORE_PERFORMANCE_HPP diff --git a/trunk/src/core/srs_core_platform.cpp b/trunk/src/core/srs_core_platform.cpp index 1da0af075..6315e3f6b 100644 --- a/trunk/src/core/srs_core_platform.cpp +++ b/trunk/src/core/srs_core_platform.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/core/srs_core_platform.hpp b/trunk/src/core/srs_core_platform.hpp index c55f8e452..474fbe907 100644 --- a/trunk/src/core/srs_core_platform.hpp +++ b/trunk/src/core/srs_core_platform.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_CORE_PLATFORM_HPP diff --git a/trunk/src/core/srs_core_time.cpp b/trunk/src/core/srs_core_time.cpp index fde549c8c..b1574de2c 100644 --- a/trunk/src/core/srs_core_time.cpp +++ b/trunk/src/core/srs_core_time.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/core/srs_core_time.hpp b/trunk/src/core/srs_core_time.hpp index 97bfb63b1..14849d0bd 100644 --- a/trunk/src/core/srs_core_time.hpp +++ b/trunk/src/core/srs_core_time.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_CORE_TIME_HPP diff --git a/trunk/src/core/srs_core_version3.cpp b/trunk/src/core/srs_core_version3.cpp index f0fe7b15f..88546d5a2 100644 --- a/trunk/src/core/srs_core_version3.cpp +++ b/trunk/src/core/srs_core_version3.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/core/srs_core_version3.hpp b/trunk/src/core/srs_core_version3.hpp index 901cdfffb..a6654698b 100644 --- a/trunk/src/core/srs_core_version3.hpp +++ b/trunk/src/core/srs_core_version3.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_CORE_VERSION3_HPP diff --git a/trunk/src/core/srs_core_version4.cpp b/trunk/src/core/srs_core_version4.cpp index b696404e9..9d0ce65d8 100644 --- a/trunk/src/core/srs_core_version4.cpp +++ b/trunk/src/core/srs_core_version4.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index 498acfafc..81ee8b85c 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_CORE_VERSION4_HPP diff --git a/trunk/src/core/srs_core_version5.cpp b/trunk/src/core/srs_core_version5.cpp index b696404e9..9d0ce65d8 100644 --- a/trunk/src/core/srs_core_version5.cpp +++ b/trunk/src/core/srs_core_version5.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp index c558b09eb..ac4ae77dd 100644 --- a/trunk/src/core/srs_core_version5.hpp +++ b/trunk/src/core/srs_core_version5.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_CORE_VERSION5_HPP diff --git a/trunk/src/kernel/srs_kernel_aac.cpp b/trunk/src/kernel/srs_kernel_aac.cpp index e941314d5..3e2b59b9f 100644 --- a/trunk/src/kernel/srs_kernel_aac.cpp +++ b/trunk/src/kernel/srs_kernel_aac.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_aac.hpp b/trunk/src/kernel/srs_kernel_aac.hpp index 5af399e40..e1939a146 100644 --- a/trunk/src/kernel/srs_kernel_aac.hpp +++ b/trunk/src/kernel/srs_kernel_aac.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_AAC_HPP diff --git a/trunk/src/kernel/srs_kernel_balance.cpp b/trunk/src/kernel/srs_kernel_balance.cpp index 65c74fcb3..6cdd9c5b7 100644 --- a/trunk/src/kernel/srs_kernel_balance.cpp +++ b/trunk/src/kernel/srs_kernel_balance.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_balance.hpp b/trunk/src/kernel/srs_kernel_balance.hpp index 6a96d9bc5..f8cceadb4 100644 --- a/trunk/src/kernel/srs_kernel_balance.hpp +++ b/trunk/src/kernel/srs_kernel_balance.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_BALANCE_HPP diff --git a/trunk/src/kernel/srs_kernel_buffer.cpp b/trunk/src/kernel/srs_kernel_buffer.cpp index 5d7a122b2..2f9f59a46 100644 --- a/trunk/src/kernel/srs_kernel_buffer.cpp +++ b/trunk/src/kernel/srs_kernel_buffer.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_buffer.hpp b/trunk/src/kernel/srs_kernel_buffer.hpp index e94a6bc2b..230fc634b 100644 --- a/trunk/src/kernel/srs_kernel_buffer.hpp +++ b/trunk/src/kernel/srs_kernel_buffer.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_BUFFER_HPP diff --git a/trunk/src/kernel/srs_kernel_codec.cpp b/trunk/src/kernel/srs_kernel_codec.cpp index 70c77c233..1e784ce25 100644 --- a/trunk/src/kernel/srs_kernel_codec.cpp +++ b/trunk/src/kernel/srs_kernel_codec.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_codec.hpp b/trunk/src/kernel/srs_kernel_codec.hpp index 942e7007e..248738a0d 100644 --- a/trunk/src/kernel/srs_kernel_codec.hpp +++ b/trunk/src/kernel/srs_kernel_codec.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_CODEC_HPP diff --git a/trunk/src/kernel/srs_kernel_consts.cpp b/trunk/src/kernel/srs_kernel_consts.cpp index 8f4a932bb..3032b17a8 100644 --- a/trunk/src/kernel/srs_kernel_consts.cpp +++ b/trunk/src/kernel/srs_kernel_consts.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_consts.hpp b/trunk/src/kernel/srs_kernel_consts.hpp index ca30aa16a..ed3b2fba5 100644 --- a/trunk/src/kernel/srs_kernel_consts.hpp +++ b/trunk/src/kernel/srs_kernel_consts.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_CONSTS_HPP diff --git a/trunk/src/kernel/srs_kernel_error.cpp b/trunk/src/kernel/srs_kernel_error.cpp index b7077ad35..a1cec9f96 100644 --- a/trunk/src/kernel/srs_kernel_error.cpp +++ b/trunk/src/kernel/srs_kernel_error.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_error.hpp b/trunk/src/kernel/srs_kernel_error.hpp index d1067eefb..722ca60b4 100644 --- a/trunk/src/kernel/srs_kernel_error.hpp +++ b/trunk/src/kernel/srs_kernel_error.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_ERROR_HPP diff --git a/trunk/src/kernel/srs_kernel_file.cpp b/trunk/src/kernel/srs_kernel_file.cpp index 5103308d6..72497f4c6 100644 --- a/trunk/src/kernel/srs_kernel_file.cpp +++ b/trunk/src/kernel/srs_kernel_file.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_file.hpp b/trunk/src/kernel/srs_kernel_file.hpp index 8f050ab86..de83b6db5 100644 --- a/trunk/src/kernel/srs_kernel_file.hpp +++ b/trunk/src/kernel/srs_kernel_file.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_FILE_HPP diff --git a/trunk/src/kernel/srs_kernel_flv.cpp b/trunk/src/kernel/srs_kernel_flv.cpp index 6f4c5edd5..9d9c256d5 100644 --- a/trunk/src/kernel/srs_kernel_flv.cpp +++ b/trunk/src/kernel/srs_kernel_flv.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_flv.hpp b/trunk/src/kernel/srs_kernel_flv.hpp index 2b9c6c66e..1cae2a88d 100644 --- a/trunk/src/kernel/srs_kernel_flv.hpp +++ b/trunk/src/kernel/srs_kernel_flv.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_FLV_HPP diff --git a/trunk/src/kernel/srs_kernel_io.cpp b/trunk/src/kernel/srs_kernel_io.cpp index a8bbec19c..8a0e86a9a 100644 --- a/trunk/src/kernel/srs_kernel_io.cpp +++ b/trunk/src/kernel/srs_kernel_io.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_io.hpp b/trunk/src/kernel/srs_kernel_io.hpp index 8a0622e3a..a295d16b4 100644 --- a/trunk/src/kernel/srs_kernel_io.hpp +++ b/trunk/src/kernel/srs_kernel_io.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_IO_HPP diff --git a/trunk/src/kernel/srs_kernel_kbps.cpp b/trunk/src/kernel/srs_kernel_kbps.cpp index 75780a2bd..046b02cf2 100644 --- a/trunk/src/kernel/srs_kernel_kbps.cpp +++ b/trunk/src/kernel/srs_kernel_kbps.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_kbps.hpp b/trunk/src/kernel/srs_kernel_kbps.hpp index 9e2e41606..b92dce174 100644 --- a/trunk/src/kernel/srs_kernel_kbps.hpp +++ b/trunk/src/kernel/srs_kernel_kbps.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_KBPS_HPP diff --git a/trunk/src/kernel/srs_kernel_log.cpp b/trunk/src/kernel/srs_kernel_log.cpp index 56f2ba014..1cd1be246 100644 --- a/trunk/src/kernel/srs_kernel_log.cpp +++ b/trunk/src/kernel/srs_kernel_log.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_log.hpp b/trunk/src/kernel/srs_kernel_log.hpp index e19dd4f7e..947a38a6a 100644 --- a/trunk/src/kernel/srs_kernel_log.hpp +++ b/trunk/src/kernel/srs_kernel_log.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_LOG_HPP diff --git a/trunk/src/kernel/srs_kernel_mp3.cpp b/trunk/src/kernel/srs_kernel_mp3.cpp index 9571c6d26..196364f8b 100644 --- a/trunk/src/kernel/srs_kernel_mp3.cpp +++ b/trunk/src/kernel/srs_kernel_mp3.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_mp3.hpp b/trunk/src/kernel/srs_kernel_mp3.hpp index a16f5c9d3..1ef6fec6b 100644 --- a/trunk/src/kernel/srs_kernel_mp3.hpp +++ b/trunk/src/kernel/srs_kernel_mp3.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_MP3_HPP diff --git a/trunk/src/kernel/srs_kernel_mp4.cpp b/trunk/src/kernel/srs_kernel_mp4.cpp index b9c35f441..fd34a0fcf 100644 --- a/trunk/src/kernel/srs_kernel_mp4.cpp +++ b/trunk/src/kernel/srs_kernel_mp4.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_mp4.hpp b/trunk/src/kernel/srs_kernel_mp4.hpp index 00ead58fe..5ecc2ae39 100644 --- a/trunk/src/kernel/srs_kernel_mp4.hpp +++ b/trunk/src/kernel/srs_kernel_mp4.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_MP4_HPP diff --git a/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp b/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp index 647f5dd19..b0d96a495 100644 --- a/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp +++ b/trunk/src/kernel/srs_kernel_rtc_rtcp.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_rtc_rtcp.hpp b/trunk/src/kernel/srs_kernel_rtc_rtcp.hpp index c094844d8..7c1a08b43 100644 --- a/trunk/src/kernel/srs_kernel_rtc_rtcp.hpp +++ b/trunk/src/kernel/srs_kernel_rtc_rtcp.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_RTC_RTCP_HPP diff --git a/trunk/src/kernel/srs_kernel_rtc_rtp.cpp b/trunk/src/kernel/srs_kernel_rtc_rtp.cpp index f1173c3fb..32a6d2c8e 100644 --- a/trunk/src/kernel/srs_kernel_rtc_rtp.cpp +++ b/trunk/src/kernel/srs_kernel_rtc_rtp.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_rtc_rtp.hpp b/trunk/src/kernel/srs_kernel_rtc_rtp.hpp index 320d49534..00f8c7d3f 100644 --- a/trunk/src/kernel/srs_kernel_rtc_rtp.hpp +++ b/trunk/src/kernel/srs_kernel_rtc_rtp.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_RTC_RTP_HPP diff --git a/trunk/src/kernel/srs_kernel_stream.cpp b/trunk/src/kernel/srs_kernel_stream.cpp index 53f09bf59..b8d95ad72 100755 --- a/trunk/src/kernel/srs_kernel_stream.cpp +++ b/trunk/src/kernel/srs_kernel_stream.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_stream.hpp b/trunk/src/kernel/srs_kernel_stream.hpp index 4001f3b11..6eaad7e4d 100644 --- a/trunk/src/kernel/srs_kernel_stream.hpp +++ b/trunk/src/kernel/srs_kernel_stream.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_STREAM_HPP diff --git a/trunk/src/kernel/srs_kernel_ts.cpp b/trunk/src/kernel/srs_kernel_ts.cpp index 9d63cc414..fc038a80f 100644 --- a/trunk/src/kernel/srs_kernel_ts.cpp +++ b/trunk/src/kernel/srs_kernel_ts.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_ts.hpp b/trunk/src/kernel/srs_kernel_ts.hpp index e8f09ef2e..eb4804823 100644 --- a/trunk/src/kernel/srs_kernel_ts.hpp +++ b/trunk/src/kernel/srs_kernel_ts.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_TS_HPP diff --git a/trunk/src/kernel/srs_kernel_utility.cpp b/trunk/src/kernel/srs_kernel_utility.cpp index 8629bde9d..af1d3f384 100644 --- a/trunk/src/kernel/srs_kernel_utility.cpp +++ b/trunk/src/kernel/srs_kernel_utility.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/kernel/srs_kernel_utility.hpp b/trunk/src/kernel/srs_kernel_utility.hpp index 747df6b1b..1ef6d9154 100644 --- a/trunk/src/kernel/srs_kernel_utility.hpp +++ b/trunk/src/kernel/srs_kernel_utility.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_KERNEL_UTILITY_HPP diff --git a/trunk/src/main/srs_main_ingest_hls.cpp b/trunk/src/main/srs_main_ingest_hls.cpp index f2e15f13e..024edc3d8 100644 --- a/trunk/src/main/srs_main_ingest_hls.cpp +++ b/trunk/src/main/srs_main_ingest_hls.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/main/srs_main_mp4_parser.cpp b/trunk/src/main/srs_main_mp4_parser.cpp index e809dd68c..6f278d0d5 100644 --- a/trunk/src/main/srs_main_mp4_parser.cpp +++ b/trunk/src/main/srs_main_mp4_parser.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index e4c54b374..de0a9c060 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_http_stack.cpp b/trunk/src/protocol/srs_http_stack.cpp index fee31313c..592850d8b 100644 --- a/trunk/src/protocol/srs_http_stack.cpp +++ b/trunk/src/protocol/srs_http_stack.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_http_stack.hpp b/trunk/src/protocol/srs_http_stack.hpp index f3db07918..eca11d425 100644 --- a/trunk/src/protocol/srs_http_stack.hpp +++ b/trunk/src/protocol/srs_http_stack.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_PROTOCOL_HTTP_HPP diff --git a/trunk/src/protocol/srs_protocol_amf0.cpp b/trunk/src/protocol/srs_protocol_amf0.cpp index f4c5468c0..7573f6b7a 100644 --- a/trunk/src/protocol/srs_protocol_amf0.cpp +++ b/trunk/src/protocol/srs_protocol_amf0.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_protocol_amf0.hpp b/trunk/src/protocol/srs_protocol_amf0.hpp index 01817cc68..039bad213 100644 --- a/trunk/src/protocol/srs_protocol_amf0.hpp +++ b/trunk/src/protocol/srs_protocol_amf0.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_PROTOCOL_AMF0_HPP diff --git a/trunk/src/protocol/srs_protocol_format.cpp b/trunk/src/protocol/srs_protocol_format.cpp index 5e5f81bf8..d0212f2be 100644 --- a/trunk/src/protocol/srs_protocol_format.cpp +++ b/trunk/src/protocol/srs_protocol_format.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_protocol_format.hpp b/trunk/src/protocol/srs_protocol_format.hpp index d964dd50a..c54686229 100644 --- a/trunk/src/protocol/srs_protocol_format.hpp +++ b/trunk/src/protocol/srs_protocol_format.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_PROTOCOL_FORMAT_HPP diff --git a/trunk/src/protocol/srs_protocol_io.cpp b/trunk/src/protocol/srs_protocol_io.cpp index 923e993f2..237cc4cc3 100644 --- a/trunk/src/protocol/srs_protocol_io.cpp +++ b/trunk/src/protocol/srs_protocol_io.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_protocol_io.hpp b/trunk/src/protocol/srs_protocol_io.hpp index 7ebcb8a20..75c863ae5 100644 --- a/trunk/src/protocol/srs_protocol_io.hpp +++ b/trunk/src/protocol/srs_protocol_io.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_PROTOCOL_IO_HPP diff --git a/trunk/src/protocol/srs_protocol_json.cpp b/trunk/src/protocol/srs_protocol_json.cpp index a889f9aab..34187c2ce 100644 --- a/trunk/src/protocol/srs_protocol_json.cpp +++ b/trunk/src/protocol/srs_protocol_json.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include @@ -1303,7 +1303,7 @@ void json_value_free (json_value * value) // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_protocol_json.hpp b/trunk/src/protocol/srs_protocol_json.hpp index 4b6626ee7..d42717aad 100644 --- a/trunk/src/protocol/srs_protocol_json.hpp +++ b/trunk/src/protocol/srs_protocol_json.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_PROTOCOL_JSON_HPP diff --git a/trunk/src/protocol/srs_protocol_kbps.cpp b/trunk/src/protocol/srs_protocol_kbps.cpp index 0617d576d..41eee4dd2 100644 --- a/trunk/src/protocol/srs_protocol_kbps.cpp +++ b/trunk/src/protocol/srs_protocol_kbps.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_protocol_kbps.hpp b/trunk/src/protocol/srs_protocol_kbps.hpp index 6cee6f901..5b7306827 100644 --- a/trunk/src/protocol/srs_protocol_kbps.hpp +++ b/trunk/src/protocol/srs_protocol_kbps.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_PROTOCOL_KBPS_HPP diff --git a/trunk/src/protocol/srs_protocol_stream.cpp b/trunk/src/protocol/srs_protocol_stream.cpp index cb3107762..6c8b5ff89 100755 --- a/trunk/src/protocol/srs_protocol_stream.cpp +++ b/trunk/src/protocol/srs_protocol_stream.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_protocol_stream.hpp b/trunk/src/protocol/srs_protocol_stream.hpp index 09c6401d0..d0e986e98 100644 --- a/trunk/src/protocol/srs_protocol_stream.hpp +++ b/trunk/src/protocol/srs_protocol_stream.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_PROTOCOL_STREAM_HPP diff --git a/trunk/src/protocol/srs_protocol_utility.cpp b/trunk/src/protocol/srs_protocol_utility.cpp index a3e1a5939..a448f068d 100644 --- a/trunk/src/protocol/srs_protocol_utility.cpp +++ b/trunk/src/protocol/srs_protocol_utility.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_protocol_utility.hpp b/trunk/src/protocol/srs_protocol_utility.hpp index b5d8aba38..a57cd63e8 100644 --- a/trunk/src/protocol/srs_protocol_utility.hpp +++ b/trunk/src/protocol/srs_protocol_utility.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_PROTOCOL_UTILITY_HPP diff --git a/trunk/src/protocol/srs_raw_avc.cpp b/trunk/src/protocol/srs_raw_avc.cpp index 2e1fc48f7..ad9deef8d 100644 --- a/trunk/src/protocol/srs_raw_avc.cpp +++ b/trunk/src/protocol/srs_raw_avc.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_raw_avc.hpp b/trunk/src/protocol/srs_raw_avc.hpp index cbe3a8234..d46762956 100644 --- a/trunk/src/protocol/srs_raw_avc.hpp +++ b/trunk/src/protocol/srs_raw_avc.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_PROTOCOL_RAW_AVC_HPP diff --git a/trunk/src/protocol/srs_rtc_stun_stack.cpp b/trunk/src/protocol/srs_rtc_stun_stack.cpp index 16c4afd1d..5b201064a 100644 --- a/trunk/src/protocol/srs_rtc_stun_stack.cpp +++ b/trunk/src/protocol/srs_rtc_stun_stack.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_rtc_stun_stack.hpp b/trunk/src/protocol/srs_rtc_stun_stack.hpp index e8c10325a..1311f491f 100644 --- a/trunk/src/protocol/srs_rtc_stun_stack.hpp +++ b/trunk/src/protocol/srs_rtc_stun_stack.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_PROTOCOL_RTC_STUN_HPP diff --git a/trunk/src/protocol/srs_rtmp_handshake.cpp b/trunk/src/protocol/srs_rtmp_handshake.cpp index 7d4750452..ec8dd78cc 100644 --- a/trunk/src/protocol/srs_rtmp_handshake.cpp +++ b/trunk/src/protocol/srs_rtmp_handshake.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_rtmp_handshake.hpp b/trunk/src/protocol/srs_rtmp_handshake.hpp index b7ae9a3f3..a65f280a6 100644 --- a/trunk/src/protocol/srs_rtmp_handshake.hpp +++ b/trunk/src/protocol/srs_rtmp_handshake.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_PROTOCOL_HANDSHAKE_HPP diff --git a/trunk/src/protocol/srs_rtmp_msg_array.cpp b/trunk/src/protocol/srs_rtmp_msg_array.cpp index 76e842890..cf856aee0 100644 --- a/trunk/src/protocol/srs_rtmp_msg_array.cpp +++ b/trunk/src/protocol/srs_rtmp_msg_array.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_rtmp_msg_array.hpp b/trunk/src/protocol/srs_rtmp_msg_array.hpp index df1086110..dccbc3200 100644 --- a/trunk/src/protocol/srs_rtmp_msg_array.hpp +++ b/trunk/src/protocol/srs_rtmp_msg_array.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_PROTOCOL_MESSAGE_ARRAY_HPP diff --git a/trunk/src/protocol/srs_rtmp_stack.cpp b/trunk/src/protocol/srs_rtmp_stack.cpp index 8128d0503..056155f23 100644 --- a/trunk/src/protocol/srs_rtmp_stack.cpp +++ b/trunk/src/protocol/srs_rtmp_stack.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_rtmp_stack.hpp b/trunk/src/protocol/srs_rtmp_stack.hpp index 24913c981..53ede724d 100644 --- a/trunk/src/protocol/srs_rtmp_stack.hpp +++ b/trunk/src/protocol/srs_rtmp_stack.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_PROTOCOL_RTMP_HPP diff --git a/trunk/src/protocol/srs_rtsp_stack.cpp b/trunk/src/protocol/srs_rtsp_stack.cpp index 1b14d2358..5f22cb75d 100644 --- a/trunk/src/protocol/srs_rtsp_stack.cpp +++ b/trunk/src/protocol/srs_rtsp_stack.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_rtsp_stack.hpp b/trunk/src/protocol/srs_rtsp_stack.hpp index 2bcaac31b..940ebf69e 100644 --- a/trunk/src/protocol/srs_rtsp_stack.hpp +++ b/trunk/src/protocol/srs_rtsp_stack.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_PROTOCOL_RTSP_HPP diff --git a/trunk/src/protocol/srs_service_conn.cpp b/trunk/src/protocol/srs_service_conn.cpp index 9a5c2f999..1d7945680 100644 --- a/trunk/src/protocol/srs_service_conn.cpp +++ b/trunk/src/protocol/srs_service_conn.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_service_conn.hpp b/trunk/src/protocol/srs_service_conn.hpp index 650bb99a9..cff04334a 100644 --- a/trunk/src/protocol/srs_service_conn.hpp +++ b/trunk/src/protocol/srs_service_conn.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_SERVICE_CONN_HPP diff --git a/trunk/src/protocol/srs_service_http_client.cpp b/trunk/src/protocol/srs_service_http_client.cpp index 12fbe0031..4196e8879 100644 --- a/trunk/src/protocol/srs_service_http_client.cpp +++ b/trunk/src/protocol/srs_service_http_client.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_service_http_client.hpp b/trunk/src/protocol/srs_service_http_client.hpp index d9e08916f..7cfa56f19 100644 --- a/trunk/src/protocol/srs_service_http_client.hpp +++ b/trunk/src/protocol/srs_service_http_client.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_SERVICE_HTTP_CLIENT_HPP diff --git a/trunk/src/protocol/srs_service_http_conn.cpp b/trunk/src/protocol/srs_service_http_conn.cpp index 5c9a67ee3..b1365c13a 100644 --- a/trunk/src/protocol/srs_service_http_conn.cpp +++ b/trunk/src/protocol/srs_service_http_conn.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_service_http_conn.hpp b/trunk/src/protocol/srs_service_http_conn.hpp index 2c473b039..968cc6086 100644 --- a/trunk/src/protocol/srs_service_http_conn.hpp +++ b/trunk/src/protocol/srs_service_http_conn.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_SERVICE_HTTP_CONN_HPP diff --git a/trunk/src/protocol/srs_service_log.cpp b/trunk/src/protocol/srs_service_log.cpp index 11921034b..1f40fe36e 100644 --- a/trunk/src/protocol/srs_service_log.cpp +++ b/trunk/src/protocol/srs_service_log.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_service_log.hpp b/trunk/src/protocol/srs_service_log.hpp index 3c73f9244..08d504ffa 100644 --- a/trunk/src/protocol/srs_service_log.hpp +++ b/trunk/src/protocol/srs_service_log.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_SERVICE_LOG_HPP diff --git a/trunk/src/protocol/srs_service_rtmp_conn.cpp b/trunk/src/protocol/srs_service_rtmp_conn.cpp index 6692cbe48..3ea549b67 100644 --- a/trunk/src/protocol/srs_service_rtmp_conn.cpp +++ b/trunk/src/protocol/srs_service_rtmp_conn.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_service_rtmp_conn.hpp b/trunk/src/protocol/srs_service_rtmp_conn.hpp index def0643f1..ce35f9de3 100644 --- a/trunk/src/protocol/srs_service_rtmp_conn.hpp +++ b/trunk/src/protocol/srs_service_rtmp_conn.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_SERVICE_RTMP_CONN_HPP diff --git a/trunk/src/protocol/srs_service_st.cpp b/trunk/src/protocol/srs_service_st.cpp index c04926ecf..a8568332f 100644 --- a/trunk/src/protocol/srs_service_st.cpp +++ b/trunk/src/protocol/srs_service_st.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_service_st.hpp b/trunk/src/protocol/srs_service_st.hpp index 93a91ddfa..6bb925464 100644 --- a/trunk/src/protocol/srs_service_st.hpp +++ b/trunk/src/protocol/srs_service_st.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_SERVICE_ST_HPP diff --git a/trunk/src/protocol/srs_service_utility.cpp b/trunk/src/protocol/srs_service_utility.cpp index 5ef7485eb..53f7a1a5d 100644 --- a/trunk/src/protocol/srs_service_utility.cpp +++ b/trunk/src/protocol/srs_service_utility.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/protocol/srs_service_utility.hpp b/trunk/src/protocol/srs_service_utility.hpp index 6295f2582..d6b130e7f 100644 --- a/trunk/src/protocol/srs_service_utility.hpp +++ b/trunk/src/protocol/srs_service_utility.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_SERVICE_UTILITY_HPP diff --git a/trunk/src/srt/srt_conn.cpp b/trunk/src/srt/srt_conn.cpp index 9be23ac19..e085ea396 100644 --- a/trunk/src/srt/srt_conn.cpp +++ b/trunk/src/srt/srt_conn.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include "srt_conn.hpp" diff --git a/trunk/src/srt/srt_conn.hpp b/trunk/src/srt/srt_conn.hpp index ee953458f..1f6e44e21 100644 --- a/trunk/src/srt/srt_conn.hpp +++ b/trunk/src/srt/srt_conn.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRT_CONN_H diff --git a/trunk/src/srt/srt_data.cpp b/trunk/src/srt/srt_data.cpp index 320147c87..2087b70d5 100644 --- a/trunk/src/srt/srt_data.cpp +++ b/trunk/src/srt/srt_data.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include "srt_data.hpp" diff --git a/trunk/src/srt/srt_data.hpp b/trunk/src/srt/srt_data.hpp index 7809ed949..e7241fc90 100644 --- a/trunk/src/srt/srt_data.hpp +++ b/trunk/src/srt/srt_data.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRT_DATA_H diff --git a/trunk/src/srt/srt_handle.cpp b/trunk/src/srt/srt_handle.cpp index 296b4e4a0..4be705bf1 100644 --- a/trunk/src/srt/srt_handle.cpp +++ b/trunk/src/srt/srt_handle.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include "srt_handle.hpp" diff --git a/trunk/src/srt/srt_handle.hpp b/trunk/src/srt/srt_handle.hpp index ff3a2e50c..836141405 100644 --- a/trunk/src/srt/srt_handle.hpp +++ b/trunk/src/srt/srt_handle.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRT_HANDLE_H diff --git a/trunk/src/srt/srt_server.cpp b/trunk/src/srt/srt_server.cpp index a15851a26..10630efa3 100644 --- a/trunk/src/srt/srt_server.cpp +++ b/trunk/src/srt/srt_server.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include "srt_server.hpp" diff --git a/trunk/src/srt/srt_server.hpp b/trunk/src/srt/srt_server.hpp index 7d6d6558d..6b86ee4c7 100644 --- a/trunk/src/srt/srt_server.hpp +++ b/trunk/src/srt/srt_server.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRT_SERVER_H diff --git a/trunk/src/srt/srt_to_rtmp.cpp b/trunk/src/srt/srt_to_rtmp.cpp index 9e2022809..dd4106e03 100644 --- a/trunk/src/srt/srt_to_rtmp.cpp +++ b/trunk/src/srt/srt_to_rtmp.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include "srt_to_rtmp.hpp" diff --git a/trunk/src/srt/srt_to_rtmp.hpp b/trunk/src/srt/srt_to_rtmp.hpp index 228a1345c..6db3c428a 100644 --- a/trunk/src/srt/srt_to_rtmp.hpp +++ b/trunk/src/srt/srt_to_rtmp.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRT_TO_RTMP_H diff --git a/trunk/src/srt/stringex.hpp b/trunk/src/srt/stringex.hpp index e01e34c3f..633e58ecf 100644 --- a/trunk/src/srt/stringex.hpp +++ b/trunk/src/srt/stringex.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef STRING_EX_H diff --git a/trunk/src/srt/time_help.hpp b/trunk/src/srt/time_help.hpp index 061c8a16c..e58e5c0fd 100644 --- a/trunk/src/srt/time_help.hpp +++ b/trunk/src/srt/time_help.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef TIME_HELP_H diff --git a/trunk/src/srt/ts_demux.cpp b/trunk/src/srt/ts_demux.cpp index d86161753..85ee47f43 100644 --- a/trunk/src/srt/ts_demux.cpp +++ b/trunk/src/srt/ts_demux.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include "ts_demux.hpp" diff --git a/trunk/src/srt/ts_demux.hpp b/trunk/src/srt/ts_demux.hpp index a2bf119d4..8ffbf25be 100644 --- a/trunk/src/srt/ts_demux.hpp +++ b/trunk/src/srt/ts_demux.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef TS_DEMUX_H diff --git a/trunk/src/srt/ts_demux_test.cpp b/trunk/src/srt/ts_demux_test.cpp index 15c15cd56..e38679640 100644 --- a/trunk/src/srt/ts_demux_test.cpp +++ b/trunk/src/srt/ts_demux_test.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include "ts_demux.hpp" diff --git a/trunk/src/utest/srs_utest.cpp b/trunk/src/utest/srs_utest.cpp index f7f2e32ec..2b07563f6 100644 --- a/trunk/src/utest/srs_utest.cpp +++ b/trunk/src/utest/srs_utest.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/utest/srs_utest.hpp b/trunk/src/utest/srs_utest.hpp index 375570d27..daeda93b1 100644 --- a/trunk/src/utest/srs_utest.hpp +++ b/trunk/src/utest/srs_utest.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_UTEST_PUBLIC_SHARED_HPP diff --git a/trunk/src/utest/srs_utest_amf0.cpp b/trunk/src/utest/srs_utest_amf0.cpp index 9efc97c19..b9e884fc3 100644 --- a/trunk/src/utest/srs_utest_amf0.cpp +++ b/trunk/src/utest/srs_utest_amf0.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/utest/srs_utest_amf0.hpp b/trunk/src/utest/srs_utest_amf0.hpp index 49a736466..937213384 100644 --- a/trunk/src/utest/srs_utest_amf0.hpp +++ b/trunk/src/utest/srs_utest_amf0.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_UTEST_AMF0_HPP diff --git a/trunk/src/utest/srs_utest_app.cpp b/trunk/src/utest/srs_utest_app.cpp index 3586d45b9..728f87ff9 100644 --- a/trunk/src/utest/srs_utest_app.cpp +++ b/trunk/src/utest/srs_utest_app.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/utest/srs_utest_app.hpp b/trunk/src/utest/srs_utest_app.hpp index fbb49533b..c2c1924fc 100644 --- a/trunk/src/utest/srs_utest_app.hpp +++ b/trunk/src/utest/srs_utest_app.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_UTEST_APP_HPP diff --git a/trunk/src/utest/srs_utest_avc.cpp b/trunk/src/utest/srs_utest_avc.cpp index 5639f5914..70ed492be 100644 --- a/trunk/src/utest/srs_utest_avc.cpp +++ b/trunk/src/utest/srs_utest_avc.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/utest/srs_utest_avc.hpp b/trunk/src/utest/srs_utest_avc.hpp index 454c15784..8208f88ed 100644 --- a/trunk/src/utest/srs_utest_avc.hpp +++ b/trunk/src/utest/srs_utest_avc.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_UTEST_AVC_HPP diff --git a/trunk/src/utest/srs_utest_config.cpp b/trunk/src/utest/srs_utest_config.cpp index 56747795a..e5532d678 100644 --- a/trunk/src/utest/srs_utest_config.cpp +++ b/trunk/src/utest/srs_utest_config.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/utest/srs_utest_config.hpp b/trunk/src/utest/srs_utest_config.hpp index 923353c98..a57581da3 100644 --- a/trunk/src/utest/srs_utest_config.hpp +++ b/trunk/src/utest/srs_utest_config.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_UTEST_CONFIG_HPP diff --git a/trunk/src/utest/srs_utest_core.cpp b/trunk/src/utest/srs_utest_core.cpp index 7de3dec9c..f5ee36c83 100644 --- a/trunk/src/utest/srs_utest_core.cpp +++ b/trunk/src/utest/srs_utest_core.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/utest/srs_utest_core.hpp b/trunk/src/utest/srs_utest_core.hpp index 165e829f2..1fd3098a6 100644 --- a/trunk/src/utest/srs_utest_core.hpp +++ b/trunk/src/utest/srs_utest_core.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_UTEST_CORE_HPP diff --git a/trunk/src/utest/srs_utest_http.cpp b/trunk/src/utest/srs_utest_http.cpp index 5b6d70b34..e5de7dd0d 100644 --- a/trunk/src/utest/srs_utest_http.cpp +++ b/trunk/src/utest/srs_utest_http.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/utest/srs_utest_http.hpp b/trunk/src/utest/srs_utest_http.hpp index e8172b1c0..2f701c251 100644 --- a/trunk/src/utest/srs_utest_http.hpp +++ b/trunk/src/utest/srs_utest_http.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_UTEST_PROTO_STACK_HPP diff --git a/trunk/src/utest/srs_utest_kernel.cpp b/trunk/src/utest/srs_utest_kernel.cpp index cef48ea92..08ad0b072 100644 --- a/trunk/src/utest/srs_utest_kernel.cpp +++ b/trunk/src/utest/srs_utest_kernel.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/utest/srs_utest_kernel.hpp b/trunk/src/utest/srs_utest_kernel.hpp index 86ef36455..7bbcf2735 100644 --- a/trunk/src/utest/srs_utest_kernel.hpp +++ b/trunk/src/utest/srs_utest_kernel.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_UTEST_KERNEL_HPP diff --git a/trunk/src/utest/srs_utest_mp4.cpp b/trunk/src/utest/srs_utest_mp4.cpp index 8f40ada9b..4edabd562 100644 --- a/trunk/src/utest/srs_utest_mp4.cpp +++ b/trunk/src/utest/srs_utest_mp4.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/utest/srs_utest_mp4.hpp b/trunk/src/utest/srs_utest_mp4.hpp index b69db713a..b34b83b8a 100644 --- a/trunk/src/utest/srs_utest_mp4.hpp +++ b/trunk/src/utest/srs_utest_mp4.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_UTEST_MP4_HPP diff --git a/trunk/src/utest/srs_utest_protocol.cpp b/trunk/src/utest/srs_utest_protocol.cpp index 77251446c..8a3347c35 100644 --- a/trunk/src/utest/srs_utest_protocol.cpp +++ b/trunk/src/utest/srs_utest_protocol.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/utest/srs_utest_protocol.hpp b/trunk/src/utest/srs_utest_protocol.hpp index d5d81e1aa..673a8a647 100644 --- a/trunk/src/utest/srs_utest_protocol.hpp +++ b/trunk/src/utest/srs_utest_protocol.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_UTEST_PROTOCOL_HPP diff --git a/trunk/src/utest/srs_utest_reload.cpp b/trunk/src/utest/srs_utest_reload.cpp index 2342915d9..15246fda0 100644 --- a/trunk/src/utest/srs_utest_reload.cpp +++ b/trunk/src/utest/srs_utest_reload.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/utest/srs_utest_reload.hpp b/trunk/src/utest/srs_utest_reload.hpp index 01688b7b5..7e9c9e97d 100644 --- a/trunk/src/utest/srs_utest_reload.hpp +++ b/trunk/src/utest/srs_utest_reload.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_UTEST_RELOAD_HPP diff --git a/trunk/src/utest/srs_utest_rtc.cpp b/trunk/src/utest/srs_utest_rtc.cpp index 09f11c327..4f24ab1e9 100644 --- a/trunk/src/utest/srs_utest_rtc.cpp +++ b/trunk/src/utest/srs_utest_rtc.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/utest/srs_utest_rtc.hpp b/trunk/src/utest/srs_utest_rtc.hpp index 1dde0f4ee..d62fb027d 100644 --- a/trunk/src/utest/srs_utest_rtc.hpp +++ b/trunk/src/utest/srs_utest_rtc.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_UTEST_RTC_HPP diff --git a/trunk/src/utest/srs_utest_rtmp.cpp b/trunk/src/utest/srs_utest_rtmp.cpp index 5279c7396..6eb3355bd 100644 --- a/trunk/src/utest/srs_utest_rtmp.cpp +++ b/trunk/src/utest/srs_utest_rtmp.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/utest/srs_utest_rtmp.hpp b/trunk/src/utest/srs_utest_rtmp.hpp index c3c20df9e..3a2cb536c 100644 --- a/trunk/src/utest/srs_utest_rtmp.hpp +++ b/trunk/src/utest/srs_utest_rtmp.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_UTEST_PROTO_STACK_HPP diff --git a/trunk/src/utest/srs_utest_service.cpp b/trunk/src/utest/srs_utest_service.cpp index 14ea28e09..ed77da08a 100644 --- a/trunk/src/utest/srs_utest_service.cpp +++ b/trunk/src/utest/srs_utest_service.cpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #include diff --git a/trunk/src/utest/srs_utest_service.hpp b/trunk/src/utest/srs_utest_service.hpp index 4da2e11e8..7929982ba 100644 --- a/trunk/src/utest/srs_utest_service.hpp +++ b/trunk/src/utest/srs_utest_service.hpp @@ -1,7 +1,7 @@ // // Copyright (c) 2013-2021 The SRS Authors // -// SPDX-License-Identifier: MIT +// SPDX-License-Identifier: MIT or MulanPSL-2.0 // #ifndef SRS_UTEST_SERVICE_HPP From 55ea0a62d36e65fff46e2fb752f692537f1a6edf Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 15 Jan 2022 09:02:14 +0800 Subject: [PATCH 3/3] Build: Disable c++11 and c++14 for CentOS 6.0 --- trunk/Dockerfile.builds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/Dockerfile.builds b/trunk/Dockerfile.builds index 73f113893..65e71df1a 100644 --- a/trunk/Dockerfile.builds +++ b/trunk/Dockerfile.builds @@ -22,7 +22,7 @@ RUN cd /srs/trunk && ./configure --jobs=2 --cxx11=off --cxx14=off --ffmpeg-fit=o ######################################################## FROM ossrs/srs:dev6 AS centos6-baseline COPY . /srs -RUN cd /srs/trunk && ./configure --jobs=2 && make -j2 +RUN cd /srs/trunk && ./configure --jobs=2 --cxx11=off --cxx14=off && make -j2 ######################################################## FROM ossrs/srs:dev8 AS centos8-baseline