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
8403 commits 14 branches 107 tags 377 MiB
Commit graph

8403 commits

This branch
This branch
All branches
Author SHA1 Message Date
winlin
32c79b49cc Support Github Actions to publish SRS. 4.0.155 2021-08-14 20:38:01 +08:00
winlin
7efae1b1d6 Squash: Update CodeQL 2021-08-14 16:43:46 +08:00
winlin
02ca63c546 Merge 2021-08-14 16:36:53 +08:00
winlin
18d76156a3 Merge branch 'develop' into merge/develop 2021-08-14 16:28:59 +08:00
winlin
94308253b7 Actions: Add github actions for CI 2021-08-14 16:16:56 +08:00
winlin
26de8c65ad Actions: Add github actions for CI 2021-08-14 15:57:46 +08:00
winlin
6d0af77fba Actions: Add github actions for CI 2021-08-14 15:53:21 +08:00
winlin
e22035b749 Squash: Fix RTC session info bug 2021-08-14 14:45:12 +08:00
winlin
864db8b78c Merge 2021-08-14 14:42:23 +08:00
winlin
f6c7a92fa0 Merge branch '4.0release' into merge/develop 2021-08-14 14:41:52 +08:00
Johnny
7c1d3edd36 RTC: fix SrsSessionInfo about copy assignment operator and comparison operator. 2021-08-14 14:39:01 +08:00
winlin
36cbe851ca RTC: Fix reousrce find bug 2021-08-14 14:37:05 +08:00
winlin
7c899a0afd Squash: Update version query. 2021-08-14 11:53:27 +08:00
winlin
4b3db5a56e Update 2021-08-14 11:52:59 +08:00
winlin
cd05ebdbb0 Merge branch 'develop' into merge/develop 2021-08-14 11:51:54 +08:00
winlin
34b97bf68d Release v4.0-d3, v4.0.153 2021-08-14 11:50:33 +08:00
winlin
cffd364d4d Update README 2021-08-13 15:00:55 +08:00
winlin
258f97de6f Update 2021-08-13 15:00:10 +08:00
winlin
3bee710ca3 Merge branch 'develop' into merge/develop 2021-08-13 14:59:27 +08:00
winlin
d8fe85606d Update README 2021-08-13 14:53:22 +08:00
winlin
9c0c35fa87 Update README 2021-08-13 14:52:49 +08:00
winlin
5cd8989fd8 Update README 2021-08-13 14:50:39 +08:00
winlin
1b6192e1b2 Update README 2021-08-13 14:50:11 +08:00
winlin
24431d35ac Squash: Merge SRS4 2021-08-13 14:29:32 +08:00
winlin
e05acbfcad Merge branch '4.0release' into merge/develop 2021-08-13 14:04:56 +08:00
winlin
ddd5c192fb Merge branch 'develop' into merge/develop 2021-08-13 14:04:52 +08:00
Haibo Chen
ab988abc59 For #2516, fix codec issue for G.711 or H.263. 4.0.152 2021-08-13 12:08:10 +08:00
Haibo Chen
aad90c7f42
fix coredump bug: caused by publish stream that codec is unsupport, sush as G.711, H.263 (#2526) 2021-08-13 12:05:28 +08:00
matthew1838
452ca7e88f
add server_id into http_hooks (#2521) 
Co-authored-by: SK <liemlhd@LiemLes-Mac-Pro.local>
 2021-08-11 10:38:22 +08:00
winlin
29dea37dbb Squash: Merge SRS4 2021-08-10 12:10:35 +08:00
winlin
6e62bb2704 Merge 2021-08-10 12:10:06 +08:00
winlin
f41eb05481 Merge branch 'develop' into merge/develop 2021-08-10 12:09:38 +08:00
Haibo Chen
dffc344747 RTC: For #1657, support http hooks n_play/stop/publish/unpublish (#2509) 
* support http hooks for rtc: on_play/stop/publish/unpublish

* Update srs_app_rtc_conn.cpp

* Update srs_app_rtc_conn.cpp
 2021-08-10 09:47:48 +08:00
Haibo Chen
345b691895
support http hooks for rtc: on_play/stop/publish/unpublish (#2509) 
* support http hooks for rtc: on_play/stop/publish/unpublish

* Update srs_app_rtc_conn.cpp

* Update srs_app_rtc_conn.cpp
 2021-08-10 09:41:20 +08:00
winlin
9bf5005bdd Squash: Merge SRS4 2021-08-08 00:30:08 +08:00
winlin
82745782cb Merge branch '4.0release' into merge/develop 2021-08-08 00:25:12 +08:00
winlin
bccd0ae8f0 Merge branch 'develop' into merge/develop 2021-08-08 00:25:07 +08:00
winlin
57f6eb09c1 Use 4.0 docker srs:4 2021-08-08 00:24:01 +08:00
winlin
42872e2500 Release v4.0.150 dev2 2021-08-07 23:43:24 +08:00
Haibo Chen
c048731049 Get original ip instead of proxy ip, for rtc api (#2514) v4.0.150 2021-08-07 23:41:16 +08:00
Haibo Chen
84d04adfff
get original ip instead of proxy ip, for rtc api (#2514) 2021-08-07 23:37:18 +08:00
winlin
92cbb1f072 Refine code 2021-08-07 23:33:20 +08:00
winlin
7739d8c7da Update README.md 2021-08-07 23:22:17 +08:00
winlin
adf0043cbc Fix #2508, Support features query by API. 5.0.10 2021-08-07 23:21:23 +08:00
winlin
05613ebbfc Merge branch '4.0release' into merge/develop 2021-08-07 23:20:40 +08:00
winlin
e05d433824 Merge branch 'develop' into merge/develop 2021-08-07 23:20:36 +08:00
winlin
ee376da0c6 Fix #2508, Support features query by API. 4.0.149 2021-08-07 23:17:15 +08:00
winlin
69faf06f0f API: For #2508, query feature docker and packager. 2021-08-07 21:35:00 +08:00
winlin
a948dfa675 Merge 2021-08-07 21:34:31 +08:00
winlin
db9a51b9b1 Merge branch 'develop' into merge/develop 2021-08-07 21:33:55 +08:00