1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Commit graph

845 commits

Author SHA1 Message Date
hondaxiao
e13d16439e SRT: support rtmp to srt 2022-06-14 20:02:22 +08:00
hondaxiao
94fa0ff7bd Refine SRT code, with StateThread adpater 2022-06-14 19:58:42 +08:00
winlin
3ed4aed824 Fix build failed. 2022-06-09 20:46:20 +08:00
winlin
f1840b87e5 Fix typo, change bridger to bridge. 2022-06-09 19:35:07 +08:00
ChenGH
70aa6b66bb
bugfix: fix rtcp nack blp encode bug (#2966)
Co-authored-by: Winlin <winlin@vip.126.com>
2022-03-15 08:40:06 +08:00
mapengfei53
fde44885d9
Support include directive for config file (#2878)
* Support include import configuration

* Remove support for regular rules

* Remove support for regular rules

* Fix configuration file parsing bug

* Added utest tests for include functionality

* Added utest tests for include functionality

* Modify the UTest function

* optimized code

* Config: Refine parse error with state

* Config: Reorder functions

* Config: Rename parsing type to context

* Config: Refine args for include

* Config: Add utests for include

* Config: Refine code, parsing recursively.

* Config: Change the mock from file to buffer

* Config: Mock buffer in config

* Config: Refine code

* Add utests for include

* Added utest for include

Co-authored-by: pengfei.ma <pengfei.ma@ngaa.com.cn>
Co-authored-by: winlin <winlin@vip.126.com>
2022-02-14 15:08:51 +08:00
winlin
6b7fc6fdb5 Squash: Fix bugs for 4.0 2022-01-23 08:12:19 +08:00
winlin
d5c86dc5fa Switch LICENSE from MIT to **MIT or MulanPSL-2.0**. v5.0.21 2022-01-13 18:40:22 +08:00
winlin
4110fb14cb Squash: Fix bugs. v5.0.20 2022-01-11 08:40:37 +08:00
winlin
d2fe83b032 RTC: Fix build warning 2021-12-26 18:16:10 +08:00
winlin
13103ec7d5 For #2815: Extract macros and headers for platform. 2021-12-26 17:50:19 +08:00
winlin
716e578a19 Squash: Fix bugs 2021-12-26 17:30:51 +08:00
winlin
f05e67e1a6 Squash: Fix bugs 2021-12-13 09:24:16 +08:00
winlin
8576fa7052 Squash: Merge v4.0.203 2021-12-04 11:21:35 +08:00
Matheus Macabu
9a017f4037
RTMP: If port is explicity set to 0, use default 1935 (#1754) 2021-10-19 08:20:28 +08:00
Haibo Chen
7fd5e8607c DVR: support mp3 audio codec. (#2593) v5.0.17 2021-10-16 14:06:43 +08:00
winlin
b874d9c9ba Squash: Merge SRS 4.0, regression test for RTMP. 2021-10-12 08:36:24 +08:00
winlin
a81aa2edc5 Squash: Merge SRS 4.0 2021-10-10 12:05:26 +08:00
winlin
7d3ec991e1 Squash: Merge SRS 4.0 2021-09-26 17:12:55 +08:00
johzzy
dc778020fc
fix some crash in rtc. (#2545) 2021-09-26 17:01:53 +08:00
winlin
19c0a9eb4b Suqash: Merge 4.0 2021-09-05 14:17:41 +08:00
Haibo Chen
826f5121c5
Support for multiple SPS/PPS, then pick the first one. (#2544) 2021-08-27 07:27:33 +08:00
winlin
85620a34f5 Squash: Fix rtc to rtmp sync timestamp using sender report. #2470 2021-08-17 07:25:03 +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
Alex.CR
4b7ba0e1e9 SRT: Use thread-safe log for multiple-threading SRT module. (#2474)
* solve srt push bugs

* solve h264 mutiple nalus in srt when obs is configured in zerolatency

* optimize error code

* optimize error code

* optimize error code

* add commemnt:we only skip pps/sps frame and send left nalus in srt

* add commemnt:we only skip pps/sps frame and send left nalus in srt

* optimize srt log system

* update conf

* update srt hpp

Co-authored-by: shiwei <shiwei05@kuaishou.com>
2021-07-21 10:23:25 +08:00
Winlin
c8a1e0f3da
Refine AUTHORS.txt to AUTHORS.md, etc. 5.0.8 (#2464)
* Refine AUTHORS.txt to AUTHORS.md, etc. 5.0.8

* Update README.md

* Update README.md

* Refine format for AUTHORS.md
2021-07-08 14:30:47 +08:00
winlin
13d015b8fd Squash: Fix random bug 2021-07-04 16:04:51 +08:00
winlin
efdbf37255 Squash: Move GB28181 to feature/gb28181. 5.0.4 2021-06-16 14:03:55 +08:00
winlin
15901cacee SquashSRS4: Use SPDX-License-Identifier: MIT. 5.0.3 2021-05-31 13:42:20 +08:00
winlin
6dc8d9dd6f SquashSRS4: Remove srs-librtmp 2021-05-20 20:07:13 +08:00
winlin
a1d7fe46c1 SquashSRS4: Rename SrsRtpPacket2 to SrsRtpPacket. 2021-05-15 08:53:54 +08:00
winlin
6a980683f7 SquashSRS4: Remove object cache and stat api 2021-05-14 18:17:42 +08:00
winlin
3256c7c2fa SquashSRS4: Refine the init of global objects 2021-05-08 11:51:54 +08:00
winlin
74bb47c13f SquashSRS4: Support RTC2RTMP. 2021-05-01 22:15:57 +08:00
winlin
aa07f45545 SquashSRS4: Happy 2021 2021-04-20 19:03:02 +08:00
winlin
8b74c7cb89 SquashSRS4: Happy 2021 2021-04-16 09:29:43 +08:00
winlin
fa2fec3247 SquashSRS4: Refine payload NALU type parser 2021-04-01 14:48:41 +08:00
winlin
0cc3063703 SquashSRS4: Refine TWCC and SDP exchange. 4.0.88 2021-04-01 10:55:03 +08:00
winlin
45b83bd22e SquashSRS4: Update comments and performance data 2021-03-31 18:25:12 +08:00
winlin
aab54b2cf4 SquashSRS4: Refine RTC extension ID parsing 2021-03-24 19:00:42 +08:00
winlin
ecd4527342 SquashSRS4: Use fast parse TWCCID, ignore in packet parsing 2021-03-24 14:17:52 +08:00
winlin
44aa976976 RTC: Fix copy RTP packet bug 2021-02-28 18:22:04 +08:00
winlin
2b4b6a8e65 Refine code 2021-02-28 17:47:35 +08:00
winlin
563b99701a RTC: Fix bug for wrap exists buffer size 2021-02-28 17:36:03 +08:00
winlin
8c94faf693 RTC: Store the actual size of buffer for RTP packet. 2021-02-28 17:26:08 +08:00
winlin
f6589aa370 RTC: Fix shared msg cache bug 2021-02-28 11:26:50 +08:00
winlin
75a4c8d9e5 RTC: Refine code, remove the reset for header 2021-02-28 10:06:52 +08:00
winlin
5af0bf9350 RTC: Refine code, remove the assign 2021-02-28 10:04:30 +08:00
winlin
515e4f135b Perf: Refine header extensions marshal 2021-02-28 09:51:28 +08:00
winlin
314a6dbec6 Cache RTP packet size, revert 9ee0ed919a 2021-02-28 08:23:35 +08:00