Skip to content

Commit 370b9b7

Browse files
laurfblaurfb
authored
Merge branch 'ossrs:develop' into develop
2 parents 7977332 + 13597d1 commit 370b9b7

File tree

363 files changed

+378
-369
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

363 files changed

+378
-369
lines changed

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2013-2024 The SRS Authors
3+
Copyright (c) 2013-2025 The SRS Authors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

‎proxy/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package main

‎proxy/debug.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package main

‎proxy/env.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package main

‎proxy/http.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package main

‎proxy/logger/context.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package logger

‎proxy/logger/log.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package logger

‎proxy/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package main

‎proxy/rtc.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package main

‎proxy/rtmp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package main

‎proxy/rtmp/amf0.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package rtmp

‎proxy/rtmp/rtmp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package rtmp

‎proxy/signal.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package main

‎proxy/srs.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package main

‎proxy/srt.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package main

‎proxy/sync/map.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package sync

‎proxy/utils.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package main

‎proxy/version.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2024 Winlin
1+
// Copyright (c) 2025 Winlin
22
//
33
// SPDX-License-Identifier: MIT
44
package main

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
The MIT License (MIT)
33
4-
Copyright (c) 2019 winlin
4+
Copyright (c) 2025 winlin
55
66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
The MIT License (MIT)
33
4-
Copyright (c) 2019 winlin
4+
Copyright (c) 2025 winlin
55
66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
The MIT License (MIT)
33
4-
Copyright (c) 2019 winlin
4+
Copyright (c) 2025 winlin
55
66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

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

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
The MIT License (MIT)
33
4-
Copyright (c) 2019 winlin
4+
Copyright (c) 2025 winlin
55
66
Permission is hereby granted, free of charge, to any person obtaining a copy
77
of this software and associated documentation files (the "Software"), to deal

‎trunk/3rdparty/signaling/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// Copyright (c) 2021 Winlin
3+
// Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* The MIT License (MIT)
44
*
5-
* Copyright (c) 2013-2021 Winlin
5+
* Copyright (c) 2013-2025 Winlin
66
*
77
* Permission is hereby granted, free of charge, to any person obtaining a copy of
88
* this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* The MIT License (MIT)
44
*
5-
* Copyright (c) 2013-2021 Winlin
5+
* Copyright (c) 2013-2025 Winlin
66
*
77
* Permission is hereby granted, free of charge, to any person obtaining a copy of
88
* this software and associated documentation files (the "Software"), to deal in

‎trunk/3rdparty/srs-bench/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2021 Winlin
3+
Copyright (c) 2025 Winlin
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy of
66
this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2023 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2023 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2023 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2023 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2023 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2023 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2023 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2023 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2023 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2023 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2022-2024 Winlin
3+
// # Copyright (c) 2022-2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2022-2024 Winlin
3+
// # Copyright (c) 2022-2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2022-2024 Winlin
3+
// # Copyright (c) 2022-2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2022-2024 Winlin
3+
// # Copyright (c) 2022-2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2022-2024 Winlin
3+
// # Copyright (c) 2022-2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2022-2024 Winlin
3+
// # Copyright (c) 2022-2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2022-2024 Winlin
3+
// # Copyright (c) 2022-2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2021 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2021 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2021 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2021 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2021 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2021 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2021 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// The MIT License (MIT)
22
//
3-
// # Copyright (c) 2021 Winlin
3+
// # Copyright (c) 2025 Winlin
44
//
55
// Permission is hereby granted, free of charge, to any person obtaining a copy of
66
// this software and associated documentation files (the "Software"), to deal in

0 commit comments

Comments
 (0)