external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity
2308 commits 13 branches 107 tags 375 MiB
Commit graph

563 commits

Author SHA1 Message Date
winlin
1d454cd5fb add bug for http-mp4. 2014-09-16 15:56:46 +08:00
winlin
9dd0939327 fix the bug for gmc. 0.9.211 2014-09-10 14:59:20 +08:00
winlin
61728118ab donot destroy the source and connections of gmc. 2014-09-10 14:58:19 +08:00
winlin
79938f3214 add comments for gmc. 2014-09-10 10:19:48 +08:00
zhengfl
c2ac11201b amendment srs_verbose info in the get_peer_ip 2014-08-28 04:18:06 +08:00
winlin
901c9590e4 refine log, log important to file. 1.0.210 2014-08-29 15:07:04 +08:00
winlin
728b749384 fix #167, add openssl includes to utest. 0.9.209. 2014-08-28 13:32:13 +08:00
winlin
53011808fb add sysctl vm.max_map_count for mmap. 2014-08-27 13:47:56 +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
839101a036 reorder the config functions. add comments for st to support 100k threads, use MALLOC_STACK macro. 2014-08-27 12:28:05 +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
4d5414faec update log, add dsu(debug_srs_upnode), 0.9.204 2014-08-19 16:32:52 +08:00
winlin
e656a65b6c for bug #162, add conf and connections limit. 2014-08-19 15:52:59 +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
cf7504826b fix reload ingest bug, remove when disabled. 0.9.196 2014-08-16 19:59:14 +08:00
winlin
08bc34e0df refine wiki, cluster to forward. 2014-08-14 16:33:26 +08:00
winlin
a9d28122f4 refine code, refine the handshake, refine the log of source_id 2014-08-06 13:57:55 +08:00
winlin
5b28355a0b fix #147, support identify the srs edge. 0.9.190. 2014-08-06 09:57:30 +08:00
winlin
33bc8755ab refine code, add comments for ossrs.net monitor. 2014-08-04 10:50:28 +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
6539ce69f4 fix #141, support tun0(vpn network device) ip retrieve. 0.9.179. 2014-07-31 10:39:39 +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
792a6f944f refine utility of cpu, add comment for cpu percent 2014-07-28 13:51:54 +08:00
winlin
c16d3585a5 refine utility of cpu, add comment for cpu percent 2014-07-28 13:41:27 +08:00
winlin
b198d17ab9 Merge pull request #135 from T-bagwell/master 
Support porting srs on MacOS OSX system Platform
 2014-07-27 21:07:37 +08:00
Steven Liu
b50ecd6dbe Support porting srs on MacOS OSX system Platform 
Add the OSX platform cross complie options into srs
 2014-07-27 19:32:12 +08:00
