github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,608 Commits
14 Branches
107 Tags
373 MiB
develop
duiniuluantanqin-patch-1
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 '1605000817'
${ noResults }
Commit Graph

3553 Commits (16050008172832d8dbe847940457e74e4f5669e4)

Author SHA1 Message Date
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
RocFang d22d7afd83 update init.d file (#1039) 7 years ago
winlin 5730bf8e43 Fix #913, support complex error. 3.0.26 7 years ago
winlin b426036832 Merge #1033, allow user to add some specific flags. 2.0.244 7 years ago
RocFang 015e76cb3f Update configure (#1033) 
allow user to add some specific flags.
 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 aebbbadf42 For #913, Service support complex error. 7 years ago
winlin 15aea686c3 For #913, KAFKA, RTSP support complex error. 7 years ago
winlin 70a20ffadb For #913, RTMP support complex error. 7 years ago
winlin 60accb6e54 For #913, AMF0 and RTMP 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
ME_Kun_Han 3744606c9b fix bug: parsing Exp-Golomb codes failed (#978) 8 years ago
winlin baa55f14b9 Change stable release to SRS2 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 e135ab59d9 Fix the utest failed for chunk_size 8 years ago
winlin 6d4315fc3c Disable valgrind by default 8 years ago
winlin 0ad4b65a56 Disable valgrind for osx. 8 years ago
winlin b3825c4021 Fix warnings 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 7275fd5397 Fix #916, build failed for headers for 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 372a9e5cb3 Fix #915, string ends with 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 58521751c3 Fix #299, support experimental MPEG-DASH. 3.0.25 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 baed1cc043 For #821, support parse dash video segment 8 years ago
winlin 8cc3ab2fa2 For #821, print mdat and udat 8 years ago
winlin beae090d67 Refine logger header 8 years ago
winlin 4f6f8a8244 Fix verbose bug, for #821 8 years ago
winlin 6c64297264 Fix #821, support MP4 file parser. 3.0.24 8 years ago
winlin 12a55cd0c2 Fix build failed. 8 years ago
winlin 86f3bd7a0f Fix build failed. 8 years ago
winlin 121eadbc07 Fix build failed. 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
winlin 5792c462b8 Merge branch 'develop' into 3.0release 8 years ago
winlin c4966484e1 For #893, #899, merge SRS2 8 years ago
winlin e8cb2e6be4 Merge #899 to fix #893, ts PES ext length. 2.0.243 8 years ago
OtterWa d1bd6993c5 fix ts decode (#899) 8 years ago
winlin 1e3550a52c For #821, Parse basic mp4 boxes. 8 years ago
HungMingWu 234904c206 Refine Refine Refine kernel/ts code (#891) 8 years ago
winlin dd1cca45cc Remove non-exists conf file. 8 years ago
winlin eaccbd0f85 Support print MP4 box. 8 years ago
winlin fe43a31d06 Parse all mp4 boxes 8 years ago
winlin 366d6bcb82 Refine code 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 e8ea27088a Refine Refine kernel/ts code (#881) 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