external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-24 15:04:20 +00:00
Code Issues Releases Wiki Activity
6995 commits 14 branches 107 tags 377 MiB
Commit graph

1276 commits

Author SHA1 Message Date
winlin
abeb4f46a9 merge 2.0 2016-08-06 17:28:43 +08:00
winlin
ec6e77992e 2.0.210 2016-08-06 16:38:18 +08:00
winlin
28080efec8 fix http reader bug, support infinite chunkted. 2.0.209 2016-01-13 12:44:51 +08:00
winlin
e2e6e76f92 for #558 and #559, 2.0.208 2016-01-11 13:21:28 +08:00
winlin
f1e7e9d933 support gmd. change work_dir. hourglass. add utilies. 2016-01-08 13:58:19 +08:00
winlin
8155e97b84 add keyword XCORE for coredump to identify the version. 2.0.207 2016-01-05 16:49:27 +08:00
winlin
973194c663 merge from srs2. 2015-12-31 16:02:01 +08:00
winlin
26211abf2e refine code. 2015-12-31 15:57:16 +08:00
winlin
eca46c03d2 refine code for consumer to refer the rtmp connection. 2015-12-26 12:13:17 +08:00
winlin
d0c74fa7cd update 2015 to 2016 2015-12-23 11:35:40 +08:00
winlin
5d3a183f43 fix #509, always alloc big object at heap. 2.0.205 2015-12-22 19:18:46 +08:00
winlin
8b24319ffb fix #418, ignore null connect props to make RED5 happy. 2.0.204 2015-12-22 17:00:22 +08:00
winlin
c7850570c1 fix #546, thread terminate normally dispose bug. 2.0.203 2015-12-22 16:13:49 +08:00
winlin
cee8c3d07d fix #541, failed when chunk size too small. 2.0.202 2015-12-22 15:39:12 +08:00
winlin
40457e6cab default hls_on_error to continue. 2.0.201 2015-12-15 16:02:02 +08:00
winlin
2310b2da59 fix #518, fix fd leak bug when fork. 2.0.200 2015-11-16 18:06:44 +08:00
winlin
01c46bdbfd rename org simle-rtmp-server to ossrs 2015-11-11 10:45:45 +08:00
winlin
1ffd5fd455 rename org simple-rtmp-server to ossrs 2015-11-11 10:37:50 +08:00
winlin
a89ed68aa3 update readme for #511. 2015-11-06 10:51:32 +08:00
winlin
49d77b3f09 for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198 2015-11-02 13:42:05 +08:00
winlin
f57e537686 for #515, merge from srs2, use SrsAutoFreeA. 2015-11-02 11:29:20 +08:00
winlin
f4f76cd196 for #515, use SrsAutoFreeA to free the array. 2015-11-02 11:26:37 +08:00
winlin
8cec06e898 merge srs2, use srs_freepa for array 2015-11-02 11:05:39 +08:00
winlin
2af7749771 for #515, use srs_freepa to free the array. 2015-11-02 11:02:27 +08:00
winlin
d1979c760f for #512, partical hotfix the hls pure audio. 2.0.196 2015-10-27 17:44:10 +08:00
winlin
9a47390253 fix #467, support write log to kafka. 3.0.6 2015-10-23 14:42:04 +08:00
winlin
29122b6e70 fix #502, transcoder support snapshot. 2015-10-20 14:52:34 +08:00
winlin
0c8209cccd fix #448, fix the bug of response of http hooks. 2.0.195 2015-10-04 08:09:39 +08:00
winlin
7811b4f3f7 fix #497, response error when client not found to kickoff. 2.0.194 2015-10-01 13:20:13 +08:00
winlin
a3c229472e fix #495, decrease the srs-librtmp size. 2.0.193 2015-10-01 13:04:28 +08:00
winlin
070ada1d6e Merge branch '2.0release' into develop 2015-10-01 12:30:55 +08:00
winlin
65e4bf2e77 fix compile failed bug. 2015-10-01 12:30:38 +08:00
winlin
4e88262512 merge from srs2 to check cpus. 2015-09-23 15:11:33 +08:00
winlin
cfe2082353 fix #485, error when arm glibc 2.15+ or not i386/x86_64/amd64. 2.0.192 2015-09-23 15:09:59 +08:00
winlin
6990508e58 for #485, srs for respberrypi and cubieboard. 2.0.191 2015-09-23 11:05:56 +08:00
winlin
b5996567e8 refine the role of srs, to cluster. 2015-09-21 12:09:09 +08:00
winlin
d8a64aaab5 fix #484, hotfix the openssl build script 2.0.190 2015-09-21 12:01:48 +08:00
winlin
8a90e76637 fix #459, support dvr raw api. 3.0.4 2015-09-15 23:00:00 +08:00
winlin
2a1b2b69a0 for #459, dvr support apply filter for ng-control dvr module. 2015-09-15 15:58:57 +08:00
winlin
8f9cfcdcf4 fix #319, http raw api support update global and vhost. 3.0.4 2015-09-15 13:03:18 +08:00
winlin
511627abab fix #474, config to donot parse width/height from sps. 2.0.189 2015-09-14 18:36:44 +08:00
winlin
0d57ef9373 fix #458, http hooks use source thread cid. 2.0.188 2015-09-14 13:47:25 +08:00
winlin
6d50aa1aa2 #475, fix http hooks crash for st context switch. 2.0.187 2015-09-14 12:22:19 +08:00
winlin
abd7ee227c support reload utc_time. 2.0.186 2015-09-09 23:37:07 +08:00
winlin
11c409688b for #319, http raw api support query. 3.0.3 2015-08-31 23:34:03 +08:00
winlin
1b1a2a1e63 fix #471, api response the width and height. 3.0.2 2015-08-28 18:00:24 +08:00
winlin
c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 2015-08-25 22:29:00 +08:00
winlin
28791fd14a release 2.0alpha0, the 2.0a0, 2.0.185 2015-08-23 09:00:21 +08:00
winlin
2cf526ffc7 close #454, support obs restart publish. 2.0.184 2015-08-18 17:43:01 +08:00
winlin
ae37fa8f3e use send_min_interval for stream control. 2.0.183 2015-08-14 11:13:40 +08:00
winlin
653afd0700 merge from 2.0 2015-08-12 13:23:00 +08:00
winlin
9fb4640a8f enable the SRS_PERF_TCP_NODELAY and add config tcp_nodelay. 2.0.182 2015-08-12 13:22:09 +08:00
winlin
b27bb48447 refine the version 2015-08-12 08:18:45 +08:00
winlin
eab538d2e4 fix the version of srs2 2015-08-11 18:37:50 +08:00
winlin
0e3128d3e3 Merge branch '2.0release' into develop 2015-08-03 15:23:07 +08:00
winlin
8d86eb6516 refine code naming or comments. 2015-07-28 17:56:50 +08:00
winlin
c85f92c229 fix #169, support default values for transcode. 2.0.180 2015-07-21 12:07:26 +08:00
winlin
b54f9b0f94 refine the hls, ignore packet when no sequence header. 2.0.179 2015-07-20 09:31:46 +08:00
winlin
366d3a3f56 for #441, use 30s timeout for first msg. 2.0.178 2015-07-16 17:30:27 +08:00
winlin
5f77724021 refine hls disable the time jitter, support not mix monotonically increase. 2.0.177 2015-07-14 11:46:23 +08:00
winlin
438914c481 fix #433, fix the sps parse bug. 2.0.176 2015-07-01 14:50:45 +08:00
winlin
2f44a29b76 Merge branch '2.0release' into develop 2015-06-13 16:05:26 +08:00
winlin
0d66e92ab5 refine code, support configure to enable --memory-watch 2015-06-13 15:45:25 +08:00
winlin
56938efdbd fix #425, refine the time jitter, correct (-inf,-250)+(250,+inf) to 10ms. 2.0.175 2015-06-10 15:38:13 +08:00
winlin
6941f2c072 fix #424, fix aggregate timestamp bug. 2.0.174 2015-06-10 13:53:13 +08:00
winlin
00d1fdded0 Merge branch '2.0release' into develop 2015-06-08 15:02:30 +08:00
winlin
573495a19f refine the memory watcher. 2015-06-08 09:47:45 +08:00
winlin
bb4db61192 add srs memory watcher. 2015-06-07 15:12:55 +08:00
winlin
223ae194b1 fix #209, cleanup hls when stop and timeout. 2.0.173. 2015-05-30 14:41:09 +08:00
winlin
5caafadd45 fix #409: support pure video hls. 2.0.172. 2015-05-29 21:43:17 +08:00
winlin
cd162c2848 merge from 2.0 2015-05-25 01:04:04 +08:00
winlin
d12fc7fcc5 fix #405, improve the HTTP FLV performance to 6k. 2.0.171 2015-05-25 01:02:06 +08:00
winlin
4df19ba99a for #405, improve the http flv to 3k. 2.0.170 2015-05-24 23:29:17 +08:00
winlin
960341b9b2 for #405, improve the HTT FLV to 3k. 2.0.169 2015-05-24 22:43:02 +08:00
winlin
fc995473eb for #405, improve the HTTP FLV delivery 1k to 2.3k. 2.0.168 2015-05-24 21:17:00 +08:00
winlin
069ee0afc3 fix #404, register handler then start http thread. 2.0.167. 2015-05-24 15:19:09 +08:00
winlin
5908096fc3 refine the thread, protocol, kbps code. 2.0.166 2015-05-23 10:04:28 +08:00
winlin
6ca46e84bc fix #397, the USER_HZ maybe not 100. 2.0.165 2015-05-22 17:16:33 +08:00
winlin
948d200ce1 fix #400, parse when got entire http header, by feilong. 2.0.164. 2015-05-22 12:00:48 +08:00
winlin
44bc7976ac merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163. 2015-05-19 18:06:20 +08:00
winlin
c617d2aaa5 support push flv stream over HTTP POST to SRS. 2015-05-10 10:35:35 +08:00
winlin
91e285b0cd Merge branch '2.0release' into develop 2015-04-29 18:46:54 +08:00
winlin
4b372d8d16 change primary to the primary branch. 2015-04-29 18:46:47 +08:00
winlin
94681702e1 Merge branch '2.0release' into develop 2015-04-29 18:03:20 +08:00
winlin
e63b8eda51 migarate to srs org. 2015-04-29 18:03:17 +08:00
winlin
42ddb76544 Merge branch '2.0release' into develop 2015-04-29 18:01:24 +08:00
winlin
8603dba697 migarate to srs org. 2015-04-29 18:01:16 +08:00
winlin
17b15deee6 Merge branch '2.0release' into develop 2015-04-29 17:38:29 +08:00
winlin
b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 2015-04-29 17:38:23 +08:00
winlin
53e92a17f5 Merge branch '2.0release' into develop 2015-04-29 17:06:40 +08:00
winlin
115daa3cc1 migarate from winlinvip to srs org 2015-04-29 17:06:32 +08:00
winlin
22ca46350b fix #383, support mix_correct algorithm. 2.0.161. 2015-04-15 17:12:22 +08:00
winlin
dcac9c69d5 fix #381, support reap hls/ts by gop or not. 2.0.160. 2015-04-13 10:32:32 +08:00
winlin
546be09219 fix #375, fix hls bug, keep cc continous between ts files. 2.0.159. 2015-04-08 16:52:43 +08:00
winlin
e56d7add44 fix bug of config to parse the default value. 2.0.158 2015-04-07 17:42:41 +08:00
winlin
77c29da26b for #304, rewrite annexb mux for ts, refer to apple sample. 2.0.157. 2015-04-04 13:30:13 +08:00
winlin
70c59da1bf enhanced avc decode, parse the sps get width+height. 2.0.156. 2015-04-03 23:17:50 +08:00
winlin
17c0a5c470 fix #372, support transform vhost of edge 2.0.155. 2015-04-03 10:56:56 +08:00
winlin
8401d9ac06 fix #366, config hls to disable cleanup of ts. 2.0.154. 2015-04-02 11:52:03 +08:00
winlin
717d088376 support server cycle handler. 2.0.153. 2015-03-31 18:06:55 +08:00
winlin
c49bc0628e support on_hls for http hooks. 2.0.152. 2015-03-31 17:42:12 +08:00
winlin
f6e135943f enhanced hls, support deviation for duration. 2.0.151. 2015-03-31 15:39:47 +08:00
winlin
692b751da8 for #351, support config the m3u8/ts path for hls. 2.0.149. 2015-03-30 12:44:04 +08:00
winlin
b6feb0742f fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148 2015-03-23 23:13:57 +08:00
winlin
f69fa7273b fix #302, remove the thread unsafe code, no static. 2015-03-23 21:19:04 +08:00
winlin
33cca3e027 for #155, add todo for osx. 2.0.146 2015-03-21 15:22:45 +08:00
winlin
e45c62003a Merge branch '2.0release' into develop 2015-03-21 11:55:35 +08:00
winlin
bbac2348db for #354, remove the double underscore functions and variables. 2015-03-21 11:55:28 +08:00
winlin
45d9018051 Merge branch '2.0release' into develop 2015-03-21 10:25:09 +08:00
winlin
c6817cc422 for #354, remove the double underscore of macro. 2015-03-21 10:25:03 +08:00
winlin
f564c903ac support got uptime and loadavg for osx. 2.0.145 2015-03-18 22:30:17 +08:00
winlin
f36e4a443d refine the fast buffer. 2.0.144 2015-03-18 16:34:27 +08:00
winlin
6a98758435 revert the changes for SRS2. 2015-03-17 23:51:10 +08:00
winlin
df2644c850 merge from 2.0release 2015-03-17 23:48:50 +08:00
winlin
9f81a8b73e for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143. 2015-03-17 22:07:38 +08:00
winlin
ab673e1300 for #155, osx(darwin) support demo with nginx and ffmpeg. 2.0.143. 2015-03-17 22:06:59 +08:00
winlin
9e407d32fe change verstion to 3.0.0 2015-03-17 07:58:38 +08:00
winlin
2241ba0e34 for #340, #343, add wiki and use srs string function, support hls_entry_prefix(hls base url). 2.0.142 2015-03-17 07:57:58 +08:00
winlin
a21243ea12 merge from 2.0 2015-03-15 08:16:37 +08:00
winlin
d349a3dbda update stable version check 2015-03-15 08:15:04 +08:00
winlin
519c25a064 fork srs2 and start srs3. 3.0.0 2015-03-15 08:06:41 +08:00
winlin
320f45c6f4 fix #324, support hstrs(http stream trigger rtmp source) edge mode. 2.0.140. 2015-03-14 20:07:56 +08:00
winlin
27cb62b7aa for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139. 2015-03-14 19:45:13 +08:00
winlin
ffef62900f for #328, support adobe hds. 2.0.138. 2015-03-12 11:15:15 +08:00
winlin
db7ddfd510 fix #155, #135, support osx(darwin) for mac pro. 2.0.137. 2015-03-10 12:50:27 +08:00
winlin
5143e3a58d fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136 2015-03-08 19:59:10 +08:00
winlin
2e9f2753c9 for #316, add stream codec info. 2.0.135 2015-03-08 18:33:35 +08:00
winlin
8dbabe3708 fix #310, refine aac LC, support aac HE/HEv2. 2.0.134. 2015-03-08 17:36:43 +08:00
winlin
f26e719800 fix #322, fix http-flv stream bug, support multiple streams. 2.0.133. 2015-03-06 13:37:57 +08:00
winlin
3982ec1d87 refine http request parse. 2.0.132. 2015-03-06 11:36:26 +08:00
winlin
3e394a5f06 for #320, set socket send buffer to smaller macro. 2.0.131 2015-03-04 16:52:43 +08:00
winlin
983ab8fb89 pass all utest for 2.0 2015-03-04 12:24:22 +08:00
winlin
a47dbf7a92 for #320, refine code. 2015-03-03 17:28:07 +08:00
winlin
34d6a2ece5 for #320, support macro to disable the complex send algorithm and enable tcp no delay. 2.0.129 2015-03-03 17:22:44 +08:00
winlin
fb3fced8d0 for #179, revert dvr http api. 2.0.128. 2015-03-01 17:57:28 +08:00
winlin
8ed256b7e9 for #179, wait keyframe for dvr. 2.0.127 2015-02-27 21:11:29 +08:00
winlin
0213cc6466 for #179, refine dvr, support POST create dvr when publish not start. 2.0.126 2015-02-27 20:39:36 +08:00
winlin
b903a7b436 for #179, dvr suport vhost/app/stream level control. 2.0.125. 2015-02-25 09:20:11 +08:00
winlin
1cb8e44b1b fix #304, fix hls bug, write pts/dts error. 2.0.124. 2015-02-24 18:39:31 +08:00
winlin
d650118988 fix #179, dvr support api to start or stop. 2.0.123 2015-02-23 19:23:32 +08:00
winlin
a984eeecab refine dvr, append file when dvr file exists. 2.0.122. 2015-02-19 19:50:10 +08:00
winlin
1102c7a58f refine pithy print to more easyer to use 2.0.121. 2015-02-19 18:56:21 +08:00
winlin
9d233db27e fix #133, support push rtsp to srs. 2.0.120. 2015-02-18 22:28:39 +08:00
winlin
e81e090239 for #133, add rtsp listener and handler. 2015-02-15 21:28:31 +08:00
winlin
78f34ad46f for #304, support config default acodec/vcodec. 2.0.118. 2015-02-15 18:11:24 +08:00
winlin
3c813847bd rewrite the ts remux of hls. 2.0.117 2015-02-15 16:37:28 +08:00
winlin
25af6c6847 for #304, use stringstream to generate m3u8, add hls_td_ratio. 2.0.116. 2015-02-12 13:34:59 +08:00
winlin
381e88d698 add release code. ZhouGuowen for SRS2.0 2015-02-11 08:52:52 +08:00
winlin
b982b27f6f add dev code for each release. HuKaiqun for SRS1.0 2015-02-11 08:48:22 +08:00
winlin
e19ee0cb99 for #311, set pcr_base to dts. 2.0.114. 2015-02-10 23:15:43 +08:00
winlin
87519aaae8 fix the avc codec bug, the ibmf format may like the annexb, we must guess only one time. 2.0.114 2015-02-10 22:37:29 +08:00
winlin
d5e3ac4e7d for #310, the aac profile must be object plus one. 1.0.26 2015-02-10 17:15:50 +08:00
winlin
4820d455d5 for #310, workaround to force to LC/MAIN, donot support SSR above. 2.0.113 2015-02-10 16:58:13 +08:00
winlin
a23191497f fix #136, support hls without io(in ram). 2.0.112 2015-02-03 16:01:07 +08:00
winlin
16afe7ddbb fix #250, support push MPEGTS over UDP to SRS. 2.0.111 2015-01-31 23:20:00 +08:00
winlin
70c8fe13c4 for #250, support h264 video for push mpegts over udp. 2.0.110 2015-01-31 19:46:55 +08:00
winlin
66fccdbbd1 for #250, demux PES stream ok, only support h.264(annexb) and aac(adts) in mpegts over udp. 3.0.109. 2015-01-31 12:21:04 +08:00
winlin
8374017329 build libfdk-aac in ffmpeg. 2.0.108 2015-01-29 10:45:19 +08:00
winlin
919a85b103 for #301, hls support h.264+mp3, ok for vlc. 2.0.107 2015-01-25 17:06:49 +08:00
winlin
2c42350489 for #301, http ts stream support h.264+mp3. 2.0.106 2015-01-25 16:42:22 +08:00
winlin
aaade0f04f for #268, refine the pcr start at 0, dts/pts plus delay. 2.0.105 2015-01-25 13:35:53 +08:00
winlin
9cbc753e8e for #151, #268, refine the pcr start at 0, dts/pts plus delay. 1.0.25 2015-01-25 13:30:45 +08:00
winlin
b0daf1482d update version to 1.0.24 2015-01-25 13:10:30 +08:00
winlin
711b6ca277 for #250, basic stream caster framework. 2.0.104 2015-01-24 16:31:32 +08:00
winlin
4f5cc9c403 for #151, use absolutely overflow to make jwplayer happy. 1.0.23 2015-01-23 15:14:29 +08:00
winlin
73cfdea332 for #299, srs http server support dash vod stream over mp4 range. 2.0.103 2015-01-23 13:45:59 +08:00
winlin
2a05783d5c for #293, support http ts stream. 2.0.101 2015-01-22 18:32:10 +08:00
winlin
2167a8385c update version to 3.0.101 2015-01-22 09:36:19 +08:00
winlin
b7b268dfbf fix #293, support http live flv/aac/mp3 stream with fast cache. 2.0.100. 2015-01-19 13:17:46 +08:00
winlin
53d9faf395 for #293, update readme. 2015-01-18 19:50:54 +08:00
winlin
e71bc0cbc5 for bug #277, refine the http server. 2015-01-17 23:44:21 +08:00
winlin
cbed2bbca4 fix #277, refine http server refer to go http-framework. 2.0.98 2015-01-17 23:00:40 +08:00
winlin
9bbbaad288 for bug #277, refine http api refer to go http-framework. 2.0.97 2015-01-17 21:58:23 +08:00
winlin
cc22ca4890 hotfix #290, use iformat only for rtmp input. 2.0.95 2015-01-17 13:06:18 +08:00
winlin
4449a8d7b0 fix #290, use iformat only for rtmp input. 1.0.22 2015-01-17 13:04:52 +08:00
winlin
63309a0538 refine for bug #288, drop info frame without error. 2015-01-14 11:55:15 +08:00
winlin
b705ed0b90 for bug #288, refine the codec decode info frame failed. 1.0.21 2015-01-14 11:32:19 +08:00
winlin
b466756931 merge from feilong for bug #281. 2015-01-08 17:44:08 +08:00
winlin
27e0521ace fix #281, fix hls bug ignore type-9 send aud. 1.0.20 2015-01-08 17:37:28 +08:00
winlin
6c833902f9 merge http api from tufang. 2.0.92 2015-01-08 16:02:33 +08:00
winlin
0e9c9db3f4 fix the aggregate bug, adjust to starttime of msg. 2.0.91 2015-01-07 15:37:44 +08:00
winlin
0e03d019a8 for bug #215, srs rtmp dump support conn args. 2.0.90 2015-01-07 13:29:30 +08:00
winlin
dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 2015-01-03 15:33:23 +08:00
winlin
dd2c7e0b4d hotfix to remove the pageUrl for http callback. 2.0.88 2015-01-03 15:08:46 +08:00
winlin
247b772449 hotfix to remove the pageUrl for http callback. 1.0.19 2015-01-03 15:07:12 +08:00
winlin
f881bc43b5 fix #179: dvr support custom filepath by variables. 2.0.87 2015-01-03 12:54:54 +08:00
winlin
75f2607685 fix #211, support security allow/deny publish/play all/ip. 2.0.86 2015-01-02 16:02:13 +08:00
winlin
f8ec7c706d merge from 1.0.18, hotfix #207, trim the last 0 of log. 2.0.85 2015-01-02 12:57:44 +08:00
winlin
e590537dca fix #207, trim the last 0 of log. 1.0.18 2015-01-02 12:56:15 +08:00
winlin
9d34820c80 fix #158: http-callback check http status code ok(200). 2.0.84 2015-01-02 10:21:04 +08:00
winlin
8df0f724d6 fix #216, http-callback post in application/json content-type. 2.0.83 2015-01-02 09:22:49 +08:00
winlin
ca977ef739 hotfix #216, http-callback post in application/json content-type. 1.0.17 2015-01-02 09:20:45 +08:00
winlin
518a5a72ab fix #263, srs-librtmp flv read tag should init size. 2.0.82 2015-01-02 09:05:16 +08:00
winlin
c1c01ec802 hotfix #270, memory leak for http client post. 2.0.81 2015-01-01 11:47:18 +08:00
winlin
bb6dfe40c1 fix #270, memory leak for http client post. 1.0.16 2015-01-01 11:44:28 +08:00
winlin
569596c10d update copyright, from 2013 to 2015 2014-12-31 20:32:09 +08:00
winlin
12f4abd553 fix #266, aac profile is object id plus one. 2.0.80 2014-12-29 14:24:22 +08:00
winlin
c0a6c3efa3 merge from 1.0release, hotfix #267, the forward dest ep should use server. 2.0.79 2014-12-29 09:07:50 +08:00
winlin
d9aca8ab82 hotfix #267, the forward dest ep should use server. 1.0.15 2014-12-29 09:05:56 +08:00
winlin
e27c95b0e8 merge from 1.0release for #268, the hls pcr is negative when startup. 2.0.78 2014-12-29 08:45:19 +08:00
winlin
513c1ec6d5 fix #268, the hls pcr is negative when startup. 1.0.14 2014-12-29 08:38:29 +08:00
winlin
9a66d22f3b hotfix 1.0release, 1.0.13 2014-12-26 21:43:00 +08:00
winlin
b8de3bd3b4 convert the core to unix format. 2014-12-25 10:55:12 +08:00
winlin
92146712d8 fix srs-librtmp send raw aac audio channel bug. 2.0.76 2014-12-25 09:52:18 +08:00
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 2014-12-22 17:12:09 +08:00
winlin
2e43a63bf4 fix #264, ignore the video NALU which is actually a sequence header to make HLS happy. 1.0.12 2014-12-22 17:10:51 +08:00
winlin
eef8034632 merge from 1.0release for bug #264. 2.0.74 2014-12-20 11:58:39 +08:00
winlin
1dfac0bf1d fix #264, support disconnect publish connect when hls error. 1.0.11 2014-12-20 11:45:59 +08:00
winlin
db13c725a6 refine #259, rename the on_dispose to wakeup. 2.0.73 2014-12-19 09:19:47 +08:00
winlin
0d6b91039d fix #257, refine latency, send when got one+ msgs, 2.0.72 2014-12-16 09:26:22 +08:00
winlin
cbad7a3074 fix #257, server latency is 0.1s+, the bottleneck is encoder. 2.0.71 2014-12-13 12:48:49 +08:00
winlin
595bf24a51 for bug #257, default to off the realtime(min-latency). 2014-12-13 10:13:49 +08:00
winlin
10297fab51 fix #257, support 0.1s+ latency. 2.0.70 2014-12-12 21:51:06 +08:00
winlin
6bdd0af728 for bug #251, remove the queue fast cache for it's too complex, use queue fast vector instead. 2.0.69 2014-12-10 09:18:49 +08:00
winlin
7150a99f41 for bug #251, remove the mic(message iovs cache), no use. 2014-12-10 09:15:38 +08:00
winlin
a3de1c71fc reset the mw_latency to 350. 2014-12-08 09:49:45 +08:00
winlin
1311b6fe65 fix #251, support 10k clients. 2.0.67 2014-12-07 16:31:47 +08:00
winlin
55d98fceed for bug #251, add min msgs for queue cond wait. 2014-12-07 16:15:19 +08:00
winlin
5a2b8afead for bug #251, add queue fast vector. 2.0.66 2014-12-07 13:26:45 +08:00
winlin
8f72f79504 for bug #251, add queue fast cache. 2.0.65 2014-12-07 12:08:38 +08:00
winlin
bba6063492 for bug #251, the shared ptr message share the header. 2.0.64 2014-12-07 11:25:05 +08:00
winlin
330819fb74 for bug #251, refine the mic algorithm. 2.0.63 2014-12-06 22:50:51 +08:00
winlin
d53fd7f570 for bug #251, support mic(message iovs cache). 2.0.61 2014-12-06 20:10:05 +08:00
winlin
d827928eeb for bug #251, merge the performance refines. 2014-12-06 09:55:51 +08:00
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.
 2014-12-06 01:19:49 +08:00
