Commit Graph

1554 Commits (170cca1f5841a7ec177ec9540779b72251841bd3)

Author SHA1 Message Date
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
winlin 4e4091231e Refine object create in server. 8 years ago
winlin 93710c7489 For #913, refine the error mechanism 8 years ago
winlin bb200b5d2d For #913, add complex error. 8 years ago
winlin 69374c8d6d For #299, use format for v/a sequence header. 8 years ago
winlin 9ca36970aa Fix #908, use empty coroutine to avoid NULL pointer. 8 years ago
winlin 0e9e1792fe For #299, write fMP4 for DASH. 8 years ago
winlin 1bf99e8f3e For #907, Wrap ST, only use in service ST. 8 years ago
winlin 54411e0768 Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23 8 years ago
winlin 6993ac226f For #906, #902, use coroutine for reusable2 thread 8 years ago
winlin ea9a5f26d9 For #906, #902, use coroutine for reusable thread 8 years ago
winlin 2ed2513f08 For #906, #902, use coroutine for one cycle thread 8 years ago
winlin b21f92f97a For #906, #902, remove the thread start and stop event 8 years ago
winlin 3ffb0980f5 For #906, #902, use connection manager to remove connection 8 years ago
winlin 44f542f77f For #906, #902, replace the endless thread with coroutine 8 years ago
winlin fc380fe48d For #906, #902, refine thread object. 8 years ago
xialixin 92c8c0505d Fix the timebase bug, change from us to ms. (#876)
* fix SRS_CONSTS_RTMP_PULSE_TMMS (int64_t)(500*1000LL)

* fix SrsBufferCache::cycle st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000)

* fix st_usleep(SRS_CONSTS_RTMP_PULSE_TMMS * 1000)
8 years ago
HungMingWu 815d50f00a Remove warning: C++11 requires a space between string literal and macro (#874)
On Ubuntu 17.04, the default gcc compiler version is 6.3.0.
It switch standard from c++98 to c++11.
So it would generate verbose warnings.
8 years ago
winlin a58874178b Fix merge build failed. 8 years ago
winlin f97260be1d Merge SRS2 8 years ago
winlin a613eb78c6 Fix #865, shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242 8 years ago
walkermi 79e4f9f3a0 fixed compile error when add --log-info (#860)
* Update srs_app_server.cpp

fixed compile error when add --log-info

* Update srs_app_mpegts_udp.cpp

fixed compile error when add --log-info
8 years ago
winlin ae5450181c Fix #636, FD leak for requesting empty HTTP stream. 2.0.241 8 years ago
HungMingWu 98d4b6ae11 Refine srs_kernel_codec audio & video config code (#854) 8 years ago
winlin c97f2233a2 Merge SRS2 for #851 8 years ago
winlin ff87318b95 Fix #851, HTTP API support number of video frames for FPS. 2.0.240 8 years ago
winlin bcd24126c5 Update comments for HLS 8 years ago
winlin a98c9e04e3 Fix #547, support HLS audio in TS. 3.0.22 8 years ago
winlin 18d9f6c8f1 Fix build failed. 8 years ago
winlin 1054b0a90f Merge SRS2 8 years ago
winlin 33a0abdeff Fix #844, support Haivision encoder. 2.0.238 8 years ago
winlin d6e28bde69 Merge from SRS2. 8 years ago
HungMingWu 14acc59a19 Refine kernel/mp4 code (#823) 8 years ago
haofz 52b6823a90 fix #826, fix memory leak in streamCasterFlv (#836) 8 years ago
winlin 33375db401 Merge from SRS2, for #834 8 years ago
winlin b11ddc7f41 Fix #834, crash for TS context corrupt. 2.0.235 8 years ago
winlin 7d618fed43 For #820, fix utest failed. 8 years ago
winlin e3526c0cf6 For #820, modules use service only. 8 years ago
winlin ff822b55cd For #820, extract service module. 8 years ago
winlin 0a57a46016 Refine LICENSE 8 years ago