winlin
9c11001391 refine log for stats network and disk 2014-07-27 19:03:56 +08:00
winlin
6f700f3f40 rename network_device_index to network 2014-07-27 18:40:32 +08:00
winlin
f4ea48adcb rename network_device_index to network 2014-07-27 18:39:20 +08:00
winlin
b8ae5c63fc add disk io test command 2014-07-27 18:05:54 +08:00
winlin
42464cbe1f add disk io test command 2014-07-27 17:59:19 +08:00
winlin
4f4b15f500 refine the disk iops stat, get cpu info. 2014-07-27 17:46:31 +08:00
winlin
ef7a02e643 refine the disk io busy, can >1 2014-07-27 17:23:07 +08:00
winlin
df8414af63 api connections add udp, add disk iops. 0.9.176 2014-07-27 17:16:04 +08:00
winlin
b334021836 add config item for the stat disk device name 2014-07-27 16:52:00 +08:00
winlin
7c1dd97513 refine system stat, use fgets and sscanf. 2014-07-27 16:34:08 +08:00
winlin
a7a009212b refine the cpu stat, use fgets and sscanf. 2014-07-27 16:21:11 +08:00
winlin
f53bfcea54 add udp stat to nb_conn_sys as nb_conn_sys_udp 2014-07-27 15:43:43 +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
d2f125b6d6 refine the cpu usage calc, add total_delta. 2014-07-27 12:47:31 +08:00
winlin
d0bc0884d1 refine rtmp client, add comments for the dumps_packets() 2014-07-27 11:57:08 +08:00
winlin
a645b403c8 add comments for utility, the USER_HZ for /proc/stat 2014-07-27 11:44:48 +08:00
winlin
6d9d9ee3c5 updte forwarder comments 2014-07-26 20:17:03 +08:00
winlin
6ee9ea341a refine code, rename SrsSocket to SrsStSocket 2014-07-26 20:08:37 +08:00
winlin
b19d2e8e2d refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp 2014-07-26 20:07:12 +08:00
winlin
fbddfbc8a3 fix #134, not fix for the shrink to clear the queue. 2014-07-26 16:35:12 +08:00
winlin
b10d95205a fix #134, not fix for the shrink to clear the queue. 2014-07-26 16:32:28 +08:00
winlin
30ebba0673 add config check utest 2014-07-26 15:54:40 +08:00
winlin
ebf9e560b1 refine the max connections, compare the system ulimit max open files, error when exeed limit 2014-07-26 15:34:45 +08:00
winlin
5f7ff37e64 fix the utest mock config bug 2014-07-26 15:03:07 +08:00
winlin
9f2da4e095 refine log, can be used when _srs_config is NULL. 2014-07-26 14:58:33 +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
7865b0e935 refine config, check chunk size. 2014-07-25 11:04:13 +08:00
winlin
630bdf0c80 refine config, check the value of http api/stream. 2014-07-25 10:54:36 +08:00
winlin
7207c2f435 refine config, check all config item name. 2014-07-25 10:44:04 +08:00
winlin
1c27f3b913 refine config, warning when feature disabled. 2014-07-25 09:38:48 +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
2c9e16a9e7 add utest for config vhosts, transcode/dvr/hls 2014-07-22 11:01:20 +08:00
winlin
d612597a8f refine log of edge push/pull 2014-07-21 15:30:44 +08:00
winlin
77236920b6 add config utest, for default vhost 2014-07-21 12:13:01 +08:00
winlin
f1b1dc0c64 add utest for config full.conf, fix the chunk-size bug 2014-07-21 10:50:08 +08:00
winlin
0db2e6b8e9 fix the empty config error 2014-07-20 17:08:47 +08:00
winlin
75bfe2af78 refine the LF,CR 2014-07-20 16:19:26 +08:00
winlin
8cd9be4fce add comments for LF,CR 2014-07-20 16:18:26 +08:00
winlin
c65a6b5d63 fix the conf_line bug of parse config directive. 2014-07-20 16:16:29 +08:00
winlin
86ad39f001 finish basic utest for config 2014-07-20 15:53:19 +08:00
winlin
8497b22d4a complete the consts refine 2014-07-20 13:45:54 +08:00
winlin
1afa6ed607 refine consts. 2014-07-20 13:42:29 +08:00
winlin
2667815123 refine consts, move http consts to kernel consts 2014-07-20 13:39:42 +08:00
winlin
c46b3bd193 refie http consts. 2014-07-20 13:37:30 +08:00
winlin
573952e2fc refine macros of HTTP 2014-07-20 13:33:21 +08:00
winlin
198a7f1e9d refine the rtmp consts name 2014-07-20 13:25:25 +08:00
winlin
a9f7f1ecfe refine the consts to kernel consts 2014-07-20 13:23:45 +08:00
winlin
baa20b2f31 refine the config consts 2014-07-20 13:16:24 +08:00
winlin
736ec48c71 move some consts to kernel consts 2014-07-20 13:11:53 +08:00
winlin
073d900674 add consts to kernel 2014-07-20 13:04:48 +08:00
winlin
f8423dfa90 fix #119: use iformat and oformat for ffmpeg transcode. 2014-07-19 15:20:16 +08:00
winlin
9bf7b722db fix #119: use iformat and oformat for ffmpeg transcode. 2014-07-19 10:54:38 +08:00
winlin
2f0a72d7d1 refine config, add comments 2014-07-18 12:12:25 +08:00
winlin
a5f4323ea8 refine config, add comments 2014-07-18 11:46:29 +08:00
winlin
b4e2d70390 refine config comments, return the engines of transcode. 2014-07-18 11:15:59 +08:00
winlin
2293700728 refine config, remove the const string& 2014-07-18 10:56:06 +08:00
winlin
1accd8c790 refine config, add comments. 2014-07-18 10:50:02 +08:00
winlin
f572531eca refine config, return the vhosts vector. 2014-07-18 10:35:31 +08:00
winlin
96e0e699dd refine the get port, return a vector<string> contains ports. 2014-07-18 10:21:34 +08:00
winlin
1243d962b8 update comments of utility 2014-07-17 17:10:32 +08:00
winlin
b37aeff8d5 refine config, check name 2014-07-17 12:07:01 +08:00
winlin
25180c51b4 refine the config comments. 2014-07-17 11:53:51 +08:00
winlin
1e8981eb08 extracta parse_buffer for config 2014-07-17 11:34:49 +08:00
winlin
784d7499cf refine config, add error line log 2014-07-17 11:28:20 +08:00
winlin
9f7d488fa4 refine config, add comments. 2014-07-17 11:05:09 +08:00
winlin
f6b084b679 remove the reload create function. 2014-07-16 11:59:44 +08:00
winlin
f4ffe0aaee refine config, move file buffer to internal namespace 2014-07-16 11:49:34 +08:00
winlin
654c3c6d71 refine server, add comments 2014-07-16 11:23:49 +08:00
winlin
88dc1523d8 refine code, add comments for bandwidth; remove the bwtc configure script test item. 2014-07-16 10:19:50 +08:00
winlin
7945a42770 refine code, add the video tag comments. 2014-07-16 10:05:41 +08:00
winlin
26bfbaeb82 refine code. 2014-07-16 09:39:36 +08:00
winlin
465ff88b1f refine hls avc/aac codec, move metadata to it. 2014-07-16 09:37:27 +08:00
winlin
e50968f404 refine the hls codec, add comments. 2014-07-15 10:59:21 +08:00
winlin
a4d3283cdd refine hls codec sample info. 0.9.161 2014-07-15 10:44:06 +08:00
winlin
f020690ed7 add comments for the FLV/RTMP enums 2014-07-15 10:08:15 +08:00
winlin
5c4398f4a9 refine bandwidth check/test, flash publish test is ok. 2014-07-13 20:25:36 +08:00
winlin
9135aa117c use librtmp to implemnts the bandwidth linux tool. 0.9.158 2014-07-13 19:16:18 +08:00
winlin
cc62d254f0 add librtmp bandwidth check/test client. 2014-07-13 16:10:06 +08:00
winlin
ccd99381e6 fix bug, when disable all, some code of HLS must be exported. 2014-07-13 13:42:08 +08:00
winlin
0322dbbfb2 big refine code, add author to bandwidth test/check. 2014-07-13 12:09:26 +08:00
winlin
b33a61a8da finish refine bandwidth check/test server-side. 2014-07-13 12:06:24 +08:00
winlin
0fb51413f4 refine bandwidth test, use function ptr. 2014-07-13 11:17:03 +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
e220596675 refine bandwidth server-side, use sample and kbps limit 2014-07-13 10:47:27 +08:00
winlin
79e7e2d6cc refine bandwidth server-side, use bandwidth sample and kbps limit service 2014-07-13 10:33:18 +08:00
winlin
3a1b3dd142 fix bandwidth bug, config item interval to float. 2014-07-12 22:22:56 +08:00
winlin
c319cc6a40 refine bandwidth test client, provides js and as library 2014-07-12 20:48:03 +08:00
winlin
b1dd0218be refactor bandwidth test, refactor the interface of bandwidth server object. 2014-07-12 15:55:39 +08:00
winlin
88c94193a3 rename rtmp_stack to stack. remove the global templte function to member function. 2014-07-12 08:47:47 +08:00
winlin
9556790a5e finish utest of protocol stack. 0.9.156 2014-07-11 18:08:34 +08:00
winlin
6a4b177475 refine shared ptr message, rename initialize to create 2014-07-06 18:23:14 +08:00
winlin
96e0273e99 refine hls, extract the flv/aac sample rates 2014-07-06 17:32:48 +08:00
winlin
dc7b952043 change HLS audio delay to 100ms. 0.9.153 2014-07-06 14:28:05 +08:00
winlin
f895523ac6 fix hls media codec info bug, ignore nal_unit_type 7/8/9. 0.9.152 2014-07-06 13:53:30 +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
f53abfa1d1 update comments for aac he or he-v2 2014-07-05 23:56:05 +08:00
winlin
b2303c5704 refine code, use macro for hls resample audio 2014-07-05 23:45:43 +08:00
winlin
921b7d239f refine code, use macro for hls resample audio 2014-07-05 23:43:28 +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
010eb09a30 Merge branch 'master' of github.com:winlinvip/simple-rtmp-server 2014-07-05 09:32:13 +08:00
winlin
8271bd657b refine flv codec, rename fast encoder to flv vod stream decoder 2014-07-05 07:40:55 +08:00