external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into bugfix/missing-msid-in-play-answer

Browse source
This commit is contained in:
Haibo Chen 2025-03-04 10:05:04 +08:00 • committed by GitHub
commit cf1fae1dca
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
364 changed files with 387 additions and 378 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/test.yml vendored
View file

@ -40,7 +40,7 @@ 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
@ -65,7 +65,7 @@ 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

2
LICENSE
View file

@ -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

2
proxy/api.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package main

2
proxy/debug.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package main

2
proxy/env.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package main

2
proxy/http.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package main

2
proxy/logger/context.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package logger

2
proxy/logger/log.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package logger

2
proxy/main.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package main

2
proxy/rtc.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package main

2
proxy/rtmp.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package main

2
proxy/rtmp/amf0.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package rtmp

2
proxy/rtmp/rtmp.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package rtmp

2
proxy/signal.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package main

2
proxy/srs.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package main

2
proxy/srt.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package main

2
proxy/sync/map.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package sync

2
proxy/utils.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package main

2
proxy/version.go
View file

@ -1,4 +1,4 @@
// Copyright (c) 2024 Winlin
// Copyright (c) 2025 Winlin
//
// SPDX-License-Identifier: MIT
package main

2
trunk/3rdparty/httpx-static/main.go vendored
View file

@ -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

2
trunk/3rdparty/httpx-static/main_test.go vendored
View file

@ -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

2
trunk/3rdparty/httpx-static/mcerts.go vendored
View file

@ -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

2
trunk/3rdparty/httpx-static/vendor/github.com/ossrs/go-oryx-lib/LICENSE generated vendored
View file

@ -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

2
trunk/3rdparty/httpx-static/version.go vendored
View file

@ -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

2
trunk/3rdparty/signaling/main.go vendored
View file

@ -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

2
trunk/3rdparty/signaling/vendor/github.com/ossrs/go-oryx-lib/LICENSE generated vendored
View file

@ -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

2
trunk/3rdparty/signaling/www/demos/js/srs.sdk.js vendored
View file

@ -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

2
trunk/3rdparty/signaling/www/demos/js/srs.sig.js vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/LICENSE vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/blackbox/blackbox.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/blackbox/blackbox_test.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/blackbox/dvr_test.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/blackbox/hevc_test.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/blackbox/hls_test.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/blackbox/http_api_test.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/blackbox/mp3_test.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/blackbox/rtmp_test.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/blackbox/srt_test.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/blackbox/util.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/gb28181/gb28181.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/gb28181/gb28181_test.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/gb28181/gb_test.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/gb28181/ingester.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/gb28181/ps.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/gb28181/sip.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/gb28181/util.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/janus/api.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/janus/ingester.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/janus/interceptor.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/janus/janus.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/janus/player.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/janus/publisher.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/janus/util.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/janus/util2.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/live/live.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/live/publisher.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/live/stat.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/main.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/srs/api.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/srs/ingester.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/srs/interceptor.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/srs/player.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/srs/publisher.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/srs/rtc_test.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/srs/rtmp_test.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/srs/srs.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/srs/srs_test.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/srs/stat.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/srs/util.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/vendor/github.com/ossrs/go-oryx-lib/LICENSE generated vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/vnet/example_udpproxy_test.go vendored
View file

@ -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

2
trunk/3rdparty/srs-bench/vnet/vnet.go vendored
View file

@ -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

2
trunk/3rdparty/st-srs/tools/backtrace/backtrace.c vendored
View file

@ -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

2
trunk/3rdparty/st-srs/tools/helloworld/helloworld.c vendored
View file

@ -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>

2
trunk/3rdparty/st-srs/tools/jmpbuf/jmpbuf.c vendored
View file

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

2
trunk/3rdparty/st-srs/tools/pcs/pcs.c vendored
View file

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

2
trunk/3rdparty/st-srs/tools/porting/porting.c vendored
View file

@ -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>

2
trunk/3rdparty/st-srs/tools/stack/stack.c vendored
View file

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

2
trunk/3rdparty/st-srs/tools/verify/verify.c vendored
View file

@ -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>

2
trunk/3rdparty/st-srs/utest/st_utest.cpp vendored
View file

@ -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>

2
trunk/3rdparty/st-srs/utest/st_utest.hpp vendored
View file

@ -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

2
trunk/3rdparty/st-srs/utest/st_utest_coroutines.cpp vendored
View file

@ -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>

