Commit Graph

3304 Commits (0d78b908a7ea446b382db9e55135d42a53155440)

Author SHA1 Message Date
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 9 years ago
winlin b19702f669 update srs player 9 years ago
winlin 9cc528cd33 merge srs2 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 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 10 years ago
winlin 0c8209cccd fix #448, fix the bug of response of http hooks. 2.0.195 10 years ago
winlin 6587c5b2f1 merge from srs2 10 years ago
winlin 7811b4f3f7 fix #497, response error when client not found to kickoff. 2.0.194 10 years ago
winlin 8862ec1988 merge from srs2 10 years ago
winlin a3c229472e fix #495, decrease the srs-librtmp size. 2.0.193 10 years ago
winlin 070ada1d6e Merge branch '2.0release' into develop 10 years ago
winlin 65e4bf2e77 fix compile failed bug. 10 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