Commit Graph

1148 Commits (3fe44c1c84be1d80c6d3af468f1f29903cecf9e2)

Author SHA1 Message Date
winlin a8781aee3e For #1304, Default HSTRS to on. 2.0.264 6 years ago
winlin a554dd85e1 Fix GCC7 build error, this statement may fall through. 2.0.263 6 years ago
winlin 91c462b6ba For #1339, Support HTTP-FLV params. 2.0.262 6 years ago
winlin b2d1d84634 Change to 2019 6 years ago
winlin f1ab8fecac Fix build warning 6 years ago
winlin f1033296bb Upgrade to FFMPEG 4.1 and X264 157. 2.0.261 6 years ago
winlin 24f46f5085 #1261, Support _definst_ for Wowza. 3.0.44 6 years ago
winlin 99aa249f3a #1261, Support _definst_ for Wowza. 2.0.260 6 years ago
winlin b2066cbf68 #1263, Fix string trim bug. 2.0.259 6 years ago
winlin 58e501ee24 Fix #1250, Support build on OSX10.14 Mojave. 2.0.258 6 years ago
winlin 63ac93a642 Merge #1236 from 2.0release 6 years ago
winlin a5b452f965 Merge #1236, Fix sleep bug in us. 2.0.257 6 years ago
winlin 9859fa9e6f Merge #1237, Support param for transcoder. 2.0.256 6 years ago
winlin 5945fb5a24 Fix #1093, Support HLS encryption. 3.0.42 7 years ago
winlin e73e30de3a Fix #1051, Drop ts when republishing stream. 3.0.41 7 years ago
winlin 1e054d2bcc Fix #354, Rename impl__SrsAutoFree to impl_SrsAutoFree 7 years ago
winlin 728ddd133b For #1202, Support edge/forward to Aliyun CDN. 3.0.40 7 years ago
winlin 74a87d54f2 For #1202, Support edge/forward to Aliyun CDN. 2.0.255 7 years ago
winlin 1cc72df134 Fix #910, Support HTTP FLV with HTTP callback. 3.0.39 7 years ago
winlin 1e7c12a6dd For #910, Support HTTP FLV with HTTP callback. 2.0.254 7 years ago
winlin 6cea551c64 For #1110, Refine params in http callback. 2.0.253 7 years ago
winlin d607c7f905 Refine HTTP-FLV latency, support realtime mode.3.0.38 7 years ago
winlin c45f72ef7b Refine HTTP-FLV latency, support realtime mode. 2.0.252 7 years ago
winlin ae99131512 Fix #1087, Ignore iface without address. 3.0.37 7 years ago
winlin 29b74c7220 For #1110, Support params in http callback. 3.0.36 7 years ago
winlin 85d3a5001c For #1110, Support params in http callback. 2.0.251 7 years ago
winlin 68a1656e07 Fix #1031, Always use vhost in stream query, the unify uri. 3.0.35 7 years ago
winlin a66d450ec1 For #1031, SRS edge support douyu.com. 3.0.34 7 years ago
winlin 586899a010 For #1031, SRS edge support douyu.com. 2.0.250 7 years ago
winlin 41c6e833b9 Replace hex to string to match MIT license. 3.0.33 7 years ago
winlin 84f81983aa Replace base64 to match MIT license. 3.0.32 7 years ago
winlin 0a63448b86 Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31 7 years ago
winlin e395878916 Replace crc32 IEEE by golang to match MIT license. 3.0.30 7 years ago
winlin 6d7c7418a8 Merge #1119, fix memory leak. 2.0.249 7 years ago
winlin 2d49b9d1a7 Merge #1176, fix scaned issues. 2.0.248 7 years ago
winlin 0fe17c3e34 Merge #1077, fix crash for edge HLS. 2.0.247 7 years ago
winlin 4bf5ab2044 Fix #464, support RTMP origin cluster. 3.0.29 7 years ago
winlin d0fbf44d18 For #464, support config for origin cluster. 7 years ago
winlin db6b8cf914 Fix #1057, switch to simple handshake. 3.0.28 7 years ago
winlin 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 9 years ago
winlin 7811b4f3f7 fix #497, response error when client not found to kickoff. 2.0.194 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 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