Commit Graph

1593 Commits (45009785fb56b00f89064fef644a951660a136cc)

Author SHA1 Message Date
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 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 073d42ca7d CI: Refine hls ts context writer 6 years ago
winlin b2d1d84634 Change to 2019 6 years ago
winlin 6234905532 Refactor ISrsKbpsDelta 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 2e9bf2af83 Always enable SRS_StreamCaster 6 years ago
winlin aa1a5442f9 Always enable SRS_Ingest 6 years ago
winlin c6844527fb 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 330100769f Always enable SRS_TRANSCODE 6 years ago
winlin ba4ef34d27 Merge 2.0release 6 years ago
RocFang 768fe68ca3 fix st_usleep param from us to ms. (#1236)
fix st_usleep param from us to ms.
7 years ago
Mirko Velic 70ad16ff6a Add request stream param to encoder output format parameters. (#1237) 7 years ago
winlin 8e55ef4b60 Refine code 7 years ago
winlin 1e2cca4712 For #1093, Refine HLS encryption wiki 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
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 ac6b37de4b rewrite ff_data_to_hex 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 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 d27db215df For #1176, should not close fd when success. 7 years ago
winlin e4742ddac7 Merge 2.0release 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 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 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 bd797ad385 Fix utest build failed for ::atoi 7 years ago
winlin 459272b94c Merge #1077 from 2.0release 7 years ago
RocFang fd016ed91a use hls->initialize to set req of hls (#1077) 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 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 ca1395a807 Change date from 2017 to 2018 7 years ago
winlin 922a8f3a5c For #988, refine code. 7 years ago
winlin 823dc2df21 Refine help 7 years ago
Thomas Dreibholz feaae341b9 IPv6 support (for 3.0 release) (#988)
* IPv6 support, part 1.

* IPv6 support, part 2.

* Some more IPv6 work.

* Made functions for address:port paŕsing IPv6-capable.

* Fixed type (compile warning).

* Fixed formatting.

* Reverted option change.

* Replaced abort() by proper error handling.

* Also retrieving local IPv6 addresses now.
7 years ago
winlin db08f1586c For #913, APP support complex error. 7 years ago
winlin e2c1f58674 For #913, APP support complex error. 7 years ago
winlin 6eae93258a For #913, APP support complex error. 7 years ago
winlin 204ef041da For #913, Kernel MP4 FLV HTTP support complex error. 7 years ago
winlin 9802dc326e For #913, source support complex error 8 years ago
winlin abcaba33ee For #913: TS/HLS/MPEGTS support complex error 8 years ago
winlin 20a42599f3 For #913, http callback use complex error 8 years ago
winlin fd91df9411 For #913, reload use complex error 8 years ago
winlin 9f5224c34a For #913, use complex error for http 8 years ago
winlin 661eb8b37c For #913, use complex error for reload utc time 8 years ago
winlin 5c9a12e72a For #913, use complex error for listener 8 years ago
winlin 71dd3f3137 For #913, use complex error for server handler. 8 years ago
winlin 9db2a04c3b For #913, coroutine support complex error. 8 years ago
winlin b5c14938d9 For #913, config and log support complex error. 8 years ago
winlin 860aac3e50 For #913, config reload and persistence 8 years ago
winlin 7cac35a289 For #913, source cycle error 8 years ago
winlin a20e2c3ef6 For #913, refine server utility 8 years ago
winlin ca9f0bdb1e For #913, refine server initialize st 8 years ago