github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
7,561 Commits
14 Branches
107 Tags
374 MiB
6.0release
5.0release
develop
duiniuluantanqin-patch-1
4.0release
feature/simulcast
feature/gb28181
feature/h265
master
fossa
3.0release
2.0release
min
1.0release
v2.0-r2
v2.0-r1
v2.0-r0
v2.0-b4
v2.0-b3
v2.0-b2
v2.0-b1
v2.0-b0
v2.0-a3
v2.0-a2
v2.0-a1
v2.0-a0
v1.0-r4
v1.0-r3
v1.0-r2
v1.0-r1
v1.0-r0
v0.9.0
v0.8.0
v0.7.0
v0.6.0
v0.5.0
v0.4.0
v0.3.0
v0.2.0
v0.1.0
v2.0-r10
v2.0-r11
v2.0-r3
v2.0-r4
v2.0-r5
v2.0-r6
v2.0-r7
v2.0-r8
v2.0-r9
v3.0-a0
v3.0-a1
v3.0-a2
v3.0-a3
v3.0-a4
v3.0-a5
v3.0-a6
v3.0-a7
v3.0-a8
v3.0-a9
v3.0-b0
v3.0-b1
v3.0-b2
v3.0-b3
v3.0-b4
v3.0-r0
v3.0-r1
v3.0-r2
v3.0-r3
v3.0-r4
v3.0-r5
v3.0-r6
v3.0-r7
v3.0-r8
v4.0-b0
v4.0-b1
v4.0-b10
v4.0-b2
v4.0-b3
v4.0-b4
v4.0-b5
v4.0-b6
v4.0-b7
v4.0-b8
v4.0-b9
v4.0-r0
v4.0-r1
v4.0-r2
v4.0-r3
v4.0-r4
v4.0-r5
v5.0-a0
v5.0-a1
v5.0-a2
v5.0-a3
v5.0-a4
v5.0-a5
v5.0-b0
v5.0-b1
v5.0-b2
v5.0-b3
v5.0-b4
v5.0-b5
v5.0-b6
v5.0-b7
v5.0-r0
v5.0-r1
v5.0-r2
v5.0-r3
v6.0-a0
v6.0-a1
v6.0-d0
v6.0-d1
v6.0-d2
v6.0-d3
v6.0-d4
v6.0-d5
v6.0-d6
v6.0.10
v6.0.36
v6.0.45
v6.0.48
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '7f6185b127'
${ noResults }
Commit Graph

5946 Commits (7f6185b127e5a3c1190e05bed9e7ea6595d2c359)

