winlin
c492a7b7fb
Merge branch 'develop' into merge/develop
2021-07-26 20:11:54 +08:00
Haibo Chen
f62a4c4893
correct the client ip of http-flv player, for statistic ( #2491 )
2021-07-26 20:01:29 +08:00
winlin
de2c720272
Merge branch '4.0release' into merge/develop
2021-07-25 08:45:47 +08:00
winlin
a5816318f9
Update
2021-07-25 08:45:44 +08:00
winlin
7d4cae45c5
Release 4.0 dev1, v4.0.146
2021-07-25 08:43:00 +08:00
winlin
ed6f8689b4
Release 4.0 dev1, v4.0.146
2021-07-25 08:42:19 +08:00
winlin
301a8ceadb
Squash: Merge SRS 4.0
2021-07-24 21:10:35 +08:00
winlin
1bd228e297
Merge branch '4.0release' into merge/develop
2021-07-24 21:09:34 +08:00
winlin
40e649dfbc
RTC: Fix NACK negotiation bug for Firefox. 4.0.145
2021-07-24 21:07:28 +08:00
winlin
128d3484cb
Merge branch '4.0release' into merge/develop
2021-07-24 21:03:33 +08:00
winlin
80fad01676
Merge branch 'develop' into merge/develop
2021-07-24 21:03:29 +08:00
Winlin
8c7ba05f9a
For #2371 : Add regression test for SDP nack ( #2487 )
...
* explicitly enable nack, for firefox (#2373 )
* For #2371 : Add regression test for SDP nack
1. Refine API to change defaule decodes.
2. Add test for publish SDP nack.
3. Add test for play SDP nack.
Co-authored-by: Haibo Chen <495810242@qq.com>
2021-07-24 21:03:00 +08:00
Haibo Chen
43bb9660ca
explicitly enable nack, for firefox ( #2373 )
2021-07-24 20:49:12 +08:00
Haibo Chen
fb73d42c38
explicitly enable nack, for firefox ( #2373 )
2021-07-24 20:47:34 +08:00
Winlin
fe5a14568b
For #2483 , add regression test for RTC stat API ( #2486 )
2021-07-24 20:46:58 +08:00
winlin
1c80b529f8
Squash: Merge SRS 4.0
2021-07-24 08:20:05 +08:00
winlin
11ae7abceb
Merge branch '4.0release' into merge/develop
2021-07-24 08:09:58 +08:00
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
