Commit Graph

5730 Commits (7fd5e8607cf5d86e2b29c02c233542b59da374c4)

Author SHA1 Message Date
winlin 36f55247a3 Support reload the object cache pool 4 years ago
winlin a29d6cba68 Perf: Limit the size of object cache pool 4 years ago
winlin 7b3b7381e2 RTC: Refine the stat logs, limit the object cache pool 4 years ago
winlin 30809aee60 RTC: Only cache the UDP packet message 4 years ago
winlin e79293a3bc Perf: Refine the stat 4 years ago
winlin d6c0117870 Perf: Stat the shared messages. 4 years ago
winlin bffe9c5f4b RTC: Cache the RTP payload objects 4 years ago
winlin d5b210abc8 RTC: Cache the large buffer allocation 4 years ago
winlin 65ba88de3f RTC: Stat the large buffer allocation 4 years ago
winlin 439a7fa655 RTC: Apply RTP packet cache manager 4 years ago
winlin 1833780655 RTC: Support RTP packet cache manager 4 years ago
winlin d7f4de6696 RTC: Refine RTP packet buffer allocate, align to about 1500 bytes 4 years ago
winlin 58d71c23bc RTC: Refine RTP packet api, keep shared message to private 4 years ago
winlin 2ae7e22469 RTC: Refine publisher memory allocate, by packet itself 4 years ago
winlin 001a6a33ce Build: Add gcc version in cache directory 4 years ago
winlin 34dae0fe0d For #2188: Remove sendmmsg from ST. 4 years ago
winlin 20374ea59f Fix build warning 4 years ago
winlin 0cd3e34900 RTC: Refine memory allocate for publisher 4 years ago
winlin 8bdf71bb7c RTC: Refine memory allocate for publisher 4 years ago
winlin ccb24a13ad RTC: Refine memory copy, allocate it later 4 years ago
winlin 2f4fe31337 RTC: Cache the buffer for player 4 years ago
winlin 8baf0867a0 RTC: Stat the RTP and payload objects 4 years ago
winlin 1909cfb3ff Kernel: Never depends on another globals for global variables 4 years ago
winlin 20df644a05 Kernel: Extract SrsPps to kernel 4 years ago
winlin 7b7a225631 RTC: Refine stat for RTC server 4 years ago
winlin adfca6069c Perf: Improve fast find for pithy print 4 years ago
winlin 3a7c742f07 RTC: Stat the drop of UDP packets. 4 years ago
winlin 243100817a RTC: Refine stat logs 4 years ago
winlin 3c1738b60e RTC Stat the detail of send packets 4 years ago
winlin 749a7eafef RTC: Stat the detail of received packets 4 years ago
winlin e06d6672d5 Refine logs 4 years ago
winlin e0eb4e2d51 RTC: Refine logs 4 years ago
winlin 0efb787f36 RTC: Send NACK one by one to avoid packet freed by context switching 4 years ago
winlin d4aead59d4 RTC: Refine TWCC and RTCP timer to 100ms. 4 years ago
winlin 9e0120dfcd Merge branch '4.0release' into develop 4 years ago
winlin 6d3aa2c426 Refine code. 4.0.74 4 years ago
winlin 3a83a74dfc Stat: Refine stat bug for timer 4 years ago
winlin 5b8eea8cc5 Stat: Fix build fail for stat of timer and dispose 4 years ago
winlin 9c1d6ae654 Merge SRS 4.0 4 years ago
winlin 941a9aaf7a Refine timer, 4.0.73 4 years ago
winlin 6bacccd1b8 Fix utest fail 4 years ago
xialixin@kanzhun.com fdaee20b81 For #2200, Enable RTC and FLV for GB28181 4 years ago
winlin 548fcd627b Config: Update config files, daemon off, log to console 4 years ago
winlin 61eeb781b7 Always link with pthread 4 years ago
winlin 1f621a6db3 Remove dead code: memory watch 4 years ago
winlin c6cb0fb21f Refine scripts 4 years ago
winlin 0fe031a156 Support to disable stats by default 4 years ago
winlin 7d75f0af0f Remove dead code 4 years ago
winlin 044df17791 Fix utest fail 4 years ago
winlin c5d2027f9a RTC: Support high performance timer about 25ms resolution. 4.0.72 4 years ago
winlin ebcba149ae For #2194, yield for timer, for rtc player 4 years ago
winlin df1eca10fb For #2194, yield for timer, for rtc publisher 4 years ago
winlin a049ce3fb7 For #2194, Core: Refine yield for high performance timer. 4 years ago
winlin a5a96491a3 For #2194, yield for timer, for live publisher 4 years ago
winlin d1bcc03d9a For #2194, yield for high performance timer, for live player 4 years ago
winlin c0fda42743 For #2194, Support ST yield 4 years ago
winlin b4b9776b02 Core: Support yield current coroutine for high performance timer. 4 years ago
winlin d8563398b2 Clock: Update stat. Insert timer to execute first 4 years ago
winlin f987198af0 Clock: Use one system wall clock 4 years ago
winlin 9db7126eb4 Core: Refine ST stat for thread switch 4 years ago
winlin 15f7fa2c36 Core: Refine ST stat for io events 4 years ago
winlin 12d7e57011 Core: Refine sched and clock stat 4 years ago
winlin c2332f9e55 Core: Use 20ms wall clock 4 years ago
winlin bddc787a16 Refine the pps. 4 years ago
winlin 70fb647ac9 Perf: Add stat for sched of ST. 4 years ago
winlin e91e0eaf46 Perf: Add stat for io of ST. 4 years ago
winlin 181c9f25ed Live: Support connect origin by HTTP-FLV/HTTPS-FLV 4 years ago
winlin 37679f2acc Fix utest fail 4 years ago
xialixin@kanzhun.com 4df6fa540f For #2200, Enable RTC and FLV for GB28181 4 years ago
winlin adb6f723c7 Config: Update config files, daemon off, log to console 4 years ago
winlin 57919e4351 Refine code, move SRS adapter. 4 years ago
winlin d8e27c3845 Always link with pthread 4 years ago
winlin 4ef1acb700 Remove dead code: memory watch 4 years ago
winlin 0898a1a7ea Refine scripts 4 years ago
winlin 25be6d6bc0 Support to disable stats by default 4 years ago
winlin f17fa69deb Remove dead code 4 years ago
winlin 3147c8f9bc Fix utest fail 4 years ago
winlin b1e7e19fd1 RTC: Support high performance timer about 25ms resolution. 4.0.72 4 years ago
winlin ccb79bc7eb For #2194, yield for timer, for rtc player 4 years ago
winlin 5a28e658a4 For #2194, yield for timer, for rtc publisher 4 years ago
winlin a04dd7ed30 For #2194, Core: Refine yield for high performance timer. 4 years ago
winlin 4fc1a19415 For #2194, yield for timer, for live publisher 4 years ago
winlin 211b05fc64 For #2194, yield for high performance timer, for live player 4 years ago
winlin 76d6449317 For #2194, Support ST yield 4 years ago
winlin 79f9cd6b3a Core: Support yield current coroutine for high performance timer. 4 years ago
winlin 321f555e30 Clock: Update stat. Insert timer to execute first 4 years ago
winlin fb61a6979c Clock: Use one system wall clock 4 years ago
winlin 71cc8e35d9 Core: Refine ST stat for thread switch 4 years ago
winlin e726aba8f9 Core: Refine ST stat for io events 4 years ago
winlin cde456710d Core: Refine sched and clock stat 4 years ago
winlin ff388b2f38 Core: Use 20ms wall clock 4 years ago
winlin 99b4866717 Refine the pps. 4 years ago
winlin a46debb4bb Perf: Add stat for sched of ST. 4 years ago
winlin 7b913b1115 Perf: Add stat for io of ST. 4 years ago
winlin 7a96b28735 Merge 4.0release 4 years ago
winlin b431ad738c RTC: Refine performance about 700+ streams. 4.0.71 4 years ago
winlin b7c7d6566f Fix build fail 4 years ago
winlin 2aa94c643c Refine server stat, extract to hybrid server stat 4 years ago
winlin 6b260d6021 Fix utest fail 4 years ago
winlin 7114682eec Timer: Apply timer(HourGlass) to server and sources 4 years ago
winlin 77cffd3e04 Main: Refine sever manager. 4 years ago
winlin f9bd84109b Timer: Refine the hour glass, support stop 4 years ago
winlin 4a37fe30c7 RTC: Refine RTP header, never extends from any class 4 years ago
winlin 6feaeace27 RTC: Send NACK by timer, no by RTP packet 4 years ago
winlin d2e728812b RTC: Send NACK by timer, no by RTP packet 4 years ago
winlin 5919865e5d RTC: Refine NACK check, interval, time 4 years ago
winlin 627688c582 RTC: Update stat for received nack 4 years ago
winlin 44c85cc3d2 RTC: Never copy the packet for hijack. 4 years ago
winlin 81db13f27f RTC: Update stat for nack 4 years ago
winlin 51e630d53c RTC: For RTP packet, never switch to context of session except error. 4 years ago
winlin 154ae9b4eb RTC: Update stat for twcc and rr 4 years ago
winlin 86d615f27e RTC: Print stat for pli and timer every 5s. 4.0.70 4 years ago
winlin 9a0e5bc979 RTC: Fix udp recvfrom bug 4 years ago
winlin ccb6c49029 RTC: Refine timer to 20ms, twcc to 40ms 4 years ago
winlin d069346f6b Update server stat for fast-id search 4 years ago
winlin 84afeaf433 Update server stat for fast-id search 4 years ago
winlin 44f5ca6a35 Update server stat for fast-id search 4 years ago
winlin 5ae47725e6 SRS: Refine the UDP address parsing, no string 4 years ago
winlin ca3ac467a3 RTC: Stat the UDP packets and addresses 4 years ago
winlin 2b73c1c7e6 RTC: Refine the UDP address parsing, no string 4 years ago
winlin 52609ea2f0 RTC: Use vector for fast search fast-id 4 years ago
winlin 7f4d8a40e9 RTC: Refine the SRTP protect api 4 years ago
winlin 2989e6c9c3 Fix build fail 4 years ago
winlin 949044d773 RTC: Refine SRTP unprotect rtp and rtcp, without copy 4 years ago
winlin aec27450e8 RTC: Refine unprotect_rtp to reuse cipher 4 years ago
winlin 719df6fa41 RTC: Parse TWCC SN fastly. 4 years ago
winlin 79a6907a65 RTC: Parse PT fast and refine udp handler. 4.0.69 4 years ago
winlin 826546d518 Refine pps add SrsPps 4 years ago
winlin c3414a30dc RTC: Refine UDP packet peer fast id. 4.0.68 4 years ago
winlin e95fd10462 RTC: Don't parse RTP header if no twcc 4 years ago
winlin 49a772770f Refine code 4 years ago
winlin fec088972d RTC: Fix bug for header parsing 4 years ago
winlin e17d20c8fa RTC: Refine static cast for RTC connection 4 years ago
winlin a5b21c159f RTC: Support disable nack 4 years ago
winlin 2b60112130 RTC: Support disable nack 4 years ago
winlin dffbebfe6f RTC: Fast parse ssrc and find the publisher 4 years ago
winlin 5f31868ce6 RTC: Refine publish stream by find publisher 4 years ago
winlin 6fa3b8212c Update ST doc 4 years ago
winlin 301904467a Update .gitignore 4 years ago
winlin b0208029bb RTC: Reuse UDP socket to receive packet. 4.0.67 4 years ago
winlin 9ada516e98 At least wait 1ms when <1ms, to avoid epoll_wait spin loop. 4.0.66 4 years ago
winlin 5eafcea895 RTC: Refine performance for UDP recv context id switch 4 years ago
winlin b7f5fa7c9d RTC: Fix NACK remove loop bug 4 years ago
winlin 4bcfce7ff1 RTC: Refine is_alive code 4 years ago
winlin aeca278de0 RTC: Refine log for twcc large timer 4 years ago
winlin e776e0eca7 Refine server stat, extract to hybrid server stat 4 years ago
winlin 152c161de3 Fix utest fail 4 years ago
winlin a357c013cd Timer: Apply timer(HourGlass) to server and sources 4 years ago
winlin ee1d06c613 Main: Refine sever manager. 4 years ago
winlin 98c29a1494 Timer: Refine the hour glass, support stop 4 years ago
winlin 45834b805b RTC: Refine RTP header, never extends from any class 4 years ago
winlin b189fc3fac RTC: Send NACK by timer, no by RTP packet 4 years ago
winlin 407ae1d7f6 RTC: Send NACK by timer, no by RTP packet 4 years ago
winlin abc26d470b RTC: Refine NACK check, interval, time 4 years ago
winlin d505bb6ea6 RTC: Update stat for received nack 4 years ago
winlin 43d4240a30 RTC: Never copy the packet for hijack. 4 years ago
winlin d01a429c13 RTC: Update stat for nack 4 years ago
winlin e31169d306 RTC: For RTP packet, never switch to context of session except error. 4 years ago
winlin 515529eba9 RTC: Update stat for twcc and rr 4 years ago
winlin 4539ffa086 RTC: Print stat for pli and timer every 5s. 4.0.70 4 years ago
winlin 18c27111e0 RTC: update stat for pli, timer and dispose 4 years ago
winlin aefd7fccd0 RTC: Fix udp recvfrom bug 4 years ago
winlin 3d34eb33e5 Fix utest fail 4 years ago
winlin b4282a6ee1 Fix build fail 4 years ago
winlin a43f339aa6 Update server stat for cid 4 years ago
winlin 102434b3d5 Context: Use key of thread to store context 4 years ago
winlin 33ab785ce9 RTC: Refine timer to 20ms, twcc to 40ms 4 years ago
winlin 83ab551396 Update server stat for fast-id search 4 years ago
winlin cbfec753f0 Update server stat for fast-id search 4 years ago
winlin af499094f8 Update server stat for fast-id search 4 years ago
winlin ec0d68d6b0 SRS: Refine the UDP address parsing, no string 4 years ago
winlin 638a94ade2 RTC: Stat the UDP packets and addresses 4 years ago
winlin d41a925694 RTC: Refine the UDP address parsing, no string 4 years ago
winlin 95193979f4 RTC: Use vector for fast search fast-id 4 years ago
winlin ef279a8b1e RTC: Refine the SRTP protect api 4 years ago
winlin 864356c9bd Fix build fail 4 years ago
winlin 9f91351f3c RTC: Refine SRTP unprotect rtp and rtcp, without copy 4 years ago
winlin 0c07459d19 RTC: Refine unprotect_rtp to reuse cipher 4 years ago
winlin 9a9efb8546 RTC: Parse TWCC SN fastly. 4 years ago
winlin d184b5662c RTC: Parse PT fast and refine udp handler. 4.0.69 4 years ago
winlin 668f8cbf6c Refine pps add SrsPps 4 years ago
winlin 8cb5cab717 RTC: Refine UDP packet peer fast id. 4.0.68 4 years ago
winlin 7bb04998af RTC: Don't parse RTP header if no twcc 4 years ago
winlin 05441d6354 Refine code 4 years ago
winlin fd605fc4ac RTC: Fix bug for header parsing 4 years ago
winlin 9c17721eb9 RTC: Refine static cast for RTC connection 4 years ago
winlin d526e170a5 RTC: Support disable nack 4 years ago
winlin d0c0f26160 RTC: Support disable nack 4 years ago
winlin 80985c7307 RTC: Fast parse ssrc and find the publisher 4 years ago
winlin cd06f2da0c RTC: Refine publish stream by find publisher 4 years ago
winlin f3806126c4 Research: Add udp connect 4 years ago
winlin de3ec74657 Update ST doc 4 years ago
winlin 960f48721f Update .gitignore 4 years ago
winlin 2b85ad1f60 RTC: Reuse UDP socket to receive packet. 4.0.67 4 years ago
winlin cfddc8f266 At least wait 1ms when <1ms, to avoid epoll_wait spin loop. 4.0.66 4 years ago
winlin 19a7c7682e RTC: Refine performance for UDP recv context id switch 4 years ago
winlin ec01f94b17 RTC: Fix NACK remove loop bug 4 years ago
winlin 0c89e899bd RTC: Refine is_alive code 4 years ago
winlin 1db8a3c92e RTC: Refine log for twcc large timer 4 years ago
winlin 076182cde2 Pick from develop. 4.0.65 4 years ago
winlin d92bbe7558 RTC: Support eip with port 4 years ago
winlin 3fa767f3cc Build: Support --ssl-local to rebuild openssl even system exists 4 years ago
winlin cd83054759 ST: Update doc 4 years ago
winlin 09224ea7e0 ST: Update doc 4 years ago
winlin 6e3bd61599 Enable --nasm and --srtp-asm by default for performance. 4.0.64 4 years ago
winlin 945cf64024 Refine srs_player 4 years ago
winlin f006bf59b1 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 4 years ago
winlin 979bf86e8b Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 4 years ago
winlin 5c41766b79 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 4 years ago
winlin b373400257 RTC: Extract NACK handler from stream to track. 4 years ago
winlin 40ea0b67f9 RTC: Refine RTP packet decoder to track and stream 4 years ago
winlin 0fe85a295c Refine options with default value 4 years ago
winlin b9a5d4beb6 Refine options with default value 4 years ago
winlin 1615c3df6c RTC: Refine code 4 years ago
winlin ec2535b183 RTC: Refine code 4 years ago
winlin 62909bb2d0 Merge branch '4.0release' into develop 4 years ago
winlin 0848574902 Research: Add c++11 thread-local 4 years ago
winlin 73c4b1cb6e RTC: Enable -std=c++11 by default. 4.0.65 4 years ago
winlin e5391ff93d RTC: Support eip with port 4 years ago
winlin 849703bca1 Build: Support --ssl-local to rebuild openssl even system exists 4 years ago
winlin 5678e8e1e7 ST: Update doc 4 years ago
winlin 6ecda1c79e ST: Update doc 4 years ago
winlin f6720c18c6 Enable --nasm and --srtp-asm by default for performance. 4.0.64 4 years ago
winlin 10205e8cc1 Refine srs_player 4 years ago
winlin 4514947e67 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 4 years ago
winlin f01da568cb Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 4 years ago
winlin 618333cdd1 Support HTTP-FLV and HLS for srs-player by H5. 4.0.63 4 years ago
winlin e2bdacb337 RTC: Extract NACK handler from stream to track. 4 years ago
winlin f2d45442c1 RTC: Refine RTP packet decoder to track and stream 4 years ago
winlin 0c56d11605 Refine options with default value 4 years ago
winlin 1371a47962 Refine options with default value 4 years ago
winlin e26b685169 Refine script 4 years ago
winlin 09011eea3a RTC: Refine code 4 years ago
winlin aaa3918a72 RTC: Refine code 4 years ago
winlin 4bb3ad5637 For #2142, Fix bug for fixing memory leak for bridger. 4.0.62 4 years ago
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
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 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
winlin 4d18835f3c Fix build fail 4 years ago
winlin 90b61ad952 Merge SRS4 4 years ago
winlin 5ebf034aea For #1694, Refine API for nb_bytes 4 years ago
winlin c17474627b Merge SRS3 4 years ago
winlin 25c76c1e8a Fix #1694, Support DVR 2GB+ MP4 file. 3.0.155 4 years ago
winlin 576be75f00 Merge branch '4.0release' into develop 4 years ago
winlin c97e943b07 Merge SRS3 4 years ago
winlin ab5ddd24e2 Fix #1548, Add edts in MP4 for Windows10. 3.0.154 4 years ago
winlin 721173e6af MP4: Fix warnings 4 years ago
winlin 1502560bcf Update conf 4 years ago
winlin 9caeb606bf ST: Support show coroutines. 4 years ago
winlin c7c6d8778a RTC: Fix warnings 4 years ago
jinxue.cgh 5309dbe18b RTC: Refine RTCP process 4 years ago
winlin 18ae8d8571 RTC: Fix SDP bug for firefox 4 years ago
winlin aad7c448bf For #1998, Support Firefox. 4 years ago
winlin 0c113ff084 For #1998, support firefox 4 years ago
winlin c5457e8241 RTC: Support unified-plan 4 years ago
winlin 27db60cc23 Fix #1996, Heap off-by-one in utest 4 years ago
winlin c796c0d093 Fix #1689, fix typo 4 years ago
莫战 b38f30c3ee support query parsing and escape 4 years ago
莫战 dc7124cd05 support base64 encode 4 years ago
jinxue.cgh 58b75c6f1b tfsfu: add play red pt negotiate 4 years ago
winlin 140f8b0fce For #1998, refine PT for firefox, support RED 4 years ago
PieerePi 3d5c18c25a
GB28181 code crashed in ffmpeg after commit "RTC: Use FFmpeg to transcode aac to opus" <d5a0ad3dd8>. (#2057)
Change the size from 64K to 256K.
4 years ago
ghostsf d3e153e504
fix: update CMakeLists.txt for rtc (#2042) 4 years ago
Jesse Xi 8515f5a91e
incomplete_len 在大华摄像头下,因为大华包头对音频的不标准处理,可能为负值,而sizeof(SrsPsPacketStartCode) 返回的是unsigned 类型, 因些增加判断 (#2039)
Co-authored-by: jesse.xi <jj.xi@tianrang-inc.com>
4 years ago
winlin c779d95246 GB28181: Remove chinese comments. 4 years ago
winlin 977e027d86 SIP: Fix build fail for Mac 4 years ago
Pieere Pi ffae1720ec gb28181模块可用性增强
主要改动,
1. 支持作为GB/T 28181上级平台
2. 新的目录接口sip_query_devicelist (/api/v1/gb28181?action=sip_query_devicelist)
3. 各种异常和问题修复
4. 其他一些小改动

以上改动基于feature/rtc分支,因为需要网页用WebRTC来拉GB28181的监控流,gb28181分支代码有点老了。

下面的序号n是指第n个差异块("@@ -"之间的内容)。

srs_gb28181.html
1. 原页面上多加了一个端口号
2-4. 给摄像头加上名称显示
5. 查询目录去掉chid
6. 删除通道参数分解为id和chid
7. API端口固定为1985

srs_app_gb28181.cpp
1-4. 四处因为错误而退出GB28181媒体处理循环,修改为不退出
5. payload为空异常
6. 修正判断startcode越界一个字符导致内存写越界的问题
ps流有可能末尾是全零填充,而且越界的那个字符正好是0x01,这样会多出一个nalu(末尾的三个0x00和一个越界的0x01),后面写video_data内存越界(if (first_pos != pre_pos){块,此处size - pre_pos - 4为-1,uint32_t naluLen得到的值为0,video_data[pre_pos+3] = p[0];写越界)破坏了其他数据,后续video_stream析构出错程序异常退出。
7. 此处srs后来已修复
8. 更新ssrc为被叫返回的值
原代码只支持标准中的《点播域内设备媒体流SSRC处理方式》(设备注册上来),不支持《点播外域设备媒体流SSRC处理方式》(即作为上级平台)。
这是因为如果srs作为上级平台,ssrc不是自己生成的,而是下级平台生成的。
9. 删除通道参数分解为id和chid
10. notify_sip_unregister后delete_stream_channel无效
11. notify_sip_query_catalog清空内存中的设备列表
12. 新函数query_device_list

srs_app_gb28181.hpp
1. update_rtmpmuxer_to_newssrc_by_id声明
2. 新函数get_gb28181_config_ptr和函数delete_stream_channel声明修改
3. 新函数query_device_list

srs_app_gb28181_sip.cpp
1-4. 在调试界面给摄像头加上名称显示;新函数clear_device_list和新函数dumpItemList
5-6. 两处因为错误而退出GB28181信令处理循环,修改为不退出
7. 设备注册上来,不检查服务器ID匹不匹配(支持作为上级平台)
8. 收到一个目录上报消息,更新内存中的数据
9. 更新ssrc为被叫返回的值
10. 新函数query_device_list

srs_app_gb28181_sip.hpp
1. 在调试界面给摄像头加上名称显示
2. 每个设备加上item_list,用于存储目录;新函数clear_device_list和新函数dumpItemList
3. 新函数clear_device_list

srs_app_http_api.cpp
1. 删除通道参数分解为id和chid
2. 新的接口sip_query_devicelist,用于查询所有设备的目录

srs_sip_stack.cpp
1. GB2312转UTF-8类
2. 被叫返回的ssrc初始化
3. parse_xml声明修改
4. 对XML内容进行字符集检测和转换
5-7. parse_xml定义修改
8. SIP BODY里面也有可能有\r\n
9-10. 防止恶意SIP消息 by vicious sip prober
11-12. 新的XML解析目录代码
13. 获取被叫返回的ssrc

srs_sip_stack.hpp
1. 依赖vector
2. 每个设备加上item_list,用于存储目录
3. 被叫返回的ssrc
4. parse_xml声明修改
4 years ago
yinjiaoyuan fe65c7bf84 For 2034, GB28181: Support transport over TCP 4 years ago
winlin 751dab56d8 RTC: Refine player and publisher 4 years ago
winlin 529264f238 RTC: Refine player and publisher 4 years ago
winlin 3cf3047f97 Add conf/rtc_live.conf 4 years ago
winlin 7521bc86ad For #1998, Update conf 4 years ago
winlin 7136af21de For #1998, TODO: FIME: Should check packetization-mode=1 also. 4 years ago
winlin 5d27c62e95 For #1998, fix fetch remote payload bug. 4.0.56 4 years ago
winlin 4650d47082 For #1998, Support Firefox, use PT in offer. 4.0.55 4 years ago
winlin 57b5204a10 For #1998, Set default fmtp for H264 when transmux RTMP to RTC 4 years ago
winlin 9908433bc8 For #1508, Transform http header name to upper camel case. 4.0.54 4 years ago
winlin 07c04a042a URI: Refine uri parser 4 years ago
winlin efca38cd89 Player: Change default HTTP-API port to 1985 for WebRTC 4 years ago
winlin e085250245 Update players 4 years ago
winlin 32c1832d64 For #1657, refine code 4 years ago
winlin 5709ee1b63 For #1657, add https configs 4 years ago
winlin 385e055c7b For #1657, Fix read bug. 4.0.53 4 years ago
winlin 4618bfc137 For #1657, fix the http read bug 4 years ago
winlin 6dc9824495 For #1657, fix the http read bug 4 years ago
winlin 79655adea0 For #1657, fix the http read bug 4 years ago
winlin c3f23f4c23 For #1657, fix the http read bug 4 years ago
winlin a20f02ffe1 For #1657, Read cached data first in SSL. 4.0.48 4 years ago
winlin a49b2d7b0e For #1657, Support HTTPS Callback, HTTPS API, HTTPS FLV, etc. 4.0.47 4 years ago
winlin 30ba5a32ed For #1657, Support HTTPS Streaming 4 years ago
winlin faf53927e8 For #1657, Fix utest fail 4 years ago
winlin 272ca9d0f6 For #1657, Support HTTPS API 4 years ago
winlin 7916214e27 For #1657, refine api for http 4 years ago
winlin 5782b45978 For #1657: Refine code 4 years ago
winlin 2fedb683e8 For #1657, refine code 4 years ago
winlin c3d290013e For #1657, handle on_message_done 4 years ago
winlin 4b082ea96c For #1657, refine http api disconnect log 4 years ago
winlin 74799a31e3 For #1657, refine on_http_message with response writer 4 years ago
winlin d67b050935 For #1657, fix the jsonp bug 4 years ago
winlin fc21b31714 For #1657, refine the context for disposing 4 years ago
winlin b492d59df0 For #1657: Refine code 4 years ago
winlin 0a3a38762a For #1657: Remove duplicated code, merge http api with conn 4 years ago
winlin 9cf4203201 For #1657: Refine code 4 years ago
winlin 24125b9770 For #1657: Refine connection arch, remove hierachy 4 years ago
winlin 2a14dc0ebd For #1657: Refine TCP connections arch 4 years ago