github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,716 Commits
13 Branches
107 Tags
371 MiB
develop
5.0release
6.0release
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 'e59d29a58b'
${ noResults }
Commit Graph

3628 Commits (e59d29a58b187610ce8cad713742750628dad270)

Author SHA1 Message Date
winlin 41d1e91540 Fix start and end time bug 6 years ago
winlin 9b91c10e52 Fix timeout bug, use 30s as RTMP default timeout 6 years ago
winlin bc1189caee Refine SrsFragment.duration in time unit. 6 years ago
winlin 0879bef9b2 Refine SRS_CONSTS_NO_TMMS to SRS_UTIME_NO_TIMEOUT 6 years ago
winlin f8e6de71f3 Refine headers 6 years ago
winlin 53357e92fe Refine headers 6 years ago
winlin 92980a0ca2 Refine SRS_CONSTS_RTMP_TMMS in time unit 6 years ago
winlin 5b0e0d0838 Refine SRS_CONSTS_RTMP_PULSE_TMMS in time unit 6 years ago
winlin 695d430dcf Refine SrsMessageQueue.duration in time unit. 6 years ago
winlin 170cca1f58 Refine srs_get_system_startup_time in time unit 6 years ago
winlin 6c12aa0eca Refine srs_update_system_time in time unit 6 years ago
winlin 9b7c0802a9 Refine srs_update_system_time in time unit 6 years ago
winlin 9b1222a79c Refine get_publish_normal_timeout in time unit 6 years ago
winlin 170872135d Refine get_publish_1stpkt_timeout in time unit 6 years ago
winlin d6828a3e58 Refine get_mw_sleep in time unit 6 years ago
winlin 839a496d50 Refine get_mr_sleep in time unit 6 years ago
winlin 5df8f2f6c1 Refine get_pithy_print in time unit 6 years ago
winlin 60f9561d2d Refine get_heartbeat_interval in time unit 6 years ago
winlin 5937304717 Refine get_dash_timeshift in time unit 6 years ago
winlin 12cf17ef6b Refine get_dash_update_period in time unit 6 years ago
winlin 4302ab7708 Refine get_dash_fragment to time unit 6 years ago
winlin bb6389143f Refine get_bw_check_interval in time unit 6 years ago
winlin 74c1944e15 Refine config, allow parse multiple times. 6 years ago
winlin 6239dfa489 Apply time unit 6 years ago
winlin 7037f6a197 Cover more ST Coroutine code 6 years ago
winlin 1ce040cc2c Cover more ST Coroutine code 6 years ago
winlin 3d5508e088 Cover more ST Coroutine code 6 years ago
winlin a9a720e32f Cover ST Coroutine and time unit. 3.0.48 6 years ago
winlin f2b4bc7110 Fix #1304, Fix ST coroutine pull error. 3.0.47 6 years ago
winlin 23a2d8eefd Support HTTP-FLV params. 3.0.46 6 years ago
winlin a8781aee3e For #1304, Default HSTRS to on. 2.0.264 6 years ago
winlin a554dd85e1 Fix GCC7 build error, this statement may fall through. 2.0.263 6 years ago
winlin 633a9a0d35 Merge #1324, Remove dead code 6 years ago
winlin b9750baa52 For #1339, Support HTTP-FLV params. 6 years ago
winlin 91c462b6ba For #1339, Support HTTP-FLV params. 2.0.262 6 years ago
YLX ab833943e1 fix: support parse flv query params to http callback (#1339) 6 years ago
winlin 251f19718e CI: Cover kernel mp4 print box 6 years ago
winlin f7b2ee4cc9 CI: Cover kernel utility 6 years ago
winlin a8408de972 CI: Cover kernel mp4 6 years ago
winlin a0ba17b397 CI: Cover kernel ts 6 years ago
winlin 073d42ca7d CI: Refine hls ts context writer 6 years ago
winlin 36c41715e7 CI: Cover kernel ts 6 years ago
winlin 8eccfeceb9 CI: Cover kernel ts 6 years ago
winlin 3f59c7885e CI: Cover kernel ts 6 years ago
winlin 4187fa0068 CI: Cover kernel utility 6 years ago
winlin 572ce5ccff CI: Cover kernel mp3 6 years ago
winlin 39541b51a1 CI: Cover all kernel log 6 years ago
winlin 492db1a904 CI: Cover kernel flv 6 years ago
winlin 2fec88b769 CI: Fix kernel file case failed. 6 years ago
winlin ec16e53802 CI: Cover kernel file 6 years ago
winlin 3064b941d5 CI: Cover kernel codec av frame and format 6 years ago
winlin 2bdba63b0b CI: Cover kernel codec 6 years ago
winlin c2a938473a CI: Cover kernel codec 6 years ago
winlin 1df1d84766 CI: Cover kernel LB round robin 6 years ago
winlin 5b311a06b7 CI: Verify kernel aac write ADTS packet 6 years ago
winlin 917cb4a299 CI: Cover all kernel aac 6 years ago
winlin 2ae3440128 CI: Cover all kernel error 6 years ago
winlin 3cd3739433 CI: Cover all kernel error 6 years ago
winlin 8c9857ff6f CI: Remove macros for utest 6 years ago
winlin bfeea72eac CI: Cover all kernel buffer 6 years ago
winlin a2b0767874 Fix build failed. 6 years ago
winlin c646e3f287 CI: Research support codecov 6 years ago
winlin a25efa3764 CI: Update codecov badge 6 years ago
winlin 7243d8e7b8 CI: Support codecov 6 years ago
winlin b4619e3393 Kbps: Remove the union for kbps slice 6 years ago
winlin 98706f793e Support Opus audio-level 6 years ago
winlin f1b1f78c4e Parse Opus for tools 6 years ago
winlin e77b570636 Add codec OPUS/HEVC to FLV 6 years ago
winlin b2d1d84634 Change to 2019 6 years ago
winlin 66198b6f78 Add utest for RTMP protocol 6 years ago
winlin a2d6566019 Add kernel utility utest 6 years ago
winlin 6e44aa4a4f Cover Kbps statistic 6 years ago
winlin 6e9c7dd11e Add utest for SrsKbps as RAW statistics 6 years ago
winlin 6234905532 Refactor ISrsKbpsDelta 6 years ago
winlin dcebf8a31f Refine kbps 6 years ago
winlin aef838338c Add utest for kbps connections 6 years ago
winlin c26b475bae Refine kbps, stub wall clock 6 years ago
winlin 4c40370986 Refine kbps more testable 6 years ago
winlin 16fa4c588a Rename ISrsProtocolReaderWriter to ISrsProtocolReadWriter 6 years ago
winlin 6e75993e7f Change public virtual to virtual public 6 years ago
winlin 5d959661e7 No sudoer 6 years ago
winlin 2e9bf2af83 Always enable SRS_StreamCaster 6 years ago
winlin 1dc95cba78 Always enable SRS_Ingest 6 years ago
winlin aa1a5442f9 Always enable SRS_Ingest 6 years ago
winlin c6844527fb Always enable SRS_SSL 6 years ago
winlin e4e6dd2169 Always enable SRS_SSL 6 years ago
winlin 0bc7fdbb35 Always enable SRS_SSL 6 years ago
winlin 8e294709b0 Always enable SRS_STAT 6 years ago
winlin 71f1ccbf90 Always enable SRS_HLS 6 years ago
winlin f003ba9a29 Always enable SRS_DVR 6 years ago
winlin 330100769f Always enable SRS_TRANSCODE 6 years ago
winlin 0626bc5982 Use openssl in docker 6 years ago
winlin 432a575c7a Use docker for #1274 and #1250 6 years ago
winlin b0e91e8fe9 Use docker for #1274 and #1250 6 years ago
winlin f1ab8fecac Fix build warning 6 years ago
winlin ef3e35f173 Fix build warning 6 years ago
winlin 4d157f2148 Fix build warning 6 years ago
winlin dcc2a73e7a Refine kernel aac 6 years ago
winlin 572a2806c1 Refine utest 6 years ago
winlin a8be5f8f27 Allow OSX for utest 6 years ago
winlin f2a93755c2 Allow OSX for utest 6 years ago
winlin f1033296bb Upgrade to FFMPEG 4.1 and X264 157. 2.0.261 6 years ago
winlin acaae0d5c9 Update SRS3 6 years ago
winlin ba4ef34d27 Merge 2.0release 6 years ago
Steven Liu 78cf3d4b58 upgrade x264 and ffmpeg to newest version (#1274) 
The ffmpeg and x264 in srs is too old.

Signed-off-by: Steven Liu lq@chinaffmpeg.org
Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
 6 years ago
winlin ff82ca1233 Merge branch 2.0release into 3.0release 6 years ago
winlin 99430d2edb For #1250, Not support macOS 10.14 6 years ago
winlin 24f46f5085 #1261, Support _definst_ for Wowza. 3.0.44 6 years ago
winlin 99aa249f3a #1261, Support _definst_ for Wowza. 2.0.260 6 years ago
MakarovYaroslav e62ac29f48 add ignoring _definst_ at the end of app (#1261) 6 years ago
winlin b2066cbf68 #1263, Fix string trim bug. 2.0.259 6 years ago
MakarovYaroslav a2480a6c94 fix bug with for loop (#1263) 6 years ago
winlin 39f1629168 Merge from SRS2 6 years ago
winlin 58e501ee24 Fix #1250, Support build on OSX10.14 Mojave. 2.0.258 6 years ago
winlin 63ac93a642 Merge #1236 from 2.0release 6 years ago
winlin a5b452f965 Merge #1236, Fix sleep bug in us. 2.0.257 6 years ago
RocFang 768fe68ca3 fix st_usleep param from us to ms. (#1236) 
fix st_usleep param from us to ms.
 6 years ago
winlin 3f009937ee Merge #1237 from 2.0release 6 years ago
winlin 9859fa9e6f Merge #1237, Support param for transcoder. 2.0.256 6 years ago
Mirko Velic 70ad16ff6a Add request stream param to encoder output format parameters. (#1237) 6 years ago
winlin 8e55ef4b60 Refine code 7 years ago
winlin 1e2cca4712 For #1093, Refine HLS encryption wiki 7 years ago
winlin 5945fb5a24 Fix #1093, Support HLS encryption. 3.0.42 7 years ago
winlin ee068cf120 For #1109, Support without ssl for HLS key. 7 years ago
winlin 522fba99aa Merge branch 3.0release into harlanc-3.0release 7 years ago
winlin e73e30de3a Fix #1051, Drop ts when republishing stream. 3.0.41 7 years ago
winlin 74d5d15c9f Merge branch 3.0release of https://github.com/harlanc/srs into harlanc-3.0release 7 years ago
winlin 1e054d2bcc Fix #354, Rename impl__SrsAutoFree to impl_SrsAutoFree 7 years ago
Harlan 22c5af62cf Merge branch '3.0release' of https://github.com/ossrs/srs into 3.0release 
# Conflicts:
#	trunk/src/kernel/srs_kernel_utility.hpp
 7 years ago
Harlan bf12a45274 add configuration instructions for hls encryption 7 years ago
Harlan ac6b37de4b rewrite ff_data_to_hex 7 years ago
winlin a9b5d65ca7 For #1202, Support auth_key param for srs player 7 years ago
winlin 728ddd133b For #1202, Support edge/forward to Aliyun CDN. 3.0.40 7 years ago
winlin 74a87d54f2 For #1202, Support edge/forward to Aliyun CDN. 2.0.255 7 years ago
winlin 1cc72df134 Fix #910, Support HTTP FLV with HTTP callback. 3.0.39 7 years ago
winlin 1e7c12a6dd For #910, Support HTTP FLV with HTTP callback. 2.0.254 7 years ago
winlin 928c6ab091 For #1181, Add utest 7 years ago
winlin 01d8bba455 For #1181, Refine code to write utest 7 years ago
winlin 6cea551c64 For #1110, Refine params in http callback. 2.0.253 7 years ago
winlin d607c7f905 Refine HTTP-FLV latency, support realtime mode.3.0.38 7 years ago
winlin 03ac48f8fa Merge 2.0, for FLV latency 7 years ago
winlin c45f72ef7b Refine HTTP-FLV latency, support realtime mode. 2.0.252 7 years ago
winlin 580c94c8c0 Refine code 7 years ago
winlin 31945c244d For #1110, Refine code. 7 years ago
winlin 455a060fa5 Merge 2.0 7 years ago
winlin ee43fc92ae For #1110, Refine conf 7 years ago
winlin ae99131512 Fix #1087, Ignore iface without address. 3.0.37 7 years ago
winlin 82699ff616 Refine code for librtmp 7 years ago
winlin 29b74c7220 For #1110, Support params in http callback. 3.0.36 7 years ago
winlin 85d3a5001c For #1110, Support params in http callback. 2.0.251 7 years ago
winlin 68a1656e07 Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35 7 years ago
winlin 09dbda5b18 For #1031, SRS forwarder support douyu.com. 7 years ago
winlin a66d450ec1 For #1031, SRS edge support douyu.com. 3.0.34 7 years ago
winlin 586899a010 For #1031, SRS edge support douyu.com. 2.0.250 7 years ago
winlin 41c6e833b9 Replace hex to string to match MIT license. 3.0.33 7 years ago
winlin 84f81983aa Replace base64 to match MIT license. 3.0.32 7 years ago
winlin 0a63448b86 Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31 7 years ago
winlin e395878916 Replace crc32 IEEE by golang to match MIT license. 3.0.30 7 years ago
winlin dea5e5bb48 Add utest or CRC32 IEEE, refine TABs of code 7 years ago
winlin 608c88b8f2 Merge 2.0release 7 years ago
winlin 6d7c7418a8 Merge #1119, fix memory leak. 2.0.249 7 years ago
winlin 551863a7ed Refine code 7 years ago
winlin 693194dffe Merge 2.0release 7 years ago
winlin d27db215df For #1176, should not close fd when success. 7 years ago
winlin e4742ddac7 Merge 2.0release 7 years ago
winlin 2d49b9d1a7 Merge #1176, fix scaned issues. 2.0.248 7 years ago
Hui Zhang (huzhang2) 01ed485cf3 fix #1172 #1173 #1174 #1175 
security scan report issue
 7 years ago
Harlan e9cb8210fc fix default value error 7 years ago
Harlan 45a57acbb4 fix bug 7 years ago
Harlan 43ebd5958d fix bug that only one stream can be encrypted.. 7 years ago
winlin dba44c7c3f Merge branch 'develop' into 3.0release 7 years ago
xialixin bb4e16ae3c fix create dir success result check (#1080) 7 years ago
xialixin aaf2905a9d add: hls configuration adds [duration] variable (#1083) 7 years ago
Harlan 52596a0b04 add HLS encryption feature 7 years ago
winlin 0d78b908a7 Fix client tools resolve dns failed bug 7 years ago
winlin 449c632e49 For #464: Add example for origin cluster 7 years ago
winlin bd797ad385 Fix utest build failed for ::atoi 7 years ago
winlin 459272b94c Merge #1077 from 2.0release 7 years ago
winlin 0fe17c3e34 Merge #1077, fix crash for edge HLS. 2.0.247 7 years ago
RocFang fd016ed91a use hls->initialize to set req of hls (#1077) 7 years ago
winlin 4bf5ab2044 Fix #464, support RTMP origin cluster. 3.0.29 7 years ago
winlin c70421e656 Fix #464, support origin cluster 7 years ago
winlin 2f09ec4353 For #464, refine result of origin cluster api 7 years ago
winlin 92f2bcd878 For #464, support config origin cluster 7 years ago
winlin 55c96192e2 For #464, refine code 7 years ago
winlin ec362b2774 For #464, query origin info and ip addresses 7 years ago
winlin 469250f850 For #464, support origin cluster api 7 years ago
winlin d0fbf44d18 For #464, support config for origin cluster. 7 years ago
winlin db6b8cf914 Fix #1057, switch to simple handshake. 3.0.28 7 years ago
winlin a2cefe4dbd For #1059, show more information from stream 7 years ago
winlin 681138d2af Fix #1059, merge from 2.0, supports url with vhost in stream. 3.0.27 7 years ago
winlin 1721e4ea4b Fix #1059, support vhost in stream parameters. 2.0.246 7 years ago
winlin 93d3e1464a For #1045, revert macro for TCP keepalive detection, use system macro 7 years ago
winlin 366309ce2d For #1045, revert macro for TCP keepalive detection, use system macro 7 years ago
winlin 049e7c82c0 Merge #1044, for #1045, set TCP SO_KEEPALIVE 7 years ago
winlin 911cd448f1 Merge #1045, for #1044, TCP connection alive detection. 2.0.245 7 years ago
juntaoliu a6871052af set tcp keepalive for tcp socket (#1045) 7 years ago
winlin 82457cda4b Change date from 2017 to 2018 7 years ago
winlin ca1395a807 Change date from 2017 to 2018 7 years ago
winlin d9e37d2f54 Merge branch '2.0release' into 3.0release 7 years ago