winlin
d073adde58 for bug #251, somhc(session-oriented message-header cache). 2.0.61 2014-12-06 00:59:10 +08:00
winlin
f9b9a60de7 for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60 2014-12-05 23:03:52 +08:00
winlin
e80c8603d4 fix #251, revert changes, for the cond wait and fast cache queue is no use. 2.0.59 2014-12-05 20:55:19 +08:00
winlin
92ecdf088b for bug #251, use macro to define the fast cache and cond wait. 2.0.58 2014-12-05 18:47:17 +08:00
winlin
cd317859db add mw sleep time and msgs/iovs table. 2014-12-05 17:07:27 +08:00
winlin
9ee138746f for bug #251, 9k+ clients, use fast cache for msgs queue. 2.0.57 2014-12-05 16:44:11 +08:00
winlin
dde05c6315 for bug #251, refine the send use cond wait. 2014-12-05 14:38:43 +08:00
winlin
fad6074a25 set send socket buf. mw/mr sleep default to 350. 2014-12-05 11:24:05 +08:00
winlin
279b4ff4c9 refine macros 2014-12-04 21:37:04 +08:00
winlin
b1d7fbe668 fix #241, add mw(merged-write) config. 2.0.53 2014-12-04 21:35:13 +08:00
winlin
f1192a8302 fix bug for bug #241, default to 32k for socket buffer. 2014-12-04 18:35:50 +08:00
winlin
5589b13d2e for bug #241, support mr(merged-read) config and reload. 2.0.52. 2014-12-04 18:21:04 +08:00
winlin
57f844b636 for bug #249, simplify the macro, 0 to disable chunk stream cache. 2014-12-04 15:49:24 +08:00
winlin
a23b5b9a4b for bug#241, simplify the buffer, donot change its size. 2014-12-04 15:43:37 +08:00
winlin
4b09531e2f for bug #241, simplify the merged read config macros. 2014-12-04 15:33:17 +08:00
winlin
f57801eb46 fix #249, cache the chunk headers info to +5% or +10% performance. 2.0.51 2014-12-04 14:58:40 +08:00
winlin
90992b31a3 for bug #194, add the send macro to performance. 2014-12-04 13:54:02 +08:00
winlin
60bc9c2aa0 add performance header to control options for performance. 2.0.50 2014-12-04 13:43:55 +08:00
winlin
29324fab46 fix #248, improve about 15% performance for fast buffer. 2.0.49 2014-12-04 13:05:13 +08:00
winlin
f35ec2155b for bug #241, support merged read. 2.0.48 2014-12-03 19:27:27 +08:00
winlin
463e1fbc41 for bug #237, refine the thread loop for publish thread. 2.0.47 2014-12-02 19:28:36 +08:00
winlin
e9712cc627 refine recv thread, donot set auto response for publish recv thread. 2.0.46 2014-12-02 17:16:20 +08:00
winlin
5905e5c050 merge from 1.0release, traverse the token before response connect. 2.0.45. 2014-12-02 15:41:54 +08:00
winlin
304208f822 fix #239, traverse the token before response connect. 1.0.10. 2014-12-02 15:27:36 +08:00
winlin
757cffbabf for bug #237, when recv thread failed, quit the cycle. 2.0.44 2014-12-02 15:21:08 +08:00
winlin
a94dbecdc4 refine macro of srs-librtmp. 2.0.43 2014-12-02 13:41:41 +08:00
winlin
3584bdb7b6 srs-librtmp support hijack io apis for st-load. 2.0.42. 2014-12-02 12:19:17 +08:00
winlin
472b1742a2 for bug #237, use isolate thread to recv message. 2.0.41 2014-12-01 23:38:51 +08:00
winlin
1847c5fef7 ignore the actual length of share key. 2.0.40 2014-12-01 22:09:09 +08:00
winlin
47b4b694be add qtcreate project file trunk/src/qt/srs/srs-qt.pro. 2.0.39. 2014-12-01 10:58:17 +08:00
winlin
efb73c5487 fix #235, refine handshake, replace union with template method. 2.0.38. 2014-11-29 18:41:14 +08:00
winlin
ff5cdb1cc1 for bug #215, add srs_rtmp_dump tool. 2.0.37. 2014-11-28 12:26:36 +08:00
winlin
7f121efd7a merge from allspace srs-librtmp for win vs2010. 2.0.36 2014-11-28 10:33:36 +08:00
winlin
14fca601f9 merge from 1.0 hotfix. 3.0.35 2014-11-27 18:50:54 +08:00
winlin
9c033c7da6 hotfix 1.0, author bug, use error macro. 1.0.9 2014-11-27 18:48:01 +08:00
winlin
03f72fb1a6 for bug #229, revert changes of allspace, for srs-librtmp branch build failed. 2.0.34 2014-11-27 18:39:02 +08:00
winlin
eb4e7aad69 try to build srs-librtmp on vs2010, failed. 2014-11-27 18:20:13 +08:00
winlin
4c0c3a9ada refine merged code for allspace. 2014-11-27 15:29:24 +08:00
winlin
468941833c change srs version to 2.0.33 2014-11-27 15:23:16 +08:00
winlin
18c308248e refine code by winlin, for merged from allspace. 2014-11-27 15:22:39 +08:00
winlin
1855c9429c merge from allspace, to srs-librtmp, for vs2010 2014-11-27 14:46:05 +08:00
winlin
e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 2014-11-25 10:41:55 +08:00
winlin
d672fae255 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 1.0.8 2014-11-25 10:07:41 +08:00
winlin
44962c9142 update PRIMARY, AUTHORS, CONTRIBUTORS rule 2014-11-25 10:06:26 +08:00
winlin
e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 2014-11-24 16:28:52 +08:00
winlin
58136ec178 fix #217, remove timeout recv, support 7.5k+ 250kbps clients. 2.0.30. 2014-11-22 17:58:02 +08:00
winlin
aa69f6197a srs-librtmp add rtmp prefix for rtmp apis. 2.0.29 2014-11-21 14:18:50 +08:00
winlin
d9474d7600 refine examples of srs-librtmp, add srs_print_rtmp_packet. 2.0.28. 2014-11-21 13:48:57 +08:00
winlin
a058eeeb20 fix #212, support publish audio raw frames. 2.0.27 2014-11-20 13:36:14 +08:00
winlin
d6072b16c0 support compile srs-librtmp on windows. 2.0.26 2014-11-19 16:16:04 +08:00
winlin
5f48d4f566 refine comments for SrsMessageArray. 2.0.25 2014-11-19 10:44:50 +08:00
winlin
df35f75df1 refine response call, 2.0.24 2014-11-18 17:55:38 +08:00
winlin
c1e9aed0ac all wiki translated to English. 1.0.7 2014-11-18 13:41:36 +08:00
winlin
fbcb63f775 v2.0, 2014-11-18, all wiki translated to English. 2.0.23. 2014-11-18 13:40:58 +08:00
winlin
2c601a0069 fix #204, srs-librtmp drop dupliated sps/pps(sequence header). 2.0.22. 2014-11-15 16:53:24 +08:00
winlin
278ff845d3 fix #203, srs-librtmp drop any video before sps/pps(sequence header). 2.0.21. 2014-11-15 16:30:37 +08:00
winlin
bb5e99f562 fix #202, fix memory leak of h.264 raw packet send in srs-librtmp. 2.0.20. 2014-11-15 14:29:25 +08:00
winlin
7ebca6cb5b refine the type of RTMP from int to char. add srs_parse_timestamp(), 2.0.19 2014-11-15 13:20:58 +08:00
winlin
47ed9e33dd refine code for bug #194, use send messages for all msg array. 2014-11-14 11:24:49 +08:00
winlin
f2f02b06d5 for bug #194, refine code, to 2.0.17 2014-11-13 16:56:59 +08:00
winlin
eba1740ed5 hotfix #200, deadloop when read/write 0 and ETIME. 1.0.6. 2014-11-13 14:48:21 +08:00
winlin
0bc35e093c for bug #200, deadloop when read/write 0 and ETIME. 2.0.16. 2014-11-13 14:30:56 +08:00
winlin
cc6aca9ad5 fix #194, writev multiple msgs, support 6k+ 250kbps clients. 2.0.15. 2014-11-13 12:25:56 +08:00
winlin
8acd143a7a fix #194: refine the timeout recv, pulse to 500ms. 2.0.14. 2014-11-12 12:59:53 +08:00
winlin
46330dd196 fix #195: remove the confuse code st_usleep(0). 2.0.13. 2014-11-11 13:40:09 +08:00
winlin
606fc13a03 rename the confict macro to srs_lib_trace 2014-11-08 18:37:15 +08:00
winlin
3405f35d06 fix #191: configure --export-librtmp-project and --export-librtmp-single. 2.0.11. 2014-11-08 18:33:15 +08:00
winlin
926650840e fix #191, configure --export-librtmp. 2.0.10. 2014-11-08 16:45:50 +08:00
winlin
106bef802f fix #66, srs-librtmp support write h264 raw packet. 2.0.9. 2014-11-08 12:36:00 +08:00
winlin
f2f259d050 use number for macro VERSION_MAJOR, VERSION_MINOR and VERSION_REVISION. 1.0.5. 2014-11-06 14:28:03 +08:00
winlin
fa53250202 refine the macro, use int as version type. 2.0.8 2014-11-06 14:23:08 +08:00
winlin
6a3418cd45 fix #185, AMF0 support 0x0B the date type codec. 2.0.5. 2014-10-25 17:12:56 +08:00
winlin
e3e18b9915 for bug #186, read the args when discovery it. 1.0.4 2014-10-24 13:17:11 +08:00
winlin
7d70864b33 for bug #186, read the args when discovery it. 2.0.6 2014-10-24 13:16:08 +08:00
winlin
b65dfd718a add comments for the RTMP packet fields, NULL or never NULL. 2.0.5 2014-10-24 10:58:06 +08:00
winlin
1bfc238fec hotfix for bug #186, drop connect args when not object. 2.0.4. 2014-10-24 10:35:40 +08:00
winlin
aa98ca60b9 fix #186, hotfix for bug #186, drop connect args when not object. 1.0.3. 2014-10-24 10:34:00 +08:00
winlin
77d14ff752 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 10:01:00 +08:00
winlin
a169262099 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 10:00:23 +08:00
winlin
57e8356221 fix #184, support AnnexB in RTMP body for HLS. 2.0.2 2014-10-19 19:42:27 +08:00
winlin
bd158ec838 hotfix for bug #183, donot support AnnexB when decoding RTMP body for HLS. 1.0.1. 2014-10-19 11:33:56 +08:00
winlin
d24e2fd0cc remove supports for OSX. 2.0.1. 2014-10-18 13:58:23 +08:00
winlin
5f29935623 update master to 2.0, because the 1.0release branch is created. 2.0.0 2014-10-09 17:40:43 +08:00
winlin
dddec3484e update to 1.0beta, 1.0.0 2014-10-09 12:55:25 +08:00
winlin
6468b9e92b refine script, to disable iptables and selinux. 0.9.225 2014-10-09 12:07:56 +08:00
winlin
2ed794ad52 refine macro, use ffmpeg_stub and ffmpeg_tool, 0.9.224 2014-10-09 10:41:24 +08:00
winlin
9789335d0b fix #151, always reap ts whatever audio or video packet. 0.9.223. 2014-10-08 15:15:57 +08:00
winlin
b830b995e6 fix bug #162, requires epoll. 0.9.222 2014-10-08 13:27:48 +08:00
winlin
967de9d2e7 for bug #159: postpone the http server bug to 2.0+ 2014-09-30 16:34:46 +08:00
winlin
f3002144fc fix #180: crash for multiple edge publishing the same stream. 0.9.220. 2014-09-30 11:21:46 +08:00
winlin
bc6616bd1f refine code according to inspect of clion. 0.9.219 2014-09-28 11:08:30 +08:00
winlin
e0b1e044de add stub code for bug #180, check complex handshake. 2014-09-27 14:18:02 +08:00
winlin
63c9ad272c fix the bug by refine code, rename the get_perfer_cid to get_prefer_cid. 0.9.217 2014-09-27 13:15:00 +08:00
winlin
20ebf68ea5 fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216. 2014-09-26 17:47:43 +08:00
winlin
002facb85b refine code, fix bug of hls, following jetbrains clion code-inspector. 0.9.215 2014-09-26 16:34:13 +08:00
winlin
2d7f5ddcbf add cmakelists.txt for cmake for clion of jetbrains. 0.9.214 2014-09-26 11:05:45 +08:00
winlin
83f266b9e2 fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213. 2014-09-25 10:59:29 +08:00
winlin
87aac3ddd4 refine log, add features for macro. 0.9.212 2014-09-23 16:53:12 +08:00
winlin
9dd0939327 fix the bug for gmc. 0.9.211 2014-09-10 14:59:20 +08:00
winlin
901c9590e4 refine log, log important to file. 1.0.210 2014-08-29 15:07:04 +08:00
winlin
d0c585af86 max connections is 32756, for st use mmap default. 0.9.209 2014-08-27 13:31:39 +08:00
winlin
42a43c69cd fix #150, forward should forward the sequence header when retry. 0.9.208. 2014-08-24 22:34:38 +08:00
winlin
9b6187c3d5 fix #165, refine dh wrapper, ensure public key is 128bytes. 0.9.207. 2014-08-22 13:10:11 +08:00
winlin
cb311d998e fix #165, refine dh wrapper, ensure public key is 128bytes. 0.9.206. 2014-08-22 12:47:50 +08:00
winlin
01ae8c4787 refine the handshake random data, fill with value in [0x0f, 0xf0], 0.9.205 2014-08-21 09:48:19 +08:00
winlin
4d5414faec update log, add dsu(debug_srs_upnode), 0.9.204 2014-08-19 16:32:52 +08:00
winlin
f549f88ed8 for bug #162, add conf and connections limit. 0.9.203 2014-08-19 15:53:13 +08:00
winlin
ab965655aa refine forwarder, add tracable debug info. 0.9.202 2014-08-19 11:54:33 +08:00
winlin
e9e0cd757c fix #160, support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201. 2014-08-19 10:59:59 +08:00
winlin
c24e68dd70 refine the stat, use one ok. 1.0.200 2014-08-18 14:39:42 +08:00
winlin
6103b1c3ce refine options, add --with-stat. 0.9.199 2014-08-17 22:11:43 +08:00
winlin
3111870316 for bug #155, refine for osx, with ssl/http, disable statistics. 0.9.198. 2014-08-17 20:38:51 +08:00
winlin
5e4dad210a build openssl for osx, for bug #155. 2014-08-17 19:12:12 +08:00
winlin
cf7504826b fix reload ingest bug, remove when disabled. 0.9.196 2014-08-16 19:59:14 +08:00
winlin
b15ee26a48 fix the ssl dh key size assert error, key size maybe 127, not always 128. 0.9.195 2014-08-13 18:09:35 +08:00
winlin
7adbe7f456 fix utest build failed, sync with src changed. 2014-08-08 10:47:55 +08:00
winlin
12ad95a5b8 refine HMAC sha256 digest algorithm. 0.9.193 2014-08-08 09:54:33 +08:00
winlin
156a9ed2a3 change to 0.9.192. 2014-08-07 14:43:03 +08:00
winlin
1ebaab2c6e fix #148, simplify the RTMP handshake key generation. 0.9.191. 2014-08-06 15:45:40 +08:00
winlin
5b28355a0b fix #147, support identify the srs edge. 0.9.190. 2014-08-06 09:57:30 +08:00
winlin
798f9139a4 add reload utest. 2014-08-05 09:16:25 +08:00
winlin
67403bdbf1 fix #79, fix the reload remove edge assert bug. 0.9.189. 2014-08-03 21:50:48 +08:00
winlin
ade2376da0 fix #57, use lock(acquire/release publish) to avoid duplicated publishing. 0.9.188. 2014-08-03 21:22:40 +08:00
winlin
6dd065bcc3 fix #85, fix the segment-dvr sequence header missing. 0.9.187. 2014-08-03 20:27:57 +08:00
winlin
5a95d594e7 fix #145, refine ffmpeg log, check abitrate for libaacplus. 0.9.186. 2014-08-03 13:06:37 +08:00
winlin
d5ba529d32 fix #143, fix retrieve sys stat bug for all linux. 0.9.185. 2014-08-03 10:42:01 +08:00
winlin
7b24788445 for bug #143, build on centos5. 2014-08-02 22:18:39 +08:00
winlin
84450e1588 fix #138, fix http hooks bug, regression bug. 0.9.184. 2014-08-02 19:24:49 +08:00
winlin
721acc350a fix #142, tcp stat slow bug, use /proc/net/sockstat instead, refer to 'ss -s'. 0.9.183. 2014-08-02 09:54:21 +08:00
winlin
d5f03200a7 revert tcp stat. need more refine. 0.9.182 2014-08-01 23:08:52 +08:00
winlin
f7fdbe6848 update get connections thread to sleep 10ms per 1000 connectios. 0.9.181 2014-08-01 22:52:40 +08:00
winlin
15d4993cc3 slowdown the cpu usage for srs to calc connections when too many connections. 0.9.180 2014-08-01 22:43:12 +08:00
winlin
f0ffdcc0ae fix #141, support tun0(vpn network device) ip retrieve. 0.9.179. 2014-07-31 10:37:34 +08:00
winlin
79c641e8d6 remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178 2014-07-30 10:00:23 +08:00
winlin
e37f312f27 refine the code for ios build. add authors StevenLiu. 0.9.177 2014-07-27 21:56:44 +08:00
winlin
df8414af63 api connections add udp, add disk iops. 0.9.176 2014-07-27 17:16:04 +08:00
winlin
e76036f40b refine config heartbeat, add new stats. 0.9.175 2014-07-27 14:43:55 +08:00
winlin
02f7c85710 add total system in and out KBps disk stat. 0.9.174 2014-07-27 14:04:22 +08:00
winlin
13abb0d768 complete config utest. 0.9.173 2014-07-26 19:57:32 +08:00
winlin
7241fa8744 fix #126, srs_publiser add warnings. refine config utest. 2014-07-26 14:43:37 +08:00
winlin
b17c736f3f fix #124, gop cache support disable video in publishing. 0.9.171. 2014-07-26 12:22:39 +08:00
winlin
50cd1d2360 refine the config 2014-07-25 11:05:54 +08:00
winlin
f562a98602 add configure options --log-verbose/info/trace to compile log macros. 0.9.169 2014-07-23 14:37:54 +08:00
winlin
91d2296836 fix #121, srs_info detail log compile failed. 0.9.168. 2014-07-23 11:21:35 +08:00
winlin
2e58fac5eb fix #122: edge forwarder(push to origin) assert failed, init client when connect to server. 0.9.167 2014-07-23 10:53:25 +08:00
winlin
d612597a8f refine log of edge push/pull 2014-07-21 15:30:44 +08:00
winlin
6e8c4df4b1 refine error codes. 2014-07-20 17:32:34 +08:00
winlin
86ad39f001 finish basic utest for config 2014-07-20 15:53:19 +08:00
winlin
f8423dfa90 fix #119: use iformat and oformat for ffmpeg transcode. 2014-07-19 15:20:16 +08:00
winlin
2f0a72d7d1 refine config, add comments 2014-07-18 12:12:25 +08:00
winlin
a4d3283cdd refine hls codec sample info. 0.9.161 2014-07-15 10:44:06 +08:00
winlin
d609fbc7ce 1.0.mainline6, core/kernel/rtmp utest, refine bandwidth(as/js/srslibrtmp library). 50029 lines. 2014-07-13 20:39:31 +08:00
winlin
fd1e8aa882 remove src/main/srs_main_bandcheck.cpp, and --with-bwtc(use librtmp instead). 0.9.159 2014-07-13 19:42:06 +08:00
winlin
9135aa117c use librtmp to implemnts the bandwidth linux tool. 0.9.158 2014-07-13 19:16:18 +08:00
winlin
539b595604 refine the bandwidth server-side, use kbps limit and sample. 0.9.157 2014-07-13 10:59:26 +08:00
winlin
9556790a5e finish utest of protocol stack. 0.9.156 2014-07-11 18:08:34 +08:00
winlin
d86e07b745 finish basic protocol utest, fix the bug of fmt11 length error. 2014-07-10 14:46:58 +08:00
winlin
1e73ae4d47 refine RTMP protocol stack, rename buffer to in_buffer, change field pp/stream to local variables. 0.9.154 2014-07-06 20:59:23 +08:00
winlin
dc7b952043 change HLS audio delay to 100ms. 0.9.153 2014-07-06 14:28:05 +08:00
winlin
21a75924ad fix hls media codec info bug, ignore nal_unit_type 7/8/9. 0.9.152 2014-07-06 13:48:03 +08:00
winlin
aefff75d08 fix #103, support all aac sample rate, add detail codec logs. 2014-07-06 09:59:41 +08:00
winlin
63214d0f2b fix #81: support all aac sample rate, for instance, 48000. to 0.9.150 2014-07-05 23:29:45 +08:00
winlin
5a41b1b538 finish kernel utest. to 0.9.149 2014-07-05 21:22:20 +08:00
winlin
95e73d0be1 remove the config log http api. 0.9.148 2014-07-05 13:02:50 +08:00
winlin
d219a7b67e complete the normal kernel flv utest. 0.9.147 2014-07-05 11:10:42 +08:00
winlin
032118581a refine http/dvr/hls to use file reader/writer. 0.9.146 2014-07-05 07:33:18 +08:00
winlin
ba2e7bbf76 support create stream twice. 0.9.145 2014-06-30 22:13:42 +08:00
winlin
fb70602f93 fix #111, always use 31bits timestamp. 0.9.143. 2014-06-30 21:23:13 +08:00
winlin
1a7735182f refine the file stream, to file reader and writer. 0.9.142 2014-06-29 17:05:26 +08:00
winlin
492665e166 refine tcp client connect, extract to utility srs_socket_connect. 0.9.141 2014-06-29 14:39:56 +08:00
winlin
051c9e6268 refine the protocol utility, add utest, 0.9.140 2014-06-29 11:45:31 +08:00
winlin
55989b4bc8 remove the libfreetype for it fullfill with bugs and always cause build failed. 0.9.139 2014-06-29 10:43:53 +08:00
winlin
e6f524281c support build on ubuntu14, 0.9.138 2014-06-29 09:11:28 +08:00
winlin
fea8755719 response the call message with null. 0.9.137 2014-06-28 16:43:57 +08:00
winlin
a3f9aa7e1e fix #110, thread start segment fault, thread cycle stop destroy thread. 0.9.136 2014-06-28 10:57:58 +08:00
winlin
b357504b1d fix #109: fix the system jump time, adjust system startup time. 0.9.135 2014-06-27 13:35:28 +08:00
winlin
0cd0761508 fix time jitter zero algorithm bug, reset when timestamp overflow. 2014-06-26 10:13:43 +08:00
winlin
1970e18ed6 fix #108: disable the time jitter for encoder non-monotonical stream. 0.9.133 2014-06-25 17:14:11 +08:00
winlin
f173345e15 support report summaries in heartbeat. 0.9.132 2014-06-23 15:44:49 +08:00
winlin
db253bc76b fix fms token traverse bug, always update the token by the latest valid client. 2014-06-23 11:18:55 +08:00
winlin
1ae3e6c64c performance refine, support 3k+ connections(270kbps). 0.9.130 2014-06-22 20:01:25 +08:00
winlin
41857edaee support edge token traverse, fix #104. 0.9.129 2014-06-21 12:39:04 +08:00
winlin
10953c9743 support token auth in connect args. 0.9.128 2014-06-21 11:41:00 +08:00
winlin
094d82bd06 add connections count to api summaries. 0.9.127 2014-06-19 18:49:05 +08:00
winlin
6ee2ba049b add srs bytes and kbps to api summaries. 0.9.126 2014-06-19 15:28:05 +08:00
winlin
d0b08d0d51 add network bytes to api summaries. 0.9.125 2014-06-18 16:13:02 +08:00
winlin
f893711499 fix #98: workaround for librtmp ping(fmt=1,cid=2 fresh stream). 2014-06-14 20:44:38 +08:00
winlin
31b568b013 refine core, move specified functions to kernel utility. 2014-06-08 13:03:03 +08:00
winlin
5273509554 refine log, to 0.9.123 2014-05-29 14:16:34 +08:00
winlin
7ec202ee41 support flv inject and flv http streaming with start=bytes. 0.9.122 2014-05-29 12:09:26 +08:00
winlin
608083d42f add flv injecter, add flv codec to librtmp. 2014-05-28 15:37:06 +08:00
winlin
978e985519 fix #87: add source id for full trackable log. 0.9.120 2014-05-27 19:18:31 +08:00
winlin
8d99ef27cf fix #84: unpublish source when edge stop, clear gop cache 2014-05-27 17:59:59 +08:00
winlin
5ff1ce7cba for bug #87, response the server SrsId to flash. 2014-05-27 15:34:55 +08:00
winlin
d74921e1ab fix #89, config to /dev/null to disable ffmpeg log. 0.9.117 2014-05-27 14:10:46 +08:00
winlin
14f0a2e046 for bug #88, add timeout for connect. 2014-05-26 18:21:35 +08:00
winlin
69248cedaa http streaming support flv start index. 0.9.115 2014-05-26 14:58:08 +08:00
winlin
b13bd70c86 http streaming support flv start index. 2014-05-26 13:57:08 +08:00
winlin
7b69b8b5c4 fix #79: allow edge vhost to add or remove. 0.9.114 2014-05-25 10:08:17 +08:00
winlin
0eb9e0af5b fix #78 st joinable thread must be stop by other threads, 0.9.113 2014-05-23 17:23:33 +08:00
winlin
5f7bacf678 fix st thread exit bug, never implict invoke the st_thread_exit, which may cause memory leak. 0.9.112 2014-05-23 13:56:40 +08:00
winlin
25e279b7c8 support amf0 StrictArray(0x0a). 0.9.111. 2014-05-22 16:30:24 +08:00
winlin
bd24fe7d75 support flv parser, add amf0 to librtmp. 0.9.110 2014-05-22 15:08:25 +08:00
winlin
d4b8fee61a fix bug #73, http callback api support authentication in tcUrl 2014-05-22 10:23:12 +08:00
winlin
2265173c4d donot install tools when ffmpeg is not open, 0.9.108 2014-05-20 18:11:33 +08:00
winlin
ef0f7f4da8 support http heartbeat, 0.9.107 2014-05-19 17:39:01 +08:00
winlin
cb95b5909c add http heartbeat framework 2014-05-19 15:45:04 +08:00
winlin
0186247fee support http api json, to PUT/POST. 0.9.105 2014-05-18 17:57:20 +08:00
winlin
3064e5ec61 fix bug of nx_json parse, to 0.9.104 2014-05-18 16:48:24 +08:00
winlin
d6355efe22 support http api json, to PUT/POST, to 0.9.103 2014-05-18 16:15:35 +08:00
winlin
b60e8418c6 add json base on nxjson(nx-json/nx_json) decoder for http api. 0.9.102 2014-05-18 14:34:45 +08:00
winlin
2c059d3a80 fix bug #72, also need stream_id for send_and_free_message. 0.9.101 2014-05-17 17:53:27 +08:00
winlin
c59576146b rename struct to class. 0.9.100 2014-05-17 14:59:33 +08:00
winlin
2f89c8b2e8 move some utilities from kernel to app. 0.9.99 2014-05-17 14:53:04 +08:00
winlin
cbbf53f8f9 fix bug #67: fix pithy print bug, stage must has a age 2014-05-14 14:34:28 +08:00
winlin
b175821b62 refine kbps, provides 30s,1m,5m,60m kbps. 0.9.97 2014-05-14 13:56:12 +08:00
winlin
3ebda13802 refine the ptr array free, 0.9.96 2014-05-14 09:58:42 +08:00
winlin
dc66c525fd refine autofree, only free object, never free arrays 2014-05-14 09:41:41 +08:00
winlin
befde6acf7 fix mem leak for delete[] SharedPtrMessage array, explicit free elems. remove srs_freepa. 0.9.95 2014-05-13 14:24:39 +08:00
winlin
7004510cc7 fix ffmpeg log fd leak, always close log_fd. 0.9.94 2014-05-13 11:16:53 +08:00
winlin
74e6e28993 refine the kbps calc module. 0.9.93 2014-05-12 18:06:13 +08:00
winlin
f6dd1371bf fix bug #36: never directly use *(int32_t*) to convert, for arm may not support 2014-05-08 12:12:01 +08:00
winlin
fa9870db96 fix bug #59: edge for FMS, always use schema1(digest-key) for FMS, or connect failed. 2014-05-08 11:51:49 +08:00
winlin
cb64d20575 refine core macros 2014-05-06 18:22:01 +08:00
winlin
f8e8c81e50 refine log, simplify it. to 0.9.90 2014-05-04 16:29:57 +08:00
winlin
7b530bf8d8 update signature 2014-05-04 11:28:17 +08:00
winlin
96a5c7b1ab fix mem leak of encoder, edge and source. add destroy for gmc to detect mem leak. to 0.9.89 2014-05-03 22:59:21 +08:00
winlin
d74f01e2d1 fix signal bug, break for gmc. fix SrsMessage leak, use common message to free payload. to 0.9.88 2014-05-02 12:29:56 +08:00
winlin
0945c2b441 fix RTMP protocol extended timestamp bug, always trust and use the extended-timestamp for the first chunk of msg 2014-04-30 17:16:28 +08:00
winlin
fc501b050b add atc_auto to disable or enable auto detect atc 2014-04-30 12:08:11 +08:00
winlin
d0dff2d332 fix bug #34: convert signal to io. 0.9.85 2014-04-30 11:26:32 +08:00
winlin
6ee49ee029 bravo auto atc per stream. 0.9.84 2014-04-30 10:17:04 +08:00
winlin
f02ac02a50 auto open atc for bravo_atc set 2014-04-29 18:27:00 +08:00
winlin
0f498acd7b add comments and variable for c3 extended-timestamp. to 0.9.82 2014-04-29 18:16:29 +08:00
winlin
80ddddf823 refine RTMP protocol completed, to 0.9.81 2014-04-29 14:44:07 +08:00
winlin
ebf6203c3b refine rtmp protocol stack, refer to go.rtmp 2014-04-29 13:39:16 +08:00
winlin
23b04e2a57 completed the edge reload, to 0.9.79 2014-04-28 17:57:59 +08:00
winlin
a363e3d293 support basic edge(play/publish) RTMP server. 0.9.78 2014-04-27 15:10:25 +08:00
winlin
2bcaeccc51 edge support play and ingest origin stream. change to 0.9.77 2014-04-26 21:41:18 +08:00
winlin
f3b441ba1f add alipay donation page. to 0.9.76 2014-04-25 12:56:48 +08:00
winlin
67e1988b81 support live flashP2P(integrated by chnvideo VDN). 0.9.75 2014-04-24 16:32:19 +08:00
winlin
35f3a93239 support dvr to hss. change to 0.9.74 2014-04-24 12:22:36 +08:00
winlin
a73bf8d4aa optimizm the http server for send ts file 2014-04-22 12:15:13 +08:00
winlin
8bf1f4ad87 add api/v1 summaries/rusages/self_proc_stats/system_proc_stats/meminfos. change to 0.9.72 2014-04-20 00:17:11 +08:00
winlin
fae1c61c3f update readme. change to 0.9.71 2014-04-19 11:21:13 +08:00
winlin
67ddc9f5ae support dvr(record live to flv file for vod), change to 0.9.70 2014-04-17 18:23:49 +08:00
winlin
73459547e1 support dvr. change to 0.9.69 2014-04-17 16:06:49 +08:00
winlin
5af1da17ed change to 0.9.68 2014-04-16 15:59:32 +08:00
winlin
0c91fa6bed fix dvr mem leak, free msg when not use it. 2014-04-16 15:58:06 +08:00
winlin
78e7a31ddb refine option, add --use-sys-ssl, change to 0.9.67 2014-04-16 14:27:34 +08:00
winlin
47927ab460 refine options, change to 0.9.66 2014-04-16 13:24:00 +08:00
winlin
1ae9178605 add favicon.ico, change to 0.9.65 2014-04-15 11:19:15 +08:00
winlin
2c6b6c6846 fix bug #47: use stream time to stop for duration of rtmpdump 2014-04-14 10:51:31 +08:00
winlin
bc756d6ad9 fix simple handshake bug #46, copy c1 to s2. change to 0.9.63 2014-04-13 21:55:01 +08:00
winlin
9a036958d7 fix bug #45, support duration for live. change to 0.9.62 2014-04-13 21:37:26 +08:00
winlin
a0472f256d support test config file. change to 0.9.61 2014-04-13 16:55:42 +08:00
winlin
cfee761899 support full reload. change to 0.9.60 2014-04-13 13:35:03 +08:00
winlin
b38df9cd1a refine main object(server, config, log, context), handler reload in intialize(), change to 0.9.59 2014-04-12 20:35:40 +08:00
winlin
ff90278048 add speex1.2 to transcode flash encoder stream. change to 0.9.58 2014-04-11 10:40:21 +08:00
winlin
e0a6fe63cc fix bug of reload ffmpeg, support multiple transcode, change to 0.9.57 2014-04-10 11:40:06 +08:00
winlin
5aded78272 change to 0.9.56, for macro changed 2014-04-08 15:32:13 +08:00
winlin
98809862f7 change to 0.9.55, for 1.0 mainline 2014-04-07 16:05:18 +08:00
winlin
12ba02238d update readme, add ingest 2014-04-07 15:56:19 +08:00
winlin
45d8f4346f implements ingest, change to 0.9.53 2014-04-07 14:20:26 +08:00
winlin
e89ab84e4e implements ingest, change to 0.9.53 2014-04-07 14:20:03 +08:00
winlin
4f7cfeed37 change to 0.9.52, refine encoder and ffmpeg 2014-04-07 10:15:44 +08:00
winlin
4e3fe36ae2 refine http server pages. change to 0.9.51 2014-04-05 13:14:59 +08:00
winlin
1c02f4551c always use 64bits for lseek 2014-04-04 23:28:31 +08:00
winlin
ced050829e fix bug of http, change to 0.9.50 2014-04-04 23:25:32 +08:00
winlin
00eda0d7b2 implements the http stream module. 2014-04-04 23:04:38 +08:00
winlin
b7093246e4 fix forward conf file bug, change pid file. change to 0.9.48 2014-04-04 15:35:17 +08:00
winlin
28b0c3a27f refine log and thread function name. change to 0.9.47. 2014-04-04 12:18:26 +08:00
winlin
f089eafd9f fix bug #38, remove app slash of jwplayer, change to 0.9.46 2014-04-04 10:12:34 +08:00
winlin
3f13726544 add log level in conf. change to 0.9.45 2014-04-03 18:32:51 +08:00
winlin
b71eb0d49a support more splash in http url. remove the strip of SrsRequest, use srs_string_remove instead, change to 0.9.44 2014-04-03 15:53:56 +08:00