Commit Graph

5745 Commits (ab97eb5fcf03e8d16a877931e7066f9ee79c9fcc)

Author SHA1 Message Date
winlin 659e173e15 RTC: Refine for writing doc. 4.0.92 4 years ago
winlin 165f97e4a0 SquashSRS3: Link source flv in doc 4 years ago
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
4 years ago
winlin a9d39f6946 RTC: Refine API params to create connection 4 years ago
winlin 51aa899358 RTC: Refine H5 demo, extract srs.sdk.js 4 years ago
winlin a5727c373a Script: Remove unused git2unix.sh 4 years ago
winlin 7cae97e4d3 SquashSRS3: Update players 4 years ago
winlin db37a4ac02 SquashSRS3: Add crossdomain.xml for install script. 4 years ago
winlin 5516d3751f Change push-RTSP as deprecated feature. 4 years ago
winlin 6f66cf0868 Player: Change the default from RTMP to HTTP-FLV. 4 years ago
winlin 5232f9e043 Disable CherryPy by --cherrypy=off. 4.0.90 4 years ago
winlin de1c7522f0 SquashSRS3: Add console 4 years ago
winlin 9ed7565789 SquashSRS3: Package srs-console 4 years ago
winlin cec0191b16 Happy 2021 4 years ago
winlin 124455be09 Update script 4 years ago
winlin d01e603b25 Happy 2021 4 years ago
stone 6da91f7dea For #2275, fix bug for transcode engine config param. 4 years ago
winlin aae0f61165 RTC: Eliminate the dup code 4 years ago
winlin 061f367a82 RTC: Fix RTC connection dispose bug 4 years ago
winlin db7e820f04 RTC: Fix DTLS warnings for HTTP api 4 years ago
winlin 96003d4a52 RTC: Fix bug for republish stream. 4.0.89 4 years ago
winlin 8d9dd532b9 RTC: Fix bug for republish stream. 4.0.89 4 years ago
winlin 3c59fedab6 RTC: Fix memory leak 4 years ago
winlin 7823d75a38 RTC: Refine payload NALU type parser 4 years ago
winlin aa5d872b8c RTC: Refine TWCC and SDP exchange. 4.0.88 4 years ago
winlin bd1752a4b2 RTC: Fix TWCC send bug 4 years ago
winlin 7ac4a4f4ca RTC: Fix audio track description bug 4 years ago
winlin f4b791a9d5 Kernel: Never assert for SrsBuffer::require 4 years ago
winlin 4d5c7e0a73 RTC: Fix object cache bug, reset payload when recycle 4 years ago
winlin f2d0c34244 RTC: Refine comments for SrsRtpPacket2 4 years ago
winlin d6c16a7e23 RTC: Support WebRTC re-publish stream. 4.0.87 4 years ago
winlin 0cb05a2953 RTC: Refine ID parsing 4 years ago
winlin 89f941fadc Refine version file 4 years ago
winlin 6c7e24fc6d RTC: Eliminate dead code, we nerver send offer 4 years ago
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.
4 years ago
winlin f5ff28d47a RTC: Refine play stream init 4 years ago
winlin 3fea5c0ec3 Test: Add republish regression test, should fail 4 years ago
winlin bb37a5550c Test: Update srs-bench 4 years ago
winlin a3dbb22696 Fix bugs. 4.0.85 4 years ago
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.
4 years ago
winlin 7f8df6f21f Build: Refine script for SRTP.
Because we have upgraded to openssl-1.1.1d and libsrtp-2.3,
so it's able to enable ASM for SRTP for not only openssl-1.0,
because libsrtp-2.3 fixed the capacity bug.
4 years ago
winlin f066914968 Test: Add missing files. 4 years ago
winlin 27d4080084 Test: Fix check file bug 4 years ago
winlin 030b94e717 Test: Add missing files for srs-bench 4 years ago
winlin 06f2e1462e DTLS: Update regression tests 4 years ago
winlin d4d11c2c18 DTLS: Change max loop to larger 4 years ago
winlin 62987aa01f DTLS: Refine retransmit between ClientHello and Certificate. 4 years ago
winlin 02aac0fea4 DTLS: Fix ARQ bug, use openssl timeout. 4.0.84 4 years ago
winlin 3c6e466280 DTLS: Use specified init API, to decrease packet size 4 years ago
winlin 3a5d88b435 DTLS: Disable QueryMTU for openssl, or the packet get fragmented 4 years ago
winlin 079c54bbe7 Add important comment for ST 4 years ago
winlin 55bdc354f5 Add important comment for disposing and thread stop 4 years ago
winlin e4df2eb2ce DTLS: Fix dead loop by duplicated Alert message. 4.0.83 4 years ago
winlin 1ed567a005 DTLS: Fix dead loop by duplicated Alert message 4 years ago
winlin 43028c99c8 Fix bug when client DTLS is passive. 4.0.82 4 years ago
winlin fc4f539907 Should check bridger status when publish stream. 4 years ago
winlin c143b6bfd0 Squash SRS3: Update README for docker 4 years ago
winlin 83c615aa8a SquashSRS3: Docker: Add conf/docker.conf, daemon off, log console, enable RTC 4 years ago
winlin 990dc8cda9 Script: Fast coverage support module filter 4 years ago
winlin d6a6f98a70 Script: Support local fast coverage by gcovr 4 years ago
winlin bb3bd1705e Refine the regression test tool, add missing files 4 years ago
winlin 876210f6c9 For regression test, add srs-bench to 3rdparty 4 years ago
winlin de87dd427d Fix utest fail 4 years ago
winlin 5a66d15e85 Support regression test in CI. 4 years ago
winlin 212ff6fc2d Never force to openssl-1.0 for asm and srtp-asm, because openssl-1.1+libsrtp-2.3 is ok now 4 years ago
Pieere Pi 4ba485002c Fix #2106, #2011, RTMP/AAC transcode to Opus bug. 4.0.81 4 years ago
winlin dd8f7ff09a Enable HTTP-FLV for conf/rtc.conf 4 years ago
winlin 0bc3bdc7b8 Refine gcov files 4 years ago
winlin 27712fdda7 Rename ffmpeg-4.2-fit to ffmpeg-4-fit 4 years ago
winlin b19074721c Refine build script 4 years ago
winlin 8089fc004c Upgrade libsrtp from 2.0.0 to 2.3.0, with source code. 4.0.79 4 years ago
winlin 3749d4d833 Update doc 4 years ago
winlin 921e4041ba Update doc 4 years ago
winlin c9d68aae79 Refine FFmpeg-4.2-fit build bug 4 years ago
winlin 812d4ebfea Refine FFmpeg-4.2-fit build, copy source code 4 years ago
winlin 98839d3d53 RTC: Fix TWCC enable bug 4 years ago
winlin 96dbd7bced Upgrade openssl from 1.1.0e to 1.1.1b, with source code. 4.0.78 4 years ago
winlin 8f1c992379 Refine code, rename drop to loss 4 years ago
winlin d4b8a57cf7 Enable Object Cache and Zero Copy Nack by default. 4.0.77 4 years ago
winlin 57f16299f4 Fix #2219, Ubuntu build fail. Add CI for ubuntu20 4 years ago
winlin 969b947849 Hotfix 4.0.76, fix build fail for FFmpeg-fit CentOS6 4 years ago
winlin 58924d41b1 RTC: Support high performance NO-COPY-NACK. 4.0.76 4 years ago
winlin f63441413d RTC: Support disable the NACK no-copy, enable copy by default 4 years ago
winlin 50860325dd RTC: Fix copy RTP packet bug 4 years ago
winlin 2719e4c0be Refine code 4 years ago
winlin ee9ef378f9 RTC: Fix bug for wrap exists buffer size 4 years ago
winlin b91d37b78a RTC: Store the actual size of buffer for RTP packet. 4 years ago
winlin 171ae5dd2d RTC: Fix shared msg cache bug 4 years ago
winlin eed98dd85b RTC: Refine code, remove the reset for header 4 years ago
winlin 5d4baf4eca RTC: Refine code, remove the assign 4 years ago
winlin 7c517988a6 Perf: Refine header extensions marshal 4 years ago
winlin eb9a263433 Cache RTP packet size, revert 9ee0ed919a 4 years ago
winlin 11454b3ced Perf: Avoid RTP packet copy for player NACK. 4 years ago
winlin 51a5e283fc Perf: Avoid RTP packet copy for publisher NACK. 4 years ago
winlin 74f63d6b14 RTC: Ignore NACK when disable for player. 4 years ago
winlin 0aeaf442f7 RTC: Ignore NACK when disable for player. 4 years ago
winlin f831e9240e RTC: Fast copy shared message for RTP 4 years ago
winlin 42223b3f2e RTC: No cache for RTP packet size. 4 years ago
winlin 3728b07c49 Perf: Refine RTP packet copy 4 years ago
winlin 033f341ce1 Perf: Refine the recycle RTP packet, user should reset it 4 years ago
winlin b1457dfc16 Perf: Refine copy RTP header. 4 years ago
winlin 81dddcbd93 RTC: Remove dead code 4 years ago
winlin 00b0e22402 Refine code 4 years ago
winlin cca5f8db82 Refine code 4 years ago
winlin 6d64490d73 Perf: Never reset the csrc 4 years ago
winlin 0fa3646c4a Perf: Directly reference the extmap 4 years ago
winlin e441702246 Refine code 4 years ago
winlin e2bf9f3623 Refine code, remove goto 4 years ago
winlin ecef3e7f0a Perf: Refine player cycle, use fast coroutine 4 years ago
winlin 29b33e6303 RTC: Disable player perf stat, because it should be refined. 4 years ago
winlin 561acd26c5 Refine code 4 years ago
winlin db0090be05 Refine code 4 years ago
winlin aacdc21d1c Refine object cache. 4 years ago
winlin 1e2daf9ea3 Refine comments for object cache 4 years ago
winlin 6656330d2a Perf: Use vector to replace list for object cache 4 years ago
winlin f2d9eb345c Perf: Refine object cache, avoid dynamic cast 4 years ago
winlin 8d7a201742 RTC: Remove unused config 4 years ago
winlin 73e357a93f RTC: Support object cache pool. 4.0.75 4 years ago
winlin 8e4f252686 Support reload the object cache pool 4 years ago
winlin 501104e728 Perf: Limit the size of object cache pool 4 years ago
winlin 3989f2d553 RTC: Refine the stat logs, limit the object cache pool 4 years ago
winlin 30d760f909 RTC: Only cache the UDP packet message 4 years ago
winlin c00d286344 Perf: Refine the stat 4 years ago
winlin 919107c674 Perf: Stat the shared messages. 4 years ago
winlin fc4d7080c6 RTC: Cache the RTP payload objects 4 years ago
winlin 4d0863468a RTC: Cache the large buffer allocation 4 years ago
winlin 6e9cb059b3 RTC: Stat the large buffer allocation 4 years ago
winlin 4cb3a18d1e RTC: Apply RTP packet cache manager 4 years ago
winlin 86f43d4f72 RTC: Support RTP packet cache manager 4 years ago
winlin bde86a2b23 RTC: Refine RTP packet buffer allocate, align to about 1500 bytes 4 years ago
winlin b2d546156e RTC: Refine RTP packet api, keep shared message to private 4 years ago
winlin 0cb125e53d RTC: Refine publisher memory allocate, by packet itself 4 years ago
winlin 81060a17e6 Build: Add gcc version in cache directory 4 years ago
winlin cec588e08a For #2188: Remove sendmmsg from ST. 4 years ago
winlin d7bc8b98fb Fix build warning 4 years ago
winlin 048a72ab6e RTC: Refine memory allocate for publisher 4 years ago
winlin 23fa3fb350 RTC: Refine memory allocate for publisher 4 years ago
winlin 4aa82b2fbf RTC: Refine memory copy, allocate it later 4 years ago
winlin edb8a0f497 RTC: Cache the buffer for player 4 years ago
winlin e7529ce9dc RTC: Stat the RTP and payload objects 4 years ago
winlin 6dac180627 Kernel: Never depends on another globals for global variables 4 years ago
winlin d8ba72fdc5 Kernel: Extract SrsPps to kernel 4 years ago
winlin df6e47ebfc RTC: Refine stat for RTC server 4 years ago
winlin 5ff9977572 Perf: Improve fast find for pithy print 4 years ago
winlin 9ab12f9f2f RTC: Stat the drop of UDP packets. 4 years ago
winlin b9352eac0c RTC: Refine stat logs 4 years ago
winlin 09bd1b9faa RTC Stat the detail of send packets 4 years ago
winlin d92ceaca39 RTC: Stat the detail of received packets 4 years ago
winlin 6c24f2e353 Refine logs 4 years ago
winlin 2f1e8a6911 RTC: Refine logs 4 years ago
winlin 33f4e02072 RTC: Send NACK one by one to avoid packet freed by context switching 4 years ago
winlin e1a840772d RTC: Refine TWCC and RTCP timer to 100ms. 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 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 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 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 e26b685169 Refine script 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