external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity
7642 commits 13 branches 107 tags 375 MiB
Commit graph

7642 commits

This branch
This branch
All branches
Author SHA1 Message Date
winlin
665bae9b44 Update 2021-05-28 21:43:39 +08:00
winlin
4e79e91ede Merge branch '4.0release' into merge/develop 2021-05-28 21:43:08 +08:00
winlin
a8d40f4cb1 Update AUTHORS 2021-05-28 21:40:43 +08:00
louis.xia
1c7c74b01a GB28181: Fix parse rtp tcp failed (#2382) 
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

* fix gb28181 support tcp stack is setup:passive

* Update push.gb28181.tcp.conf

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
Co-authored-by: Winlin <winlin@vip.126.com>
 2021-05-28 21:38:52 +08:00
louis.xia
cc52e5b27c
GB28181: Fix parse rtp tcp failed (#2382) 
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

* fix gb28181 support tcp stack is setup:passive

* Update push.gb28181.tcp.conf

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
Co-authored-by: Winlin <winlin@vip.126.com>
 2021-05-28 21:38:12 +08:00
cfw11
3e7536c493 GB28181: fix parse rtp-tcp failed (#2378) 
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
 2021-05-28 21:20:41 +08:00
cfw11
4d6f00e6bf
GB28181: fix parse rtp-tcp failed (#2378) 
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
 2021-05-28 21:19:05 +08:00
winlin
f270d42849 Update README.md 2021-05-27 13:44:46 +08:00
winlin
295ef90815 SRS: Update README.md 2021-05-27 11:13:31 +08:00
winlin
c353f1fe57 Update Usage 2021-05-26 14:21:23 +08:00
winlin
bd1ec99d5b Demo: Update srs.sdk.js 2021-05-25 16:04:44 +08:00
winlin
463105c012 Refine README.md 2021-05-25 14:39:47 +08:00
winlin
bbd7ee08d4 Update README.md 2021-05-24 15:19:49 +08:00
winlin
4cfde4fa08 Merge 2021-05-24 15:19:06 +08:00
winlin
a00bb76d13 Merge branch 'develop' into merge/develop 2021-05-24 15:18:10 +08:00
winlin
3cdd1c4e66 Update README.md 2021-05-24 15:12:36 +08:00
winlin
7fcafef6c4 Refine README.md 2021-05-24 14:45:19 +08:00
winlin
a9f171144d SquashSRS4: Eliminate dead code 2021-05-24 08:17:59 +08:00
winlin
3e1b9a545c Merge 2021-05-24 08:17:14 +08:00
winlin
9d2e5a7333 Merge branch '4.0release' into merge/develop 2021-05-24 08:16:50 +08:00
winlin
8e79b90bc3 RTC: Eliminate dead code. 4.0.122 2021-05-24 08:11:42 +08:00
winlin
5afa8edd01 Update README, eliminate unused wikis. 2021-05-21 20:32:10 +08:00
winlin
e50582f9c7 SquashSRS4: Refine SDK 2021-05-21 19:57:59 +08:00
winlin
f42acb4c48 Merge branch '4.0release' into merge/develop 2021-05-21 19:57:23 +08:00
winlin
da7413d5e0 Merge branch 'develop' into merge/develop 2021-05-21 19:57:19 +08:00
winlin
5df90a2a1c Fix #2370 bug for Firefox play stream(published by Chrome). 4.0.121 2021-05-21 18:56:19 +08:00
winlin
7ea05dddf2 RTC: Allow set constrain for publisher 2021-05-21 18:32:53 +08:00
winlin
9ed388523f RTC: Refine demo H5 page 2021-05-21 17:26:52 +08:00
winlin
a7ab78a588 SquashSRS4: Update SDK 2021-05-21 17:14:04 +08:00
winlin
586bbf9f53 Merge branch '4.0release' into merge/develop 2021-05-21 17:13:08 +08:00
winlin
3b3615bb17 Merge branch 'develop' into merge/develop 2021-05-21 17:13:04 +08:00
winlin
37c9066636 RTC: Refine sdk, migrate from onaddstream to ontrack. 4.0.120 2021-05-21 16:58:21 +08:00
winlin
c5c0a3e1b0 Refine doc 2021-05-21 09:19:17 +08:00
winlin
1ba0b20b74 Refine commens 2021-05-21 08:48:19 +08:00
winlin
0c1e60c8df Tools: Refine configure options. 4.0.119 2021-05-21 08:31:10 +08:00
winlin
6dc8d9dd6f SquashSRS4: Remove srs-librtmp 2021-05-20 20:07:13 +08:00
winlin
365b367ad4 Merge branch '4.0release' into merge/develop 2021-05-20 20:06:30 +08:00
winlin
9e5c4e2c5b RTC: Fix build fail 2021-05-20 19:56:23 +08:00
winlin
a01e2d062c Merge branch '4.0release' into merge/develop 2021-05-20 19:09:19 +08:00
winlin
7482aaf60a Merge branch 'develop' into merge/develop 2021-05-20 19:09:16 +08:00
winlin
fc9363e7df Fix build fail when disable RTC by --rtc=off. 4.0.118 2021-05-20 19:06:45 +08:00
winlin
af04285baa Tools: Remove srs-librtmp 2021-05-20 18:52:21 +08:00
winlin
3fb6433c9e Tools: Ignore some unused options 2021-05-20 18:31:00 +08:00
winlin
55baa81cea Tools: Refine --arm with --rtc=off 2021-05-20 18:20:52 +08:00
chenhaibo
bd506da070 Fix #2366, bug when disabled gb28181. 2021-05-20 17:27:32 +08:00
winlin
8f304b94ec Refine comments 2021-05-20 10:49:42 +08:00
winlin
f043a7eb48 SquashSRS4: Allow RTC play before publish. 2021-05-19 21:06:17 +08:00
winlin
5251ac9cca Merge branch '4.0release' into merge/develop 2021-05-19 21:04:40 +08:00
winlin
3f3c62b673 Merge branch 'develop' into merge/develop 2021-05-19 21:04:34 +08:00
root
d55af6be44 Fix #2362: Allow WebRTC to play before publishing, for GB28181 as such. 4.0.117 2021-05-19 20:54:22 +08:00