1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Commit graph

7625 commits

Author SHA1 Message Date
winlin
a71c6426b8 Merge branch 'develop' into merge/develop 2021-07-24 08:09:54 +08:00
Haibo Chen
86c67f7d95 RTC: Support statistic for HTTP-API, HTTP-Callback and Security (#2483) v4.0.144
* commit message for your changes. Lines starting

* Update srs_app_rtc_api.cpp

* add SrsRtcConnPlay and SrsRtcConnPublish, in enum SrsRtmpConnType

* Update srs_rtmp_stack.cpp

* Update srs_app_rtc_conn.cpp

* Update srs_app_rtc_api.cpp

* update utest

* Update srs_utest_app.cpp
2021-07-24 08:08:35 +08:00
Haibo Chen
0efd7b1bbc
RTC: Support statistic for HTTP-API, HTTP-Callback and Security (#2483)
* commit message for your changes. Lines starting

* Update srs_app_rtc_api.cpp

* add SrsRtcConnPlay and SrsRtcConnPublish, in enum SrsRtmpConnType

* Update srs_rtmp_stack.cpp

* Update srs_app_rtc_conn.cpp

* Update srs_app_rtc_api.cpp

* update utest

* Update srs_utest_app.cpp
2021-07-24 08:05:10 +08:00
winlin
20931ddbb1 Squash: Fix README.md link issue 2021-07-21 18:22:53 +08:00
winlin
c7415ab384 Merge branch 'develop' into merge/develop 2021-07-21 18:22:20 +08:00
winlin
cb0dcc2918 Merge branch '4.0release' into merge/develop 2021-07-21 18:22:16 +08:00
winlin
4332beed79 Fix README.md link issue 2021-07-21 18:21:19 +08:00
winlin
33610c6865 Squash: Merge SRS 4.0 2021-07-21 10:36:07 +08:00
winlin
7f14085e6f Merge branch 'develop' into merge/develop 2021-07-21 10:35:00 +08:00
winlin
cfcccb6716 Merge 2021-07-21 10:34:56 +08:00
Alex.CR
af05f89925 SRT: Use thread-safe log for multiple-threading SRT module. (#2474) v4.0.143
* 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:28:42 +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
4ca433d3f8 Refine push script 2021-07-19 07:51:35 +08:00
winlin
6c40419de7 Fix configure bug 2021-07-19 07:49:57 +08:00
winlin
486b838397 Add badge for CodeQL, security scan 2021-07-17 19:57:15 +08:00
winlin
d1cb123a60 Add badge for CodeQL, security scan 2021-07-17 19:56:04 +08:00
winlin
beea3216fe Squash: Refine IDE 2021-07-17 19:50:35 +08:00
winlin
a58d24f71e Merge branch '4.0release' into merge/develop 2021-07-17 19:48:33 +08:00
winlin
cc9c74850c Merge branch 'develop' into merge/develop 2021-07-17 19:48:29 +08:00
winlin
169f08bae1 [IDE] We should always configure SRS for switching between branches. 2021-07-17 19:48:14 +08:00
winlin
97c627f9d4 Squash: Support CLion 2021-07-17 19:43:22 +08:00
winlin
8e66e2ac96 Merge branch '4.0release' into merge/develop 2021-07-17 19:38:41 +08:00
winlin
526c6772c5 Merge branch 'develop' into merge/develop 2021-07-17 19:38:38 +08:00
winlin
afa32910c9 Fix bugs and enhance code. 4.0.142 2021-07-17 19:16:26 +08:00
winlin
66a696efe0 [IDE] Refine .gitignore for cmake from ide/srs_clion 2021-07-16 22:37:09 +08:00
winlin
2e222d369d [IDE] Refine CMakeLists.txt, use absolute path 2021-07-16 22:29:51 +08:00
winlin
c209e547a8 [IDE] Support CLion and cmake to build and debug SRS. 4.0.141
1. Remove all except JetBrains clion by cmake
2. Add .run/srs.run.xml for debugging for CLion.
3. Auto configure SRS when load CMakeLists.txt
2021-07-16 11:38:12 +08:00
winlin
12ba584ea3 Fix build failed 2021-07-09 09:00:35 +08:00
winlin
dca0397c47 Update README 2021-07-09 08:13:36 +08:00
winlin
3182dee1c5 Update README.md 2021-07-08 18:03:38 +08:00
winlin
8f91a90f28 Squash: Fix padding packets for RTMP2RTC 2021-07-08 14:37:18 +08:00
winlin
a47c55a171 Merge branch '4.0release' into merge/develop 2021-07-08 14:36:23 +08:00
winlin
1e27fec8de Merge branch 'develop' into merge/develop 2021-07-08 14:36:17 +08:00
winlin
73e8133e84 Merge branch 'develop' into merge/develop 2021-07-08 14:32:56 +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
Haibo Chen
90b7933dbb For #2403, fix padding packets for RTMP2RTC. 4.0.140.
Calculate the correct payload_size which pure padding data, in the process of rtc2rtmp, make Chrome happy (#2461)

* Calculate the correct payload_size which pure padding data, in the process of rtc2rtmp, make Chrome happy

* make clear for magic number

make clear for magic number

* Update srs_app_rtc_source.cpp
2021-07-08 14:27:51 +08:00
winlin
10b9a81061 RTC: Support eip/candidate to set the eip of server 2021-07-08 14:25:38 +08:00
Haibo Chen
7eee9aa598
Calculate the correct payload_size which pure padding data, in the process of rtc2rtmp, make Chrome happy (#2461)
* Calculate the correct payload_size which pure padding data, in the process of rtc2rtmp, make Chrome happy

* make clear for magic number

make clear for magic number

* Update srs_app_rtc_source.cpp
2021-07-08 14:23:53 +08:00
winlin
b121f5f588 Update SRS 4.0 docker 2021-07-08 12:56:43 +08:00
Winlin
77c958ad1c
RTC: Trim SDP line space for pion/webrtc client. (#2466) 2021-07-08 09:54:55 +08:00
winlin
56310ffd9d Refine .curcleci workflow 2021-07-07 08:38:30 +08:00
winlin
481f8b203c Refine .curcleci workflow 2021-07-07 08:36:27 +08:00
winlin
14bc799029 Refine .curcleci workflow 2021-07-07 08:34:02 +08:00
winlin
5beea97e8e Refine .curcleci workflow 2021-07-07 08:32:07 +08:00
winlin
5a7a742f36 Squash: Update README 2021-07-06 11:37:31 +08:00
winlin
2538a74e36 Merge branch '4.0release' into merge/develop 2021-07-06 11:24:22 +08:00
winlin
ce1b09da28 Merge branch 'develop' into merge/develop 2021-07-06 11:24:16 +08:00
winlin
67ebd08342 Add role(srs) to query versions 2021-07-06 11:22:16 +08:00
winlin
a88eb5242e Update README.md 2021-07-04 17:04:57 +08:00
winlin
13d015b8fd Squash: Fix random bug 2021-07-04 16:04:51 +08:00