github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,486 Commits
13 Branches
107 Tags
346 MiB
Commit Graph

6486 Commits (945cf64024522e157404ba94ce2f2ffd401f06d2)
 

Author SHA1 Message Date
winlin 945cf64024 Refine srs_player
winlin f006bf59b1 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63
winlin 979bf86e8b Support HTTP-FLV and HLS for srs-player by H5. 4.0.63
winlin 5c41766b79 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63
winlin b373400257 RTC: Extract NACK handler from stream to track.
winlin 40ea0b67f9 RTC: Refine RTP packet decoder to track and stream
winlin 0fe85a295c Refine options with default value
winlin b9a5d4beb6 Refine options with default value
winlin 1615c3df6c RTC: Refine code
winlin ec2535b183 RTC: Refine code
winlin e26b685169 Refine script
winlin 4bb3ad5637 For , Fix bug for fixing memory leak for bridger. 4.0.62
winlin 4e70bf5eaf For , Fix memory leak for bridger of RTC source stream. 4.0.61
winlin 50bb9eb391 Revert "For , RTC: Fix memory leak" 
This reverts commit 2492b726af.
winlin ed32965aa4 Revert "Fix , Async release bridger when unpublish. 4.0.60" 
This reverts commit 06adb9dc42.
winlin 06adb9dc42 Fix , Async release bridger when unpublish. 4.0.60
winlin 10ffb2da36 HTML5 video tag resolution adaptive. 4.0.59
winlin 26dec1b037 Release 4.0.58 
Merge , Fix bugs for GB28181.
Merge , Refine srs_string_split.
Fix memory leak and bugs for RTC.
winlin b6843428c6 Fix build warnings
winlin 81d78310a0 Fix build warnings
winlin 61f62ceec6 Fix build warnings
winlin 473942c6f6 Kernel: Add utest for srs_string_split
winlin 8580b1e5fb Merge branch '4.0release' into develop
winlin f8266fe3b7 Add usage for --cherrypy=on|off when configure
winlin bfa156247c Merge branch '4.0release' into develop
winlin 6c7ffdeedf Merge branch '3.0release' into 4.0release
winlin d520679547 Refine code for changing id of stat to string
winlin 4f013404e3 Refine stat id
winlin 1c41f5d796 Merge SRS3, change id of stat to string
winlin fb7c051833 Change id from int to string for the statistics. 3.0.157
winlin 50efd80537 For , , Update authors.
johzzy 3c14a96bdd
fix: html5 video tag resolution adaptive. ()
winlin 248085edfe For , Add more utest for srs_string_split
winlin 2492b726af RTC: Fix memory leak
xbpeng121 47422b7819
GB28181: 无法对接平台问题及一些小bug () 
* 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>
winlin 6cf93557e1 RTC: Fix publish RTC ssrc bug
winlin fbbdf5ba0e RTC: Fix audio track NULL bug
winlin 040893efde Add research for UDP binding
winlin 155587d2c1 RTC: Fix parse error stap playload crash bug
winlin ebe38f7337 RTC: Fix RTX bug
winlin 010878889c Release 3.0r3
winlin 78fcaaf7b1 RTC: Fix memory leak
winlin 03389f5e8c Merge branch '4.0release' into develop
winlin 1df2ea5ca8 Merge branch '3.0release' into 4.0release
winlin 831c78062b Remove vhost in query if not present it
winlin 8fa093c53c Merge branch '4.0release' into develop
winlin 2538b02a9b Merge branch '3.0release' into 4.0release
winlin 6e43ef6866 For RTMP edge/forward, pass vhost in tcUrl, not in stream. 3.0.156
winlin f9444c376c Merge SRS4
winlin 0ccbd7c40a Support get schema for HTTP message