Commit Graph

1310 Commits (2376c4cebbe8a9b3386e866a39f95afd4a1c78ca)

Author SHA1 Message Date
winlin db6b8cf914 Fix #1057, switch to simple handshake. 3.0.28 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
winlin ca1395a807 Change date from 2017 to 2018 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
winlin baa55f14b9 Change stable release to SRS2 8 years ago
winlin 5c9a12e72a For #913, use complex error for listener 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 6c64297264 Fix #821, support MP4 file parser. 3.0.24 8 years ago
winlin 54411e0768 Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23 8 years ago
winlin e8cb2e6be4 Merge #899 to fix #893, ts PES ext length. 2.0.243 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 a613eb78c6 Fix #865, shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242 8 years ago
winlin ae5450181c Fix #636, FD leak for requesting empty HTTP stream. 2.0.241 8 years ago
winlin ff87318b95 Fix #851, HTTP API support number of video frames for FPS. 2.0.240 8 years ago
winlin 5e284b58a4 Fix #848, crash at HTTP fast buffer grow 2.0.239 8 years ago
winlin a98c9e04e3 Fix #547, support HLS audio in TS. 3.0.22 8 years ago
winlin 33a0abdeff Fix #844, support Haivision encoder. 2.0.238 8 years ago
winlin 1c139d8fd8 Merge #846, fix fd leak for FLV stream caster. 2.0.237 8 years ago
winlin 8d35585c13 Merge #841, avoid the duplicated sps/pps in ts. 2.0.236 8 years ago
winlin b11ddc7f41 Fix #834, crash for TS context corrupt. 2.0.235 8 years ago
winlin 609605a50b Fix #820, extract service for modules. 3.0.21 8 years ago
winlin 0a57a46016 Refine LICENSE 8 years ago
winlin f32aab3d92 For #299, refine code. 8 years ago
winlin 308c6fee18 Fix #786, simply don't reuse object. 3.0.20 8 years ago
winlin 121a2e5886 For #110, refine thread object. 3.0.19 8 years ago
winlin 3903d2a8e3 For #730, remove the test code. 2.0.234 8 years ago
winlin 2a4f57a587 Fix #301, User must config the codec in right way for HLS. 3.0.18 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 38a683fe14 disable glibc memory check 8 years ago
winlin 6706bda42c for #752, release the io then free it for kbps. 2.0.232 8 years ago
winlin 4cff49afd2 for #742, refine source, meta and origin hub. 3.0.16 8 years ago
winlin 60be29f324 fix #750, use specific error code for dns resolve. 2.0.231 8 years ago
winlin d76419e3bb fix #749, timestamp overflow for ATC. 2.0.230 8 years ago
winlin dca9749f37 for #742, refine the object live cycle. 3.0.15 8 years ago
winlin e6eafd3b97 fix #740, convert ts aac audio private stream 1 to common. 2.0.229 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 e3aa34ec5f fix #736, recovery the hls dispose. 2.0.227 8 years ago
winlin c9a71b7fb2 fix #635, hls support NonIDR(open gop). 2.0.226 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 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 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 759c84a395 for #513, remove hls ram from srs2 to srs3+. 2.0.224 8 years ago
winlin aca8a79d95 fix #713, disable the source cleanup. 2.0.223 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 dd1c769f65 refine main 8 years ago
winlin 28517849ed refine typo 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
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 112d98ffdb merge srs2. 8 years ago
winlin d6fc289c6a fix #661, close fd after thread stopped. 2.0.219 8 years ago
winlin 0e308b0fa1 merge srs2, support oryx 9 years ago
winlin b748fac23a support asprocess for oryx. 2.0.218 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 504352d17a merge srs2. 9 years ago
winlin c2cb666995 fix fast stream error bug. 2.0.216 9 years ago
winlin 8a4e241eec merge from srs2 9 years ago
winlin 6c4c68ccb6 2.0 beta1(2.0.215) released. 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 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 abeb4f46a9 merge 2.0 9 years ago
winlin ec6e77992e 2.0.210 9 years ago
winlin 28080efec8 fix http reader bug, support infinite chunkted. 2.0.209 9 years ago
winlin e2e6e76f92 for #558 and #559, 2.0.208 9 years ago
winlin f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 9 years ago
winlin 8155e97b84 add keyword XCORE for coredump to identify the version. 2.0.207 9 years ago
winlin 973194c663 merge from srs2. 9 years ago
winlin 26211abf2e refine code. 9 years ago
winlin eca46c03d2 refine code for consumer to refer the rtmp connection. 9 years ago
winlin d0c74fa7cd update 2015 to 2016 9 years ago
winlin 5d3a183f43 fix #509, always alloc big object at heap. 2.0.205 9 years ago
winlin 8b24319ffb fix #418, ignore null connect props to make RED5 happy. 2.0.204 9 years ago
winlin c7850570c1 fix #546, thread terminate normally dispose bug. 2.0.203 9 years ago
winlin cee8c3d07d fix #541, failed when chunk size too small. 2.0.202 9 years ago
winlin 40457e6cab default hls_on_error to continue. 2.0.201 9 years ago
winlin 2310b2da59 fix #518, fix fd leak bug when fork. 2.0.200 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 a89ed68aa3 update readme for #511. 9 years ago
winlin 49d77b3f09 for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198 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 d1979c760f for #512, partical hotfix the hls pure audio. 2.0.196 9 years ago
winlin 9a47390253 fix #467, support write log to kafka. 3.0.6 9 years ago
winlin 29122b6e70 fix #502, transcoder support snapshot. 9 years ago
winlin 0c8209cccd fix #448, fix the bug of response of http hooks. 2.0.195 10 years ago
winlin 7811b4f3f7 fix #497, response error when client not found to kickoff. 2.0.194 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 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 6990508e58 for #485, srs for respberrypi and cubieboard. 2.0.191 10 years ago
winlin b5996567e8 refine the role of srs, to cluster. 10 years ago
winlin d8a64aaab5 fix #484, hotfix the openssl build script 2.0.190 10 years ago
winlin 8a90e76637 fix #459, support dvr raw api. 3.0.4 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 511627abab fix #474, config to donot parse width/height from sps. 2.0.189 10 years ago
winlin 0d57ef9373 fix #458, http hooks use source thread cid. 2.0.188 10 years ago
winlin 6d50aa1aa2 #475, fix http hooks crash for st context switch. 2.0.187 10 years ago
winlin abd7ee227c support reload utc_time. 2.0.186 10 years ago
winlin 11c409688b for #319, http raw api support query. 3.0.3 10 years ago
winlin 1b1a2a1e63 fix #471, api response the width and height. 3.0.2 10 years ago
winlin c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 10 years ago
winlin 28791fd14a release 2.0alpha0, the 2.0a0, 2.0.185 10 years ago
winlin 2cf526ffc7 close #454, support obs restart publish. 2.0.184 10 years ago
winlin ae37fa8f3e use send_min_interval for stream control. 2.0.183 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 b27bb48447 refine the version 10 years ago
winlin eab538d2e4 fix the version of srs2 10 years ago
winlin 0e3128d3e3 Merge branch '2.0release' into develop 10 years ago
winlin 8d86eb6516 refine code naming or comments. 10 years ago
winlin c85f92c229 fix #169, support default values for transcode. 2.0.180 10 years ago
winlin b54f9b0f94 refine the hls, ignore packet when no sequence header. 2.0.179 10 years ago
winlin 366d3a3f56 for #441, use 30s timeout for first msg. 2.0.178 10 years ago
winlin 5f77724021 refine hls disable the time jitter, support not mix monotonically increase. 2.0.177 10 years ago
winlin 438914c481 fix #433, fix the sps parse bug. 2.0.176 10 years ago
winlin 2f44a29b76 Merge branch '2.0release' into develop 10 years ago
winlin 0d66e92ab5 refine code, support configure to enable --memory-watch 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 6941f2c072 fix #424, fix aggregate timestamp bug. 2.0.174 10 years ago
winlin 00d1fdded0 Merge branch '2.0release' into develop 10 years ago
winlin 573495a19f refine the memory watcher. 10 years ago
winlin bb4db61192 add srs memory watcher. 10 years ago
winlin 223ae194b1 fix #209, cleanup hls when stop and timeout. 2.0.173. 10 years ago
winlin 5caafadd45 fix #409: support pure video hls. 2.0.172. 10 years ago
winlin cd162c2848 merge from 2.0 10 years ago
winlin d12fc7fcc5 fix #405, improve the HTTP FLV performance to 6k. 2.0.171 10 years ago
winlin 4df19ba99a for #405, improve the http flv to 3k. 2.0.170 10 years ago
winlin 960341b9b2 for #405, improve the HTT FLV to 3k. 2.0.169 10 years ago
winlin fc995473eb for #405, improve the HTTP FLV delivery 1k to 2.3k. 2.0.168 10 years ago
winlin 069ee0afc3 fix #404, register handler then start http thread. 2.0.167. 10 years ago
winlin 5908096fc3 refine the thread, protocol, kbps code. 2.0.166 10 years ago
winlin 6ca46e84bc fix #397, the USER_HZ maybe not 100. 2.0.165 10 years ago
winlin 948d200ce1 fix #400, parse when got entire http header, by feilong. 2.0.164. 10 years ago
winlin 44bc7976ac merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163. 10 years ago
winlin c617d2aaa5 support push flv stream over HTTP POST to SRS. 10 years ago
winlin 91e285b0cd Merge branch '2.0release' into develop 10 years ago
winlin 4b372d8d16 change primary to the primary branch. 10 years ago
winlin 94681702e1 Merge branch '2.0release' into develop 10 years ago
winlin e63b8eda51 migarate to srs org. 10 years ago
winlin 42ddb76544 Merge branch '2.0release' into develop 10 years ago
winlin 8603dba697 migarate to srs org. 10 years ago
winlin 17b15deee6 Merge branch '2.0release' into develop 10 years ago
winlin b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 10 years ago
winlin 53e92a17f5 Merge branch '2.0release' into develop 10 years ago
winlin 115daa3cc1 migarate from winlinvip to srs org 10 years ago
winlin 22ca46350b fix #383, support mix_correct algorithm. 2.0.161. 10 years ago
winlin dcac9c69d5 fix #381, support reap hls/ts by gop or not. 2.0.160. 10 years ago
winlin 546be09219 fix #375, fix hls bug, keep cc continous between ts files. 2.0.159. 10 years ago
winlin e56d7add44 fix bug of config to parse the default value. 2.0.158 10 years ago
winlin 77c29da26b for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157. 10 years ago
winlin 70c59da1bf enhanced avc decode, parse the sps get width+height. 2.0.156. 10 years ago
winlin 17c0a5c470 fix #372, support transform vhost of edge 2.0.155. 10 years ago
winlin 8401d9ac06 fix #366, config hls to disable cleanup of ts. 2.0.154. 10 years ago
winlin 717d088376 support server cycle handler. 2.0.153. 10 years ago
winlin c49bc0628e support on_hls for http hooks. 2.0.152. 10 years ago
winlin f6e135943f enhanced hls, support deviation for duration. 2.0.151. 10 years ago
winlin 692b751da8 for #351, support config the m3u8/ts path for hls. 2.0.149. 10 years ago
winlin b6feb0742f fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148 10 years ago
winlin f69fa7273b fix #302, remove the thread unsafe code, no static. 10 years ago
winlin 33cca3e027 for #155, add todo for osx. 2.0.146 10 years ago
winlin e45c62003a Merge branch '2.0release' into develop 10 years ago
winlin bbac2348db for #354, remove the double underscore functions and variables. 10 years ago
winlin 45d9018051 Merge branch '2.0release' into develop 10 years ago
winlin c6817cc422 for #354, remove the double underscore of macro. 10 years ago
winlin f564c903ac support got uptime and loadavg for osx. 2.0.145 10 years ago
winlin f36e4a443d refine the fast buffer. 2.0.144 10 years ago
winlin 6a98758435 revert the changes for SRS2. 10 years ago
winlin df2644c850 merge from 2.0release 10 years ago
winlin 9f81a8b73e for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143. 10 years ago
winlin ab673e1300 for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143. 10 years ago
winlin 9e407d32fe change verstion to 3.0.0 10 years ago
winlin 2241ba0e34 for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142 10 years ago
winlin a21243ea12 merge from 2.0 10 years ago
winlin d349a3dbda update stable version check 10 years ago
winlin 519c25a064 fork srs2 and start srs3. 3.0.0 10 years ago
winlin 320f45c6f4 fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140. 10 years ago
winlin 27cb62b7aa for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139. 10 years ago
winlin ffef62900f for #328, support adobe hds. 2.0.138. 10 years ago
winlin db7ddfd510 fix #155, #135, support osx(darwin) for mac pro. 2.0.137. 10 years ago
winlin 5143e3a58d fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136 10 years ago
winlin 2e9f2753c9 for #316, add stream codec info. 2.0.135 10 years ago
winlin 8dbabe3708 fix #310, refine aac LC, support aac HE/HEv2. 2.0.134. 10 years ago
winlin f26e719800 fix #322, fix http-flv stream bug, support multiple streams. 2.0.133. 10 years ago
winlin 3982ec1d87 refine http request parse. 2.0.132. 10 years ago
winlin 3e394a5f06 for #320, set socket send buffer to smaller macro. 2.0.131 10 years ago
winlin 983ab8fb89 pass all utest for 2.0 10 years ago
winlin a47dbf7a92 for #320, refine code. 10 years ago
winlin 34d6a2ece5 for #320, support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129 10 years ago
winlin fb3fced8d0 for #179, revert dvr http api. 2.0.128. 10 years ago
winlin 8ed256b7e9 for #179, wait keyframe for dvr. 2.0.127 10 years ago
winlin 0213cc6466 for #179, refine dvr, support POST create dvr when publish not start. 2.0.126 10 years ago
winlin b903a7b436 for #179, dvr suport vhost/app/stream level control. 2.0.125. 10 years ago
winlin 1cb8e44b1b fix #304, fix hls bug, write pts/dts error. 2.0.124. 10 years ago
winlin d650118988 fix #179, dvr support api to start or stop. 2.0.123 10 years ago
winlin a984eeecab refine dvr, append file when dvr file exists. 2.0.122. 10 years ago
winlin 1102c7a58f refine pithy print to more easyer to use 2.0.121. 10 years ago
winlin 9d233db27e fix #133, support push rtsp to srs. 2.0.120. 10 years ago
winlin e81e090239 for #133, add rtsp listener and handler. 10 years ago
winlin 78f34ad46f for #304, support config default acodec/vcodec. 2.0.118. 10 years ago
winlin 3c813847bd rewrite the ts remux of hls. 2.0.117 10 years ago
winlin 25af6c6847 for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116. 10 years ago
winlin 381e88d698 add release code. ZhouGuowen for SRS2.0 10 years ago
winlin b982b27f6f add dev code for each release. HuKaiqun for SRS1.0 10 years ago
winlin e19ee0cb99 for #311, set pcr_base to dts. 2.0.114. 10 years ago
winlin 87519aaae8 fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114 10 years ago
winlin d5e3ac4e7d for #310, the aac profile must be object plus one. 1.0.26 10 years ago
winlin 4820d455d5 for #310, workaround to force to LC/MAIN, donot support SSR above. 2.0.113 10 years ago
winlin a23191497f fix #136, support hls without io(in ram). 2.0.112 10 years ago
winlin 16afe7ddbb fix #250, support push MPEGTS over UDP to SRS. 2.0.111 10 years ago
winlin 70c8fe13c4 for #250, support h264 video for push mpegts over udp. 2.0.110 10 years ago
winlin 66fccdbbd1 for #250, demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109. 10 years ago
winlin 8374017329 build libfdk-aac in ffmpeg. 2.0.108 10 years ago
winlin 919a85b103 for #301, hls support h.264+mp3, ok for vlc. 2.0.107 10 years ago
winlin 2c42350489 for #301, http ts stream support h.264+mp3. 2.0.106 10 years ago
winlin aaade0f04f for #268, refine the pcr start at 0, dts/pts plus delay. 2.0.105 10 years ago
winlin 9cbc753e8e for #151, #268, refine the pcr start at 0, dts/pts plus delay. 1.0.25 10 years ago
winlin b0daf1482d update version to 1.0.24 10 years ago
winlin 711b6ca277 for #250, basic stream caster framework. 2.0.104 10 years ago
winlin 4f5cc9c403 for #151, use absolutely overflow to make jwplayer happy. 1.0.23 10 years ago
winlin 73cfdea332 for #299, srs http server support dash vod stream over mp4 range. 2.0.103 10 years ago
winlin 2a05783d5c for #293, support http ts stream. 2.0.101 10 years ago
winlin 2167a8385c update version to 3.0.101 10 years ago
winlin b7b268dfbf fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100. 10 years ago
winlin 53d9faf395 for #293, update readme. 10 years ago
winlin e71bc0cbc5 for bug #277, refine the http server. 10 years ago
winlin cbed2bbca4 fix #277, refine http server refer to go http-framework. 2.0.98 10 years ago
winlin 9bbbaad288 for bug #277, refine http api refer to go http-framework. 2.0.97 10 years ago
winlin cc22ca4890 hotfix #290, use iformat only for rtmp input. 2.0.95 10 years ago
winlin 4449a8d7b0 fix #290, use iformat only for rtmp input. 1.0.22 10 years ago
winlin 63309a0538 refine for bug #288, drop info frame without error. 10 years ago
winlin b705ed0b90 for bug #288, refine the codec decode info frame failed. 1.0.21 10 years ago
winlin b466756931 merge from feilong for bug #281. 10 years ago
winlin 27e0521ace fix #281, fix hls bug ignore type-9 send aud. 1.0.20 10 years ago
winlin 6c833902f9 merge http api from tufang. 2.0.92 10 years ago
winlin 0e9c9db3f4 fix the aggregate bug, adjust to starttime of msg. 2.0.91 10 years ago
winlin 0e03d019a8 for bug #215, srs rtmp dump support conn args. 2.0.90 10 years ago
winlin dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 10 years ago
winlin dd2c7e0b4d hotfix to remove the pageUrl for http callback. 2.0.88 10 years ago
winlin 247b772449 hotfix to remove the pageUrl for http callback. 1.0.19 10 years ago
winlin f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 10 years ago
winlin 75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 10 years ago
winlin f8ec7c706d merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85 10 years ago
winlin e590537dca fix #207, trim the last 0 of log. 1.0.18 10 years ago
winlin 9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 10 years ago
winlin 8df0f724d6 fix #216, http-callback post in application/json content-type. 2.0.83 10 years ago
winlin ca977ef739 hotfix #216, http-callback post in application/json content-type. 1.0.17 10 years ago
winlin 518a5a72ab fix #263, srs-librtmp flv read tag should init size. 2.0.82 10 years ago
winlin c1c01ec802 hotfix #270, memory leak for http client post. 2.0.81 10 years ago
winlin bb6dfe40c1 fix #270, memory leak for http client post. 1.0.16 10 years ago
winlin 569596c10d update copyright, from 2013 to 2015 10 years ago
winlin 12f4abd553 fix #266, aac profile is object id plus one. 2.0.80 10 years ago
winlin c0a6c3efa3 merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79 10 years ago
winlin d9aca8ab82 hotfix #267, the forward dest ep should use server. 1.0.15 10 years ago
winlin e27c95b0e8 merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78 10 years ago
winlin 513c1ec6d5 fix #268, the hls pcr is negative when startup. 1.0.14 10 years ago
winlin 9a66d22f3b hotfix 1.0release, 1.0.13 10 years ago
winlin b8de3bd3b4 convert the core to unix format. 10 years ago
winlin 92146712d8 fix srs-librtmp send raw aac audio channel bug. 2.0.76 10 years ago
winlin 28eedfc177 merge from 1.0release for #264, ignore the video NALU which is actually a sequence header to make HLS happy. 2.0.75 10 years ago
winlin 2e43a63bf4 fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12 10 years ago
winlin eef8034632 merge from 1.0release for bug #264. 2.0.74 10 years ago
winlin 1dfac0bf1d fix #264, support disconnect publish connect when hls error. 1.0.11 10 years ago
winlin db13c725a6 refine #259, rename the on_dispose to wakeup. 2.0.73 10 years ago
winlin 0d6b91039d fix #257, refine latency, send when got one+ msgs, 2.0.72 10 years ago
winlin cbad7a3074 fix #257, server latency is 0.1s+, the bottleneck is encoder. 2.0.71 10 years ago
winlin 595bf24a51 for bug #257, default to off the realtime(min-latency). 10 years ago
winlin 10297fab51 fix #257, support 0.1s+ latency. 2.0.70 10 years ago
winlin 6bdd0af728 for bug #251, remove the queue fast cache for it's too complex, use queue fast vector instead. 2.0.69 10 years ago
winlin 7150a99f41 for bug #251, remove the mic(message iovs cache), no use. 10 years ago
winlin a3de1c71fc reset the mw_latency to 350. 10 years ago
winlin 1311b6fe65 fix #251, support 10k clients. 2.0.67 10 years ago
winlin 55d98fceed for bug #251, add min msgs for queue cond wait. 10 years ago
winlin 5a2b8afead for bug #251, add queue fast vector. 2.0.66 10 years ago
winlin 8f72f79504 for bug #251, add queue fast cache. 2.0.65 10 years ago
winlin bba6063492 for bug #251, the shared ptr message share the header. 2.0.64 10 years ago
winlin 330819fb74 for bug #251, refine the mic algorithm. 2.0.63 10 years ago
winlin d53fd7f570 for bug #251, support mic(message iovs cache). 2.0.61 10 years ago
winlin d827928eeb for bug #251, merge the performance refines. 10 years ago
winlin 9892b92258 Revert "for bug #251, somhc(session-oriented message-header cache). 2.0.61"
It hurt performance, should never use it.