Author SHA1 Message Date
Haibo Chen 03c5f76e64 update channel_layout by channels, for ffmpeg transcode opus to aac success (#2452) 4 years ago
Haibo Chen d32d8c0da6
update channel_layout by channels, for ffmpeg transcode opus to aac success (#2452) 4 years ago
winlin 9f5d011687 Squash: Fix build fail for arm/aarch64 4 years ago
winlin b8dcf20237 Fix build fail for arm/aarch64 4 years ago
winlin 81a5c1b8da Move AUTHORS.txt to trunk for docker to access it 4 years ago
winlin 75530efbc4 Squash: Merge #2448, #2440 4 years ago
winlin ef43532cf4 Merge #2440, fix #2390, SRT bug for zerolatency. 4.0.137 4 years ago
Alex.CR 7e164b0061 SRT: Fix bug for multiple NALUs, when configure OBS in zerolatency. (#2440) 
* solve srt push bugs

* solve h264 mutiple nalus in srt when obs is configured in zerolatency

* optimize error code

* optimize error code

* optimize error code

* add commemnt:we only skip pps/sps frame and send left nalus in srt

* add commemnt:we only skip pps/sps frame and send left nalus in srt

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 4 years ago
long cff4c07be4
打开rtmp转rtc，当rtmp重复推流时，第2路会影响第1路流的正常播放。 (#2448) 
* Update srs_app_rtmp_conn.cpp

修复推重复的RTMP流导致的RTC和RTMP播放的问题

* change ERROR_RTC_SOURCE_BUSY to ERROR_SYSTEM_STREAM_BUSY

change ERROR_RTC_SOURCE_BUSY to ERROR_SYSTEM_STREAM_BUSY

Co-authored-by: Haibo Chen <495810242@qq.com>
 4 years ago
Alex.CR 346cc96d7a
SRT: Fix bug for multiple NALUs, when configure OBS in zerolatency. (#2440) 
* solve srt push bugs

* solve h264 mutiple nalus in srt when obs is configured in zerolatency

* optimize error code

* optimize error code

* optimize error code

* add commemnt:we only skip pps/sps frame and send left nalus in srt

* add commemnt:we only skip pps/sps frame and send left nalus in srt

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 4 years ago
winlin 98e56f5325 Refine the random id by srs_random_str 4 years ago
winlin 0391e71682 Squash: Merge SRS4 4 years ago
winlin 6ea270adf3 Merge #2435, fix #2015, fix bug for HTTP-RAW-API to check vhost. 4.0.136 4 years ago
Xiaoniu 31679c46d4 check 'vhost' validity in 'http raw dvr api' (#2435) 4 years ago
Xiaoniu f986b5956b
check 'vhost' validity in 'http raw dvr api' (#2435) 4 years ago
winlin d02ba80db1 Squash: Fix bug for building FFmpeg 4 years ago
winlin bfae75077e Fix #2431, configure FFmpeg bug. 4.0.135 4 years ago
winlin c8d8581d4b For #2444, add libavcodec/crystalhd.c for FFmpeg. 4.0.134 4 years ago
Hung-Yi Chen bbd9d864d5
Add missing ffmpeg-4-fit/libavcodec/crystalhd.c from ffmpeg 4.2, #2271 (#2444) 4 years ago
winlin 5ee20613ca Squash: Support query lastest available version. 5.0.6 4 years ago
Xiaoniu 7bf03ef2ba Fix #2068, losing of last HLS ts file 4.0.133 
fix bug: last segment of ts not trigger 'on_hls',
because of 'on_unpublish' earlier than 'segment_close' (#2438)
 4 years ago
Xiaoniu d987e194ff
fix bug: last segment of ts not trigger 'on_hls', because of 'on_unpublish' earlier than 'segment_close' (#2438) 4 years ago
winlin aa12251084 Fix bug for v3.0-r6 4 years ago
winlin da763e43d5 Squash for #2424, query the latest available version. 4.0.132 4 years ago
winlin ce47d5cc28 Squash: Update README 4 years ago
winlin 25262dd3cb Fix SRT bug. 4.0.131 4 years ago
Alex.CR bb9aefd869 srt publish core dump bug (#2429) 
* solve srt push bugs

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 4 years ago
Alex.CR 67ac720b92
srt publish core dump bug (#2429) 
* solve srt push bugs

Co-authored-by: shiwei <shiwei05@kuaishou.com>
 4 years ago
winlin a594678e3d Squash #1685, #1282, #1547: Support ARM platform. 5.0.5 4 years ago
winlin fed57f6f17 Refine scripts 4 years ago
winlin 5906345a97 Fix #2413, fix RTMP to RTC bug 4.0.130 4 years ago
john 1347da81f8
Check audio/video track when rtc stream updated (#2418) 4 years ago
winlin 3aba2f3479 Add machine to build dir 4 years ago
winlin 70e552ef23 Guess where FFmpeg is. 4.0.129 4 years ago
winlin 6038276b4e Fix bug for build on osx 4 years ago
winlin 440883e6e6 Fix bug for 'make st' 4 years ago
winlin a52e7c08ea Update AUTHORS 4 years ago
winlin 229578cc65 Fix #1685, support RTC cross-build for armv7/armv8(aarch64). 4.0.128 4 years ago
winlin 1e9de0e191 For #1685: Cross build RTC with FFmpeg 4 years ago
winlin 1c75a270b3 RTC: Eliminate dead code. 4 years ago
winlin 623a453787 Fix #2214, remove detection for gmc and gmp. 4 years ago
winlin efdbf37255 Squash: Move GB28181 to feature/gb28181. 5.0.4 4 years ago
winlin df20fe6c9d Fix build fail 4 years ago
winlin 68c48e27f5 Change GB28181 to feature/gb28181. 4.0.127 4 years ago
winlin f75ef2f808 Build: Support --shared-ffmpeg 4 years ago
winlin d5266725e2 Build: Support --shared-ffmpeg to link with *.so for LGPL license. 4.0.126 4 years ago
winlin d1d0b9ca5c Doc: Update 3rdparty links 4 years ago
winlin 785d2fce08 Build: Support --shared-srt 4 years ago
winlin f44224a2a1 Build: Support --shared-srt to link with *.so for MPL license. 4.0.125 4 years ago
winlin 8434271578 Build: Refine configure option help 4 years ago
winlin 7e657ae654 Refine AUTHORS format 4 years ago
winlin 689100f651 Refine AUTHORS format 4 years ago
winlin 9e2c6d458e Fix build fail for SPDX 4 years ago
winlin 67272f0721 Fix build fail for SPDX 4 years ago
winlin 15901cacee SquashSRS4: Use SPDX-License-Identifier: MIT. 5.0.3 4 years ago
winlin 3cd22b6e6e Use SPDX-License-Identifier: MIT. 4.0.124 4 years ago
winlin 4cf1f852cf Fix bugs for GB28181 and RTC. 4.0.123 4 years ago
johzzy 7be6025546 fix: fix typo about inactive. (#2380) 4 years ago
johzzy 2aad8ad5bd
fix: fix typo about inactive. (#2380) 4 years ago
winlin 81bda41b31 SquashSRS4: Refine srs.sdk.js 4 years ago
louis.xia 1c7c74b01a GB28181: Fix parse rtp tcp failed (#2382) 
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

* fix gb28181 support tcp stack is setup:passive

* Update push.gb28181.tcp.conf

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
Co-authored-by: Winlin <winlin@vip.126.com>
 4 years ago
louis.xia cc52e5b27c
GB28181: Fix parse rtp tcp failed (#2382) 
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

* fix gb28181 support tcp stack is setup:passive

* Update push.gb28181.tcp.conf

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
Co-authored-by: Winlin <winlin@vip.126.com>
 4 years ago
cfw11 3e7536c493 GB28181: fix parse rtp-tcp failed (#2378) 
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
 4 years ago
cfw11 4d6f00e6bf
GB28181: fix parse rtp-tcp failed (#2378) 
* fix parse rtp-tcp failed

* fix parse rtp-tcp failed

Co-authored-by: cfw <fangwei.cheng@transwarp.io>
 4 years ago
winlin c353f1fe57 Update Usage 4 years ago
winlin bd1ec99d5b Demo: Update srs.sdk.js 4 years ago
winlin a9f171144d SquashSRS4: Eliminate dead code 4 years ago
winlin 8e79b90bc3 RTC: Eliminate dead code. 4.0.122 4 years ago
winlin e50582f9c7 SquashSRS4: Refine SDK 4 years ago
winlin 5df90a2a1c Fix #2370 bug for Firefox play stream(published by Chrome). 4.0.121 4 years ago
winlin 7ea05dddf2 RTC: Allow set constrain for publisher 4 years ago
winlin 9ed388523f RTC: Refine demo H5 page 4 years ago
winlin a7ab78a588 SquashSRS4: Update SDK 4 years ago
winlin 37c9066636 RTC: Refine sdk, migrate from onaddstream to ontrack. 4.0.120 4 years ago
winlin 1ba0b20b74 Refine commens 4 years ago
winlin 0c1e60c8df Tools: Refine configure options. 4.0.119 4 years ago
winlin 6dc8d9dd6f SquashSRS4: Remove srs-librtmp 4 years ago
winlin 9e5c4e2c5b RTC: Fix build fail 4 years ago
winlin fc9363e7df Fix build fail when disable RTC by --rtc=off. 4.0.118 4 years ago
winlin af04285baa Tools: Remove srs-librtmp 4 years ago
winlin 3fb6433c9e Tools: Ignore some unused options 4 years ago
winlin 55baa81cea Tools: Refine --arm with --rtc=off 4 years ago
chenhaibo bd506da070 Fix #2366, bug when disabled gb28181. 4 years ago
winlin 8f304b94ec Refine comments 4 years ago
winlin f043a7eb48 SquashSRS4: Allow RTC play before publish. 4 years ago
root d55af6be44 Fix #2362: Allow WebRTC to play before publishing, for GB28181 as such. 4.0.117 4 years ago
winlin ef617b5fc6 Demo: Refine H5 demo page 4 years ago
Xiaoniu 75607d0723 Fix #2364: Live: Fail for stream busy if GB28181 is publishing. 4 years ago
winlin 442cf615c0 ST: Simplify it, only Linux/Darwin, epoll/kqueue, single process. 5.0.2 
commit f4872e528cad07f8ea683cc8cb26e34111bad1b5
Author: winlin <winlin@vip.126.com>
Date:   Fri Feb 26 09:13:21 2021 +0800

    ST: For #2188: Remove sendmmsg from ST.

commit aaeb8919bd4a026268e0600398cb1e9ad477663f
Author: winlin <winlin@vip.126.com>
Date:   Thu Mar 11 08:09:54 2021 +0800

    ST: Refine utest script.

commit d1ac9da53060b6bfa82b5d041da4c2ad9bd6b90a
Author: winlin <winlin@vip.126.com>
Date:   Wed Mar 3 11:02:25 2021 +0800

    ST: Support fast utest and coverage

commit 8400115b83c022e33f59422dbf6d85ee46fb9edb
Author: winlin <winlin@vip.126.com>
Date:   Fri Feb 26 07:02:19 2021 +0800

    ST: Always use unserialized accept for linux or darwin

commit c3686f2bca80d2c139239b08975575b1bb981ffa
Author: winlin <winlin@vip.126.com>
Date:   Fri Feb 26 06:54:05 2021 +0800

    ST: Refine ARFLAGS by disable the verbose log

commit aaa5c4f863eba278c4ed2b29a46297fb01a4ed63
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 08:58:46 2021 +0800

    ST: Stack always grows from top to down.

commit dddd466e5c2e418c6f4896cd8bf701130052b3d9
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 08:51:31 2021 +0800

    ST: Ignore process fork, for single process only

commit 7906cb5f6e78c916cb8b8d9522275bfc086bb6a3
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 08:50:59 2021 +0800

    ST: Fix build warnings

commit d94921b84a3b6cf88ace2c766cc2bfedb9c0602e
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 07:27:45 2021 +0800

    ST: Remove select and poll support, only epoll and kqueue

commit 76d202514615f78d1a8f2b15778f3dac5abf4abb
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 07:10:47 2021 +0800

    ST: Remove multiple OS support, except Linux and Darwin.

commit 13c4ba345c61170e86dde486a174378ca235f442
Author: winlin <winlin@vip.126.com>
Date:   Thu Feb 25 06:59:35 2021 +0800

    ST: Remove __ia64__ CPU support

commit 46c06e4a11879cfeb828382e44f11287782ce4b5
Author: winlin <winlin@vip.126.com>
Date:   Wed Feb 24 11:37:27 2021 +0800

    ST: Remove unused files for ST
 4 years ago
winlin 34aa11b72a SquashSRS4: Update doc 4 years ago
winlin 476e114cc4 Update doc 4 years ago
winlin 0d14c4b073 System: Fail if use use full.conf 4 years ago
xialixin 2e14d80aa4 SquashSRS4: Refine GB28181 4 years ago
winlin 1bd6bfd142 GB28181: Rename sip and jitter file. 4 years ago
xialixin 4c2b19a264 GB28181: Refine for bad network, we can wait for more incomplete frames 4 years ago
xialixin 7d8bde3cdb Fix #2355: GB28181: Fix play by RTC bug. 4.0.116 4 years ago
winlin 4639510f1b RTC: Allow config perf_stat and queue_length of rtc_server 4 years ago
winlin e3bca883e1 SuqashSRS4: Build SRT native 4 years ago
winlin edbb9cb238 Add FFmpeg LICENSE 4 years ago
hondaxiao 90f1b482ab SRT: Build SRT from source by SRS. 4.0.115 4 years ago
winlin 262f0fc8c8 SRT: Enable HTTP-FLV for SRT 4 years ago
winlin 3dce568b9c Rename SrsConsumer* to SrsLiveConsumer*. 4.0.114 4 years ago
winlin dae6dc5395 Rename SrsRtcStream* to SrsRtcSource*. 4.0.113 4 years ago
winlin 2dd58665fa Rename SrsSource* to SrsLiveSource*. 4.0.112 4 years ago
winlin 9b6a1b16e1 RTC: Eliminate unused perf_stat 4 years ago
winlin a1d7fe46c1 SquashSRS4: Rename SrsRtpPacket2 to SrsRtpPacket. 4 years ago
winlin ddd7a378b1 Rename SrsRtpPacket2 to SrsRtpPacket. 4.0.111 4 years ago
winlin 6a980683f7 SquashSRS4: Remove object cache and stat api 4 years ago
winlin ab0979a4ea RTC: Remove DTLS utests, cover by regression test 4 years ago
winlin f7b32252b0 RTC: Remove Object Cache Pool, no effect. 4.0.110 4 years ago
winlin 717e811002 Change virtual public to public. 4.0.109 4 years ago
winlin 53e20d4a37 RTC: Eliminate unused stat code 4 years ago
winlin cd45750c9d RTC: Eliminate unused stat API 4 years ago
winlin f711eb79ed SquashSRS4: Refine stat id. Fix SRT build bug 4 years ago
winlin 06f7d7d11b Refine id and vid for statistic. 4.0.108 4 years ago
winlin 393d976685 SquashSRS4: Fix memory leak 4 years ago
winlin 9cbdf29f7d SRT: Fix build fail bug, add ssl 4 years ago
winlin 47f3f4da5c SquashSRS4: fix bugs 4 years ago
winlin 996c7d5697 SquashSRS3: Fix bug 4 years ago
winlin 3939844301 SquashSRS4: Fix bugs 4 years ago
winlin 8c5a435714 Fix print bug in retrieve_local_ips. 4.0.107 4 years ago
winlin eb339432c4 SquashSRS4: Update benchmark data. 4 years ago
winlin 6dc93fe0a8 RTC: Update benchmark data 4 years ago
winlin 3bf1b0cb7d Refine tid for sdk and demos. 4.0.106 4 years ago
winlin 8895d36746 SquashSRS4: Refine shared fast timer 4 years ago
winlin 2ad24b2313 Refine shared fast timer. 4.0.105 4 years ago
winlin 3256c7c2fa SquashSRS4: Refine the init of global objects 4 years ago
winlin f370259c9d Fix build fail 4 years ago
winlin 4cf6da107c Refine init of global objects 4 years ago
winlin 8b58d18a5a Refine init of global objects 4 years ago
winlin b1e85664a1 Refine init of global SrsPps 4 years ago
winlin b6f2745822 Refine init of global variables 4 years ago
winlin e8f7c913b0 Refine global or thread-local variables initialize. 4.0.104 4 years ago
winlin 276bd2223e SquashSRS4: Support circuit breaker 4 years ago
winlin e7cce88912 RTC: Refine timer stat 4 years ago
winlin 25f17c32e9 RTC: Refine fast timer 4 years ago
winlin 92fc0af8f4 RTC: Support circuit breaker. 4.0.103 4 years ago
winlin fd6c653d3c SquashSRS4: Refine performance for FastTimer 4 years ago
winlin 46c980c70a RTC: Eliminate unused code 4 years ago
winlin 4527a91545 RTC: Refine play stream find track. 4.0.102 4 years ago
winlin b823dcdfd7 RTC: Refine FastTimer to fixed interval. 4.0.101 4 years ago
winlin f995bf7ca8 SquashSRS4: Transform config for nack/twcc. 4 years ago
winlin 0c0b467917 RTC: Transform config for nack/twcc. 4.0.100 4 years ago
winlin f41c0b42b1 SquashSRS4: Fix config bug for nack and twcc. 4 years ago
winlin b41788ca4a RTC: Fix config bug for nack and twcc. 4.0.99 4 years ago
winlin 4f48ad7a8b RTC: Fix config check bug for nack and twcc 4 years ago
winlin becbe45bcd SquashSRS4: Add demo for RTC 4 years ago
winlin 320bff49e0 Update demos 4 years ago
winlin 37f051f16d Update console 4 years ago
winlin 1e27db6a7d Update players 4 years ago