2
trunk/3rdparty/st-srs/utest/st_utest_tcp.cpp vendored
View file

@ -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>

9
trunk/doc/CHANGELOG.md
View file

@ -7,6 +7,9 @@ The changelog for SRS.
<a name="v7-changes"></a>
## SRS 7.0 Changelog
* v7.0, 2025-02-20, Merge [#4253](https://github.com/ossrs/srs/pull/4253): fix typo about heartbeat. v7.0.23 (#4253)
* v7.0, 2025-02-19, Merge [#4291](https://github.com/ossrs/srs/pull/4291): fix ci error. v7.0.22 (#4291)
* v7.0, 2025-01-14, Merge [#4271](https://github.com/ossrs/srs/pull/4271): update copyright to 2025. v7.0.21 (#4271)
* v7.0, 2024-10-31, Merge [#4218](https://github.com/ossrs/srs/pull/4218): fix Unit test: StUtimeInMicroseconds. v7.0.20 (#4218)
* v7.0, 2024-10-31, Merge [#4216](https://github.com/ossrs/srs/pull/4216): fix hls error when stream has extension. v7.0.19 (#4216)
* v7.0, 2024-10-15, Merge [#4160](https://github.com/ossrs/srs/pull/4160): RTC2RTMP: Fix screen sharing stutter caused by packet loss. v7.0.18 (#4160)
@ -32,6 +35,9 @@ The changelog for SRS.
<a name="v6-changes"></a>
## SRS 6.0 Changelog
* 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)
@ -194,6 +200,9 @@ The changelog for SRS.
<a name="v5-changes"></a>
## SRS 5.0 Changelog
* 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)

2
trunk/research/code-statistic/cs.py
View file

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

2
trunk/research/code-statistic/csr.py
View file

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

2
trunk/research/ffempty/ffempty.cc
View file

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

2
trunk/research/gperftools/cpu-profiler/cpu_profiler.cc
View file

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

2
trunk/research/gperftools/heap-checker/heap_checker.cc
View file

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

2
trunk/research/gperftools/heap-defense/heap_defense.cc
View file

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

2
trunk/research/gperftools/heap-profiler/heap_profiler.cc
View file

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

2
trunk/research/hls/ts_info.cc
View file

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

2
trunk/research/index.html
View file

@ -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.

2
trunk/research/players/js/srs.sdk.js
View file

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

2
trunk/scripts/perf_gso.py
View file

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

2
trunk/src/app/srs_app_async_call.cpp
View file

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

2
trunk/src/app/srs_app_async_call.hpp
View file

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

2
trunk/src/app/srs_app_caster_flv.cpp
View file

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

2
trunk/src/app/srs_app_caster_flv.hpp
View file

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

18
trunk/src/app/srs_app_config.cpp
View file

@ -1,5 +1,5 @@
//
// Copyright (c) 2013-2024 The SRS Authors
// Copyright (c) 2013-2025 The SRS Authors
//
// SPDX-License-Identifier: MIT
//
@ -2405,7 +2405,7 @@ srs_error_t SrsConfig::check_normal_config()
}
}
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"
@ -8708,7 +8708,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");
}
@ -8719,7 +8719,7 @@ bool SrsConfig::get_heartbeat_enabled()
static bool DEFAULT = false;
SrsConfDirective* conf = get_heartbeart();
SrsConfDirective* conf = get_heartbeat();
if (!conf) {
return DEFAULT;
}
@ -8738,7 +8738,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;
}
@ -8757,7 +8757,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;
}
@ -8776,7 +8776,7 @@ string SrsConfig::get_heartbeat_device_id()
static string DEFAULT = "";
SrsConfDirective* conf = get_heartbeart();
SrsConfDirective* conf = get_heartbeat();
if (!conf) {
return DEFAULT;
}
@ -8795,7 +8795,7 @@ bool SrsConfig::get_heartbeat_summaries()
static bool DEFAULT = false;
SrsConfDirective* conf = get_heartbeart();
SrsConfDirective* conf = get_heartbeat();
if (!conf) {
return DEFAULT;
}
@ -8814,7 +8814,7 @@ bool SrsConfig::get_heartbeat_ports()
static bool DEFAULT = false;
SrsConfDirective* conf = get_heartbeart();
SrsConfDirective* conf = get_heartbeat();
if (!conf) {
return DEFAULT;
}

Some files were not shown because too many files have changed in this diff Show more