external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-24 15:04:20 +00:00
Code Issues Releases Wiki Activity
8150 commits 14 branches 107 tags 377 MiB
Commit graph

938 commits

Author SHA1 Message Date
winlin
7b3b7381e2 RTC: Refine the stat logs, limit the object cache pool 2021-02-27 07:41:51 +08:00
winlin
30809aee60 RTC: Only cache the UDP packet message 2021-02-26 22:55:27 +08:00
winlin
e79293a3bc Perf: Refine the stat 2021-02-26 21:35:51 +08:00
winlin
d6c0117870 Perf: Stat the shared messages. 2021-02-26 20:38:50 +08:00
winlin
bffe9c5f4b RTC: Cache the RTP payload objects 2021-02-26 20:28:05 +08:00
winlin
d5b210abc8 RTC: Cache the large buffer allocation 2021-02-26 19:46:52 +08:00
winlin
65ba88de3f RTC: Stat the large buffer allocation 2021-02-26 18:32:49 +08:00
winlin
1833780655 RTC: Support RTP packet cache manager 2021-02-26 16:21:59 +08:00
winlin
d7f4de6696 RTC: Refine RTP packet buffer allocate, align to about 1500 bytes 2021-02-26 13:11:56 +08:00
winlin
58d71c23bc RTC: Refine RTP packet api, keep shared message to private 2021-02-26 12:25:35 +08:00
winlin
2ae7e22469 RTC: Refine publisher memory allocate, by packet itself 2021-02-26 11:18:15 +08:00
winlin
8baf0867a0 RTC: Stat the RTP and payload objects 2021-02-25 14:25:54 +08:00
winlin
1909cfb3ff Kernel: Never depends on another globals for global variables 2021-02-25 14:06:18 +08:00
winlin
20df644a05 Kernel: Extract SrsPps to kernel 2021-02-25 13:46:52 +08:00
winlin
1f621a6db3 Remove dead code: memory watch 2021-02-19 18:53:40 +08:00
winlin
4ef1acb700 Remove dead code: memory watch 2021-02-15 19:33:40 +08:00
winlin
4a37fe30c7 RTC: Refine RTP header, never extends from any class 2021-02-10 16:16:49 +08:00
winlin
5919865e5d RTC: Refine NACK check, interval, time 2021-02-10 16:14:54 +08:00
winlin
2989e6c9c3 Fix build fail 2021-02-10 15:57:49 +08:00
winlin
719df6fa41 RTC: Parse TWCC SN fastly. 2021-02-10 15:57:38 +08:00
winlin
79a6907a65 RTC: Parse PT fast and refine udp handler. 4.0.69 2021-02-10 15:57:37 +08:00
winlin
dffbebfe6f RTC: Fast parse ssrc and find the publisher 2021-02-10 15:57:03 +08:00
winlin
45834b805b RTC: Refine RTP header, never extends from any class 2021-02-09 10:53:44 +08:00
winlin
abc26d470b RTC: Refine NACK check, interval, time 2021-02-08 16:24:12 +08:00
winlin
864356c9bd Fix build fail 2021-02-07 16:32:34 +08:00
winlin
9a9efb8546 RTC: Parse TWCC SN fastly. 2021-02-07 15:48:46 +08:00
winlin
d184b5662c RTC: Parse PT fast and refine udp handler. 4.0.69 2021-02-07 12:44:00 +08:00
winlin
80985c7307 RTC: Fast parse ssrc and find the publisher 2021-02-05 14:13:48 +08:00
winlin
1615c3df6c RTC: Refine code 2021-01-31 17:59:59 +08:00
winlin
09011eea3a RTC: Refine code 2021-01-17 20:30:10 +08:00
winlin
248085edfe For #2109, Add more utest for srs_string_split 2021-01-07 12:30:51 +08:00
xbpeng121
47422b7819
GB28181: 无法对接平台问题及一些小bug (#2109) 
* 1-新增srs_string_split2函数，该函数支持空串也能按照原有顺序进行切分并放入数组
2-SrsGb28181Device增加属性字段，并在收到catalog命令时能够更新该属性
3-修复sip包解包不严谨bug(body中有可能会有SRS_RTSP_CRLFCRLF那么导致header_body[1]就不一定是body了可能只是body的一部分)

* 1-修复停用rtp多路复用参数（invite_port_fixed）不起作用bug

* bugfix: 当srs发送invite时会指定一个ssrc作为流媒体序列号，但有些平台发流时并不使用这个作为ssrc,而是自己新生成一个。（修复该bug是在invite response时解析内容中的sdp，把对方生成的流媒体序列号ssrc读出来，并且更新srs的channel映射）

* Update push.gb28181.conf

恢复成原来的conf

* bugfix,在取得muxer时需要更新。之前写反了

* Merge branch 'develop' into 4.0release

* 解决冲突时，优先选择原有代码（还原选择develop的代码）

* 解决冲突时，优先选择原有代码（还原选择develop的代码）

* 解决冲突时，优先选择原有代码（还原选择develop的代码）

* 解决冲突时，优先选择原有代码（还原选择develop的代码）

* 修改sdp_map相同属性的连接符

* 解决冲突时，优先选择原有代码（还原选择develop的代码）

* 修改sdp_map相同属性的连接符

* 解决冲突时，优先选择原有代码（还原选择develop的代码）

* 解决冲突时，优先选择原有代码（还原选择develop的代码）

* 回退原来代码

* 删除parse_sdp存储至map相关代码

* 格式恢复

* 格式恢复

* 恢复格式

* srs_string_split() 函数的bugfix

Co-authored-by: xbpeng <xianbin.peng@sibat.cn>
 2021-01-06 15:37:02 +08:00
winlin
155587d2c1 RTC: Fix parse error stap playload crash bug 2021-01-05 10:56:05 +08:00
winlin
90b61ad952 Merge SRS4 2020-12-18 10:14:26 +08:00
winlin
5ebf034aea For #1694, Refine API for nb_bytes 2020-12-18 09:56:40 +08:00
winlin
c17474627b Merge SRS3 2020-12-18 09:34:32 +08:00
winlin
25c76c1e8a Fix #1694, Support DVR 2GB+ MP4 file. 3.0.155 2020-12-17 18:43:45 +08:00
winlin
576be75f00 Merge branch '4.0release' into develop 2020-12-17 12:28:04 +08:00
winlin
c97e943b07 Merge SRS3 2020-12-17 12:27:47 +08:00
winlin
ab5ddd24e2 Fix #1548, Add edts in MP4 for Windows10. 3.0.154 2020-12-17 12:07:34 +08:00
winlin
721173e6af MP4: Fix warnings 2020-12-17 11:25:51 +08:00
莫战
b38f30c3ee support query parsing and escape 2020-12-01 16:27:37 +08:00
莫战
dc7124cd05 support base64 encode 2020-12-01 16:04:55 +08:00
winlin
07c04a042a URI: Refine uri parser 2020-11-10 18:51:21 +08:00
winlin
272ca9d0f6 For #1657, Support HTTPS API 2020-11-06 15:05:01 +08:00
winlin
d552a1a5fb For #1657, support HTTPS client, for http-callback. 4.0.45 2020-11-03 15:45:52 +08:00
winlin
8c1eca98b0 Merge SRS3.0 2020-10-31 19:25:56 +08:00
winlin
86f8cbb5eb Remove some global elements for debugging. 3.0.152 2020-10-31 18:01:16 +08:00
winlin
b602aef56f Merge branch 'develop' into feature/rtc 2020-10-10 17:56:05 +08:00
winlin
20293e7e5d Merge 3.0release 2020-10-10 17:54:34 +08:00
winlin
13af54171f For #1780, build fail on ubuntu:focal. 3.0.144 2020-10-10 16:20:05 +08:00
winlin
fe66755bab RTC: Init RTP extension types 2020-09-15 16:40:35 +08:00
winlin
4c459a004e Log: Support tag for log 2020-09-10 11:07:21 +08:00
winlin
1c07aed2fc Fix bugs 2020-08-21 21:23:32 +08:00
winlin
a826926073 SRS: Fix bug 2020-08-21 21:14:18 +08:00
winlin
2b725b8167 Fix bug 2020-08-20 18:46:11 +08:00
winlin
a2d9f0a9ad Fix bug 2020-08-20 18:22:36 +08:00
winlin
7dcfd6b029 Refine code 2020-08-20 18:05:40 +08:00
winlin
7a9e89d7b3 Fix memory leak 2020-08-20 17:15:07 +08:00
winlin
b41ffed0a2 Refine code style 2020-08-20 16:16:35 +08:00
winlin
c33dfd2313 RTC: Add utest for DTLS 2020-08-18 19:20:07 +08:00
winlin
66a0143f14 RTC: Refine source state to created and delivering 2020-08-17 18:15:34 +08:00
winlin
9d38009b7f RTC: Ignore twcc if no need to feedback 2020-08-17 11:43:29 +08:00
winlin
1800d9d71b RTC: Support empty RR, ignore it 2020-08-17 11:30:28 +08:00
winlin
fd69635052 RTC: Fix typo 2020-08-17 11:17:58 +08:00
winlin
f54bf8d9be RTC: Support more than one publishers or players. 2020-08-11 11:06:17 +08:00
winlin
a728e02b93 RTC: Refine RTCP packets parsing 2020-08-11 09:40:27 +08:00
winlin
1591318792 Fix build fail 2020-08-10 18:35:32 +08:00
winlin
8f1af9a13a RTP: Refine RTCP protocol 2020-08-10 17:48:53 +08:00
winlin
49bb418e74 Fix TWCC default value 2020-08-07 20:11:37 +08:00
winlin
a52a81ebb0 RTC: Fix RTCP extension padding bug 2020-08-06 17:25:20 +08:00
winlin
2f1e77aeaf RTC: Fix RTCP app bug. Add is_rtcp_app API. 2020-08-06 17:18:45 +08:00
winlin
994c53b6c1 Merge branch '4.0release' into develop 2020-08-06 12:08:46 +08:00
winlin
4984bcbaef Revert "supprot LAS(live adaptive stream)" 
This reverts commit c1f98ddcc8.
 2020-08-06 12:02:32 +08:00
winlin
0eae1bd493 RTC: Enable track of player when init done. 2020-08-03 12:49:12 +08:00
winlin
8e22508057 Refine utest 2020-07-30 18:54:16 +08:00
winlin
e0c9544995 RTC: Refine code 2020-07-24 16:44:16 +08:00
winlin
7ad1dfbbb8 Merge SRS 4.0 2020-07-19 10:13:48 +08:00
winlin
8ae3ab0ba7 Merge SRS 4.0 2020-07-19 10:09:28 +08:00
winlin
2934673d3f RTC: Create file if not exists for append 2020-07-18 09:49:27 +08:00
winlin
991672bf41 RTC: Refine stream/ssrc/sdp structure 2020-07-15 13:11:35 +08:00
winlin
deb54b8866 Core: Refine utility string/hex 2020-07-13 14:30:44 +08:00
winlin
0a057a0427 Log: Refine log context, use const 2020-07-13 11:19:34 +08:00
winlin
bbc168d980 RTC: Refine generate_id, never set the cid for current thread 2020-07-09 18:11:49 +08:00
winlin
6624b8acca Log: Use object as context id for complex context 2020-07-05 23:26:55 +08:00
liulichuan
c1f98ddcc8 supprot LAS(live adaptive stream) 
Change-Id: I2f9fd889fc924a3b080667bd2114f4632be461a0
 2020-07-03 11:18:10 +08:00
winlin
c62479b112 Merge branch 'feature/rtc' into develop 2020-07-03 09:23:27 +08:00
kyxlx550
1bbf5c8126 fix ps to h264 frame_size < 0 checkt 2020-07-02 09:06:05 +08:00
jinxue.cgh
747be9047c RTC: refine twcc encode_chunk_two_bit 2020-06-28 19:32:17 +08:00
winlin
e9731fe0c1 RTC: Support ignore padding for RTP header 2020-06-27 16:12:08 +08:00
jinxue.cgh
6ff048ed35 RTC: process twcc before srtp unprotected 2020-06-27 15:59:47 +08:00
winlin
a6ade57ce5 Refine comments 2020-06-26 15:25:11 +08:00
winlin
5cc0f70f62 RTC: Refine the extensions for RTP. 2020-06-26 15:24:37 +08:00
winlin
62b70943d4 RTC: Fix TWCC delta bug. 2020-06-26 15:20:24 +08:00
winlin
81d2e10f65 Refactor ISrsContext and ISrsLog 2020-06-25 13:14:59 +08:00
winlin
be5d76009e RTC: Support build without RTMP2RTC bridger, no FFmpeg fit. 2020-06-24 12:44:13 +08:00
winlin
8a0c2e01f8 Log: Change cid from int to string 2020-06-18 11:45:43 +08:00
jinxue.cgh
e2fcd89644 rtc: refine set extension map for rtp_header 2020-06-02 11:00:52 +08:00
winlin
b8ba4ff779 RTC: Refine code 2020-05-31 10:54:59 +08:00
winlin
899493e968 Fix build failed 2020-05-30 17:52:11 +08:00
jinxue.cgh
b8ab6ef6ce RTC: use c++ 98 style map.erase and NULL 2020-05-27 10:15:59 +08:00
winlin
a5265c5753 RTC: Add comments. 2020-05-24 21:18:46 +08:00
winlin
2bd0e1ce43 Kernel: Buffer supports little-endian 2020-05-22 18:14:15 +08:00
jinxue.cgh
6ce4ff56f8 rtc: rtp packet encode support twcc extension 2020-05-20 11:28:15 +08:00
winlin
eb0667ba08 RTC: Fix build failed 2020-05-19 20:47:01 +08:00
jinxue.cgh
95596d9c38 rtc: rtpheader decode add extmap parameter 2020-05-19 20:37:16 +08:00
jinxue.cgh
3681c564d0 rtc: fix rtp header parse extension xlen caclulate bug 2020-05-19 20:37:07 +08:00
jinxue.cgh
705843b512 rtc: support parse rtp packet extension 2020-05-19 20:30:38 +08:00
winlin
69e4a1b5e7 RTC: Refactor variable name 2020-05-19 18:06:12 +08:00
winlin
e3d010113f RTC: Refactor code 2020-05-19 17:49:34 +08:00
忘篱
f5ba274019 RTC: Refine RTCP names. 2020-05-17 20:23:57 +08:00
忘篱
d6d2554c7f RTC: Refine comments for TWCC 2020-05-17 20:20:06 +08:00
忘篱
d603b1580e RTC: Merge srs_rtp_seq_distance with srs_seq_is_newer 2020-05-17 09:03:40 +08:00
忘篱
3f5ab8dc63 RTC: Add utest for srs_rtp_seq_distance 2020-05-17 00:03:14 +08:00
忘篱
be1b0bf941 RTC: Refactor code 2020-05-15 18:06:25 +08:00
忘篱
d1485c40e4 RTC: Rename APIs 2020-05-15 15:36:55 +08:00
忘篱
99496ed24c RTC: Remove dead code 2020-05-15 12:07:11 +08:00
忘篱
e20a1d2f39 RTC: Rename RTCP_XXX to RtcpXXX 2020-05-15 12:03:43 +08:00
忘篱
cef8be4a46 RTC: Support RTCP codec. 2020-05-15 11:50:59 +08:00
莫战
9910151feb add twcc and replace auto method 2020-05-15 09:55:15 +08:00
winlin
f510a94a91 RTC: Rename SrsRtpPacket2.rtp_header to SrsRtpPacket2.header 2020-05-15 08:38:43 +08:00
winlin
ba8f2e2aba RTC: Remove dead code 2020-05-15 08:34:58 +08:00
winlin
f81d35d20f RTC: Rename padding API. 2020-05-14 15:01:12 +08:00
winlin
5e2a3572eb RTC: Remove cache for RTP packet 2020-05-14 14:44:24 +08:00
winlin
7b0a9fe95f RTC: Remove shared bytes, use shared msg 2020-05-14 14:30:32 +08:00
winlin
f794a7d3a7 RTC: Use shared message for RTP packet 2020-05-14 14:26:19 +08:00
winlin
2b1c4a188a RTC: Refine RTMP bridge to RTC, use RTP packets in consumer 2020-05-14 09:33:00 +08:00
winlin
54d8c36905 RTC: Refine audio to RTP packet base. 2020-05-13 20:13:25 +08:00
winlin
588d17c09d RTC: Refactor source to accept RTP audio packet. 2020-05-13 18:43:25 +08:00
winlin
9b334f91e7 RTC: Fix build failed 2020-05-13 15:27:31 +08:00
winlin
0b9887bbcd RTC: Rename RTC files. 2020-05-11 12:07:55 +08:00
莫战
a72dce494d add rtcp support 2020-05-09 10:51:57 +08:00
winlin
fe01a504b6 Fix RTP decode bug 2020-05-07 16:12:04 +08:00
winlin
c4b93b8a38 Refactor RTC video queue, extract RTP video packet 2020-05-05 08:24:49 +08:00
winlin
4d33070c59 Support NACK for RTC player 2020-05-04 14:47:58 +08:00
winlin
15955b6cdd Refactor the RTP packet. 2020-05-04 07:40:02 +08:00
winlin
ef64c5e2bd Refine RTC, reject when config disabled. 2020-05-03 13:11:38 +08:00
winlin
32c4febafe Refactor RTC publish packet flags. 2020-05-03 10:15:54 +08:00
winlin
780753c0ec Refine code for RTC publisher 2020-05-02 20:57:36 +08:00
winlin
5c43037190 Remove usused RTP shared packet. 2020-05-02 10:24:31 +08:00
winlin
b3a0284db5 Refactor code to split implementation to cpp 2020-05-02 09:48:04 +08:00
winlin
6f2b78f16a Refactor code to keep sample function order 2020-05-02 09:15:49 +08:00
winlin
7b5fa0e391 Refactor kernel buffer 2020-04-30 20:46:45 +08:00
winlin
d045ce5d74 Refine kernel buffer API. 2020-04-30 19:33:08 +08:00
winlin
5ee5ef6ab2 For #307, support publish RTC with passing opus. 4.0.24 2020-04-30 10:57:03 +08:00
winlin
ed338f4c0a Refactor macro SRS_AUTO_XXX to SRS_XXX. 2020-04-29 20:02:28 +08:00
winlin
db586903ba Refactor RTC source create 2020-04-26 16:12:23 +08:00
winlin
ebdc03416a Free rtc publish. Refactor TAB to spaces 2020-04-25 22:30:55 +08:00
winlin
70a81b3970 Fix the bug for RTC publisher 2020-04-25 18:59:02 +08:00
xiaozhihong
8dc0746e2d rtc publish release 2020-04-24 16:19:08 +08:00
xiaozhihong
a061d5c3db rtc publish, with debug code 2020-04-23 17:08:21 +08:00
winlin
dabad68f48 Merge branch 'feature/gb28181' into develop 2020-04-21 15:27:40 +08:00
winlin
74800d0137 Refactor code 2020-04-21 12:18:49 +08:00
kyxlx550
6a070a9a64 support sip ptz cmd 2020-04-20 21:34:18 +08:00
winlin
32879eaf47 Fix double free bug for RTP 2020-04-19 13:16:48 +08:00
winlin
6a4e043349 Fix the double free bug 2020-04-19 11:22:18 +08:00
winlin
b1df04cb09 Fix double free bug for RTP 2020-04-19 09:32:09 +08:00
winlin
c93cd86ce4 For #307, refine performance 2020-04-18 20:37:08 +08:00
winlin
cf52390cf2 Support fast padding 2020-04-17 18:04:52 +08:00
winlin
36d06edab3 Refine performance 2020-04-17 14:24:24 +08:00
winlin
634225f92f Improve perforance of marshaling RTP header 2020-04-16 18:04:56 +08:00
winlin
3bd56bb3a3 For #307, reuse fua cache payload for RTP 2020-04-16 14:51:36 +08:00
winlin
d5c514cdcb For #307, reuse raw cache payload for RTP 2020-04-16 14:28:59 +08:00
winlin
e90f0629ed Refactor RTP cache reset 2020-04-16 13:13:02 +08:00
winlin
34fec09bc0 Refactor padding 2020-04-16 11:22:25 +08:00
winlin
1064429c7e Cache RTP packets 2020-04-15 22:46:06 +08:00
winlin
d692f2d9c4 Fix build failed when RTC disabled. 2020-04-15 21:37:46 +08:00
winlin
6869ccca50 Fix RTP padding bug 2020-04-15 14:19:00 +08:00
kyxlx550
95b869245b fix sip message parse error 2020-04-15 12:06:27 +08:00
winlin
97cfae624c Fix CentOS8 build warnings 2020-04-14 19:23:15 +08:00
winlin
96059e0d42 For #307, support merge multiple slices/NALUs to one NALU/RTP/FUA 2020-04-13 19:23:17 +08:00
winlin
0bb61f7d98 For #307, RTC RTP support padding 2020-04-13 13:44:55 +08:00
winlin
acbbdf51d6 Refacor STAP RTP packet 2020-04-12 01:05:11 +08:00
winlin
ca027ca5cb For #307, zero copy for RTP FUA packet 2020-04-12 01:01:39 +08:00
winlin
aa81b47c9a For #307, zero copy for RTP STAP packet 2020-04-11 23:57:04 +08:00
winlin
4b2404c203 For #307, zero copy for RTP audio packet 2020-04-11 22:54:44 +08:00
winlin
a2fdf0d3c7 For #307, package video rtp packets when send message 2020-04-11 21:03:37 +08:00
kyxlx550
769efa87c3 add sip device channel error code 2020-04-11 20:01:35 +08:00
kyxlx550
3d1c34a45e add gbs log id define 2020-04-11 20:00:31 +08:00
winlin
3cccef327c For #307, package opus when send it. 2020-04-11 17:52:14 +08:00
winlin
1f2db4d746 For #307, refactor aac to opus code 2020-04-11 17:09:55 +08:00
winlin
7ffe4aacb8 For #307, refactor shared msg, add samples and extra payload 2020-04-11 15:26:20 +08:00
winlin
5b9cb7dc3f For #307, refactor code, parse B-frame by sample. 2020-04-11 15:11:42 +08:00
winlin
719c0ae85b For #307, refactor SPS/PPS only before IDR, not each FUA 2020-04-11 13:10:27 +08:00
winlin
49f88a3326
Merge pull request #1691 from xialixin/dev-28181 
Dev 28181
 2020-04-09 08:28:53 +08:00
xiaozhihong
85fcbad778 [1].Add 'stun_strict_check' in conf file 
[2].Try to pickup at least H.264 payload type
 2020-04-08 23:24:59 +08:00
xiaozhihong
ca7060c005 Add SrsRtpHeader. 2020-04-08 14:45:26 +08:00
winlin
f228b3809a Fix utest failed. 2020-04-05 21:22:50 +08:00
xialixin
ac8acc0b22 fix 28281 to 28181, sip heart message, timeout channel peer ip and port reset 2020-04-04 16:07:23 +08:00
winlin
e19b927f92 Merge GB28181 2020-03-31 22:45:20 +08:00
winlin
a342f460e7 Merge branch '4.0release' into xialixin-dev-28181 2020-03-31 20:09:07 +08:00
winlin
33455867f9 Merge branch 'dev-28181' of https://github.com/xialixin/srs into xialixin-dev-28181 2020-03-31 20:08:24 +08:00
xialixin
c99fb99ab6 refactor gb28181, supporting SIP server enable, multiplex, API interface 2020-03-31 00:39:10 +08:00
xiaozhihong
9dadcdffd6 Merge remote-tracking branch 'upstream/feature/rtc' into sdp 2020-03-30 15:16:44 +08:00
xiaozhihong
49da2099c1 sdp exchange. 2020-03-30 15:16:29 +08:00
winlin
c1e124786c For #307, fix build warnings for rtc 2020-03-28 20:57:03 +08:00
winlin
c2b02f86fa Merge 4.0release 2020-03-28 17:46:47 +08:00
winlin
217b8b94b6 Merge 3.0release 2020-03-28 17:45:14 +08:00
winlin
c339542ce0 Support macOS OSX 2020-03-28 17:20:40 +08:00
winlin
caf7e9e6ea Merge branch 'feature/rtc' into develop 2020-03-22 18:53:39 +08:00