Commit Graph

6624 Commits (6d64490d738ff6b8f51f80dce80bb1297bec9416)
 

Author SHA1 Message Date
winlin 4e70bf5eaf For #2142, Fix memory leak for bridger of RTC source stream. 4.0.61 4 years ago
winlin 50bb9eb391 Revert "For #2142, RTC: Fix memory leak"
This reverts commit 2492b726af.
4 years ago
winlin ed32965aa4 Revert "Fix #2142, Async release bridger when unpublish. 4.0.60"
This reverts commit 06adb9dc42.
4 years ago
winlin 06adb9dc42 Fix #2142, Async release bridger when unpublish. 4.0.60 4 years ago
winlin 10ffb2da36 HTML5 video tag resolution adaptive. 4.0.59 4 years ago
winlin 26dec1b037 Release 4.0.58
Merge #2109, Fix bugs for GB28181.
Merge #2109, Refine srs_string_split.
Fix memory leak and bugs for RTC.
4 years ago
winlin b6843428c6 Fix build warnings 4 years ago
winlin 81d78310a0 Fix build warnings 4 years ago
winlin 61f62ceec6 Fix build warnings 4 years ago
winlin 473942c6f6 Kernel: Add utest for srs_string_split 4 years ago
winlin 8580b1e5fb Merge branch '4.0release' into develop 4 years ago
winlin f8266fe3b7 Add usage for --cherrypy=on|off when configure 4 years ago
winlin bfa156247c Merge branch '4.0release' into develop 4 years ago
winlin 6c7ffdeedf Merge branch '3.0release' into 4.0release 4 years ago
winlin d520679547 Refine code for changing id of stat to string 4 years ago
winlin 4f013404e3 Refine stat id 4 years ago
winlin 1c41f5d796 Merge SRS3, change id of stat to string 4 years ago
winlin fb7c051833 Change id from int to string for the statistics. 3.0.157 4 years ago
winlin 50efd80537 For #2128, #2109, Update authors. 4 years ago
johzzy 3c14a96bdd
fix: html5 video tag resolution adaptive. (#2128) 4 years ago
winlin 248085edfe For #2109, Add more utest for srs_string_split 4 years ago
winlin 2492b726af RTC: Fix memory leak 4 years ago
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>
4 years ago
winlin 6cf93557e1 RTC: Fix publish RTC ssrc bug 4 years ago
winlin fbbdf5ba0e RTC: Fix audio track NULL bug 4 years ago
winlin 040893efde Add research for UDP binding 4 years ago
winlin 155587d2c1 RTC: Fix parse error stap playload crash bug 4 years ago
winlin ebe38f7337 RTC: Fix RTX bug 4 years ago
winlin 010878889c Release 3.0r3 4 years ago
winlin 78fcaaf7b1 RTC: Fix memory leak 4 years ago
winlin 03389f5e8c Merge branch '4.0release' into develop 4 years ago
winlin 1df2ea5ca8 Merge branch '3.0release' into 4.0release 4 years ago
winlin 831c78062b Remove vhost in query if not present it 4 years ago
winlin 8fa093c53c Merge branch '4.0release' into develop 4 years ago
winlin 2538b02a9b Merge branch '3.0release' into 4.0release 4 years ago
winlin 6e43ef6866 For RTMP edge/forward, pass vhost in tcUrl, not in stream. 3.0.156 4 years ago
winlin f9444c376c Merge SRS4 4 years ago
winlin 0ccbd7c40a Support get schema for HTTP message 4 years ago
winlin af8bf67606 Refine player 4 years ago
winlin 92588c0872 Merge branch '4.0release' into develop 4 years ago
winlin 18d049accc Support disable CherryPy. 4.0.57 4 years ago
jinxue.cgh 7f081b4178 RTC: Refine TWCC from 200ms to 50ms 4 years ago
winlin c3938ddfd2 Research: Add cost analysis 4 years ago
winlin a4d1b3e2ca Research: Add cost analysis 4 years ago
winlin ec212b7413 Merge branch '4.0release' into develop 4 years ago
winlin 764909c6cf Clear disposing then free resources to avoid reuse addresses 4 years ago
winlin 6afdf3addf Merge branch '4.0release' into develop 4 years ago
winlin e8fa92e3d1 Refine logs for resource manager 4 years ago
winlin 5949eee4f4 Keep resources when dispoing to avoid reuse addresses. 4 years ago
winlin 9217fad73b Hotfix: Print resource address when manager dispose it 4 years ago