Edge: Fix RTMP late-join missing sequence headers. v6.0.186 (#4678)

Backport of the RTMP late-join fix from v8.0.2 / v7.0.150 to the 6.0
release line. The HTTP-FLV inverted-guard bug from that fix does not
apply to v6 (the lazy edge-mount mechanism that introduced it does not
exist on this branch).

RTMP players that join an edge stream after the first player fail to
decode. After v6.0.179 (#4512) stopped creating SrsOriginHub on edge,
the hub_active gate in SrsLiveSource::consumer_dumps() always evaluated
false on edge. That gate guards the dump of cached onMetaData + AVC
sequence header + AAC sequence header + GOP cache to a new consumer.
Result: the first player attaches before the edge-pull starts and gets
headers via the live fan-out, but every subsequent player gets coded
payload with no codec config and ffmpeg aborts with `dimensions not set`
/ `Could not write header`. Fall back to the meta cache state when hub
is NULL, so the dump path runs once the edge-pull has populated the
cache. (trunk/src/app/srs_app_source.cpp)

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

.github/workflows/codeql-analysis.yml

@@ -9,7 +9,7 @@ permissions: write-all
 jobs:
   analyze:
     name: actions-codeql-analyze
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false

.github/workflows/release.yml

@@ -47,7 +47,7 @@ jobs:
       SRS_VERSION: ${{ env.SRS_VERSION }}
       SRS_MAJOR: ${{ env.SRS_MAJOR }}
       SRS_XYZ: ${{ env.SRS_XYZ }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   test:
     name: test
@@ -77,7 +77,7 @@ jobs:
           docker run --rm srs:test bash -c 'make && \
             ./objs/srs -c conf/regression-test.conf && \
             cd 3rdparty/srs-bench && make && ./objs/srs_test -test.v'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   draft:
     name: draft
@@ -93,81 +93,11 @@ jobs:
           allowUpdates: true
           tag: ${{ github.ref }}
           draft: true
-          prerelease: true
+          prerelease: false
     # Map a step output to a job output, see https://docs.github.com/en/actions/using-jobs/defining-outputs-for-jobs
     outputs:
       SRS_RELEASE_ID: ${{ steps.create_draft.outputs.id }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
-
-  cygwin64:
-    name: cygwin64
-    needs:
-      - envs
-      - draft
-    steps:
-      # See https://github.com/cygwin/cygwin-install-action#parameters
-      # Note that https://github.com/egor-tensin/setup-cygwin fails to install packages.
-      - name: Setup Cygwin
-        uses: cygwin/cygwin-install-action@006ad0b0946ca6d0a3ea2d4437677fa767392401 # master
-        with:
-          platform: x86_64
-          packages: bash make gcc-g++ cmake automake patch pkg-config tcl unzip
-          install-dir: C:\cygwin64
-      ##################################################################################################################
-      - name: Checkout repository
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
-      ##################################################################################################################
-      - name: Covert output to env
-        env:
-          SHELLOPTS: igncr
-        shell: C:\cygwin64\bin\bash.exe --login '{0}'
-        run: |
-          echo "SRS_TAG=${{ needs.envs.outputs.SRS_TAG }}" >> $GITHUB_ENV
-          echo "SRS_VERSION=${{ needs.envs.outputs.SRS_VERSION }}" >> $GITHUB_ENV
-          echo "SRS_MAJOR=${{ needs.envs.outputs.SRS_MAJOR }}" >> $GITHUB_ENV
-          echo "SRS_RELEASE_ID=${{ needs.draft.outputs.SRS_RELEASE_ID }}" >> $GITHUB_ENV
-      ##################################################################################################################
-      - name: Build SRS
-        env:
-          SHELLOPTS: igncr
-          SRS_WORKSPACE: ${{ github.workspace }}
-        shell: C:\cygwin64\bin\bash.exe --login '{0}'
-        run: |
-          export PATH=/usr/bin:/usr/local/bin &&
-          which make gcc g++ patch cmake pkg-config uname grep sed &&
-          (make --version; gcc --version; patch --version; cmake --version; pkg-config --version) && 
-          (aclocal --version; autoconf --version; automake --version; uname -a) &&
-          cd $(cygpath -u $SRS_WORKSPACE)/trunk && ./configure --gb28181=on --h265=on && make
-      ##################################################################################################################
-      - name: Package SRS
-        env:
-          SHELLOPTS: igncr
-          SRS_WORKSPACE: ${{ github.workspace }}
-        shell: C:\cygwin64\bin\bash.exe --login '{0}'
-        run: |
-          cd $(cygpath -u $SRS_WORKSPACE) &&
-          if [[ $(echo $SRS_TAG |grep -qE '^v' && echo YES) != YES ]]; then 
-              SRS_VERSION=$(./trunk/objs/srs -v 2>&1); echo "Change version to ${SRS_VERSION}"; 
-          fi &&
-          "/cygdrive/c/Program Files (x86)/NSIS/makensis.exe" /DSRS_VERSION=${SRS_VERSION} \
-              /DCYGWIN_DIR="C:\cygwin64" trunk/packaging/nsis/srs.nsi &&
-          mv trunk/packaging/nsis/SRS-Windows-x86_64-${SRS_VERSION}-setup.exe . && ls -lh *.exe &&
-          echo "SRS_CYGWIN_TAR=SRS-Windows-x86_64-${SRS_VERSION}-setup.exe" >> $GITHUB_ENV &&
-          echo "SRS_CYGWIN_MD5=$(md5sum SRS-Windows-x86_64-${SRS_VERSION}-setup.exe| awk '{print $1}')" >> $GITHUB_ENV
-      ##################################################################################################################
-      - name: Upload Release Assets Cygwin
-        id: upload-release-assets-cygwin
-        uses: dwenegar/upload-release-assets@5bc3024cf83521df8ebfadf00ad0c4614fd59148 # v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          release_id: ${{ env.SRS_RELEASE_ID }}
-          assets_path: ${{ env.SRS_CYGWIN_TAR }}
-    # Map a step output to a job output, see https://docs.github.com/en/actions/using-jobs/defining-outputs-for-jobs
-    outputs:
-      SRS_CYGWIN_TAR: ${{ env.SRS_CYGWIN_TAR }}
-      SRS_CYGWIN_MD5: ${{ env.SRS_CYGWIN_MD5 }}
-    runs-on: windows-latest
 
   linux:
     name: linux
@@ -237,7 +167,7 @@ jobs:
       SRS_PACKAGE_MD5: ${{ env.SRS_PACKAGE_MD5 }}
       SRS_SOURCE_TAR: ${{ env.SRS_SOURCE_TAR }}
       SRS_SOURCE_MD5: ${{ env.SRS_SOURCE_MD5 }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   docker-srs:
     name: docker-srs
@@ -280,7 +210,6 @@ jobs:
             --build-arg CONFARGS='--sanitizer=off --gb28181=on' \
             -f Dockerfile .
       # Docker alias images
-      # TODO: FIXME: If stable, please set the latest from 5.0 to 6.0
       - name: Docker alias images for ossrs/srs
         uses: akhilerm/tag-push-action@85bf542f43f5f2060ef76262a67ee3607cb6db37 # v2.1.0
         with:
@@ -291,7 +220,8 @@ jobs:
             ossrs/srs:v${{ env.SRS_MAJOR }}
             ossrs/srs:${{ env.SRS_XYZ }}
             ossrs/srs:v${{ env.SRS_XYZ }}
-    runs-on: ubuntu-20.04
+            ossrs/srs:latest
+    runs-on: ubuntu-22.04
 
   aliyun-srs:
     name: aliyun-srs
@@ -308,7 +238,6 @@ jobs:
           echo "SRS_MAJOR=${{ needs.envs.outputs.SRS_MAJOR }}" >> $GITHUB_ENV
           echo "SRS_XYZ=${{ needs.envs.outputs.SRS_XYZ }}" >> $GITHUB_ENV
       # Aliyun ACR
-      # TODO: FIXME: If stable, please set the latest from 5.0 to 6.0
       - name: Login aliyun hub
         uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a # v2.1.0
         with:
@@ -326,7 +255,8 @@ jobs:
             registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v${{ env.SRS_MAJOR }}
             registry.cn-hangzhou.aliyuncs.com/ossrs/srs:${{ env.SRS_XYZ }}
             registry.cn-hangzhou.aliyuncs.com/ossrs/srs:v${{ env.SRS_XYZ }}
-    runs-on: ubuntu-20.04
+            registry.cn-hangzhou.aliyuncs.com/ossrs/srs:latest
+    runs-on: ubuntu-22.04
 
   update:
     name: update
@@ -391,7 +321,7 @@ jobs:
               docker rmi -f $image
               echo "Remove image $image, r0=$?"
             done
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   release:
     name: release
@@ -399,7 +329,6 @@ jobs:
       - update
       - envs
       - draft
-      - cygwin64
       - linux
     steps:
       ##################################################################################################################
@@ -408,20 +337,17 @@ jobs:
           echo "SRS_TAG=${{ needs.envs.outputs.SRS_TAG }}" >> $GITHUB_ENV
           echo "SRS_VERSION=${{ needs.envs.outputs.SRS_VERSION }}" >> $GITHUB_ENV
           echo "SRS_MAJOR=${{ needs.envs.outputs.SRS_MAJOR }}" >> $GITHUB_ENV
+          echo "SRS_XYZ=${{ needs.envs.outputs.SRS_XYZ }}" >> $GITHUB_ENV
           echo "SRS_RELEASE_ID=${{ needs.draft.outputs.SRS_RELEASE_ID }}" >> $GITHUB_ENV
           echo "SRS_PACKAGE_ZIP=${{ needs.linux.outputs.SRS_PACKAGE_ZIP }}" >> $GITHUB_ENV
           echo "SRS_PACKAGE_MD5=${{ needs.linux.outputs.SRS_PACKAGE_MD5 }}" >> $GITHUB_ENV
           echo "SRS_SOURCE_TAR=${{ needs.linux.outputs.SRS_SOURCE_TAR }}" >> $GITHUB_ENV
           echo "SRS_SOURCE_MD5=${{ needs.linux.outputs.SRS_SOURCE_MD5 }}" >> $GITHUB_ENV
-          echo "SRS_CYGWIN_TAR=${{ needs.cygwin64.outputs.SRS_CYGWIN_TAR }}" >> $GITHUB_ENV
-          echo "SRS_CYGWIN_MD5=${{ needs.cygwin64.outputs.SRS_CYGWIN_MD5 }}" >> $GITHUB_ENV
       ##################################################################################################################
       # Git checkout
       - name: Checkout repository
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
       # Create release.
-      # TODO: FIXME: Refine the release when 6.0 released
-      # TODO: FIXME: Change prerelease to false and makeLatest to true when 6.0 released
       - name: Update release
         id: update_release
         uses: ncipollo/release-action@a2e71bdd4e7dab70ca26a852f29600c98b33153e # v1.12.0
@@ -440,39 +366,37 @@ jobs:
             ## Resource
             * Source: ${{ env.SRS_SOURCE_MD5 }} [${{ env.SRS_SOURCE_TAR }}](https://github.com/ossrs/srs/releases/download/${{ env.SRS_TAG }}/${{ env.SRS_SOURCE_TAR }})
             * Binary: ${{ env.SRS_PACKAGE_MD5 }} [${{ env.SRS_PACKAGE_ZIP }}](https://github.com/ossrs/srs/releases/download/${{ env.SRS_TAG }}/${{ env.SRS_PACKAGE_ZIP }})
-            * Binary: ${{ env.SRS_CYGWIN_MD5 }} [${{ env.SRS_CYGWIN_TAR }}](https://github.com/ossrs/srs/releases/download/${{ env.SRS_TAG }}/${{ env.SRS_CYGWIN_TAR }})
 
             ## Resource Mirror: gitee.com
             * Source: ${{ env.SRS_SOURCE_MD5 }} [${{ env.SRS_SOURCE_TAR }}](https://gitee.com/ossrs/srs/releases/download/${{ env.SRS_TAG }}/${{ env.SRS_SOURCE_TAR }})
             * Binary: ${{ env.SRS_PACKAGE_MD5 }} [${{ env.SRS_PACKAGE_ZIP }}](https://gitee.com/ossrs/srs/releases/download/${{ env.SRS_TAG }}/${{ env.SRS_PACKAGE_ZIP }})
-            * Binary: ${{ env.SRS_CYGWIN_MD5 }} [${{ env.SRS_CYGWIN_TAR }}](https://gitee.com/ossrs/srs/releases/download/${{ env.SRS_TAG }}/${{ env.SRS_CYGWIN_TAR }})
             
             ## Docker
-            * [docker pull ossrs/srs:${{ env.SRS_MAJOR }}](https://ossrs.io/lts/en-us/docs/v5/doc/getting-started)
+            * [docker pull ossrs/srs:${{ env.SRS_MAJOR }}](https://ossrs.io/lts/en-us/docs/v6/doc/getting-started)
-            * [docker pull ossrs/srs:${{ env.SRS_TAG }}](https://ossrs.io/lts/en-us/docs/v5/doc/getting-started)
+            * [docker pull ossrs/srs:${{ env.SRS_TAG }}](https://ossrs.io/lts/en-us/docs/v6/doc/getting-started)
-            * [docker pull ossrs/srs:${{ env.SRS_XYZ }}](https://ossrs.io/lts/en-us/docs/v5/doc/getting-started)
+            * [docker pull ossrs/srs:${{ env.SRS_XYZ }}](https://ossrs.io/lts/en-us/docs/v6/doc/getting-started)
             
             ## Docker Mirror: aliyun.com
-            * [docker pull registry.cn-hangzhou.aliyuncs.com/ossrs/srs:${{ env.SRS_MAJOR }}](https://ossrs.net/lts/zh-cn/docs/v5/doc/getting-started)
+            * [docker pull registry.cn-hangzhou.aliyuncs.com/ossrs/srs:${{ env.SRS_MAJOR }}](https://ossrs.net/lts/zh-cn/docs/v6/doc/getting-started)
-            * [docker pull registry.cn-hangzhou.aliyuncs.com/ossrs/srs:${{ env.SRS_TAG }}](https://ossrs.net/lts/zh-cn/docs/v5/doc/getting-started)
+            * [docker pull registry.cn-hangzhou.aliyuncs.com/ossrs/srs:${{ env.SRS_TAG }}](https://ossrs.net/lts/zh-cn/docs/v6/doc/getting-started)
-            * [docker pull registry.cn-hangzhou.aliyuncs.com/ossrs/srs:${{ env.SRS_XYZ }}](https://ossrs.net/lts/zh-cn/docs/v5/doc/getting-started)
+            * [docker pull registry.cn-hangzhou.aliyuncs.com/ossrs/srs:${{ env.SRS_XYZ }}](https://ossrs.net/lts/zh-cn/docs/v6/doc/getting-started)
             
             ## Doc: ossrs.io
-            * [Getting Started](https://ossrs.io/lts/en-us/docs/v5/doc/getting-started)
+            * [Getting Started](https://ossrs.io/lts/en-us/docs/v6/doc/getting-started)
-            * [Wiki home](https://ossrs.io/lts/en-us/docs/v5/doc/introduction)
+            * [Wiki home](https://ossrs.io/lts/en-us/docs/v6/doc/introduction)
             * [FAQ](https://ossrs.io/lts/en-us/faq), [Features](https://github.com/ossrs/srs/blob/${{ github.sha }}/trunk/doc/Features.md#features) or [ChangeLogs](https://github.com/ossrs/srs/blob/${{ github.sha }}/trunk/doc/CHANGELOG.md#changelog)
             
             ## Doc: ossrs.net
-            * [快速入门](https://ossrs.net/lts/zh-cn/docs/v5/doc/getting-started)
+            * [快速入门](https://ossrs.net/lts/zh-cn/docs/v6/doc/getting-started)
-            * [中文Wiki首页](https://ossrs.net/lts/zh-cn/docs/v5/doc/introduction)
+            * [中文Wiki首页](https://ossrs.net/lts/zh-cn/docs/v6/doc/introduction)
             * [中文FAQ](https://ossrs.net/lts/zh-cn/faq), [功能列表](https://github.com/ossrs/srs/blob/${{ github.sha }}/trunk/doc/Features.md#features) 或 [修订历史](https://github.com/ossrs/srs/blob/${{ github.sha }}/trunk/doc/CHANGELOG.md#changelog)
           draft: false
-          prerelease: true
+          prerelease: false
-          makeLatest: false
+          makeLatest: true
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   release-done:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs:
       - update
       - release

.github/workflows/test.yml

@@ -40,12 +40,12 @@ jobs:
               bash -c "bash /srs/convert.sh && tar cf /srs/objs.tar.bz2 objs" &&
           pwd && du -sh *
       ##################################################################################################################
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
+      - uses: actions/upload-artifact@v4
         with:
           name: srs-cache
           path: objs.tar.bz2
           retention-days: 1
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   cygwin64:
     name: cygwin64
@@ -65,10 +65,11 @@ jobs:
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
       ##################################################################################################################
       # Note that we must download artifact after checkout code, because it will change the files in workspace.
-      - uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+      - uses: actions/download-artifact@v4
         with:
           name: srs-cache
-      - uses: geekyeggo/delete-artifact@54ab544f12cdb7b71613a16a2b5a37a9ade990af # v2.0.0
+      # https://github.com/marketplace/actions/delete-artifact?version=v5.0.0#-compatibility
+      - uses: geekyeggo/delete-artifact@v5.0.0
         with:
           name: srs-cache
       ##################################################################################################################
@@ -103,7 +104,7 @@ jobs:
         run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target centos7-no-asm .
       - name: Build on CentOS7, C++98, no FFmpeg
         run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target centos7-ansi-no-ffmpeg .
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   build-ubuntu16:
     name: build-ubuntu16
@@ -117,7 +118,7 @@ jobs:
         run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-baseline .
       - name: Build on Ubuntu16, with all features
         run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-all .
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   build-ubuntu18:
     name: build-ubuntu18
@@ -131,7 +132,7 @@ jobs:
         run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu18-baseline .
       - name: Build on Ubuntu18, with all features
         run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu18-all .
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   build-ubuntu20:
     name: build-ubuntu20
@@ -145,7 +146,7 @@ jobs:
         run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-baseline .
       - name: Build on Ubuntu20, with all features
         run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-all .
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   build-cross-arm:
     name: build-cross-arm
@@ -158,7 +159,7 @@ jobs:
         run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cache-cross-armv7 .
       - name: Cross Build for ARMv7 on Ubuntu20
         run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cache-cross-armv7 .
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   build-cross-aarch64:
     name: build-cross-aarch64
@@ -171,7 +172,7 @@ jobs:
         run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cache-cross-aarch64 .
       - name: Cross Build for AARCH64 on Ubuntu20
         run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cache-cross-aarch64 .
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   test:
     name: utest-regression-blackbox-test
@@ -200,7 +201,7 @@ jobs:
           docker run --rm srs:test bash -c './objs/srs -c conf/regression-test.conf && \
               cd 3rdparty/srs-bench && (./objs/srs_test -test.v || (cat ../../objs/srs.log && exit 1)) && \
               ./objs/srs_gb28181_test -test.v'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   coverage:
     name: coverage
@@ -233,7 +234,7 @@ jobs:
             --env SRS_PR=$SRS_PR --env SRS_SHA=$SRS_SHA --env SRS_PROJECT=$SRS_PROJECT \
             srs:cov bash -c './objs/srs_utest && bash auto/codecov.sh'
           #
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   multiple-arch-armv7:
     name: multiple-arch-armv7
@@ -254,7 +255,7 @@ jobs:
             --build-arg IMAGE=ossrs/srs:ubuntu20-cache \
             --build-arg INSTALLDEPENDS="NO" \
             -f Dockerfile .
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   multiple-arch-aarch64:
     name: multiple-arch-aarch64
@@ -275,7 +276,7 @@ jobs:
             --build-arg IMAGE=ossrs/srs:ubuntu20-cache \
             --build-arg INSTALLDEPENDS="NO" \
             -f Dockerfile .
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   multiple-arch-amd64:
     name: multiple-arch-amd64
@@ -297,7 +298,7 @@ jobs:
             --output "type=image,push=false" \
             --build-arg IMAGE=ossrs/srs:ubuntu20-cache \
             -f Dockerfile .
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   fast:
     name: fast
@@ -305,7 +306,7 @@ jobs:
       - cygwin64-cache
     steps:
       - run: echo 'Start fast jobs'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
   test-done:
     needs:
@@ -321,7 +322,7 @@ jobs:
       - multiple-arch-armv7
       - multiple-arch-aarch64
       - multiple-arch-amd64
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - run: echo 'All done'
 

.gitignore

@@ -43,3 +43,6 @@ cmake-build-debug
 /trunk/ide/srs_clion/cmake_install.cmake
 /trunk/ide/srs_clion/srs
 /trunk/ide/srs_clion/Testing/
+
+/proxy
+/trunk/ide/vscode-build

.run/private.run.xml

@@ -1,7 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="private" type="CMakeRunConfiguration" factoryName="Application" PROGRAM_PARAMS="-c console.conf" REDIRECT_INPUT="false" ELEVATE="false" USE_EXTERNAL_CONSOLE="false" WORKING_DIR="file://$CMakeCurrentBuildDir$/../../../" PASS_PARENT_ENVS_2="true" PROJECT_NAME="srs" TARGET_NAME="srs" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="srs" RUN_TARGET_NAME="srs">
     <envs>
-      <env name="SRS_RTC_SERVER_ENABLED" value="on" />
       <env name="MallocNanoZone" value="0" />
     </envs>
     <method v="2">

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2024 The SRS Authors
+Copyright (c) 2013-2025 The SRS Authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

README.md

@@ -122,6 +122,12 @@ distributed under their [licenses](https://ossrs.io/lts/en-us/license).
 
 ## Releases
 
+* 2025-12-03, [Release v6.0-r0](https://github.com/ossrs/srs/releases/tag/v6.0-r0), v6.0-r0, 6.0 release0, v6.0.184, 170962 lines.
+* 2025-11-03, [Release v6.0-b3](https://github.com/ossrs/srs/releases/tag/v6.0-b3), v6.0-b3, 6.0 beta3, v6.0.183, 170957 lines.
+* 2025-10-16, [Release v6.0-b2](https://github.com/ossrs/srs/releases/tag/v6.0-b2), v6.0-b2, 6.0 beta2, v6.0.181, 170948 lines.
+* 2025-09-15, [Release v6.0-b1](https://github.com/ossrs/srs/releases/tag/v6.0-b1), v6.0-b1, 6.0 beta1, v6.0.177, 170611 lines.
+* 2025-08-12, [Release v6.0-b0](https://github.com/ossrs/srs/releases/tag/v6.0-b0), v6.0-b0, 6.0 beta0, v6.0.172, 170417 lines.
+* 2024-09-01, [Release v6.0-a1](https://github.com/ossrs/srs/releases/tag/v6.0-a1), v6.0-a1, 6.0 alpha1, v6.0.155, 169636 lines.
 * 2024-07-27, [Release v6.0-a0](https://github.com/ossrs/srs/releases/tag/v6.0-a0), v6.0-a0, 6.0 alpha0, v6.0.145, 169259 lines.
 * 2024-07-04, [Release v6.0-d6](https://github.com/ossrs/srs/releases/tag/v6.0-d6), v6.0-d6, 6.0 dev6, v6.0.134, 168904 lines.
 * 2024-06-15, [Release v6.0-d5](https://github.com/ossrs/srs/releases/tag/v6.0-d5), v6.0-d5, 6.0 dev5, v6.0.129, 168454 lines.

trunk/3rdparty/httpx-static/main.go

@@ -1,7 +1,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2019 winlin
+Copyright (c) 2025 winlin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

trunk/3rdparty/httpx-static/main_test.go

@@ -1,7 +1,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2019 winlin
+Copyright (c) 2025 winlin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

trunk/3rdparty/httpx-static/mcerts.go

@@ -1,7 +1,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2019 winlin
+Copyright (c) 2025 winlin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

trunk/3rdparty/httpx-static/vendor/github.com/ossrs/go-oryx-lib/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2017 winlin
+Copyright (c) 2013-2025 winlin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

trunk/3rdparty/httpx-static/version.go

@@ -1,7 +1,7 @@
 /*
 The MIT License (MIT)
 
-Copyright (c) 2019 winlin
+Copyright (c) 2025 winlin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

trunk/3rdparty/signaling/main.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// Copyright (c) 2021 Winlin
+// Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/signaling/vendor/github.com/ossrs/go-oryx-lib/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2017 winlin
+Copyright (c) 2013-2025 winlin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

trunk/3rdparty/signaling/www/demos/js/srs.sdk.js

@@ -2,7 +2,7 @@
 /**
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2021 Winlin
+ * Copyright (c) 2013-2025 Winlin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/signaling/www/demos/js/srs.sig.js

@@ -2,7 +2,7 @@
 /**
  * The MIT License (MIT)
  *
- * Copyright (c) 2013-2021 Winlin
+ * Copyright (c) 2013-2025 Winlin
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Winlin
+Copyright (c) 2025 Winlin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/blackbox/blackbox.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2023 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/blackbox/blackbox_test.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2023 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/blackbox/dvr_test.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2023 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/blackbox/hevc_test.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2023 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/blackbox/hls_test.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2023 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/blackbox/http_api_test.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2023 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/blackbox/mp3_test.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2023 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/blackbox/rtmp_test.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2023 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/blackbox/srt_test.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2023 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/blackbox/util.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2023 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/gb28181/gb28181.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2022-2024 Winlin
+// # Copyright (c) 2022-2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/gb28181/gb28181_test.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2022-2024 Winlin
+// # Copyright (c) 2022-2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/gb28181/gb_test.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2022-2024 Winlin
+// # Copyright (c) 2022-2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/gb28181/ingester.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2022-2024 Winlin
+// # Copyright (c) 2022-2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/gb28181/ps.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2022-2024 Winlin
+// # Copyright (c) 2022-2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/gb28181/sip.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2022-2024 Winlin
+// # Copyright (c) 2022-2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/gb28181/util.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2022-2024 Winlin
+// # Copyright (c) 2022-2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/janus/api.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/janus/ingester.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/janus/interceptor.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/janus/janus.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/janus/player.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/janus/publisher.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/janus/util.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/janus/util2.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/live/live.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/live/publisher.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/live/stat.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/main.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/srs/api.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/srs/ingester.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/srs/interceptor.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/srs/player.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/srs/publisher.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/srs/rtc_test.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/srs/rtmp_test.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/srs/srs.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/srs/srs_test.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/srs/stat.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/srs/util.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/vendor/github.com/ossrs/go-oryx-lib/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2013-2017 winlin
+Copyright (c) 2013-2025 winlin
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

trunk/3rdparty/srs-bench/vnet/example_udpproxy_test.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/srs-bench/vnet/vnet.go

@@ -1,6 +1,6 @@
 // The MIT License (MIT)
 //
-// # Copyright (c) 2021 Winlin
+// # Copyright (c) 2025 Winlin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy of
 // this software and associated documentation files (the "Software"), to deal in

trunk/3rdparty/st-srs/tools/backtrace/backtrace.c

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: MIT */
-/* Copyright (c) 2013-2024 The SRS Authors */
+/* Copyright (c) 2013-2025 The SRS Authors */
 
 #ifdef __linux__
 #define _GNU_SOURCE

trunk/3rdparty/st-srs/tools/helloworld/helloworld.c

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: MIT */
-/* Copyright (c) 2013-2024 The SRS Authors */
+/* Copyright (c) 2013-2025 The SRS Authors */
 
 #include <stdio.h>
 

trunk/3rdparty/st-srs/tools/jmpbuf/jmpbuf.c

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: MIT */
-/* Copyright (c) 2022 Winlin */
+/* Copyright (c) 2025 Winlin */
 
 #include <stdio.h>
 #include <setjmp.h>

trunk/3rdparty/st-srs/tools/pcs/pcs.c

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: MIT */
-/* Copyright (c) 2022 Winlin */
+/* Copyright (c) 2025 Winlin */
 
 void foo() {
 }

trunk/3rdparty/st-srs/tools/porting/porting.c

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: MIT */
-/* Copyright (c) 2013-2024 The SRS Authors */
+/* Copyright (c) 2013-2025 The SRS Authors */
 
 #include <stdio.h>
 #include <setjmp.h>

trunk/3rdparty/st-srs/tools/stack/stack.c

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: MIT */
-/* Copyright (c) 2022 Winlin */
+/* Copyright (c) 2025 Winlin */
 
 long foo() {
     char c;

trunk/3rdparty/st-srs/tools/verify/verify.c

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: MIT */
-/* Copyright (c) 2013-2024 The SRS Authors */
+/* Copyright (c) 2013-2025 The SRS Authors */
 
 #include <stdio.h>
 

trunk/3rdparty/st-srs/utest/st_utest.cpp

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: MIT */
-/* Copyright (c) 2013-2024 The SRS Authors */
+/* Copyright (c) 2013-2025 The SRS Authors */
 
 #include <st_utest.hpp>
 

trunk/3rdparty/st-srs/utest/st_utest.hpp

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: MIT */
-/* Copyright (c) 2013-2024 The SRS Authors */
+/* Copyright (c) 2013-2025 The SRS Authors */
 
 #ifndef ST_UTEST_PUBLIC_HPP
 #define ST_UTEST_PUBLIC_HPP

trunk/3rdparty/st-srs/utest/st_utest_coroutines.cpp

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: MIT */
-/* Copyright (c) 2013-2024 The SRS Authors */
+/* Copyright (c) 2013-2025 The SRS Authors */
 
 #include <st_utest.hpp>
 

trunk/3rdparty/st-srs/utest/st_utest_tcp.cpp

@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: MIT */
-/* Copyright (c) 2013-2024 The SRS Authors */
+/* Copyright (c) 2013-2025 The SRS Authors */
 
 #include <st_utest.hpp>
 

trunk/Dockerfile.test

@@ -18,7 +18,7 @@ WORKDIR /srs/trunk
 # Note that we must enable the gcc7 or link failed.
 # Please note that we must disable the ffmpeg-opus, as it negatively impacts performance. We may consider
 # enabling it in the future when support for multi-threading transcoding is available.
-RUN ./configure --srt=on --gb28181=on --srt=on --apm=on --h265=on --utest=on --ffmpeg-opus=off --build-cache=on
+RUN ./configure --srt=on --gb28181=on --srt=on --apm=on --h265=on --utest=on --sanitizer=on --ffmpeg-opus=off --build-cache=on
 RUN make utest ${MAKEARGS}
 
 # Build benchmark tool.

trunk/auto/auto_headers.sh

@@ -171,6 +171,11 @@ if [ $SRS_SANITIZER_LOG == YES ]; then
 else
     srs_undefine_macro "SRS_SANITIZER_LOG" $SRS_AUTO_HEADERS_H
 fi
+if [ $SRS_VALGRIND == YES ]; then
+    srs_define_macro "SRS_VALGRIND" $SRS_AUTO_HEADERS_H
+else
+    srs_undefine_macro "SRS_VALGRIND" $SRS_AUTO_HEADERS_H
+fi
 
 #####################################################################################
 # for embeded.
@@ -196,6 +201,11 @@ if [[ $SRS_SINGLE_THREAD == YES ]]; then
 else
     srs_undefine_macro "SRS_SINGLE_THREAD" $SRS_AUTO_HEADERS_H
 fi
+if [[ $SRS_SIGNAL_API == YES ]]; then
+    srs_define_macro "SRS_SIGNAL_API" $SRS_AUTO_HEADERS_H
+else
+    srs_undefine_macro "SRS_SIGNAL_API" $SRS_AUTO_HEADERS_H
+fi
 if [[ $SRS_LOG_LEVEL_V2 == YES ]]; then
     srs_define_macro "SRS_LOG_LEVEL_V2" $SRS_AUTO_HEADERS_H
 else

trunk/auto/depends.sh

@@ -671,6 +671,11 @@ fi
 if [[ $SRS_SRT == YES && $SRS_USE_SYS_SRT == NO ]]; then
     # Always disable c++11 for libsrt, because only the srt-app requres it.
     LIBSRT_OPTIONS="--enable-apps=0  --enable-static=1 --enable-c++11=0"
+    CMAKE_VERSION=$(cmake --version | head -n1 | cut -d' ' -f3)
+    CMAKE_MAJOR=$(echo $CMAKE_VERSION | cut -d'.' -f1)
+    if [[ $CMAKE_MAJOR -ge 4 ]]; then
+        LIBSRT_OPTIONS="$LIBSRT_OPTIONS --CMAKE_POLICY_VERSION_MINIMUM=3.5"
+    fi
     if [[ $SRS_SHARED_SRT == YES ]]; then
         LIBSRT_OPTIONS="$LIBSRT_OPTIONS --enable-shared=1"
     else

trunk/auto/options.sh

@@ -85,6 +85,7 @@ SRS_CLEAN=YES # Whether do "make clean" when configure.
 SRS_SIMULATOR=NO # Whether enable RTC simulate API.
 SRS_GENERATE_OBJS=NO # Whether generate objs and quit.
 SRS_SINGLE_THREAD=YES # Whether force single thread mode.
+SRS_SIGNAL_API=NO # Use http API to simulate sending signal to SRS, for debugging.
 #
 ################################################################
 # Performance options.
@@ -235,6 +236,7 @@ Experts:
   --simulator=on|off        RTC: Whether enable network simulator. Default: $(value2switch $SRS_SIMULATOR)
   --generate-objs=on|off    RTC: Whether generate objs and quit. Default: $(value2switch $SRS_GENERATE_OBJS)
   --single-thread=on|off    Whether force single thread mode. Default: $(value2switch $SRS_SINGLE_THREAD)
+  --signal-api=on|off       Whether support sending signal by HTTP API. Default: $(value2switch $SRS_SIGNAL_API)
   --build-tag=<TAG>         Set the build object directory suffix.
   --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)
@@ -339,6 +341,7 @@ function parse_user_option() {
         --simulator)                    SRS_SIMULATOR=$(switch2value $value) ;;
         --generate-objs)                SRS_GENERATE_OBJS=$(switch2value $value) ;;
         --single-thread)                SRS_SINGLE_THREAD=$(switch2value $value) ;;
+        --signal-api)                   SRS_SIGNAL_API=$(switch2value $value) ;;
         --ffmpeg-fit)                   SRS_FFMPEG_FIT=$(switch2value $value) ;;
         --ffmpeg-opus)                  SRS_FFMPEG_OPUS=$(switch2value $value) ;;
         --h265)                         SRS_H265=$(switch2value $value) ;;
@@ -546,6 +549,10 @@ function apply_auto_options() {
         SRS_SANITIZER=YES
     fi
 
+    if [[ $SRS_SANITIZER == RESERVED && $SRS_UTEST == YES ]]; then
+        SRS_SANITIZER=YES
+    fi
+
     # If enable gperf, disable sanitizer.
     if [[ $SRS_GPERF == YES && $SRS_SANITIZER == YES ]]; then
         echo "Disable sanitizer for gperf"
@@ -681,6 +688,7 @@ function regenerate_options() {
     SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --sanitizer-log=$(value2switch $SRS_SANITIZER_LOG)"
     SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --cygwin64=$(value2switch $SRS_CYGWIN64)"
     SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --single-thread=$(value2switch $SRS_SINGLE_THREAD)"
+    SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --signal-api=$(value2switch $SRS_SIGNAL_API)"
     SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --generic-linux=$(value2switch $SRS_GENERIC_LINUX)"
     SRS_AUTO_CONFIGURE="${SRS_AUTO_CONFIGURE} --build-cache=$(value2switch $SRS_BUILD_CACHE)"
     if [[ $SRS_CROSS_BUILD_ARCH != "" ]]; then SRS_AUTO_CONFIGURE="$SRS_AUTO_CONFIGURE --arch=$SRS_CROSS_BUILD_ARCH"; fi

trunk/conf/edge.conf

@@ -12,6 +12,26 @@ http_server {
     listen          8080;
     dir             ./objs/nginx/html;
 }
+http_api {
+    enabled         on;
+    listen          1985;
+}
+
+# Edge does not support WebRTC, so even if enabled in config, 
+# it will be automatically disabled at runtime.
+rtc_server {
+    enabled on;
+    listen 8000;
+    candidate $CANDIDATE;
+}
+
+# Edge does not support SRT, so even if enabled in config, 
+# it will be automatically disabled at runtime.
+srt_server {
+    enabled on;
+    listen 10080;
+}
+
 vhost __defaultVhost__ {
     cluster {
         mode            remote;
@@ -21,4 +41,50 @@ vhost __defaultVhost__ {
         enabled     on;
         mount       [vhost]/[app]/[stream].flv;
     }
+
+    # Edge does not support WebRTC, so even if enabled in config, 
+    # it will be automatically disabled at runtime.
+    rtc {
+        enabled     on;
+        rtmp_to_rtc on;
+        rtc_to_rtmp on;
+    }
+
+    # Edge does not support SRT, so even if enabled in config, 
+    # it will be automatically disabled at runtime.
+    srt {
+        enabled     on;
+        srt_to_rtmp on;
+    }
+
+    # Edge does not support HDS, so even if enabled in config, 
+    # it will be automatically disabled at runtime.
+    hds {
+        enabled         on;
+    }
+
+    # Edge does not support HLS, so even if enabled in config, 
+    # it will be automatically disabled at runtime.
+    hls {
+        enabled         on;
+    }
+
+    # Edge does not support MPEG-DASH, so even if enabled in config, 
+    # it will be automatically disabled at runtime.
+    dash {
+        enabled         on;
+    }
+
+    # Edge does not support forwarding, so even if enabled in config, 
+    # it will be automatically disabled at runtime.
+    forward {
+        enabled on;
+        destination 127.0.0.1:19350;
+    }
+
+    # Edge does not support DVR, so even if enabled in config, 
+    # it will be automatically disabled at runtime.
+    dvr {
+        enabled      on;
+    }
 }

trunk/conf/full.conf

@@ -338,6 +338,12 @@ srt_server {
     # Overwrite by env SRS_SRT_SERVER_DEFAULT_APP
     # default: live
     default_app live;
+    # Default streamid when client doesn't provide one.
+    # This is used when SRT client connects without setting SRTO_STREAMID socket option.
+    # The streamid format follows SRT standard: #!::r=app/stream,m=publish|request
+    # Overwrite by env SRS_SRT_SERVER_DEFAULT_STREAMID
+    # default: #!::r=live/livestream,m=publish
+    default_streamid "#!::r=live/livestream,m=publish";
 	# The peerlatency is set by the sender side and will notify the receiver side.
     # Overwrite by env SRS_SRT_SERVER_PEERLATENCY
     # default: 0
@@ -907,6 +913,14 @@ heartbeat {
     # Overwrite by env SRS_HEARTBEAT_SUMMARIES
     # default: off
     summaries off;
+    # Whether report with listen ports.
+    # if on, request with the ports of SRS:
+    #   {
+    #       "rtmp": ["1935"], "http": ["8080"], "api": ["1985"], "srt": ["10080"], "rtc": ["8000"]
+    #   }
+    # Overwrite by env SRS_HEARTBEAT_PORTS
+    # default: off
+    ports off;
 }
 
 # system statistics section.

trunk/conf/srt.conf

@@ -28,6 +28,7 @@ srt_server {
     tlpktdrop off;
     sendbuf 2000000;
     recvbuf 2000000;
+    default_streamid "#!::r=live/livestream,m=publish";
 }
 
 # @doc https://github.com/ossrs/srs/issues/1147#issuecomment-577607026

trunk/conf/srt.vlc.conf

@@ -0,0 +1,54 @@
+# SRT config.
+
+listen              1935;
+max_connections     1000;
+daemon              off;
+srs_log_tank        console;
+
+http_api {
+    enabled         on;
+    listen          1985;
+}
+
+http_server {
+    enabled         on;
+    listen          8080;
+    dir             ./objs/nginx/html;
+}
+
+srt_server {
+    enabled on;
+    listen 10080;
+    maxbw 1000000000;
+    connect_timeout 4000;
+    peerlatency 0;
+    recvlatency 0;
+    latency 0;
+    tsbpdmode off;
+    tlpktdrop off;
+    sendbuf 2000000;
+    recvbuf 2000000;
+    default_streamid "#!::r=live/livestream,m=request";
+}
+
+# @doc https://github.com/ossrs/srs/issues/1147#issuecomment-577607026
+vhost __defaultVhost__ {
+    srt {
+        enabled     on;
+        srt_to_rtmp on;
+    }
+
+    http_remux {
+        enabled     on;
+        mount       [vhost]/[app]/[stream].flv;
+    }
+}
+
+# For SRT to use vhost.
+vhost srs.srt.com.cn {
+}
+
+stats {
+    network         0;
+    disk            sda sdb xvda xvdb;
+}

trunk/configure

@@ -268,7 +268,7 @@ fi
 MODULE_ID="CORE"
 MODULE_DEPENDS=()
 ModuleLibIncs=(${SRS_OBJS})
-MODULE_FILES=("srs_core" "srs_core_version" "srs_core_version5" "srs_core_autofree" "srs_core_performance"
+MODULE_FILES=("srs_core" "srs_core_version" "srs_core_version6" "srs_core_autofree" "srs_core_performance"
 		"srs_core_time" "srs_core_platform" "srs_core_deprecated")
 CORE_INCS="src/core"; MODULE_DIR=${CORE_INCS} . $SRS_WORKDIR/auto/modules.sh
 CORE_OBJS="${MODULE_OBJS[@]}"

trunk/doc/CHANGELOG.md

@@ -7,6 +7,47 @@ The changelog for SRS.
 <a name="v6-changes"></a>
 
 ## SRS 6.0 Changelog
+* v6.0, 2026-05-19, Merge [#4678](https://github.com/ossrs/srs/pull/4678): Edge: Fix RTMP late-join missing sequence headers. v6.0.186 (#4678)
+* v6.0, 2025-12-06, Merge [#4605](https://github.com/ossrs/srs/pull/4605): DVR: Fix HEVC mp4 recording error. v6.0.185 (#4605)
+* v6.0, 2025-12-03, Merge [#4588](https://github.com/ossrs/srs/pull/4588): RTMP: Ignore FMLE start packet after flash publish. v6.0.184 (#4588)
+* v6.0, 2025-10-21, Merge [#4535](https://github.com/ossrs/srs/issues/4535): Bridge: Fix heap-use-after-free in SrsCompositeBridge iterator. v6.0.183 (#4535)
+* v6.0, 2025-10-17, Merge [#4534](https://github.com/ossrs/srs/pull/4534): HLS: Fix a iterator bug in hls_ctx cleanup function. v6.0.182 (#4534)
+* v6.0, 2025-10-14, Disable sanitizer by default to fix memory leak. (#4364) v6.0.181
+* v6.0, 2025-10-01, SRT: Support configurable default_streamid option. v6.0.180
+* v6.0, 2025-09-27, For Edge, only support RTMP or HTTP-FLV. v6.0.179 (#4512)
+* v6.0, 2025-09-20, Fix WHIP with transcoding bug. v6.0.178 (#4495)
+* v6.0, 2025-09-15, RTC2RTMP: Fix sequence number wraparound assertion crashes. v6.0.177 (#4491)
+* v6.0, 2025-09-05, RTX: Fix race condition for timer. v6.0.176 (#4470) (#4474)
+* v6.0, 2025-08-26, Merge [#4451](https://github.com/ossrs/srs/pull/4451): RTC: Fix null pointer crash in RTC2RTMP when start packet is missing. v6.0.175 (#4451)
+* v6.0, 2025-08-16, Merge [#4441](https://github.com/ossrs/srs/pull/4441): fix err memory leak in rtc to rtmp bridge. v6.0.174 (#4441)
+* v6.0, 2025-08-14, Merge [#4161](https://github.com/ossrs/srs/pull/4161): fix hls & dash segments cleanup. v6.0.173 (#4161)
+* v6.0, 2025-08-12, Merge [#4230](https://github.com/ossrs/srs/pull/4230): MP4 DVR: Fix audio/video synchronization issues in WebRTC recordings. v6.0.172 (#4230)
+* v6.0, 2025-08-11, Merge [#4432](https://github.com/ossrs/srs/pull/4432): AI: HTTP-FLV: Fix heap-use-after-free crash during stream unmount. v6.0.171 (#4432)
+* v6.0, 2025-07-28, Merge [#4245](https://github.com/ossrs/srs/pull/4245): Allow Forward to be configured with Env Var. v6.0.170 (#4245)
+* v6.0, 2025-07-10, Merge [#4414](https://github.com/ossrs/srs/pull/4414): Fix H.264 B-frame detection logic to comply with specification. v6.0.169 (#4414)
+* v6.0, 2025-06-04, Merge [#4325](https://github.com/ossrs/srs/pull/4325): fix bug: loop transcoding #3516. v6.0.168 (#4325)
+* v6.0, 2025-05-29, Merge [#4356](https://github.com/ossrs/srs/pull/4356): RTMP: Use extended timestamp as delta when chunk fmt=1/2. v6.0.167 (#4356)
+* v6.0, 2025-03-21, Merge [#4303](https://github.com/ossrs/srs/pull/4303): replace values with enums. v6.0.165 (#4303)
+* v6.0, 2025-03-20, Merge [#4305](https://github.com/ossrs/srs/pull/4305): free sample to prevent memory leak. v6.0.164 (#4305)
+* v6.0, 2025-03-18, Merge [#4302](https://github.com/ossrs/srs/pull/4302): update geekyeggo/delete-artifact to 5.0.0. v6.0.163 (#4302)
+* v6.0, 2025-03-06, Merge [#4296](https://github.com/ossrs/srs/pull/4296): Dvr: support h265 flv fragments. v6.0.162 (#4296)
+* v6.0, 2025-02-20, Merge [#4253](https://github.com/ossrs/srs/pull/4253): fix typo about heartbeat. v6.0.161 (#4253)
+* v6.0, 2025-02-19, Merge [#4291](https://github.com/ossrs/srs/pull/4291): fix ci error. v6.0.160 (#4291)
+* v6.0, 2025-01-14, Merge [#4271](https://github.com/ossrs/srs/pull/4271): update copyright to 2025. v6.0.159 (#4271)
+* v6.0, 2024-10-31, Merge [#4216](https://github.com/ossrs/srs/pull/4216): fix hls error when stream has extension. v6.0.158 (#4216)
+* v6.0, 2024-10-15, Merge [#4160](https://github.com/ossrs/srs/pull/4160): RTC2RTMP: Fix screen sharing stutter caused by packet loss. v6.0.157 (#4160)
+* v6.0, 2024-09-09, Merge [#4171](https://github.com/ossrs/srs/pull/4171): Heartbeat: Report ports for proxy server. v6.0.156 (#4171)
+* v6.0, 2024-09-01, Merge [#4165](https://github.com/ossrs/srs/pull/4165): FLV: Refine source and http handler. v6.0.155 (#4165)
+* v6.0, 2024-09-01, Merge [#4166](https://github.com/ossrs/srs/pull/4166): Edge: Fix flv edge crash when http unmount. v6.0.154 (#4166)
+* v6.0, 2024-08-31, Merge [#4162](https://github.com/ossrs/srs/pull/4162): Fix #3767: RTMP: Do not response empty data packet. v6.0.153 (#4162)
+* v6.0, 2024-08-31, Merge [#4164](https://github.com/ossrs/srs/pull/4164): HTTP-FLV: Notify connection to expire when unpublishing. v6.0.152 (#4164)
+* v6.0, 2024-08-24, Merge [#4157](https://github.com/ossrs/srs/pull/4157): Fix crash when quiting. v6.0.151 (#4157)
+* v6.0, 2024-08-24, Merge [#4156](https://github.com/ossrs/srs/pull/4156): Build: Fix srs_mp4_parser compiling error. v6.0.150 (#4156)
+* v6.0, 2024-08-21, Merge [#4150](https://github.com/ossrs/srs/pull/4150): API: Support new HTTP API for VALGRIND. v6.0.149 (#4150)
+* v6.0, 2024-08-15, Merge [#4144](https://github.com/ossrs/srs/pull/4144): HTTP-FLV: Crash when multiple viewers. v6.0.148 (#4144)
+* v6.0, 2024-08-15, Merge [#4142](https://github.com/ossrs/srs/pull/4142): Config: Add more utest for env config. v6.0.147 (#4142)
+* v6.0, 2024-08-14, Merge [#4141](https://github.com/ossrs/srs/pull/4141): Live: Crash for invalid live stream state when unmount HTTP. v6.0.146 (#4141)
+* v6.0, 2024-08-13, Merge [#4092](https://github.com/ossrs/srs/pull/4092): Config: Improve env config to support multi values. v6.0.146 (#4092)
 * v6.0, 2024-07-27, Merge [#4127](https://github.com/ossrs/srs/pull/4127): Transcode: Support video codec such as h264_qsv and libx265. v6.0.145 (#4127)
 * v6.0, 2024-07-27, Merge [#4101](https://github.com/ossrs/srs/pull/4101): GB28181: Support external SIP server. v6.0.144 (#4101)
 * v6.0, 2024-07-24, Merge [#4115](https://github.com/ossrs/srs/pull/4115): HLS: Add missing newline to end of session manifest. v6.0.143 (#4115)
@@ -156,6 +197,16 @@ The changelog for SRS.
 <a name="v5-changes"></a>
 
 ## SRS 5.0 Changelog
+* v5.0, 2025-07-10, Merge [#4414](https://github.com/ossrs/srs/pull/4414): Fix H.264 B-frame detection logic to comply with specification. v5.0.224 (#4414)
+* v5.0, 2025-03-21, Merge [#4303](https://github.com/ossrs/srs/pull/4303): replace values with enums. v5.0.223 (#4303)
+* v5.0, 2025-03-20, Merge [#4305](https://github.com/ossrs/srs/pull/4305): free sample to prevent memory leak. v5.0.222 (#4305)
+* v5.0, 2025-03-18, Merge [#4302](https://github.com/ossrs/srs/pull/4302): update geekyeggo/delete-artifact to 5.0.0. v5.0.221 (#4302)
+* v5.0, 2025-02-20, Merge [#4253](https://github.com/ossrs/srs/pull/4253): fix typo about heartbeat. v5.0.220 (#4253)
+* v5.0, 2025-02-19, Merge [#4291](https://github.com/ossrs/srs/pull/4291): fix ci error. v5.0.219 (#4291)
+* v5.0, 2025-01-14, Merge [#4271](https://github.com/ossrs/srs/pull/4271): update copyright to 2025. v5.0.218 (#4271)
+* v5.0, 2024-10-31, Merge [#4216](https://github.com/ossrs/srs/pull/4216): fix hls error when stream has extension. v5.0.217 (#4216)
+* v5.0, 2024-10-15, Merge [#4160](https://github.com/ossrs/srs/pull/4160): RTC2RTMP: Fix screen sharing stutter caused by packet loss. v5.0.216 (#4160)
+* v5.0, 2024-09-09, Merge [#4171](https://github.com/ossrs/srs/pull/4171): Heartbeat: Report ports for proxy server. v5.0.215 (#4171)
 * v5.0, 2024-07-24, Merge [#4126](https://github.com/ossrs/srs/pull/4126): Edge: Improve stability for state and fd closing. v5.0.214 (#4126)
 * v5.0, 2024-06-03, Merge [#4057](https://github.com/ossrs/srs/pull/4057): RTC: Support dropping h.264 SEI from NALUs. v5.0.213 (#4057)
 * v5.0, 2024-04-23, Merge [#4038](https://github.com/ossrs/srs/pull/4038): RTMP: Do not response publish start message if hooks fail. v5.0.212 (#4038)

trunk/research/code-statistic/cs.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 #
-# Copyright (c) 2013-2021 Winlin
+# Copyright (c) 2013-2025 Winlin
 #
 # SPDX-License-Identifier: MIT
 #

trunk/research/code-statistic/csr.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 #
-# Copyright (c) 2013-2021 Winlin
+# Copyright (c) 2013-2025 Winlin
 #
 # SPDX-License-Identifier: MIT
 #

trunk/research/ffempty/ffempty.cc

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2021 Winlin
+// Copyright (c) 2013-2025 Winlin
 //
 // SPDX-License-Identifier: MIT
 //

trunk/research/gperftools/cpu-profiler/cpu_profiler.cc

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2021 Winlin
+// Copyright (c) 2013-2025 Winlin
 //
 // SPDX-License-Identifier: MIT
 //

trunk/research/gperftools/heap-checker/heap_checker.cc

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2021 Winlin
+// Copyright (c) 2013-2025 Winlin
 //
 // SPDX-License-Identifier: MIT
 //

trunk/research/gperftools/heap-defense/heap_defense.cc

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2021 Winlin
+// Copyright (c) 2013-2025 Winlin
 //
 // SPDX-License-Identifier: MIT
 //

trunk/research/gperftools/heap-profiler/heap_profiler.cc

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2021 Winlin
+// Copyright (c) 2013-2025 Winlin
 //
 // SPDX-License-Identifier: MIT
 //

trunk/research/hls/ts_info.cc

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2021 Winlin
+// Copyright (c) 2013-2025 Winlin
 //
 // SPDX-License-Identifier: MIT
 //

trunk/research/index.html

@@ -65,7 +65,7 @@
         <p>2. 点击选择 <a id="cnPlayer" href="#">SRS播放器</a></p>
         <p>3. 点击进入 <a id="cnConsole" href="#">SRS控制台</a> (可选) </p>
         <hr/>
-        <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2013~2024</a></p>
+        <p><a href="https://github.com/ossrs/srs">SRS Team &copy; 2013~2025</a></p>
     </div>
     <script type="text/javascript">
         // Build RTMP url.

trunk/research/players/js/srs.sdk.js

@@ -1,6 +1,6 @@
 
 //
-// Copyright (c) 2013-2021 Winlin
+// Copyright (c) 2013-2025 Winlin
 //
 // SPDX-License-Identifier: MIT
 //
@@ -527,36 +527,56 @@ function SrsRtcWhipWhepAsync() {
     // @url The WebRTC url to publish with, for example:
     //      http://localhost:1985/rtc/v1/whip/?app=live&stream=livestream
     // @options The options to control playing, supports:
-    //      videoOnly: boolean, whether only play video, default to false.
+    //      camera: boolean, whether capture video from camera, default to true.
-    //      audioOnly: boolean, whether only play audio, default to false.
+    //      screen: boolean, whether capture video from screen, default to false.
+    //      audio: boolean, whether play audio, default to true.
     self.publish = async function (url, options) {
         if (url.indexOf('/whip/') === -1) throw new Error(`invalid WHIP url ${url}`);
-        if (options?.videoOnly && options?.audioOnly) throw new Error(`The videoOnly and audioOnly in options can't be true at the same time`);
+        const hasAudio = options?.audio ?? true;
+        const useCamera = options?.camera ?? true;
+        const useScreen = options?.screen ?? false;
 
-        if (!options?.videoOnly) {
+        if (!hasAudio && !useCamera && !useScreen) throw new Error(`The camera, screen and audio can't be false at the same time`);
+
+        if (hasAudio) {
             self.pc.addTransceiver("audio", {direction: "sendonly"});
         } else {
             self.constraints.audio = false;
         }
 
-        if (!options?.audioOnly) {
+        if (useCamera || useScreen) {
             self.pc.addTransceiver("video", {direction: "sendonly"});
-        } else {
+        }
+
+        if (!useCamera) {
             self.constraints.video = false;
         }
 
         if (!navigator.mediaDevices && window.location.protocol === 'http:' && window.location.hostname !== 'localhost') {
             throw new SrsError('HttpsRequiredError', `Please use HTTPS or localhost to publish, read https://github.com/ossrs/srs/issues/2762#issuecomment-983147576`);
         }
-        var stream = await navigator.mediaDevices.getUserMedia(self.constraints);
 
-        // @see https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/addStream#Migrating_to_addTrack
+        if (useScreen) {
-        stream.getTracks().forEach(function (track) {
+            const displayStream = await navigator.mediaDevices.getDisplayMedia({
-            self.pc.addTrack(track);
+                video: true
+            });
+            // @see https://developer.mozilla.org/en-US/docs/Web/API/RTCPeerConnection/addStream#Migrating_to_addTrack
+            displayStream.getTracks().forEach(function (track) {
+                self.pc.addTrack(track);
+				// Notify about local track when stream is ok.
+                self.ontrack && self.ontrack({track: track});
+            });
+        }
 
-            // Notify about local track when stream is ok.
+       if (useCamera || hasAudio) {
-            self.ontrack && self.ontrack({track: track});
+            const userStream = await navigator.mediaDevices.getUserMedia(self.constraints);
-        });
+
+            userStream.getTracks().forEach(function (track) {
+                self.pc.addTrack(track);
+                // Notify about local track when stream is ok.
+                self.ontrack && self.ontrack({track: track});
+            });
+       }
 
         var offer = await self.pc.createOffer();
         await self.pc.setLocalDescription(offer);

trunk/research/players/whip.html

@@ -62,10 +62,16 @@
     <div class="form-inline">
         Controls:
         <label>
-            <input type="checkbox" id="ch_videoonly" style="margin-bottom: 8px"> Video Only
+            <input type="radio" id="ra_camera" name="video" value="Camera" checked style="margin-bottom: 8px"> Camera
         </label>
         <label>
-            <input type="checkbox" id="ch_audioonly" style="margin-bottom: 8px"> Audio Only
+            <input type="radio" id="ra_screen" name="video" value="Screen" style="margin-bottom: 8px"> Screen
+        </label>
+        <label>
+            <input type="radio" id="ra_none" name="video" value="None" style="margin-bottom: 8px"> No Video
+        </label>
+        <label>
+            <input type="checkbox" id="ch_audio" checked style="margin-bottom: 8px"> Audio
         </label>
     </div>
 
@@ -113,8 +119,9 @@ $(function(){
         // For example: webrtc://r.ossrs.net/live/livestream
         var url = $("#txt_url").val();
         sdk.publish(url, {
-            videoOnly: $('#ch_videoonly').prop('checked'),
+            camera: $('#ra_camera').prop('checked'),
-            audioOnly: $('#ch_audioonly').prop('checked'),
+            screen: $('#ra_screen').prop('checked'),
+            audio: $('#ch_audio').prop('checked')
         }).then(function(session){
             $('#sessionid').html(session.sessionid);
             $('#simulator-drop').attr('href', session.simulator + '?drop=1&username=' + session.sessionid);

trunk/scripts/perf_gso.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 
 #
-# Copyright (c) 2013-2021 Winlin
+# Copyright (c) 2013-2025 Winlin
 #
 # SPDX-License-Identifier: MIT
 #

trunk/src/app/srs_app_async_call.cpp

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2024 The SRS Authors
+// Copyright (c) 2013-2025 The SRS Authors
 //
 // SPDX-License-Identifier: MIT
 //

trunk/src/app/srs_app_async_call.hpp

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2024 The SRS Authors
+// Copyright (c) 2013-2025 The SRS Authors
 //
 // SPDX-License-Identifier: MIT
 //

trunk/src/app/srs_app_caster_flv.cpp

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2024 The SRS Authors
+// Copyright (c) 2013-2025 The SRS Authors
 //
 // SPDX-License-Identifier: MIT
 //

trunk/src/app/srs_app_caster_flv.hpp

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2024 The SRS Authors
+// Copyright (c) 2013-2025 The SRS Authors
 //
 // SPDX-License-Identifier: MIT
 //

trunk/src/app/srs_app_config.cpp

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2024 The SRS Authors
+// Copyright (c) 2013-2025 The SRS Authors
 //
 // SPDX-License-Identifier: MIT
 //
@@ -68,15 +68,21 @@ const char* _srs_version = "XCORE-" RTMP_SIG_SRS_SERVER;
 #define SRS_OVERWRITE_BY_ENV_MILLISECONDS(key) if (!srs_getenv(key).empty()) return (srs_utime_t)(::atoi(srs_getenv(key).c_str()) * SRS_UTIME_MILLISECONDS)
 #define SRS_OVERWRITE_BY_ENV_FLOAT_SECONDS(key) if (!srs_getenv(key).empty()) return srs_utime_t(::atof(srs_getenv(key).c_str()) * SRS_UTIME_SECONDS)
 #define SRS_OVERWRITE_BY_ENV_FLOAT_MILLISECONDS(key) if (!srs_getenv(key).empty()) return srs_utime_t(::atof(srs_getenv(key).c_str()) * SRS_UTIME_MILLISECONDS)
-#define SRS_OVERWRITE_BY_ENV_DIRECTIVE(key) { \
+#define SRS_OVERWRITE_BY_ENV_DIRECTIVE(key) {                                 \
-        static SrsConfDirective* dir = NULL;      \
+        SrsConfDirective* dir = env_cache_->get(key);                         \
-        if (!dir && !srs_getenv(key).empty()) {   \
+        if (!dir && !srs_getenv(key).empty()) {                               \
-            string v = srs_getenv(key);           \
+            std::vector<string> vec = srs_string_split(srs_getenv(key), " "); \
-            dir = new SrsConfDirective();         \
+            dir = new SrsConfDirective();                                     \
-            dir->name = key;                      \
+            dir->name = key;                                                  \
-            dir->args.push_back(v);               \
+            for (size_t i = 0; i < vec.size(); ++i) {                         \
-        }                                         \
+                std::string value = vec[i];                                   \
-        if (dir) return dir;                      \
+                if (!value.empty()) {                                        \
+                    dir->args.push_back(value);                              \
+                }                                                             \
+            }                                                                 \
+            env_cache_->directives.push_back(dir);                            \
+        }                                                                     \
+        if (dir) return dir;                                                  \
     }
 
 /**
@@ -1343,11 +1349,15 @@ SrsConfig::SrsConfig()
     root = new SrsConfDirective();
     root->conf_line = 0;
     root->name = "root";
+
+    env_cache_ = new SrsConfDirective();
+    env_cache_->name = "env_cache_";
 }
 
 SrsConfig::~SrsConfig()
 {
     srs_freep(root);
+    srs_freep(env_cache_);
 }
 
 void SrsConfig::subscribe(ISrsReloadHandler* handler)
@@ -2389,17 +2399,18 @@ srs_error_t SrsConfig::check_normal_config()
                 && n != "peerlatency" && n != "connect_timeout" && n != "peer_idle_timeout"
                 && n != "sendbuf" && n != "recvbuf" && n != "payloadsize"
                 && n != "default_app" && n != "sei_filter" && n != "mix_correct"
-                && n != "tlpktdrop" && n != "tsbpdmode" && n != "passphrase" && n != "pbkeylen") {
+                && n != "tlpktdrop" && n != "tsbpdmode" && n != "passphrase" && n != "pbkeylen"
+                && n != "default_streamid") {
                 return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "illegal srt_server.%s", n.c_str());
             }
         }
     }
     if (true) {
-        SrsConfDirective* conf = get_heartbeart();
+        SrsConfDirective* conf = get_heartbeat();
         for (int i = 0; conf && i < (int)conf->directives.size(); i++) {
             string n = conf->at(i)->name;
             if (n != "enabled" && n != "interval" && n != "url"
-                && n != "device_id" && n != "summaries") {
+                && n != "device_id" && n != "summaries" && n != "ports") {
                 return srs_error_new(ERROR_SYSTEM_CONFIG_INVALID, "illegal heartbeat.%s", n.c_str());
             }
         }
@@ -5556,7 +5567,10 @@ int SrsConfig::get_global_chunk_size()
     return ::atoi(conf->arg0().c_str());
 }
 
-bool SrsConfig::get_forward_enabled(string vhost) {
+bool SrsConfig::get_forward_enabled(string vhost) 
+{
+    SRS_OVERWRITE_BY_ENV_BOOL("srs.vhost.forward.enabled"); // SRS_VHOST_FORWARD_ENABLED
+
     static bool DEFAULT = false;
 
     SrsConfDirective* conf = get_vhost(vhost);
@@ -5569,6 +5583,8 @@ bool SrsConfig::get_forward_enabled(string vhost) {
 
 bool SrsConfig::get_forward_enabled(SrsConfDirective* vhost)
 {
+    SRS_OVERWRITE_BY_ENV_BOOL("srs.vhost.forward.enabled"); // SRS_VHOST_FORWARD_ENABLED
+
     static bool DEFAULT = false;
 
     SrsConfDirective* conf = vhost->get("forward");
@@ -5601,6 +5617,9 @@ SrsConfDirective* SrsConfig::get_forwards(string vhost)
 
 SrsConfDirective* SrsConfig::get_forward_backend(string vhost)
 {
+
+    SRS_OVERWRITE_BY_ENV_DIRECTIVE("srs.vhost.forward.backend"); // SRS_VHOST_FORWARD_BACKEND
+
     SrsConfDirective* conf = get_vhost(vhost);
     if (!conf) {
         return NULL;
@@ -8236,6 +8255,23 @@ string SrsConfig::get_default_app_name()
     return conf->arg0();
 }
 
+string SrsConfig::get_srt_default_streamid()
+{
+    SRS_OVERWRITE_BY_ENV_STRING("srs.srt_server.default_streamid"); // SRS_SRT_SERVER_DEFAULT_STREAMID
+
+    static string DEFAULT = "#!::r=live/livestream,m=publish";
+    SrsConfDirective* conf = root->get("srt_server");
+    if (!conf) {
+        return DEFAULT;
+    }
+
+    conf = conf->get("default_streamid");
+    if (!conf || conf->arg0().empty()) {
+        return DEFAULT;
+    }
+    return conf->arg0();
+}
+
 SrsConfDirective* SrsConfig::get_srt(std::string vhost)
 {
     SrsConfDirective* conf = get_vhost(vhost);
@@ -8698,7 +8734,7 @@ string SrsConfig::get_vhost_http_remux_mount(string vhost)
     return conf->arg0();
 }
 
-SrsConfDirective* SrsConfig::get_heartbeart()
+SrsConfDirective* SrsConfig::get_heartbeat()
 {
     return root->get("heartbeat");
 }
@@ -8709,7 +8745,7 @@ bool SrsConfig::get_heartbeat_enabled()
 
     static bool DEFAULT = false;
     
-    SrsConfDirective* conf = get_heartbeart();
+    SrsConfDirective* conf = get_heartbeat();
     if (!conf) {
         return DEFAULT;
     }
@@ -8728,7 +8764,7 @@ srs_utime_t SrsConfig::get_heartbeat_interval()
 
     static srs_utime_t DEFAULT = (srs_utime_t)(10 * SRS_UTIME_SECONDS);
     
-    SrsConfDirective* conf = get_heartbeart();
+    SrsConfDirective* conf = get_heartbeat();
     if (!conf) {
         return DEFAULT;
     }
@@ -8747,7 +8783,7 @@ string SrsConfig::get_heartbeat_url()
 
     static string DEFAULT = "http://" SRS_CONSTS_LOCALHOST ":8085/api/v1/servers";
     
-    SrsConfDirective* conf = get_heartbeart();
+    SrsConfDirective* conf = get_heartbeat();
     if (!conf) {
         return DEFAULT;
     }
@@ -8766,7 +8802,7 @@ string SrsConfig::get_heartbeat_device_id()
 
     static string DEFAULT = "";
     
-    SrsConfDirective* conf = get_heartbeart();
+    SrsConfDirective* conf = get_heartbeat();
     if (!conf) {
         return DEFAULT;
     }
@@ -8785,7 +8821,7 @@ bool SrsConfig::get_heartbeat_summaries()
 
     static bool DEFAULT = false;
 
-    SrsConfDirective* conf = get_heartbeart();
+    SrsConfDirective* conf = get_heartbeat();
     if (!conf) {
         return DEFAULT;
     }
@@ -8798,6 +8834,25 @@ bool SrsConfig::get_heartbeat_summaries()
     return SRS_CONF_PREFER_FALSE(conf->arg0());
 }
 
+bool SrsConfig::get_heartbeat_ports()
+{
+    SRS_OVERWRITE_BY_ENV_BOOL("srs.heartbeat.ports"); // SRS_HEARTBEAT_PORTS
+
+    static bool DEFAULT = false;
+
+    SrsConfDirective* conf = get_heartbeat();
+    if (!conf) {
+        return DEFAULT;
+    }
+
+    conf = conf->get("ports");
+    if (!conf || conf->arg0().empty()) {
+        return DEFAULT;
+    }
+
+    return SRS_CONF_PREFER_FALSE(conf->arg0());
+}
+
 SrsConfDirective* SrsConfig::get_stats()
 {
     return root->get("stats");

trunk/src/app/srs_app_config.hpp

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2024 The SRS Authors
+// Copyright (c) 2013-2025 The SRS Authors
 //
 // SPDX-License-Identifier: MIT
 //
@@ -305,6 +305,9 @@ private:
 protected:
     // The directive root.
     SrsConfDirective* root;
+private:
+    // The cache for parsing the config from environment variables.
+    SrsConfDirective* env_cache_;
 // Reload  section
 private:
     // The reload subscribers, when reload, callback all handlers.
@@ -705,6 +708,8 @@ public:
     virtual int get_srto_pbkeylen();
     // Get the default app.
     virtual std::string get_default_app_name();
+    // Get the default streamid when client doesn't provide one.
+    virtual std::string get_srt_default_streamid();
 private:
     SrsConfDirective* get_srt(std::string vhost);
 public:
@@ -1101,10 +1106,10 @@ public:
     // Get the http flv live stream mount point for vhost.
     // used to generate the flv stream mount path.
     virtual std::string get_vhost_http_remux_mount(std::string vhost);
-// http heartbeart section
+// http heartbeat section
 private:
     // Get the heartbeat directive.
-    virtual SrsConfDirective* get_heartbeart();
+    virtual SrsConfDirective* get_heartbeat();
 public:
     // Whether heartbeat enabled.
     virtual bool get_heartbeat_enabled();
@@ -1116,6 +1121,7 @@ public:
     virtual std::string get_heartbeat_device_id();
     // Whether report with summaries of http api: /api/v1/summaries.
     virtual bool get_heartbeat_summaries();
+    bool get_heartbeat_ports();
 // stats section
 private:
     // Get the stats directive.

trunk/src/app/srs_app_conn.cpp

@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2013-2024 The SRS Authors
+// Copyright (c) 2013-2025 The SRS Authors
 //
 // SPDX-License-Identifier: MIT
 //