This reverts commit d073adde58.
10 years ago
winlin d073adde58 for bug #251, somhc(session-oriented message-header cache). 2.0.61 10 years ago
winlin f9b9a60de7 for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60 10 years ago
winlin e80c8603d4 fix #251, revert changes, for the cond wait and fast cache queue is no use. 2.0.59 10 years ago
winlin 92ecdf088b for bug #251, use macro to define the fast cache and cond wait. 2.0.58 10 years ago
winlin cd317859db add mw sleep time and msgs/iovs table. 10 years ago
winlin 9ee138746f for bug #251, 9k+ clients, use fast cache for msgs queue. 2.0.57 10 years ago
winlin dde05c6315 for bug #251, refine the send use cond wait. 10 years ago
winlin fad6074a25 set send socket buf. mw/mr sleep default to 350. 10 years ago
winlin 279b4ff4c9 refine macros 10 years ago
winlin b1d7fbe668 fix #241, add mw(merged-write) config. 2.0.53 10 years ago
winlin f1192a8302 fix bug for bug #241, default to 32k for socket buffer. 10 years ago
winlin 5589b13d2e for bug #241, support mr(merged-read) config and reload. 2.0.52. 10 years ago
winlin 57f844b636 for bug #249, simplify the macro, 0 to disable chunk stream cache. 10 years ago
winlin a23b5b9a4b for bug#241, simplify the buffer, donot change its size. 10 years ago
winlin 4b09531e2f for bug #241, simplify the merged read config macros. 10 years ago
winlin f57801eb46 fix #249, cache the chunk headers info to +5% or +10% performance. 2.0.51 10 years ago
winlin 90992b31a3 for bug #194, add the send macro to performance. 10 years ago
winlin 60bc9c2aa0 add performance header to control options for performance. 2.0.50 10 years ago
winlin 29324fab46 fix #248, improve about 15% performance for fast buffer. 2.0.49 10 years ago
winlin f35ec2155b for bug #241, support merged read. 2.0.48 10 years ago
winlin 463e1fbc41 for bug #237, refine the thread loop for publish thread. 2.0.47 10 years ago
winlin e9712cc627 refine recv thread, donot set auto response for publish recv thread. 2.0.46 10 years ago
winlin 5905e5c050 merge from 1.0release, traverse the token before response connect. 2.0.45. 10 years ago
winlin 304208f822 fix #239, traverse the token before response connect. 1.0.10. 10 years ago
winlin 757cffbabf for bug #237, when recv thread failed, quit the cycle. 2.0.44 10 years ago
winlin a94dbecdc4 refine macro of srs-librtmp. 2.0.43 10 years ago
winlin 3584bdb7b6 srs-librtmp support hijack io apis for st-load. 2.0.42. 10 years ago
winlin 472b1742a2 for bug #237, use isolate thread to recv message. 2.0.41 10 years ago
winlin 1847c5fef7 ignore the actual length of share key. 2.0.40 10 years ago
winlin 47b4b694be add qtcreate project file trunk/src/qt/srs/srs-qt.pro. 2.0.39. 10 years ago
winlin efb73c5487 fix #235, refine handshake, replace union with template method. 2.0.38. 10 years ago
winlin ff5cdb1cc1 for bug #215, add srs_rtmp_dump tool. 2.0.37. 10 years ago
winlin 7f121efd7a merge from allspace srs-librtmp for win vs2010. 2.0.36 10 years ago
winlin 14fca601f9 merge from 1.0 hotfix. 3.0.35 10 years ago
winlin 9c033c7da6 hotfix 1.0, author bug, use error macro. 1.0.9 10 years ago
winlin 03f72fb1a6 for bug #229, revert changes of allspace, for srs-librtmp branch build failed. 2.0.34 10 years ago
winlin eb4e7aad69 try to build srs-librtmp on vs2010, failed. 10 years ago
winlin 4c0c3a9ada refine merged code for allspace. 10 years ago
winlin 468941833c change srs version to 2.0.33 10 years ago
winlin 18c308248e refine code by winlin, for merged from allspace. 10 years ago
winlin 1855c9429c merge from allspace, to srs-librtmp, for vs2010 10 years ago
winlin e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 10 years ago
winlin d672fae255 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8 10 years ago
winlin 44962c9142 update PRIMARY, AUTHORS, CONTRIBUTORS rule 10 years ago
winlin e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 10 years ago
winlin 58136ec178 fix #217, remove timeout recv, support 7.5k+ 250kbps clients. 2.0.30. 10 years ago
winlin aa69f6197a srs-librtmp add rtmp prefix for rtmp apis. 2.0.29 10 years ago
winlin d9474d7600 refine examples of srs-librtmp, add srs_print_rtmp_packet. 2.0.28. 10 years ago
winlin a058eeeb20 fix #212, support publish audio raw frames. 2.0.27 10 years ago
winlin d6072b16c0 support compile srs-librtmp on windows. 2.0.26 10 years ago
winlin 5f48d4f566 refine comments for SrsMessageArray. 2.0.25 10 years ago
winlin df35f75df1 refine response call, 2.0.24 10 years ago
winlin c1e9aed0ac all wiki translated to English. 1.0.7 10 years ago
winlin fbcb63f775 v2.0, 2014-11-18, all wiki translated to English. 2.0.23. 10 years ago
winlin 2c601a0069 fix #204, srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22. 10 years ago
winlin 278ff845d3 fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21. 10 years ago
winlin bb5e99f562 fix #202, fix memory leak of h.264 raw packet send in srs-librtmp. 2.0.20. 10 years ago
winlin 7ebca6cb5b refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19 10 years ago
winlin 47ed9e33dd refine code for bug #194, use send messages for all msg array. 10 years ago
winlin f2f02b06d5 for bug #194, refine code, to 2.0.17 10 years ago
winlin eba1740ed5 hotfix #200, deadloop when read/write 0 and ETIME. 1.0.6. 10 years ago
winlin 0bc35e093c for bug #200, deadloop when read/write 0 and ETIME. 2.0.16. 10 years ago
winlin cc6aca9ad5 fix #194, writev multiple msgs, support 6k+ 250kbps clients. 2.0.15. 10 years ago
winlin 8acd143a7a fix #194: refine the timeout recv, pulse to 500ms. 2.0.14. 10 years ago
winlin 46330dd196 fix #195: remove the confuse code st_usleep(0). 2.0.13. 10 years ago
winlin 606fc13a03 rename the confict macro to srs_lib_trace 10 years ago
winlin 3405f35d06 fix #191: configure --export-librtmp-project and --export-librtmp-single. 2.0.11. 10 years ago
winlin 926650840e fix #191, configure --export-librtmp. 2.0.10. 10 years ago
winlin 106bef802f fix #66, srs-librtmp support write h264 raw packet. 2.0.9. 10 years ago
winlin f2f259d050 use number for macro VERSION_MAJOR, VERSION_MINOR and VERSION_REVISION. 1.0.5. 10 years ago
winlin fa53250202 refine the macro, use int as version type. 2.0.8 10 years ago
winlin 6a3418cd45 fix #185, AMF0 support 0x0B the date type codec. 2.0.5. 10 years ago
winlin e3e18b9915 for bug #186, read the args when discovery it. 1.0.4 10 years ago
winlin 7d70864b33 for bug #186, read the args when discovery it. 2.0.6 10 years ago
winlin b65dfd718a add comments for the RTMP packet fields, NULL or never NULL. 2.0.5 10 years ago
winlin 1bfc238fec hotfix for bug #186, drop connect args when not object. 2.0.4. 10 years ago
winlin aa98ca60b9 fix #186, hotfix for bug #186, drop connect args when not object. 1.0.3. 10 years ago
winlin 77d14ff752 update readme, rename wiki/xxx to wiki/v1_xxx 10 years ago
winlin a169262099 update readme, rename wiki/xxx to wiki/v1_xxx 10 years ago
winlin 57e8356221 fix #184, support AnnexB in RTMP body for HLS. 2.0.2 11 years ago
winlin bd158ec838 hotfix for bug #183, donot support AnnexB when decoding RTMP body for HLS. 1.0.1. 11 years ago
winlin d24e2fd0cc remove supports for OSX. 2.0.1. 11 years ago
winlin 5f29935623 update master to 2.0, because the 1.0release branch is created. 2.0.0 11 years ago
winlin dddec3484e update to 1.0beta, 1.0.0 11 years ago
winlin 6468b9e92b refine script, to disable iptables and selinux. 0.9.225 11 years ago
winlin 2ed794ad52 refine macro, use ffmpeg_stub and ffmpeg_tool, 0.9.224 11 years ago
winlin 9789335d0b fix #151, always reap ts whatever audio or video packet. 0.9.223. 11 years ago
winlin b830b995e6 fix bug #162, requires epoll. 0.9.222 11 years ago
winlin 967de9d2e7 for bug #159: postpone the http server bug to 2.0+ 11 years ago
winlin f3002144fc fix #180: crash for multiple edge publishing the same stream. 0.9.220. 11 years ago
winlin bc6616bd1f refine code according to inspect of clion. 0.9.219 11 years ago
winlin e0b1e044de add stub code for bug #180, check complex handshake. 11 years ago
winlin 63c9ad272c fix the bug by refine code, rename the get_perfer_cid to get_prefer_cid. 0.9.217 11 years ago
winlin 20ebf68ea5 fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216. 11 years ago
winlin 002facb85b refine code, fix bug of hls, following jetbrains clion code-inspector. 0.9.215 11 years ago
winlin 2d7f5ddcbf add cmakelists.txt for cmake for clion of jetbrains. 0.9.214 11 years ago
winlin 83f266b9e2 fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213. 11 years ago
winlin 87aac3ddd4 refine log, add features for macro. 0.9.212 11 years ago
winlin 9dd0939327 fix the bug for gmc. 0.9.211 11 years ago
winlin 901c9590e4 refine log, log important to file. 1.0.210 11 years ago
winlin d0c585af86 max connections is 32756, for st use mmap default. 0.9.209 11 years ago
winlin 42a43c69cd fix #150, forward should forward the sequence header when retry. 0.9.208. 11 years ago
winlin 9b6187c3d5 fix #165, refine dh wrapper, ensure public key is 128bytes. 0.9.207. 11 years ago
winlin cb311d998e fix #165, refine dh wrapper, ensure public key is 128bytes. 0.9.206. 11 years ago
winlin 01ae8c4787 refine the handshake random data, fill with value in [0x0f, 0xf0], 0.9.205 11 years ago
winlin 4d5414faec update log, add dsu(debug_srs_upnode), 0.9.204 11 years ago
winlin f549f88ed8 for bug #162, add conf and connections limit. 0.9.203 11 years ago
winlin ab965655aa refine forwarder, add tracable debug info. 0.9.202 11 years ago
winlin e9e0cd757c fix #160, support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201. 11 years ago
winlin c24e68dd70 refine the stat, use one ok. 1.0.200 11 years ago
winlin 6103b1c3ce refine options, add --with-stat. 0.9.199 11 years ago
winlin 3111870316 for bug #155, refine for osx, with ssl/http, disable statistics. 0.9.198. 11 years ago
winlin 5e4dad210a build openssl for osx, for bug #155. 11 years ago
winlin cf7504826b fix reload ingest bug, remove when disabled. 0.9.196 11 years ago
winlin b15ee26a48 fix the ssl dh key size assert error, key size maybe 127, not always 128. 0.9.195 11 years ago
winlin 7adbe7f456 fix utest build failed, sync with src changed. 11 years ago
winlin 12ad95a5b8 refine HMAC sha256 digest algorithm. 0.9.193 11 years ago
winlin 156a9ed2a3 change to 0.9.192. 11 years ago
winlin 1ebaab2c6e fix #148, simplify the RTMP handshake key generation. 0.9.191. 11 years ago
winlin 5b28355a0b fix #147, support identify the srs edge. 0.9.190. 11 years ago
winlin 798f9139a4 add reload utest. 11 years ago
winlin 67403bdbf1 fix #79, fix the reload remove edge assert bug. 0.9.189. 11 years ago
winlin ade2376da0 fix #57, use lock(acquire/release publish) to avoid duplicated publishing. 0.9.188. 11 years ago
winlin 6dd065bcc3 fix #85, fix the segment-dvr sequence header missing. 0.9.187. 11 years ago
winlin 5a95d594e7 fix #145, refine ffmpeg log, check abitrate for libaacplus. 0.9.186. 11 years ago
winlin d5ba529d32 fix #143, fix retrieve sys stat bug for all linux. 0.9.185. 11 years ago
winlin 7b24788445 for bug #143, build on centos5. 11 years ago
winlin 84450e1588 fix #138, fix http hooks bug, regression bug. 0.9.184. 11 years ago
winlin 721acc350a fix #142, tcp stat slow bug, use /proc/net/sockstat instead, refer to 'ss -s'. 0.9.183. 11 years ago
winlin d5f03200a7 revert tcp stat. need more refine. 0.9.182 11 years ago
winlin f7fdbe6848 update get connections thread to sleep 10ms per 1000 connectios. 0.9.181 11 years ago
winlin 15d4993cc3 slowdown the cpu usage for srs to calc connections when too many connections. 0.9.180 11 years ago
winlin f0ffdcc0ae fix #141, support tun0(vpn network device) ip retrieve. 0.9.179. 11 years ago
winlin 79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178 11 years ago
winlin e37f312f27 refine the code for ios build. add authors StevenLiu. 0.9.177 11 years ago
winlin df8414af63 api connections add udp, add disk iops. 0.9.176 11 years ago
winlin e76036f40b refine config heartbeat, add new stats. 0.9.175 11 years ago
winlin 02f7c85710 add total system in and out KBps disk stat. 0.9.174 11 years ago
winlin 13abb0d768 complete config utest. 0.9.173 11 years ago
winlin 7241fa8744 fix #126, srs_publiser add warnings. refine config utest. 11 years ago
winlin b17c736f3f fix #124, gop cache support disable video in publishing. 0.9.171. 11 years ago