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

1554 Commits (170cca1f5841a7ec177ec9540779b72251841bd3)

Author SHA1 Message Date
winlin f32aab3d92 For #299, refine code. 8 years ago
winlin 2980e7d3ef For #813, refine code. 8 years ago
Chengdong Zhang 8ad934a8a4 srs_info use not available variable (#813) 
srs_info use not available variable.
Variable has been removed or changed.
 8 years ago
winlin 9ab5e6a916 For #299, fix bug of fragment url 8 years ago
winlin c71e8fa947 For #299, fragment reap workflow 8 years ago
winlin 721a8457c2 For #299, Refine init mp4, use fragment 8 years ago
winlin 8d679a6f9a For #299, use fragment for dvr FLV/MP4 8 years ago
winlin da4c390d69 For #299, extract fragment and fragment window for hls 8 years ago
winlin 6da6e0511d For #803, should refine code. 8 years ago
Chengdong Zhang a6eebacc99 Streams API is not correct. (#800) 
HTTP API for streams is not correct. When stream stopped, API does not
remove it.
 8 years ago
winlin 3ec9df6578 For #299, A/V init mp4 are fine. 8 years ago
winlin 886930c22a For #299, refine the comments. 8 years ago
winlin 308c6fee18 Fix #786, simply don't reuse object. 3.0.20 8 years ago
winlin 44014683e1 Refine thread. 8 years ago
winlin c849010fe2 Refine api for srs-librtmp 8 years ago
winlin 747d6f2f52 For #299, write legal MPD, fix CORS. 8 years ago
winlin 8ab727f3c5 For #299, write MPD file. 8 years ago
winlin d786d61685 Merge branch '2.0release' into develop 8 years ago
winlin 0059b1cf7a For #783, use directly free to replace auto free 8 years ago
ljx0305 b0d16840b5 fix Repeated release (#783) 
fix  Repeated release
 8 years ago
winlin cee9d736a4 for #299, refine code. 8 years ago
winlin ede1c34a25 for #299, refine the signature of api for hls/dash 8 years ago
winlin 2fcd3972c1 for #299, refine the encoder object name 8 years ago
winlin 2a4f57a587 Fix #301, User must config the codec in right way for HLS. 3.0.18 8 years ago
winlin d612a21bad for #299, refine audio codec object name 8 years ago
winlin caf69f193d for #299, refine the codec object name 8 years ago
winlin d7458c4e72 For #299, refine the codec to format-frame-sample chain. 8 years ago
winlin c4a510b834 For #299, refine the codec info structure. 8 years ago
winlin 5e419c66f8 For #299, add dash files. 8 years ago
winlin 7fd221ef63 Always enable DVR 8 years ago
winlin 8e5d4dc73d always enable http and hls 8 years ago
winlin 477414106a add dash files. 8 years ago
winlin 5fec59ace2 merge from srs2, fix #503 8 years ago
winlin 99bffea328 fix #503, disable utilities when reload a source. 2.0.233 8 years ago
winlin afbc3443f3 fix #738, support DVR general mp4. 3.0.17 8 years ago
winlin 3209ad29e0 for #738, refine code for DVR mp4. 8 years ago
winlin 0a054cd6bd for #738, remove the dvr plan append for it's no use 8 years ago
winlin 8c01f52372 for #738, refine the dvr segmenter. 8 years ago
winlin 733ba73d54 for #738, write mp4 samples. 8 years ago
winlin 9d21a8bb33 for #738, use reader and seeker for mp4 demuxer to seek for general mp4(ftyp-mdat-moov). 8 years ago
winlin ac7ee10b60 fix #751,#756, refine code 8 years ago
Chengdong Zhang 80540e4dc1 change TAB space 
change TAB space for line 794
 8 years ago
eagle-zhang 7b02e3543f Clients Api support start and count 
Clients Api support start and count
line 794~810 && line 830
 8 years ago
winlin eaa222f034 for #742, refine the file reader and writer interface. 8 years ago
winlin b16ab038ce for #742, refine the u_intxx_t to uintxx_t 8 years ago
winlin 136a7ef488 for #299, refine docs. 8 years ago
winlin a1fcf66f32 for #742, always enable http utilities. 8 years ago
winlin 79def81792 for #742, refine the rtmp conn, use info as data cluster. 8 years ago
winlin 39aee2b318 for #742, fix publish recv thread bug. 8 years ago
winlin 954bb186c1 identify the flash and fmle for recv thread. 8 years ago
winlin 4583a63789 for #742, refine code for recv thread. 8 years ago
winlin a07986f4ee for #742, refine code 8 years ago
winlin 5c959fc781 merge from srs2, for kbps free io 8 years ago
winlin 6706bda42c for #752, release the io then free it for kbps. 2.0.232 8 years ago
winlin a3ea83f504 directly free the transport, not need to close for maybe NULL 8 years ago
winlin 99c13fb1c1 convert ms to us for st 8 years ago
winlin 7bfb648bd8 refine the meta cache name 8 years ago
winlin 4cff49afd2 for #742, refine source, meta and origin hub. 3.0.16 8 years ago
winlin 310032d8d8 merge srs2, timestamp overflow for ATC. 8 years ago
winlin d76419e3bb fix #749, timestamp overflow for ATC. 2.0.230 8 years ago
cenxinwei 762d7a8884 fix publish_normal_timeout 配置读取错误 8 years ago
winlin 3fe338d1c5 for #742, use ms for application clock tbn. 8 years ago
winlin dca9749f37 for #742, refine the object live cycle. 3.0.15 8 years ago
winlin f4c0af8bfc refine code remove dup api for #742 8 years ago
winlin 1ed5118246 refine the spaces, no TABS 8 years ago
winlin 750f4413c8 merge srs2 for #536 8 years ago
winlin 142a9733b2 refine encoder code for #536. 8 years ago
winlin ccb250f3bc merge srs2. convert ts aac audio private stream 1 to common. 8 years ago
winlin e6eafd3b97 fix #740, convert ts aac audio private stream 1 to common. 2.0.229 8 years ago
winlin 7fe60b5bbf fix #735 config transform refer_publish invalid. 3.0.14 8 years ago
winlin 7bbb3bae42 merge srs2 8 years ago
winlin e3aa34ec5f fix #736, recovery the hls dispose. 2.0.227 8 years ago
Himer afa704bca5 Update srs_app_source.cpp 
enabled 为true才进行转发实例创建
 8 years ago
winlin a1ae48f4ac Merge branch '2.0release' into develop 8 years ago
winlin 6fbda2ae3f for #635, refine hls open/close gop. 8 years ago
winlin ae1920e91a Merge branch '2.0release' into develop 8 years ago
winlin 4104f25069 for #635, support IDR and NonIDR(open-gop). 8 years ago
winlin 1dd877c0d6 merge srs2 8 years ago
winlin c9a71b7fb2 fix #635, hls support NonIDR(open gop). 2.0.226 8 years ago
winlin d49f195bbf fix #734, log format error. 8 years ago
winlin 1b175b1107 for #730, support config in/out ack size. 3.0.13 8 years ago
winlin 4709d0214c for #711, support prefile for transcode. 3.0.12 8 years ago
winlin 8bdf50b14d update feature list 8 years ago
winlin f2efa96015 for #324, always enable hstrs. 3.0.10 8 years ago
winlin 7ac932cfa0 update to 2013-2017 8 years ago
winlin b231550c32 fix #717, #691, http api/static/stream support cors. 3.0.9 8 years ago
winlin f6661989af fix typo for #513, #691 8 years ago
winlin 664844b5f5 merge from srs2. for #513. 8 years ago
winlin 759c84a395 for #513, remove hls ram from srs2 to srs3+. 2.0.224 8 years ago
winlin f30b3073a2 refine the cros of api for flv 8 years ago
winlin 3df8f11884 refine thread stop 8 years ago
winlin 8935fe8897 merge srs2. 8 years ago
winlin aca8a79d95 fix #713, disable the source cleanup. 2.0.223 8 years ago
winlin 9ba4bed648 merge srs2 8 years ago
winlin cb1d47bfef fix #713, refine source to avoid critical fetch and create. 2.0.222 8 years ago
winlin 439c67018d remove unused macros. 8 years ago
winlin 2955b1fd2d support log rotate signal SIGUSR1. 3.0.8 8 years ago
winlin 2d387035cd refine the global variables. 8 years ago
winlin b06203e777 dispose kafka 8 years ago
winlin 9a3674c624 refine kafka 8 years ago
winlin f6c8e02cca Merge branch '2.0release' into develop 8 years ago
ME_Kun_Han ec4d1b3b4f fix bug: run srs at startup failed. (#454) 8 years ago
winlin 0a8d40925f merge from 2.0 8 years ago
ME_Kun_Han f107f404ea fix bug for issues #654 (#426) 8 years ago
winlin 5796e4bf89 merge from srs2 8 years ago
hankun 4f09bcce9f fix the bug: when trying to push same stream more than twice, to play it through http-flv will cause a core dump(#666) 9 years ago
winlin 112d98ffdb merge srs2. 9 years ago
ME_Kun_Han 7058411cb8 fix the core dump when trying to close srs (#386) 9 years ago
winlin 3659eec9d1 update the cwd 9 years ago
winlin 0e308b0fa1 merge srs2, support oryx 9 years ago
winlin 07fe35f11d support asprocess for oryx. 2.0.218 9 years ago
winlin b748fac23a support asprocess for oryx. 2.0.218 9 years ago
winlin 2a01540433 support change work_dir for oryx. 9 years ago
winlin b5d466f3d2 update utest 9 years ago
winlin 09895fcfc2 Merge branch '2.0release' into develop 9 years ago
Star Brilliant a164c90e28 Flush the stdout buffer after logging to console 
Normally if the stdout is connected to a PTY, the stdout buffer is flushed automatically after each \n.
However if I run SRS under Docker, the stdout is not connected to a PTY (unless I ask it to), causing the last log line to be incomplete (showing only half).
By adding fflush, we could make sure each log line is completely shown, whenever the stdout is connected to a PTY or not.
 9 years ago
winlin b24d1de377 Merge branch '2.0release' into develop 9 years ago
winlin 590e951739 fix memory leak of source. 9 years ago
winlin 0e9318e5d8 merge from 2.0 9 years ago
winlin c7b97aa1c3 fix memory leak at source. 2.0.214 9 years ago
winlin 8ad7da1cb6 merge from 2.0 9 years ago
xubin 49853d2b8a 修复forward崩溃 9 years ago
winlin 7d96a33207 Merge branch '2.0release' into develop 9 years ago
winlin e2865c6ac1 workaround for #511, the fly stfd in close. 2.0.211 9 years ago
winlin 36eb0981ec merge from 2.0release 9 years ago
intliang 3fbe9d2442 fixed crash by improper srs_info use. 9 years ago
winlin eed4626c35 use larger limit 9 years ago
winlin 8db25a0bf5 fix the log for mmap. 9 years ago
winlin 214eda745d open null dev, not close stdout or stderr. 9 years ago
winlin 03469fc37d refine code for process fork. 9 years ago
winlin ce8f3b4478 refine the dup2 of stdout and stderr. 9 years ago
winlin ae8bd4c2aa should never close the fd 3+, for it myabe used. 9 years ago
winlin a6dc17a67d support redirect stdout by > 9 years ago
winlin dfe5306327 fix process bug. 9 years ago
winlin 61c0c168b9 merge from srs2. 9 years ago
winlin 266397acee merge from srs2 9 years ago
winlin 28080efec8 fix http reader bug, support infinite chunkted. 2.0.209 9 years ago
winlin f971538cf3 refine http, support no host. 9 years ago
winlin 2941328ee8 rtmp edge support 302 redirect. 9 years ago
winlin d81b2cb140 support hls mount to vhost and reload 9 years ago
winlin 041040b846 ignore ingester when vhost disabled. 9 years ago
winlin eac5440559 merge from srs2 #558 #559 9 years ago
winlin da722b5b5d Merge pull request #559 from tufang14/2.0release 
srs reusable thread need join
 9 years ago
tufang14 56bffb6646 Update srs_app_thread.cpp 9 years ago
flowerwrong d42a58faf4 Keep blank of line 9 years ago
tufang14 233ff11172 srs reusable thread need join 9 years ago
flowerwrong 9ddd0054a1 Add tcUrl to on_publish http hook for issue #548 9 years ago
winlin f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 9 years ago
winlin 5338f21439 merge from srs2 9 years ago
winlin 8155e97b84 add keyword XCORE for coredump to identify the version. 2.0.207 9 years ago
winlin dc38ae1687 show first message when not show version. 9 years ago
winlin 9d22d09646 show signature of server. 9 years ago
winlin 973194c663 merge from srs2. 9 years ago
winlin 26211abf2e refine code. 9 years ago
winlin f516636448 refine code for hooks and http core. 9 years ago
winlin 79fdc4e766 fix bug for rtmp client use NULL ptr. 9 years ago
winlin 96a4428bdb refine the http request parse. edge retry timeout. 9 years ago
winlin 86a7db0adb refine edge ingester, use upstream adapter. 9 years ago
winlin 7ae2c6bf50 merge from srs2. 9 years ago
winlin eca46c03d2 refine code for consumer to refer the rtmp connection. 9 years ago
winlin 11e11005ac specifies the try default vhost 9 years ago
winlin d267b8fa19 fix bug for create connection with ip. 9 years ago
winlin a7bf4bfda5 refine code, ignore client when no ip. 9 years ago
winlin d0c74fa7cd update 2015 to 2016 9 years ago
winlin b881166f9a merge from srs2 9 years ago
winlin c7850570c1 fix #546, thread terminate normally dispose bug. 2.0.203 9 years ago
winlin e124aeb614 Merge branch '2.0release' into develop 9 years ago
winlin 69d191e53f refine the hls error log. 9 years ago
winlin 0ab64ccd2a merge from srs2. 9 years ago
winlin 40457e6cab default hls_on_error to continue. 2.0.201 9 years ago
winlin f6ff116505 refine code, persistence use isolate method. 9 years ago
winlin b486f6fe6b refine /api/v1/summaries, with code and server id. 9 years ago
winlin 26d328e7f2 fix bug for api, level should be string. 9 years ago
winlin ffef3905af merge from srs2. 9 years ago
winlin 5660e24953 fast stop server. 9 years ago
winlin 2830ee12c1 fix the on_hls.ts_url bug. 9 years ago
winlin 1e4c8f8bf3 fast stop server. 9 years ago
winlin 3ab5892863 refine comments. 9 years ago
winlin 5ac8177ce6 fix bugs 9 years ago
winlin b2ae1acaa4 copy http-parser-2.1 into srs http stack. 9 years ago
winlin 17bb31cab1 fix the config bug. 9 years ago
winlin 18eb8c81b3 merge from srs2 9 years ago
winlin 2310b2da59 fix #518, fix fd leak bug when fork. 2.0.200 9 years ago
YueHonghui eb4ca9ff5d fix bug of fd leek in srs_app_server 9 years ago
winlin 01c46bdbfd rename org simle-rtmp-server to ossrs 9 years ago
winlin 1ffd5fd455 rename org simple-rtmp-server to ossrs 9 years ago
winlin 97f5bb8b99 merge from srs2 9 years ago
zhengfl 1dae8fc987 fix #511, fix the bug of thread stop invalid. 9 years ago
winlin 4b5eb5ea2d fix the parse rtmp url bug for ingest. 9 years ago
winlin ec225b2108 quit child process when fork failed. 9 years ago
winlin 9d7826c681 quit child process when fork failed. 9 years ago
winlin f57e537686 for #515, merge from srs2, use SrsAutoFreeA. 9 years ago
winlin f4f76cd196 for #515, use SrsAutoFreeA to free the array. 9 years ago
winlin 8cec06e898 merge srs2, use srs_freepa for array 9 years ago
winlin 2af7749771 for #515, use srs_freepa to free the array. 9 years ago
winlin cef1ae5a8e fix the config bug. 10 years ago
winlin 9ebb77d711 fix the warnings 10 years ago
winlin e9e202dbf1 merge srs2 10 years ago
winlin ef00005ab4 for ExoPlayer, remove duration for live. 10 years ago
winlin 59f5c5d6a5 Merge branch '2.0release' into develop 10 years ago