github-forks
/
srs
mirror of https://github.com/ossrs/srs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,862 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 '84f6f3d051'
${ noResults }
Commit Graph

3761 Commits (84f6f3d0511645db434aaff266563b368a96228b)

Author SHA1 Message Date
winlin 136a7ef488 for #299, refine docs. 8 years ago
winlin e8353cba3b for #299, add mp4 and dash doc. 8 years ago
winlin 38a683fe14 disable glibc memory check 8 years ago
winlin 7057bb1ef5 for #742, always enable http utilities. 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 8acb99f96c refine comments for librtmp 8 years ago
winlin c5fcc15989 update the date info 8 years ago
winlin 0e6f7e66f0 add srs_rtmp_free_packet for srs-librtmp 8 years ago
winlin 7acc3aca16 refine hijack io for srslibrtmp 8 years ago
winlin e8c48ac8f8 merge srs2, use specific error code for dns resolve 8 years ago
winlin 60be29f324 fix #750, use specific error code for dns resolve. 2.0.231 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
winlin 2ef1ef06e9 increase the nb_samples because some large video may overflow. 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 f92db0f87e merge srs2 for kbps 8 years ago
winlin 6a8c232c5b fix #588, kbps interface error. 2.0.228 8 years ago
winlin c58dbe4d14 fix #588, kbps interface error. 2.0.228 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 db231f6d37 refine hls html5 video template. 8 years ago
winlin 087a596a63 refine hls html5 video template. 8 years ago
winlin df983cc9ec fix typo 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 07871a442e fix typo 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 c46e925be5 add utest for avc uev 8 years ago
winlin b7dd764920 update gitignore 8 years ago
winlin 10a0c6c10c update for srs3 8 years ago
winlin 1b1ae00910 fix #727, install valgrind-devel 8 years ago
winlin 517812dbe2 remove test code for #730 8 years ago
winlin 1b175b1107 for #730, support config in/out ack size. 3.0.13 8 years ago
winlin bbbc40f9c2 Merge branch '2.0release' into develop 8 years ago
winlin aa2b7afb44 refine code, print protocol level info. 8 years ago
winlin e434c09dc0 for #730, merge srs2 8 years ago
winlin c67036d52e for #730, reset ack follow flash player rules. 2.0.225 8 years ago
winlin dc1f227aeb for #730, refine code to decode the acknowledge message 8 years ago
winlin d29416a5f0 add conf sample for ingest rtsp 8 years ago
winlin 4709d0214c for #711, support prefile for transcode. 3.0.12 8 years ago
winlin f9a159cd21 patch ST for valgrind and ARM. 3.0.11 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 9e9cad1826 refine messages 8 years ago
winlin dd1c769f65 refine main 8 years ago
winlin 83c251fc1c fix bug 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 28517849ed refine typo 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 6dfb44b7b5 Merge branch '2.0release' into develop 8 years ago
winlin 85a7cb884f fix bug: fix the way calculating PCR for ts(#678) (#430) 8 years ago
hankun e0ab8b080d fix bug: fix the way calculating PCR for ts(#678) 8 years ago
winlin 0a8d40925f merge from 2.0 8 years ago
winlin d8599a56ca fix #654, crash when source cleanup for edge. 2.0.221 8 years ago
ME_Kun_Han f107f404ea fix bug for issues #654 (#426) 8 years ago
winlin 2f5f7d4a7b merge srs2 8 years ago
winlin 8b00e56a84 fix #666, crash when source cleanup for http-flv. 2.0.220 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) 8 years ago
winlin 112d98ffdb merge srs2. 8 years ago
winlin d6fc289c6a fix #661, close fd after thread stopped. 2.0.219 8 years ago
ME_Kun_Han 7058411cb8 fix the core dump when trying to close srs (#386) 8 years ago
winlin 78aa518ecc merge srs2 8 years ago
winlin b19702f669 update srs player 8 years ago
winlin 9cc528cd33 merge srs2 8 years ago
winlin 3659eec9d1 update the cwd 8 years ago
winlin 0e308b0fa1 merge srs2, support oryx 8 years ago
winlin 07fe35f11d support asprocess for oryx. 2.0.218 8 years ago
winlin b748fac23a support asprocess for oryx. 2.0.218 8 years ago
winlin 2a01540433 support change work_dir for oryx. 8 years ago
winlin b5d466f3d2 update utest 9 years ago
winlin 0fb71281a9 add circleci 9 years ago
winlin cbffe74494 add circleci 9 years ago
winlin e15e07c4d1 merge srs2 9 years ago
winlin ff3f8272a9 fix #640, typo for rtmp type. 2.0.217 9 years ago
winlin 0596550a72 Merge branch '2.0release' into develop 9 years ago
winlin 99d87f9f9c fix sys-ssl librtmp build bug. 9 years ago
winlin 4bcd90d747 fix sys-ssl librtmp build bug. 9 years ago
winlin 92fb81003c link crypto when use sys-ssl 9 years ago
winlin 77bca7cc05 Merge branch '2.0release' into develop 9 years ago
winlin 53d2eb5e02 fix librtmp get bytes bug. 9 years ago
winlin 6b8fe92afa Merge branch '2.0release' into develop 9 years ago
winlin 588de3e7b4 check lsb_realease for install 9 years ago
winlin 504352d17a merge srs2. 9 years ago
winlin c2cb666995 fix fast stream error bug. 2.0.216 9 years ago
winlin c231f45fe8 Merge branch '2.0release' into develop 9 years ago
winlin bd652e4607 fix build failed for stdc++ 9 years ago
winlin 8a4e241eec merge from srs2 9 years ago
winlin 6c4c68ccb6 2.0 beta1(2.0.215) released. 9 years ago
winlin 49b880d4ce refine comments 9 years ago
winlin eb915413ad Merge branch '2.0release' into develop 9 years ago
winlin 0015b303a6 librtmp: refine comment for NALU process. 9 years ago
winlin 93eb961b4c Merge branch '2.0release' into develop 9 years ago
winlin 4c6c2c28b8 refine h264 raw publish with fps 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 17df61724d Merge branch '2.0release' into develop 9 years ago
winlin 7aaa74b9e0 TODO: FIXME: for librtmp, must group NALUs to frame. 9 years ago
winlin 2cf077abe9 Merge branch '2.0release' into develop 9 years ago
winlin 80a98cf836 refine annexb parse 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 815f2491a4 merge from 2.0 9 years ago
winlin 6ec60b0a21 fix memory leak at handshake. 2.0.213 9 years ago
winlin 39a46f7b97 Merge branch '2.0release' into develop 9 years ago
winlin 1214af643e refine comments for arm 9 years ago
winlin c0498c82ee merge 2.0 9 years ago
winlin e775eb3ff2 support all arm for patched st. 2.0.212 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 b49cb3d379 Merge branch '2.0release' into develop 9 years ago
winlin a0890fe06a comment the pcr 9 years ago
winlin 5d5fa7204d Merge branch '2.0release' into develop 9 years ago
winlin d919668b61 don't ignore aud 9 years ago
winlin bf22acd689 Merge branch '2.0release' into develop 9 years ago
winlin a4bb03b9d6 ignore other 264 frame except sps,pps,idr,nonidr 9 years ago
winlin 31a1b7bed2 Merge branch '2.0release' into develop 9 years ago
winlin 304ff02aef default to 30s timeout for librtmp 9 years ago
winlin d68a459198 Merge branch '2.0release' into develop 9 years ago
winlin 02fb0779be fix the microsec calc bug for librtmp 9 years ago
winlin 14760003ba merge from 2.0 9 years ago
winlin e00928557e fix the timeout for librtmp 9 years ago
winlin 516f33888c refine config 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 f87646d489 fix typo of config. 9 years ago
winlin abeb4f46a9 merge 2.0 9 years ago
winlin ec6e77992e 2.0.210 9 years ago
winlin 499fc07db1 refine the hls m3u8 refresh interval. 9 years ago
winlin 5fa500646e update srs player version 9 years ago
winlin ec57e2170d refine hls m3u8 refresh interval and buffer time 9 years ago
winlin b463e4a2f4 Merge branch '2.0release' into develop 9 years ago
weiyabo 8df7135dee for bug #5064, success parse 264 sps 9 years ago
winlin c746753c6a update player, add pst(player startup time) 9 years ago
winlin 892591f9a6 merge from @mbeacom 9 years ago
winlin 2e75c9f45f add more buffer 9 years ago
winlin 9312d77c20 default not to preview the stream for publisher. 9 years ago
winlin 6b5c880ff9 refine player to support status change. 9 years ago
winlin 4841435b14 fix default http port bug. 9 years ago
winlin a2d235f015 refresh js cache. 9 years ago
winlin d7a28059ed remove jwplayer and osmf 9 years ago
winlin d9f1ced732 change srs player to 1.28 9 years ago
winlin 77167f3331 refine srs player for hls, extract a HlsNetStream. 9 years ago
winlin 2492562d25 use xpsid X-Playback-Session-Id to more useful. 9 years ago
winlin b2bd63e833 refine srs player to play hls. 9 years ago
winlin 46a31f4884 support play hls 9 years ago
winlin 69ec66ee36 refine js for player. 9 years ago
winlin 0a2e00f8c5 dump logs 9 years ago
winlin 9ab5039b36 extract iplayer for srs-player. 9 years ago
winlin 10ce961a00 update version for bwtc 9 years ago
winlin b3c13f2550 refine the bwtc, to compatible with bms4. 9 years ago
winlin eed4626c35 use larger limit 9 years ago
winlin a3038b1274 fix the rtmp url parse bug. 9 years ago
winlin 82aa9d120c for #5114, display metadata. 9 years ago
winlin a8ee3162d4 Merge branch '2.0release' into develop 9 years ago
winlin d72b93e58b fix the sed bug, to compatible with osx 9 years ago
winlin 00c60db7c3 Merge branch '2.0release' into develop 9 years ago
winlin f7d9ed5ae4 update api 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 0cd15068de set default buffer time to 0.5 for srs player. 9 years ago
winlin f8358da316 refine ingester log. 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 e2e6e76f92 for #558 and #559, 2.0.208 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
winlin d24aef50ba for #369, support RTMP 302 api at protocol level. 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 190db75835 refine code for nx_json modify the data when loads. 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 49308dddfb update 2015 to 2016 9 years ago
winlin d0c74fa7cd update 2015 to 2016 9 years ago
winlin 714c13d88d merge from srs2 9 years ago
winlin 5d3a183f43 fix #509, always alloc big object at heap. 2.0.205 9 years ago
winlin 65b81a4e68 merge from srs2 9 years ago
winlin 8b24319ffb fix #418, ignore null connect props to make RED5 happy. 2.0.204 9 years ago
winlin 8d378cda2e for #418, when simple handshake, copy s1 to c2. 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 5f915aa959 merge from srs2 9 years ago
winlin cee8c3d07d fix #541, failed when chunk size too small. 2.0.202 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 fabcc91a0e refine codes. 9 years ago
winlin b2ae1acaa4 copy http-parser-2.1 into srs http stack. 9 years ago
winlin fba1122835 private the srs_vhost_resolve 9 years ago
winlin 17bb31cab1 fix the config bug. 9 years ago
winlin eec2c34b5c refine publisher. 9 years ago
winlin cfe230438a revert test code 9 years ago
winlin 6191e0af90 s1 compute key. 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 c77cefb6fa refine the position of log script 9 years ago
winlin 44b26271bf Merge branch '2.0release' into develop 9 years ago
winlin c4c63f7825 fix build failed bug for osx. 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 6c7a51d310 Merge branch '2.0release' into develop 9 years ago
winlin 1d8318d2fc change simple-rtmp-server org to ossrs 9 years ago
winlin d2ccc4f661 Merge branch '2.0release' into develop 9 years ago
winlin 8c04b17d08 use /usr/local/bin for osx. 9 years ago
winlin 7db7d43aea Merge branch '2.0release' into develop 9 years ago
winlin 18b50d961f support query server by id. 9 years ago
winlin aca9fe805c Merge branch '2.0release' into develop 9 years ago
winlin d916c53702 refine the api server. 9 years ago
winlin a89ed68aa3 update readme for #511. 9 years ago
winlin 75be18133d fix build failed for utest. 9 years ago
winlin 6df4d1f05a merge from srs2. 9 years ago
winlin 98e25def6c fix utest build failed for osx. 9 years ago
winlin 97f5bb8b99 merge from srs2 9 years ago
zhengfl 38b81ce312 允许操作SrsStream中的函数时，长度为0. 9 years ago
zhengfl 1dae8fc987 fix #511, fix the bug of thread stop invalid. 9 years ago
winlin 49d77b3f09 for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198 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 604486b0a3 for #515, use srs_freepa to free 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. 9 years ago
winlin 9ebb77d711 fix the warnings 9 years ago
winlin e9e202dbf1 merge srs2 9 years ago
winlin ef00005ab4 for ExoPlayer, remove duration for live. 9 years ago
winlin 8c96472cea merge srs2 9 years ago
winlin 50a7b9c1ff for ExoPlayer, add av tag in flv header. 2.0.197 9 years ago
winlin 59f5c5d6a5 Merge branch '2.0release' into develop 9 years ago
winlin 3b0bf1e10b for #512, make the segment more acceptable, when in [min, max_td * 2], it's ok. 9 years ago
winlin 390f58e186 fix compile failed. 9 years ago
winlin a416e891b4 fix compile failed. 9 years ago
winlin 1d57e53910 merge from 2.0release 9 years ago
winlin d1979c760f for #512, partical hotfix the hls pure audio. 2.0.196 9 years ago
winlin 3683f06e4d for #512, write audio frame by frame for video+audio hls. 9 years ago
winlin fe27e76492 support schema 9 years ago
winlin a501f5bd7a update htbt script 9 years ago
winlin dd2945add1 update htbt script 9 years ago
winlin 6f6d495a19 update htbt script 9 years ago
winlin 3933819686 add htbt script 9 years ago
winlin 0a8cb8a391 add heartbeat script 9 years ago
winlin 11979229e6 Merge branch '2.0release' into develop 9 years ago
winlin e08beba89e fix the sed command for arm 9 years ago
winlin 45385241bb fix the sed command for arm 9 years ago
winlin b8f2ba4f0d complete kafka 9 years ago
winlin cbe4252b4d refine code. 9 years ago
winlin d2ca51ac50 notify kafka when client close 9 years ago
winlin 71451878c9 refine kafka, simplify code. 9 years ago
winlin 9a47390253 fix #467, support write log to kafka. 3.0.6 9 years ago
winlin 76cd3f8749 kafka convert json to producer message. 9 years ago
winlin 8e344f1c26 add producer api messages. 9 years ago
winlin 7a0aaf5900 kafka refine code 9 years ago
winlin f9f5b56951 kakfa erase messages when wrote. 9 years ago
winlin 22fa9a0f1f kafka use temp transport to fetch metadata. 9 years ago
winlin 531b658f8e retry when metadata empty 9 years ago
winlin 61486a82aa kafka use topic and partition cache 9 years ago
winlin 7013993c7a kafka send the accept message. 9 years ago
winlin de41c1c9d2 kafka refine comments. 9 years ago
winlin 31a77a83ed convert metadata to partitions 9 years ago
winlin f0e39cc330 support show the summary of kafka metadata. 9 years ago
winlin d013374871 rename ISrsCodec size to nb_bytes. 9 years ago
winlin 33a015329d add function to convert kafka array to vector 9 years ago
winlin 84b3981d47 refs #1670: support decode the metadata response. 9 years ago
winlin 7106934c3a kafka producer use async interface to request metadata. 9 years ago
winlin a108fa8d01 kafka recv and decode message. 9 years ago
winlin 493d282255 kafka refine array, to decode and create object. 9 years ago
winlin c4862878d1 kafka rename message set to raw message set. 9 years ago
winlin 6e5ed11a00 for kafka, support correlation id cache. 9 years ago
winlin 2e67eb8786 refine comments for kafka messages. 9 years ago
winlin 3c64e4b957 kafka encode and send packet. 9 years ago
winlin 9117e1e918 extract ISrsCodec for code and decode object. 9 years ago
winlin 45755fd1e7 refine code for kakfa request/response, string/bytes. 9 years ago
winlin 8a4ec49064 add graph comments for size of request and response. 9 years ago
winlin 8974fe298b connect to kafka and send metadata request. 9 years ago
winlin a9fdb630d9 refine code, replace all rtmp connect by simple rtmp client. 9 years ago
winlin a08d8f83d6 refine mpegts code, use simple rtmp client 9 years ago
winlin ad9b377d96 refine forwarder code, use simple rtmp client. 9 years ago
winlin 0f4cb8ee00 refine code, remove the rtmp recv/send macro, use one macro. 9 years ago
winlin 12e013142d refine code, use simple rtmp client. 9 years ago
winlin bc27481886 refine code, use simple rtmp client. 9 years ago
winlin e4c852945f refine code, support override vhost 9 years ago
winlin a9ad7b211b refine simple rtmp client for post flv stream. 9 years ago
winlin adb8f243bf use simple rtmp client for raw connect app 9 years ago
winlin 24b3899972 use SrsTcpClient instead raw socket. 9 years ago
winlin a9bb6061c3 use tcp client for raw connect. 9 years ago
winlin 20fcfb3eee fix bug, use system utility 9 years ago
winlin 69cc01b696 use system utilities 9 years ago
winlin 908365a61a use string for const char* 9 years ago
winlin d9f991ed2f use system utility for string finds 9 years ago
winlin ca73534d7e refine comments for api key 9 years ago
winlin 29122b6e70 fix #502, transcoder support snapshot. 9 years ago
winlin 2bae6e09d3 for #502, snapshot 1 image per 1 seconds, choose best from 5 images. 9 years ago
winlin 1aa4502d5f for snapshot, choose the best to link to the [stream]-best.png 9 years ago
winlin 33a282e576 support snapshot by http hooks for #152. 9 years ago
winlin 9eebb89432 Merge branch '2.0release' into develop 9 years ago
winlin 91e9fc7e5b fix typo of INVLIAD to INVALID 9 years ago
winlin 57a3b11b86 merge from srs2 9 years ago
winlin 5de65d41f4 Merge pull request #499 from synote/2.0release 
fix bug for build failure when configure with --log-info
 9 years ago
winlin b5ba1043e8 Merge branch '2.0release' into develop 9 years ago
winlin 9c2eafc244 refine the git command 9 years ago
winlin ed80d9d281 merge from srs2 9 years ago
winlin 0c8209cccd fix #448, fix the bug of response of http hooks. 2.0.195 9 years ago
winlin 6587c5b2f1 merge from srs2 9 years ago
winlin 7811b4f3f7 fix #497, response error when client not found to kickoff. 2.0.194 9 years ago
winlin 8862ec1988 merge from srs2 9 years ago
winlin a3c229472e fix #495, decrease the srs-librtmp size. 2.0.193 9 years ago
winlin 070ada1d6e Merge branch '2.0release' into develop 9 years ago
winlin 65e4bf2e77 fix compile failed bug. 9 years ago
winlin d8f18aee37 use the right int type for port. 10 years ago
winlin 1c7d5f1852 Merge branch '2.0release' into develop 10 years ago
winlin 353e3260b8 remove duplicated code 10 years ago
winlin 9ead08725d use kernel utility int2str and float2str 10 years ago
winlin 6efd2dd27e add load balance round robin for brokers. 10 years ago
winlin 2a4ab8a923 add brokers to config 10 years ago
winlin f187a7deef refine the startup logs. 10 years ago
winlin 3ab0ccaa27 Merge branch '2.0release' into develop 10 years ago
winlin 7cdcf41d26 refine the api server 10 years ago
winlin afd6428366 refine code of server. 10 years ago
winlin 8b6c78b862 Merge branch '2.0release' into develop 10 years ago
winlin d1de097f5e fix make clean bug, donot rm when no dir 10 years ago
winlin 396bb43672 Merge branch '2.0release' into develop 10 years ago
winlin 8b1198562a show cpu info. 10 years ago
winlin 4e88262512 merge from srs2 to check cpus. 10 years ago
winlin cfe2082353 fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192 10 years ago
winlin f6e655396c for #485, support cross build for arm 10 years ago
winlin d94a88a797 merge from srs2 for pi and cubie. 10 years ago
winlin 16730ea031 refine code for cross build 10 years ago
winlin 6990508e58 for #485, srs for respberrypi and cubieboard. 2.0.191 10 years ago
winlin f75058413d Merge branch '2.0release' into develop 10 years ago
winlin 7dcdb18588 support build on pi and cubie 10 years ago
winlin a8829e0a8b support build on pi or cubie. 10 years ago
winlin 9a9483e7d5 support without kafka 10 years ago
winlin abb5c5ad31 add kafka producer 10 years ago
winlin b5ccc35340 add kafka config 10 years ago
winlin ab1e62a886 create the metadata request message 10 years ago
winlin ca3b89aa7d add kafka array, use c++ template. 10 years ago
winlin 8a6edac4e8 add --x86-64 alias for --x86-x64. 10 years ago
winlin edead21a25 refine the options 10 years ago
winlin e415824576 refine the options 10 years ago
winlin 2d5cc7a3e4 add structures for kafka 10 years ago
winlin 83f40697e2 refine the hpp macro defines. 10 years ago
winlin df6ac8842c rename rtmp utility to protocol utility 10 years ago
winlin 82ff05c1d4 rename rtmp io to protocol io 10 years ago
winlin 168625dce2 rename rtmp amf0 to protocol amf0. 10 years ago
winlin 1310c0f577 rename srs_protocol_buffer to srs_protocol_stream 10 years ago
winlin d32632ee8a rename SrsFastBuffer to SrsFastStream 10 years ago
winlin 4f3d2c8607 rename SrsSimpleBuffer to SrsSimpleStream 10 years ago
winlin dadfe101b4 rename SrsBitStream to SrsBitBuffer 10 years ago
winlin 0e52fc6d5b rename SrsStream to SrsBuffer 10 years ago
winlin ca3577e11b rename temp to stream 10 years ago
winlin f33d736442 rename kernel stream to buffer 10 years ago
winlin a4f51564db rename kernel stream to buffer 10 years ago
winlin 495f575ac3 rename kernel buffer to temp 10 years ago
winlin ac2b03a3ed rename srs_kernel_buffer to temp 10 years ago
winlin faf6d15878 add replace script. 10 years ago
winlin 1de2bb0801 add kafka protocol files. 10 years ago
winlin b5996567e8 refine the role of srs, to cluster. 10 years ago
winlin e4e36a0166 merge from srs2, fix openssl build 10 years ago
winlin d8a64aaab5 fix #484, hotfix the openssl build script 2.0.190 10 years ago
winlin b471c6e61c refine code, use json integter rather than number. 10 years ago
winlin c5cd58761c move the srs thread to st. 10 years ago
winlin 3042115385 refine json to_str to dumps. 10 years ago
winlin b59d9ba6a1 support amf0 and json to convert with each other. 10 years ago
winlin 3f7e69b617 json objects support dumps to string. 10 years ago
winlin b78781707e update the srs player 10 years ago
winlin 5073a6fa08 merge from srs2 10 years ago
winlin 225e742657 add args3 10 years ago
winlin 1fd83d9314 refine the order. 10 years ago
没——问题 e8680527c3 allow domain * 
在使用时，srs_player可能和所在页面部署在不同的域名下。

所以在此处添加跨域许可。
 10 years ago
winlin 7b2b11e932 async call worker fast execute tasks. 10 years ago
没——问题 c548ab5019 function set_srs_player_url(url, params) 
在实际环境中，player.swf 等静态资源 和页面可能部署到不同的域名或路径下。

所以在此处提供设置 srs_player.swf 的url的方法。
 10 years ago
winlin 087f7740b7 fix the build failed bug 10 years ago
winlin 256459e1ec fix the utest bug 10 years ago
winlin 240a1bfadb rename kafka protocol 10 years ago
winlin c4e4711b93 add kafka protocol 10 years ago
winlin 8a90e76637 fix #459, support dvr raw api. 3.0.4 10 years ago
winlin 2b9869ee52 update the wiki for dvr 10 years ago
winlin 2a1b2b69a0 for #459, dvr support apply filter for ng-control dvr module. 10 years ago
winlin 8f9cfcdcf4 fix #319, http raw api support update global and vhost. 3.0.4 10 years ago
winlin e8a00de4a3 for #319, support enable or disable vhost. 10 years ago
winlin 631e76cd32 for #319, support update and delete the disabled vhost 10 years ago
winlin a7c4b786cf merge from 2.0 10 years ago
winlin 511627abab fix #474, config to donot parse width/height from sps. 2.0.189 10 years ago
winlin eb578b4a39 refine the thread, set to disposed when terminate normally 10 years ago
winlin 83a9ff9f5d for #474, refine the hls publish, donot fetch from source when publish 10 years ago
winlin 44bcb4045f for #474, decode the sequence header before hls. 10 years ago
winlin 07ef8160a3 clear the queue when edge republish. 10 years ago
winlin 704624c9ec clear the queue when edge republish. 10 years ago
winlin 8be3c875af donot release stream when busy 10 years ago
winlin 3da25f3aee when thread terminated normally, set the tid to NULL. 10 years ago
winlin a994191ddc for #474, always release publish for source. 10 years ago
winlin eb9aa47ab1 merge from 2.0 10 years ago
winlin 0d57ef9373 fix #458, http hooks use source thread cid. 2.0.188 10 years ago
winlin 3b483094bd merge from 2.0 10 years ago
winlin 6d50aa1aa2 #475, fix http hooks crash for st context switch. 2.0.187 10 years ago
winlin adb74dc74e Merge branch '2.0release' into develop 10 years ago
winlin f0fc093b19 fix the http zero content length bug. 10 years ago
winlin 01308ecc98 for #319, support initialize the parser to whether use jsonp 10 years ago
winlin 491ec11833 for #319, raw api support add new vhost 10 years ago
winlin 0d6c24581d refine json number, use int64 when number is int. 10 years ago
winlin 7ae76b579e refine the conf, use srs3 style 10 years ago
winlin a88f321d8b for #319, merge from 2.0release 10 years ago
winlin abd7ee227c support reload utc_time. 2.0.186 10 years ago
winlin c4feb8f6ed for #319, raw api support update all globals. 10 years ago
winlin 6aafd072db for #319, raw api support update srs log tank, level and file. 10 years ago
winlin 8107e5f9a6 for #319, raw api support set the ff_log_dir 10 years ago
winlin c8466c36bd for #319, raw api support update the global RTMP chunk_size. 10 years ago
winlin 2cfb71616e for #319, copy all data to request for source. 10 years ago
winlin 2bdd974227 for #319, reorder the ingesters. 10 years ago
winlin 342483bf04 for #319, when reload the listen, restart all ingesters. 10 years ago
winlin 310b5a14cb for #319, support minimal query api 10 years ago
winlin 06c7ae62ee for #319, refine the error code for RAW APi. 10 years ago
winlin 11c409688b for #319, http raw api support query. 3.0.3 10 years ago
winlin 8a2709dd2c for #319, do not apply when config not changed. 10 years ago
winlin a62c82bd46 for #319, api raw update global.listen 10 years ago
winlin 364460f2ab for #319, support raw update global.listen 10 years ago
winlin f8d8c3ace4 use function to dumps the engine. 10 years ago
winlin 01878e5a9c for #319, query vhost detail. 10 years ago
winlin b1b76a4a80 for #319, allow multiple ingest and transcode. 10 years ago
winlin 873aa7bf9f for #319, refine the query global, only show true options. 10 years ago
winlin d1336e0d80 refine conf 10 years ago
winlin dc11013c01 for #319, render the detail of vhost 10 years ago
winlin 0109a74840 for #319, refine the config structure. 10 years ago
winlin 2b4fa2d73e for #319, move the edge configs to cluster. 10 years ago
winlin 6bd05f9cfc for #319, refine the config forward. 10 years ago
winlin bc24c0407b for #319, move smi and rsh to play 10 years ago
winlin f7c893d907 for #319, move gop_cache and queue_length to play 10 years ago
winlin 06ae74dd3f for #319, move mw_latency to play. 10 years ago
winlin 4eb1874955 for #319, the vhost scope config is enabled, chunk_size, tcp_nodelay and min_latency. 10 years ago
winlin 9c4340f789 for #319, move atc and atc_auto to play 10 years ago
winlin d6b0aa3a5b for #319, move time_jitter and mix_correct to play 10 years ago
winlin 738642073e for #319, refine config, collect the mr and publish timeout 10 years ago
winlin bc100c2867 refine the log, move default to each functions. 10 years ago
winlin 7ef3ff90c0 refine the config structure, compatible with SRS1/2 10 years ago
winlin a79e19599c for #319, support query the vhost info. 10 years ago
winlin bdfd0ae09e for #319, dumps the http static, remux and globals. 10 years ago
winlin 1b1a2a1e63 fix #471, api response the width and height. 3.0.2 10 years ago
winlin 04bea781ca use amf0 encode for json encode. 10 years ago
winlin e0219bd7aa refine code, merge json encode to amf0. 10 years ago
winlin 66ffcad635 for #319, always allow raw query. 10 years ago
winlin f167616379 rename the config_query to query 10 years ago
winlin 75ca759e5d fix the reload http api bug. 10 years ago
winlin 2dcf3bc606 for #319, support rpc raw api to query the HTTP RAW API configs. 10 years ago
synote 9b01aad220 fix bug for build failure when configure with --log-info 
wrong use of size in SrsStream::initialize of  srs_kernel_stream.cpp
 10 years ago
winlin af0a76e51a fix the build failed bug on centos 10 years ago
winlin e03d8a0115 fix the build failed bug on centos 10 years ago
winlin 555a3fbf5f for #319, support render HTTP RAW API in console. 10 years ago
winlin 8e635d9749 for #319, support HTTP RAW API config_query global data. 10 years ago
winlin d921d59e57 for #319, support HTTP RAW API reload. 10 years ago
winlin f74dc62046 fix the process restart bug. 10 years ago
winlin e39e006d63 fix the exec clear bug. 10 years ago
winlin c081a5370b Merge branch '2.0release' into develop 10 years ago
winlin fe4cdceb15 always wait for process to terminated when SIGKILL. 10 years ago
winlin 1e0481a2d0 for #319, support signal to persistence config 10 years ago
winlin 980e3921e4 for #319, add signal to write config to file. 10 years ago
winlin cdde293785 add todo for reload the source components. 10 years ago
winlin 53f4ce3604 for #367, update wiki to v3 10 years ago
winlin c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 10 years ago
winlin 7de181004f Merge branch '2.0release' into develop 10 years ago
lovecat 9c2beffe8f statistic connection bytes before remove client. 10 years ago
winlin 039af7243c for #367, refine the comments for process. 10 years ago
winlin 6fe88d088c for #367, process support redirect stdout and stderr. 10 years ago
winlin 0e1861b084 for #367: extract the process from ffmpeg to exec programs. 10 years ago
winlin 3a8c03a471 Merge branch '2.0release' into develop 10 years ago
winlin a242aa35dc add pid to srs rtmp dump 10 years ago
winlin 15102a7345 refine commit script 10 years ago
winlin 2a4b448cce Merge branch '2.0release' into develop 10 years ago
winlin a7f4104d45 fix bug of commit script 10 years ago
winlin d8030faabe Merge branch '2.0release' into develop 10 years ago
winlin 064031cac1 refine commit script 10 years ago
winlin 8e259eb0c2 refine the commit script 10 years ago
winlin 4118138cf0 update commit script 10 years ago
winlin b25c45c643 refine srs player, support set the bufferTimeMax. 10 years ago
winlin 74d4c96423 for #367, design the config for exec. 10 years ago
winlin cbfe438e73 for #367, design the config for exec. 10 years ago
winlin 28791fd14a release 2.0alpha0, the 2.0a0, 2.0.185 10 years ago
winlin 5721bc371c Merge branch '2.0release' into develop 10 years ago
winlin e43d4e46b4 support JSONP DELTE/POST/PUT 10 years ago
winlin baa70d4ddd add nb_streams for vhost 10 years ago
winlin 7a2836ae2a Merge branch '2.0release' into develop 10 years ago
winlin 6e5143449e HTTP API support JSONP by specifies the query string callback=xxx. 10 years ago
winlin 22485ce5e9 Merge branch '2.0release' into develop 10 years ago
winlin aeebddb269 for #442, add more information for client for api. 10 years ago
winlin 94641c812b fix #442, support kickoff client. 10 years ago
winlin b37797b13a for #442, add publish connection in stream.publish api 10 years ago
winlin 529803ed04 refine code for api. 10 years ago
winlin 1962449770 Merge branch '2.0release' into develop 10 years ago
winlin 6b6d951298 add api /api/v1/features 10 years ago
winlin 4763f205a2 add kbps for vhost and stream 10 years ago
winlin 0a4d78383c Merge branch '2.0release' into develop 10 years ago
winlin 20a8818a8e refine the error response. 10 years ago
winlin 2edcf1d4ff support query specified vhost 10 years ago
winlin 66a26bdce8 move json from app to protocol 10 years ago
winlin a7589b9ad3 refine code for api, add clients and parse_rest_id 10 years ago
winlin ab4620870d refine the stat api, support query specified stream. 10 years ago
winlin 32a484164a Merge branch '2.0release' into develop 10 years ago
winlin c75f05c88b fix the log cid display error, merge the publish recv thread log to publish connection. 10 years ago
winlin 9528243b81 Merge branch '2.0release' into develop 10 years ago
winlin 3c402cb908 refine the tcp nodelay, effect connected connections. 10 years ago
winlin 71aacebcbc Merge branch '2.0release' into develop 10 years ago
winlin c31a546eec support vhost for http flv. 10 years ago
winlin 0afe4963bc Merge branch '2.0release' into develop 10 years ago
winlin dd21eee7f0 srs player show current time and url 10 years ago
winlin ce8f446494 Merge branch '2.0release' into develop 10 years ago
winlin dfecfb65b1 support fluency and stream empty count 10 years ago
winlin fcd2d3d445 refine code for link generation from rtmp url. 10 years ago
winlin fe87bf1b61 support generate link page for rtmp url 10 years ago
winlin 018af55d65 refine the demo pages, move scripts after body. 10 years ago
winlin 77765b463a Merge branch '2.0release' into develop 10 years ago
winlin 575a698820 fix #380, srs-librtmp send sequence header when sps or pps changed. 10 years ago
winlin f10e399991 Merge branch '2.0release' into develop 10 years ago
winlin ec87dd9cd6 refine code for srs rtmp dump 10 years ago
winlin 785a5907a8 set the default get_publish_normal_timeout to 5s 10 years ago
winlin 0bbfc5526a set the default get_publish_normal_timeout to 5s 10 years ago
winlin 7273c33c35 support publish_1stpkt_timeout and publish_normal_timeout 10 years ago
winlin 170ad05148 add gfps and nb_packets 10 years ago
winlin a5dd3a8e7b Merge branch '2.0release' into develop 10 years ago
winlin e7714cd445 add packets interval in ms to set the right send_min_interval 10 years ago
winlin de48b477ae drop the metadata when drop sequence header 10 years ago
winlin 22491b0c99 merge from 2.0 10 years ago
winlin f691dddc1a drop metadata when drop sequence header. support PCUC 0x1a 10 years ago
winlin 2cf526ffc7 close #454, support obs restart publish. 2.0.184 10 years ago
winlin 0cb7ddfe8c Merge branch '2.0release' into develop 10 years ago
winlin ccc4c05da9 fix #229, support vs2010 for srslibrtmp. 10 years ago
winlin f53b2556bb Merge branch '2.0release' into develop 10 years ago
winlin 01be68fe58 refine code, donot remove the detail when hls disabled. 10 years ago
winlin 53351cd645 Merge branch '2.0release' into develop 10 years ago
winlin afd05f71c3 refine code, use size cache for performance issue. 10 years ago
winlin 0b90af7e46 Merge branch '2.0release' into develop 10 years ago
winlin 3b0b2e0b85 fix the bug to support dump packets with count. 10 years ago
winlin 8d3d5dd10b Merge branch '2.0release' into develop 10 years ago
winlin a0a89a8ca6 use reduce_sequence_header for stream control. 10 years ago
winlin 9fbff4b8f9 Merge branch '2.0release' into develop 10 years ago
winlin b79d830e2c refine the default smi 10 years ago
winlin 807299589e merge from srs2. 10 years ago
winlin ae37fa8f3e use send_min_interval for stream control. 2.0.183 10 years ago
winlin 0b84c1d962 Merge branch '2.0release' into develop 10 years ago
winlin 7dcba040eb refine config. 10 years ago
winlin 653afd0700 merge from 2.0 10 years ago
winlin 9fb4640a8f enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182 10 years ago
winlin 1261916eab refine the mount and dir to /console 10 years ago
winlin b27bb48447 refine the version 10 years ago
winlin eab538d2e4 fix the version of srs2 10 years ago
winlin f28c9b7eb5 merge from 2.0release 10 years ago
winlin 3a6854fc2e refine code. 10 years ago
lovacat e8c0ca7af0 fix #442: HTTP API kickoff client. 10 years ago
winlin d761ebfa55 refine the api, move the requests and errors to rest. 10 years ago
winlin c5bf397295 fix the http error header. 10 years ago
winlin fbcc07d85a fix the typo of AUTIO. 10 years ago
winlin 0e3128d3e3 Merge branch '2.0release' into develop 10 years ago
winlin 65b2ed7ac5 refine code, move the order of functions. 10 years ago
winlin 71f2726b31 fix bug of merge code for reload http_remux for vhost 10 years ago
winlin ccf6a4de1e remove the on_reload_vhost_http_remux_updated for vhost added. 10 years ago
winlin bfe0f97edd refine params nameing and SrsStream. 10 years ago
winlin 8d86eb6516 refine code naming or comments. 10 years ago
winlin c2d9c98678 Merge branch '2.0release' into develop 10 years ago
winlin bc033d5de3 refine code, move default to config function. 10 years ago
zhengfl 39a2d51c66 fix #445, 修正由skip(-4)引起的assert错误 10 years ago
winlin 94569b181f merge from 2.0 10 years ago
winlin c85f92c229 fix #169, support default values for transcode. 2.0.180 10 years ago
winlin 48c040c92b Merge branch '2.0release' into develop 10 years ago
winlin 31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 10 years ago
winlin 146a44a2ce merge from 2.0 10 years ago
winlin b54f9b0f94 refine the hls, ignore packet when no sequence header. 2.0.179 10 years ago
winlin fdb17a1864 merge from 2.0 10 years ago
winlin 3b65af9bd2 fix the hstrs bug on edge. 10 years ago
winlin 99db2888e7 refine code for hstrs. 10 years ago
winlin c2ef779523 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 10 years ago
winlin 366d3a3f56 for #441, use 30s timeout for first msg. 2.0.178 10 years ago
zhengfl a5a9f7c8c5 refine code:优化edge模式回源播放线程启动流程 10 years ago
winlin 5f77724021 refine hls disable the time jitter, support not mix monotonically increase. 2.0.177 10 years ago
winlin 5f91fbc970 merge from 2.0release 10 years ago
winlin d995726fee fix the http flv mount bug. 10 years ago
winlin 9743e02541 refine the mix correct algorithm. 10 years ago
winlin 6fe36afcfa when hls timestamp jump, reset it. 10 years ago
winlin 99574bb77b ignore when no segments for there must no m3u8 10 years ago
winlin 40c264a316 always reset the max target duration for hls. 10 years ago
winlin 54bb42483b change time jitter to off for hls and forward. 10 years ago
winlin be342178c0 fix ingest flv tool, support non monotonically timestamp. 10 years ago
winlin b3b6df365e fix the stream caster build failed bug. 10 years ago
winlin 50feaacdde refine code for http remux reload. 10 years ago
winlin 677567d9f2 Merge branch '2.0release' into develop 10 years ago
winlin 0aa053433c fix #132: build failed when enable the info or verbose log. 10 years ago
zhengfl 2567a89599 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 10 years ago
zhengfl 2263f2a610 refine code: 
优化 判断重复推流 及 推流流程
 10 years ago
winlin 404bc565a1 refine the pithy print mechenism. 10 years ago
winlin 97b8c99682 Merge branch '2.0release' into develop 10 years ago
winlin bed540bac9 fix #439: http remux support reload 10 years ago
winlin da47f1648b refine file mode to 644 10 years ago
zhengfl f6a2cea716 refine code: 删除srs_app_edge中的user_stat相关代码。因为没有任何作用。 10 years ago
winlin 3dadad2dbc Merge branch '2.0release' into develop 10 years ago
winlin 0aed408855 refine code, to 644 and unix encoding. 10 years ago
winlin 210d0a67cb Merge branch '2.0release' into develop 10 years ago
winlin c6c90e2643 refine code, add comments for stat on_disconnect. 10 years ago
zhengfl db9ea4e66e rewrite #438 10 years ago
zhengfl f9257b89e7 fix #438 
问题：edge模式，推流时异常断开。
    解决方法：增加edge模式推流检测。
 10 years ago
zhengfl 120033e0a2 fix #437 
edge模式，重新从源站拉流时，导致forwarders异常
 10 years ago
winlin f39faa78bb refine config default values of srs, prepare to move each default values to functions. 10 years ago
winlin 9c716d4791 Merge branch '2.0release' into develop 10 years ago
winlin 3b8daafc03 use local openssl header files to avoid warnings on osx. 10 years ago
winlin c8fef99cb6 merge from 2.0release 10 years ago
winlin 438914c481 fix #433, fix the sps parse bug. 2.0.176 10 years ago
winlin 312366bba2 add srs_recvi_bytes for intranet bytes stat. 10 years ago
winlin 750399ace4 fix network device compare bug. 10 years ago
winlin 8cd68a1eb3 ignore any intranet bandwidth. 10 years ago
zhengfl 52110990c1 修正编码风格问题 10 years ago
zhengfl b4ff9cfba1 fix bug 
某种情况下，当客户端全部断开后，边缘服务器回源线程（EdgeIngester/EdgeForwarder）没有被断开。
 10 years ago
winlin 8951752086 Merge branch '2.0release' into develop 10 years ago
winlin 8102a22606 add comments for async call. 10 years ago
winlin 6f685e66b1 Merge branch '2.0release' into develop 10 years ago
winlin 3211282b0c refine the http code. 10 years ago
winlin f8f6e438cc extract http static and http stream from http conn. 10 years ago
winlin e743795f3d Merge branch '2.0release' into develop 10 years ago
winlin baa892a762 merge srs_app_st_socket to srs_app_st. 10 years ago
winlin c58b7231e2 Merge branch '2.0release' into develop 10 years ago
winlin 17c276113e refine the hls dispose, when not cycle always dispose it. 10 years ago
winlin ec90ae2082 refine the space of code. 10 years ago
winlin 2f44a29b76 Merge branch '2.0release' into develop 10 years ago
winlin d103557a8b merge the rtmp sdk to stack. 10 years ago
winlin 0d66e92ab5 refine code, support configure to enable --memory-watch 10 years ago
winlin 69b7c57511 Merge branch '2.0release' into develop 10 years ago
winlin 0d6a574216 fix the hls_dispose bug, ignore for 0. 10 years ago
winlin b0ce38dc8f merge from 2.0 10 years ago
winlin 56938efdbd fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175 10 years ago
winlin 12eab8a128 merge from srs2. 10 years ago
winlin 6941f2c072 fix #424, fix aggregate timestamp bug. 2.0.174 10 years ago
winlin 8e8c8108fc refine the time jitter code. 10 years ago
winlin 1f1776a0d8 fix the export project bug. wakeup connection when dispose server. 10 years ago
winlin bf9166dbec Merge branch '2.0release' into develop 10 years ago
winlin 969ed7b0ae refine build summary. 10 years ago
winlin 66837ffa6e fix the thread stop bug, must wait when not joinable. 10 years ago
winlin d317528af9 refine the signal manager. 10 years ago
winlin 7996b3b789 add warning for gmp, use gmc to detect memory leak. 10 years ago
winlin f347099fd1 for memory leak detect, move the payload create to message. 10 years ago
winlin 863dddde09 fix typo of code. 10 years ago
winlin 19e1f610a3 merge from bravo, parse the http reponse in json of bravo system. 10 years ago
winlin 00d1fdded0 Merge branch '2.0release' into develop 10 years ago
winlin 574cf6a094 use libfdk_aac for srs2. 10 years ago
winlin 00a25ee5c5 cleanup connections when terminate server. 10 years ago
winlin d7e5df2578 cleanup connections when terminate server. 10 years ago
winlin 573495a19f refine the memory watcher. 10 years ago
winlin bb4db61192 add srs memory watcher. 10 years ago
winlin 811ef4bcf6 dispose the gop cache 10 years ago
winlin 600e8e10d0 Merge branch '2.0release' into develop 10 years ago
winlin beb0431746 detect the monotonically increase and warn to use mix_correct 10 years ago
winlin 57f01185f5 Merge branch '2.0release' into develop 10 years ago
winlin 2d9f258eaf refine the mix correct algorithm, mix when got 10+ av or got 1 video and 1 audio. 10 years ago
winlin 17d6016bf6 Merge branch '2.0release' into develop 10 years ago
winlin ec24533955 use smaller value for publish timeout. 10 years ago
winlin a6dd8fb3a1 fix #421, when mix correct on, must check the type of dequeue msg. 10 years ago
winlin 5d75e32e1d Merge branch '2.0release' into develop 10 years ago
winlin a1dd734318 fix #421, drop video for unkown RTMP header. 10 years ago
winlin 679b4317d8 fix the build failed bug. 10 years ago
winlin 0fbfad4172 fix gop cache, drop video only when video and not h.264 10 years ago
winlin 2a1db36750 refine the pithy print of ingesters. 10 years ago
winlin d10d57716a Merge branch '2.0release' into develop 10 years ago
winlin e4c27a51b8 fix the hls bug 10 years ago
winlin 4400b12515 Merge branch '2.0release' of github.com:simple-rtmp-server/srs into 2.0release 10 years ago
winlin 26b76c0e4c fix #420, remove ts for hls ram mode. 10 years ago
winlin 5dd81d182c Merge branch '2.0release' into develop 10 years ago
winlin af9efe9213 disable the hls_dispose by default to 0, for p2p system should never cleanup for timeshift hls. 10 years ago
winlin 982a937e84 Merge branch '2.0release' into develop 10 years ago
winlin 4e42b9c628 copy the request for hls. 10 years ago
winlin 091b480ac9 Merge branch '2.0release' into develop 10 years ago
winlin 679583dad6 refine comments of ffmpeg. 10 years ago