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
7091 commits 13 branches 107 tags 375 MiB
Commit graph

4568 commits

Author SHA1 Message Date
Haibo Chen
43bb9660ca explicitly enable nack, for firefox (#2373) 2021-07-24 20:49:12 +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
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
winlin
afa32910c9 Fix bugs and enhance code. 4.0.142 2021-07-17 19:16:26 +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
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
Winlin
77c958ad1c
RTC: Trim SDP line space for pion/webrtc client. (#2466) 2021-07-08 09:54:55 +08:00
winlin
67ebd08342 Add role(srs) to query versions 2021-07-06 11:22:16 +08:00
winlin
642359a50e For #2424, use srandom/random to generate. 4.0.139 2021-07-04 15:50:29 +08:00
winlin
e802fe5bd6 Release 4.0.138 2021-07-01 06:25:36 +08:00
Haibo Chen
03c5f76e64 update channel_layout by channels, for ffmpeg transcode opus to aac success (#2452) 2021-07-01 06:23:29 +08:00
winlin
81a5c1b8da Move AUTHORS.txt to trunk for docker to access it 2021-06-30 08:20:53 +08:00
winlin
ef43532cf4 Merge #2440, fix #2390, SRT bug for zerolatency. 4.0.137 2021-06-30 07:26:45 +08:00
Alex.CR
7e164b0061 SRT: Fix bug for multiple NALUs, when configure OBS in zerolatency. (#2440) 
* 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

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-06-30 07:26:40 +08:00
long
cff4c07be4
打开rtmp转rtc，当rtmp重复推流时，第2路会影响第1路流的正常播放。 (#2448) 
* Update srs_app_rtmp_conn.cpp

修复推重复的RTMP流导致的RTC和RTMP播放的问题

* change ERROR_RTC_SOURCE_BUSY to ERROR_SYSTEM_STREAM_BUSY

change ERROR_RTC_SOURCE_BUSY to ERROR_SYSTEM_STREAM_BUSY

Co-authored-by: Haibo Chen <495810242@qq.com>
 2021-06-30 07:24:12 +08:00
winlin
98e56f5325 Refine the random id by srs_random_str 2021-06-28 08:34:00 +08:00
winlin
6ea270adf3 Merge #2435, fix #2015, fix bug for HTTP-RAW-API to check vhost. 4.0.136 2021-06-28 07:54:50 +08:00
Xiaoniu
31679c46d4 check 'vhost' validity in 'http raw dvr api' (#2435) 2021-06-28 07:53:16 +08:00
winlin
bfae75077e Fix #2431, configure FFmpeg bug. 4.0.135 2021-06-28 07:46:13 +08:00
winlin
c8d8581d4b For #2444, add libavcodec/crystalhd.c for FFmpeg. 4.0.134 2021-06-28 07:39:24 +08:00
Xiaoniu
7bf03ef2ba Fix #2068, losing of last HLS ts file 4.0.133 
fix bug: last segment of ts not trigger 'on_hls',
because of 'on_unpublish' earlier than 'segment_close' (#2438)
 2021-06-28 07:28:46 +08:00
winlin
aa12251084 Fix bug for v3.0-r6 2021-06-27 10:11:15 +08:00
winlin
da763e43d5 Squash for #2424, query the latest available version. 4.0.132 2021-06-27 08:56:41 +08:00
winlin
25262dd3cb Fix SRT bug. 4.0.131 2021-06-24 22:07:48 +08:00
Alex.CR
bb9aefd869 srt publish core dump bug (#2429) 
* solve srt push bugs

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 2021-06-24 22:03:59 +08:00
winlin
5906345a97 Fix #2413, fix RTMP to RTC bug 4.0.130 2021-06-21 14:37:41 +08:00
john
1347da81f8
Check audio/video track when rtc stream updated (#2418) 2021-06-21 14:35:37 +08:00
winlin
70e552ef23 Guess where FFmpeg is. 4.0.129 2021-06-20 17:08:09 +08:00
winlin
a52e7c08ea Update AUTHORS 2021-06-20 15:15:47 +08:00
winlin
229578cc65 Fix #1685, support RTC cross-build for armv7/armv8(aarch64). 4.0.128 2021-06-20 15:11:54 +08:00
winlin
1e9de0e191 For #1685: Cross build RTC with FFmpeg 2021-06-19 21:55:12 +08:00
winlin
1c75a270b3 RTC: Eliminate dead code. 2021-06-17 10:52:00 +08:00
winlin
623a453787 Fix #2214, remove detection for gmc and gmp. 2021-06-17 08:39:19 +08:00
winlin
df20fe6c9d Fix build fail 2021-06-16 14:02:48 +08:00
winlin
68c48e27f5 Change GB28181 to feature/gb28181. 4.0.127 2021-06-16 08:27:37 +08:00
winlin
d5266725e2 Build: Support --shared-ffmpeg to link with *.so for LGPL license. 4.0.126 2021-06-01 15:34:31 +08:00
winlin
f44224a2a1 Build: Support --shared-srt to link with *.so for MPL license. 4.0.125 2021-06-01 12:24:13 +08:00
winlin
67272f0721 Fix build fail for SPDX 2021-05-31 13:45:23 +08:00
winlin
3cd22b6e6e Use SPDX-License-Identifier: MIT. 4.0.124 2021-05-31 12:59:21 +08:00
winlin
4cf1f852cf Fix bugs for GB28181 and RTC. 4.0.123 2021-05-28 22:23:17 +08:00
johzzy
7be6025546 fix: fix typo about inactive. (#2380) 2021-05-28 22:20:36 +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
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
winlin
8e79b90bc3 RTC: Eliminate dead code. 4.0.122 2021-05-24 08:11:42 +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
37c9066636 RTC: Refine sdk, migrate from onaddstream to ontrack. 4.0.120 2021-05-21 16:58:21 +08:00
winlin
0c1e60c8df Tools: Refine configure options. 4.0.119 2021-05-21 08:31:10 +08:00
winlin
9e5c4e2c5b RTC: Fix build fail 2021-05-20 19:56:23 +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
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
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
Xiaoniu
75607d0723 Fix #2364: Live: Fail for stream busy if GB28181 is publishing. 2021-05-19 20:54:22 +08:00
winlin
0d14c4b073 System: Fail if use use full.conf 2021-05-18 11:06:14 +08:00
winlin
1bd6bfd142 GB28181: Rename sip and jitter file. 2021-05-18 09:03:16 +08:00
xialixin
4c2b19a264 GB28181: Refine for bad network, we can wait for more incomplete frames 2021-05-18 08:53:51 +08:00
xialixin
7d8bde3cdb Fix #2355: GB28181: Fix play by RTC bug. 4.0.116 2021-05-18 08:42:01 +08:00
winlin
4639510f1b RTC: Allow config perf_stat and queue_length of rtc_server 2021-05-17 18:23:54 +08:00
hondaxiao
90f1b482ab SRT: Build SRT from source by SRS. 4.0.115 2021-05-16 08:23:26 +08:00
winlin
3dce568b9c Rename SrsConsumer* to SrsLiveConsumer*. 4.0.114 2021-05-15 12:36:53 +08:00
winlin
dae6dc5395 Rename SrsRtcStream* to SrsRtcSource*. 4.0.113 2021-05-15 12:33:02 +08:00
winlin
2dd58665fa Rename SrsSource* to SrsLiveSource*. 4.0.112 2021-05-15 12:30:13 +08:00
winlin
9b6a1b16e1 RTC: Eliminate unused perf_stat 2021-05-15 12:04:21 +08:00
winlin
ddd7a378b1 Rename SrsRtpPacket2 to SrsRtpPacket. 4.0.111 2021-05-15 08:47:09 +08:00
winlin
ab0979a4ea RTC: Remove DTLS utests, cover by regression test 2021-05-14 18:14:00 +08:00
winlin
f7b32252b0 RTC: Remove Object Cache Pool, no effect. 4.0.110 2021-05-14 16:12:11 +08:00
winlin
717e811002 Change virtual public to public. 4.0.109 2021-05-14 09:13:15 +08:00
winlin
53e20d4a37 RTC: Eliminate unused stat code 2021-05-14 09:06:12 +08:00
winlin
cd45750c9d RTC: Eliminate unused stat API 2021-05-14 08:56:41 +08:00
winlin
06f7d7d11b Refine id and vid for statistic. 4.0.108 2021-05-14 08:21:16 +08:00
winlin
393d976685 SquashSRS4: Fix memory leak 2021-05-13 22:32:29 +08:00
winlin
996c7d5697 SquashSRS3: Fix bug 2021-05-12 21:48:11 +08:00
winlin
8c5a435714 Fix print bug in retrieve_local_ips. 4.0.107 2021-05-11 19:04:43 +08:00
winlin
6dc93fe0a8 RTC: Update benchmark data 2021-05-10 14:30:08 +08:00
winlin
3bf1b0cb7d Refine tid for sdk and demos. 4.0.106 2021-05-09 22:33:43 +08:00
winlin
2ad24b2313 Refine shared fast timer. 4.0.105 2021-05-08 16:50:26 +08:00
winlin
f370259c9d Fix build fail 2021-05-08 11:42:50 +08:00
winlin
4cf6da107c Refine init of global objects 2021-05-08 11:29:19 +08:00
winlin
8b58d18a5a Refine init of global objects 2021-05-08 11:25:48 +08:00
winlin
b1e85664a1 Refine init of global SrsPps 2021-05-08 11:11:13 +08:00
winlin
b6f2745822 Refine init of global variables 2021-05-08 10:25:04 +08:00
winlin
e8f7c913b0 Refine global or thread-local variables initialize. 4.0.104 2021-05-08 10:16:40 +08:00
winlin
e7cce88912 RTC: Refine timer stat 2021-05-07 19:01:25 +08:00
winlin
25f17c32e9 RTC: Refine fast timer 2021-05-07 18:42:36 +08:00
winlin
92fc0af8f4 RTC: Support circuit breaker. 4.0.103 2021-05-07 17:43:05 +08:00
winlin
46c980c70a RTC: Eliminate unused code 2021-05-07 10:57:25 +08:00
winlin
4527a91545 RTC: Refine play stream find track. 4.0.102 2021-05-07 10:50:51 +08:00
winlin
b823dcdfd7 RTC: Refine FastTimer to fixed interval. 4.0.101 2021-05-07 10:20:00 +08:00
winlin
0c0b467917 RTC: Transform config for nack/twcc. 4.0.100 2021-05-06 17:24:20 +08:00
winlin
b41788ca4a RTC: Fix config bug for nack and twcc. 4.0.99 2021-05-06 11:42:42 +08:00
winlin
4f48ad7a8b RTC: Fix config check bug for nack and twcc 2021-05-06 11:41:11 +08:00
winlin
81a87d07f6 Add video room demo. 4.0.98 2021-05-04 10:48:02 +08:00
winlin
9fb2b69212 Add RTC stream merging demo by FFmpeg. 4.0.97 2021-05-03 15:53:55 +08:00
winlin
5a611e0c4b Add one to one demo. 4.0.96 2021-05-02 19:35:03 +08:00
winlin
8a30cc86d9 Bridger: Fix build fail if disable rtc and ffmpeg-fit 2021-05-01 18:16:51 +08:00
winlin
3d225973ef Bridger: Support RTC2RTMP bridger and shared FastTimer. 4.0.95 2021-05-01 18:16:51 +08:00
winlin
c770e6d7bc Bridger: Start RTMP2RTC bridger in RTMP publisher 2021-05-01 18:16:51 +08:00
winlin
c10232b4e2 Bridger: Refine transcoder to support aac2opus and opus2aac. 4.0.94 2021-05-01 18:16:51 +08:00
winlin
00c192ede1 Timer: Apply shared FastTimer to RTC server. 4.0.93 2021-05-01 18:16:51 +08:00
winlin
8747dd6630 Timer: Extract shared FastTimer to use one timer for all connections 2021-05-01 18:16:51 +08:00
winlin
659e173e15 RTC: Refine for writing doc. 4.0.92 2021-05-01 16:42:09 +08:00
Winlin
e8fe66e3ba
RTC: Support av1 for Chrome M90 enabled it. 4.0.91 (#2324) 
* RTC: Support av1 for Chrome M90 enabled it. 4.0.91

* RTC: Show codec for WebRTC publisher
 2021-04-30 08:09:01 +08:00
winlin
a9d39f6946 RTC: Refine API params to create connection 2021-04-29 20:30:24 +08:00
winlin
7cae97e4d3 SquashSRS3: Update players 2021-04-28 15:45:34 +08:00
winlin
5516d3751f Change push-RTSP as deprecated feature. 2021-04-24 21:33:44 +08:00
winlin
5232f9e043 Disable CherryPy by --cherrypy=off. 4.0.90 2021-04-24 19:26:24 +08:00
winlin
de1c7522f0 SquashSRS3: Add console 2021-04-24 19:07:37 +08:00
winlin
9ed7565789 SquashSRS3: Package srs-console 2021-04-24 17:51:05 +08:00
winlin
cec0191b16 Happy 2021 2021-04-20 19:00:14 +08:00
winlin
d01e603b25 Happy 2021 2021-04-16 09:25:55 +08:00
stone
6da91f7dea For #2275, fix bug for transcode engine config param. 2021-04-09 07:19:31 +08:00
winlin
aae0f61165 RTC: Eliminate the dup code 2021-04-06 10:56:40 +08:00
winlin
061f367a82 RTC: Fix RTC connection dispose bug 2021-04-06 10:50:23 +08:00
winlin
db7e820f04 RTC: Fix DTLS warnings for HTTP api 2021-04-05 08:28:16 +08:00
winlin
96003d4a52 RTC: Fix bug for republish stream. 4.0.89 2021-04-04 19:01:42 +08:00
winlin
8d9dd532b9 RTC: Fix bug for republish stream. 4.0.89 2021-04-04 18:35:02 +08:00
winlin
3c59fedab6 RTC: Fix memory leak 2021-04-01 17:34:47 +08:00
winlin
7823d75a38 RTC: Refine payload NALU type parser 2021-04-01 14:46:28 +08:00
winlin
aa5d872b8c RTC: Refine TWCC and SDP exchange. 4.0.88 2021-04-01 10:50:20 +08:00
winlin
bd1752a4b2 RTC: Fix TWCC send bug 2021-04-01 10:47:50 +08:00
winlin
7ac4a4f4ca RTC: Fix audio track description bug 2021-04-01 10:24:37 +08:00
winlin
f4b791a9d5 Kernel: Never assert for SrsBuffer::require 2021-04-01 10:22:07 +08:00
winlin
4d5c7e0a73 RTC: Fix object cache bug, reset payload when recycle 2021-04-01 10:21:19 +08:00
winlin
f2d0c34244 RTC: Refine comments for SrsRtpPacket2 2021-03-31 17:46:45 +08:00
winlin
d6c16a7e23 RTC: Support WebRTC re-publish stream. 4.0.87 2021-03-24 20:12:31 +08:00
winlin
0cb05a2953 RTC: Refine ID parsing 2021-03-24 18:58:01 +08:00
winlin
89f941fadc Refine version file 2021-03-24 15:24:21 +08:00
winlin
6c7e24fc6d RTC: Eliminate dead code, we nerver send offer 2021-03-24 15:21:40 +08:00
winlin
4c39cc7c2f RTC: Use fast parse TWCCID, ignore in packet parsing. 4.0.86 
1. TWCC should not be passed from end to end.
2. Publisher TWCC information, should be ignore when pass to player
3. Player should regenerate its own TWCC.
 2021-03-24 12:29:17 +08:00
winlin
f5ff28d47a RTC: Refine play stream init 2021-03-24 10:50:13 +08:00
winlin
3fea5c0ec3 Test: Add republish regression test, should fail 2021-03-23 19:32:59 +08:00
winlin
a3dbb22696 Fix bugs. 4.0.85 2021-03-11 17:12:44 +08:00
winlin
a53fe451ff RTC: Feed TWCC then drop the specified PT packet. 
1. Sometimes we might drop RTP packets, by PT(payload type).
2. For example, the padding packets from client.
3. We should feed these packets to TWCC, then drop it.
 2021-03-11 16:48:29 +08:00
winlin
d4d11c2c18 DTLS: Change max loop to larger 2021-03-09 22:19:32 +08:00
winlin
62987aa01f DTLS: Refine retransmit between ClientHello and Certificate. 2021-03-09 22:12:23 +08:00
winlin
02aac0fea4 DTLS: Fix ARQ bug, use openssl timeout. 4.0.84 2021-03-09 19:36:45 +08:00
winlin
3c6e466280 DTLS: Use specified init API, to decrease packet size 2021-03-09 11:54:27 +08:00
winlin
3a5d88b435 DTLS: Disable QueryMTU for openssl, or the packet get fragmented 2021-03-09 07:22:11 +08:00
winlin
079c54bbe7 Add important comment for ST 2021-03-09 07:21:07 +08:00
winlin
55bdc354f5 Add important comment for disposing and thread stop 2021-03-08 21:05:02 +08:00
winlin
e4df2eb2ce DTLS: Fix dead loop by duplicated Alert message. 4.0.83 2021-03-08 12:35:16 +08:00
winlin
1ed567a005 DTLS: Fix dead loop by duplicated Alert message 2021-03-08 12:34:15 +08:00
winlin
43028c99c8 Fix bug when client DTLS is passive. 4.0.82 2021-03-08 10:41:42 +08:00
winlin
fc4f539907 Should check bridger status when publish stream. 2021-03-05 16:47:47 +08:00
winlin
c143b6bfd0 Squash SRS3: Update README for docker 2021-03-05 09:53:15 +08:00
winlin
de87dd427d Fix utest fail 2021-03-04 14:18:54 +08:00
Pieere Pi
4ba485002c Fix #2106, #2011, RTMP/AAC transcode to Opus bug. 4.0.81 2021-03-04 14:17:36 +08:00
winlin
8089fc004c Upgrade libsrtp from 2.0.0 to 2.3.0, with source code. 4.0.79 2021-03-04 14:13:58 +08:00