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
3116 commits 13 branches 107 tags 375 MiB
Commit graph

964 commits

Author SHA1 Message Date
winlin
d53fd7f570 for bug #251, support mic(message iovs cache). 2.0.61 2014-12-06 20:10:05 +08:00
winlin
32d537b96b for bug #251, refine code before mic. 2014-12-06 19:56:06 +08:00
winlin
d827928eeb for bug #251, merge the performance refines. 2014-12-06 09:55:51 +08:00
winlin
de993b6465 for bug #251, refine the directly access ptrs for hls,dvr,forwarder,consumer. 2014-12-05 23:49:53 +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
528ae1e9b1 refine source and queue dump msgs. 2014-12-05 22:00:57 +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
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
4c1d5c0d1e refine the log for mw and mr. 2.0.55 2014-12-05 11:31:06 +08:00
winlin
fad6074a25 set send socket buf. mw/mr sleep default to 350. 2014-12-05 11:24:05 +08:00
winlin
98647d6e67 limit the user-space buffer size to 128KB, 128MB for 1k publishers. 2014-12-04 22:00:09 +08:00
winlin
76af04c55d refine the recv buffer for mr. 2014-12-04 21:50:23 +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
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
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
0ea8cd9e84 for bug #248, use simple buffer for http. 2014-12-04 11:29:47 +08:00
winlin
2cb8b7dd52 for bug #248, use simple buffer for hls. 2014-12-04 11:27:07 +08:00
winlin
315f981821 refine for bug #241, increase the small bytes for merged read. 2014-12-04 09:10:57 +08:00
winlin
5791ed59fd for bug #241, refine the socket max buffer. 2014-12-03 23:05:42 +08:00
winlin
4785f882d4 for bug #241, refine the max buffer and kbps. 2014-12-03 22:51:19 +08:00
winlin
850946bb13 for bug #241, calc the small and sleep for merged read. 2014-12-03 22:39:25 +08:00
winlin
aee00877df for bug #241, change buffer size when chunk size changed. 2014-12-03 21:46:47 +08:00
winlin
f35ec2155b for bug #241, support merged read. 2.0.48 2014-12-03 19:27:27 +08:00
winlin
adf95d239e refine code, move the ISrsBufferReader to srs_protocol_io 2014-12-03 19:09:59 +08:00
winlin
ea0e837cd6 move the srs_kernel_buffer to srs_protocol_buffer. 2014-12-03 18:56:09 +08:00
winlin
6cbf732e1a for bug #237, thread donot sleep when timeout is 0. 2014-12-03 14:25:02 +08:00
winlin
c457364321 for bug #237, add name for thread. 2.0.47 2014-12-03 14:05:15 +08:00
winlin
787ab674e3 fix #244, conn thread use cond to wait for recv thread error. 2.0.47. 2014-12-03 12:08:29 +08:00
winlin
565f29ed6c Revert "for bug #241, merge big chunks for publish, no use." 
This reverts commit 6b57597718.
 2014-12-02 22:26:20 +08:00
winlin
6b57597718 for bug #241, merge big chunks for publish, no use. 2014-12-02 22:26:04 +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
24a6a723ee for bug #237, never sleep when thread interval is 0. 2014-12-02 19:22:06 +08:00
winlin
6f963b50f3 refine code, publish recv thread sleep 697ms 2014-12-02 18:19:01 +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
757cffbabf for bug #237, when recv thread failed, quit the cycle. 2.0.44 2014-12-02 15:21:08 +08:00
winlin
29c6014192 refs #1670: fix the bug for bug #237, use us and ms timeout. 2014-12-02 10:40:21 +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
0e7836868c for bug #235, refine the queue recv thread. 2014-12-01 22:53:03 +08:00
winlin
0b631ee80d for bug #235, pass timeout to recv thread. 2014-12-01 22:45:45 +08:00
winlin
31eb9bf1c1 for bug #237, extract a queue recv thread. 2014-12-01 22:39:22 +08:00
winlin
22524f390a rename the recv thread to queue recv thread for bug #237. 2014-12-01 22:23:05 +08:00
winlin
d171a26758 disable gop cache when not h.264. fix some warning. 2014-12-01 21:34:35 +08:00
winlin
b4057916b6 add qt project file. fix cmake file for clion. 2014-11-30 16:06:37 +08:00
winlin
e7ccbce472 update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32. 2014-11-25 10:41:55 +08:00
winlin
e492fa5353 fix #212, support publish aac adts raw stream. 2.0.31. 2014-11-24 16:28:52 +08:00
winlin
3d97048c3a fix bug #217, add reuse conn to play different player. 2014-11-22 19:15:40 +08:00
winlin
3e81e6e0f1 refine code for bug #217, use recv thread to set the timeout. 2014-11-22 18:08:45 +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
622218c4dd for bug #217, use isolate thread to improve 17% performance. 2014-11-22 15:53:05 +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
749fac414b refine code, donot response call when transaction id is zero. 2014-11-18 17:30:40 +08:00
winlin
9f60a6738a add comments for listen 2014-11-17 10:27:05 +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
f11272e3ce add comments for bug #194, #196 2014-11-13 17:29:56 +08:00
winlin
8845bb7caf for bug #194, refine code, remove the old duplicated code. 2014-11-13 16:56:41 +08:00
winlin
62719c2b12 for bug #200, fix the writev for librtmp, add comments. 2014-11-13 14:38:23 +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
77cf885d8c add comments for #161 2014-11-13 13:49:50 +08:00
winlin
4af2e78c59 refine code for bug #194, add comments to macros. 2014-11-13 12:45:54 +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
d257360e96 add comments about bug #196 2014-11-12 13:46:21 +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
a6f3478a74 for bug #194, remove the poll, it's no-use 2014-11-12 10:26:48 +08:00
winlin
bc1b5f4bbf for bug #194, disable the srs fd poll. 2014-11-12 10:05:42 +08:00
winlin
4f21e92ae0 fix the message of config for max_connections. 2014-11-11 18:49:27 +08:00
winlin
21f16f3a83 for bug #194, use play fd poll to improve performance, it works. 2014-11-11 18:46:35 +08:00
winlin
164f632b62 for bug #194, add fds poll, just sleep to send without recv. 2014-11-11 18:35:46 +08:00
winlin
133cc62b51 for bug #194, use play fd poll, create the singleton poll 2014-11-11 17:54:02 +08:00
winlin
efc85ed6df refine config, check the connections more precise 2014-11-11 17:19:56 +08:00
winlin
de5e2d0a40 Revert "Revert "for bug #194, refine the config"" 
This reverts commit b4c1d55311.
 2014-11-11 17:12:45 +08:00
winlin
b4c1d55311 Revert "for bug #194, refine the config" 
This reverts commit 2a55ae4317.
 2014-11-11 17:05:36 +08:00
winlin
e87eacd499 Revert "add srs pipe for bug #194" 
This reverts commit f9756ea14c.
 2014-11-11 17:05:25 +08:00
winlin
73abb1a31d Revert "for bug #194, add pipe to consumer." 
This reverts commit 1e601a6efc.
 2014-11-11 17:04:56 +08:00
winlin
306f75b267 Revert "for bug#194, open pipe for each connection." 
This reverts commit ade81bb244.
 2014-11-11 17:04:32 +08:00
winlin
ade81bb244 for bug#194, open pipe for each connection. 2014-11-11 16:41:39 +08:00
winlin
1e601a6efc for bug #194, add pipe to consumer. 2014-11-11 16:27:35 +08:00
winlin
f9756ea14c add srs pipe for bug #194 2014-11-11 16:09:44 +08:00
winlin
2a55ae4317 for bug #194, refine the config 2014-11-11 15:38:21 +08:00
winlin
36d12dd8ea for bug #194, change server main cycle to 1s. 2014-11-11 14:41:48 +08:00
winlin
8cc9a11b81 for bug #194, set the server main cycle to 1s 2014-11-11 14:38:54 +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
3358570be6 refine for bug#66, implements the usage. 2014-11-08 10:44:00 +08:00
winlin
72ad6894ca move the annexb decode utility to protocol. 2014-11-07 23:07:31 +08:00
winlin
59f68a2655 add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki. 2014-10-24 11:35:06 +08:00
winlin
e46e7fc596 update readme, rename wiki/xxx to wiki/v1_xxx 2014-10-24 09:58:53 +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
d24e2fd0cc remove supports for OSX. 2.0.1. 2014-10-18 13:58:23 +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
bcd1b3d2d4 refine code, remove unused code of dvr. 2014-09-27 13:02:16 +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
83f266b9e2 fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213. 2014-09-25 10:59:29 +08:00
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
winlin
032118581a refine http/dvr/hls to use file reader/writer. 0.9.146 2014-07-05 07:33:18 +08:00
wenjiegit
d7454134c9 Update srs_app_hls.cpp 
for hls, srs should not allow player to cache m3u8 list.

add #EXT-X-ALLOW-CACHE:NO to m3u8 file.
 2014-07-04 09:53:50 +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
cb2967c967 refine forward, use utility to generate the tcUrl 2014-06-29 10:32:52 +08:00
winlin
aad42d7941 fix ubuntu14 build warnings 2014-06-29 00:09:55 +08:00
winlin
bfeb24c52b update call response, add comments. 2014-06-28 21:34:21 +08:00
winlin
fea8755719 response the call message with null. 0.9.137 2014-06-28 16:43:57 +08:00
winlin
53ad510766 add comments for the connection remove 2014-06-28 11:16:45 +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
efed34301c add virtual destructor to SrsRefer 2014-06-27 13:40:17 +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
46611ac062 refine configure, add cubieboard. use IProtocolStatistic in kbps. 2014-06-19 11:22:24 +08:00
winlin
b0e4dc8085 refine network bytes of summaries, remove the lo data. 2014-06-18 16:21:33 +08:00
winlin
d0b08d0d51 add network bytes to api summaries. 0.9.125 2014-06-18 16:13:02 +08:00
winlin
cbc1486688 refine message, add license 2014-06-14 14:19:19 +08:00
winlin
55b99c90c7 refine detect tool, support atc stream. 2014-06-11 14:16:44 +08:00
winlin
ef6efb821c add rtmp detecter 2014-06-10 10:40:31 +08:00
winlin
6286759eaa refine codec, extract avc aac codec to app. 2014-06-08 22:36:17 +08:00
winlin
31b568b013 refine core, move specified functions to kernel utility. 2014-06-08 13:03:03 +08:00
winlin
94cf0c1069 refine kernel buffer. complete the utest for buffer. 2014-06-07 22:23:17 +08:00
winlin
8992e217a9 refine srs buffer, min interfaces 2014-06-07 21:09:46 +08:00
winlin
7166b666c8 refine http log. 2014-05-30 09:20:51 +08:00
winlin
5273509554 refine log, to 0.9.123 2014-05-29 14:16:34 +08:00
winlin
4970664e37 move codec to kernel. 2014-05-28 17:37:15 +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
7920348e5f extract get_local_ip and get_peer_ip to app utility 2014-05-27 16:45:02 +08:00
winlin
e39eed6519 add SrsPid and SrsId to client response, add pid to log 2014-05-27 16:11:25 +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
b13bd70c86 http streaming support flv start index. 2014-05-26 13:57:08 +08:00
winlin
344a49918a fix #79: allow edge vhost to add or remove. 2014-05-25 10:07:57 +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
6fba0db9b5 refine http stream server 2014-05-23 14:26:11 +08:00
winlin
9eedf1ac40 the st_thread_exit is ok, not the memory leak cause. 2014-05-23 14:11:50 +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
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
f0b54678ad fix http hooks dvr bug, check dvr macro 2014-05-21 12:02:50 +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
7c804277b2 add heatbeat url, add stream for api-server 2014-05-19 15:27:05 +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
952abbee03 use server ip or name for forward tcurl. 2014-05-17 15:55:58 +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
4b8d3fe05f refine log, add overflow log 2014-05-16 13:31:59 +08:00
winlin
47089f0e82 add nxjson 2014-05-16 13:26:04 +08:00
winlin
154f084f1b add comments for json 2014-05-16 11:56:43 +08:00
winlin
cf712b06bb fix bug #67: fix pithy print bug, stage must has a age. 0.9.98 2014-05-14 14:35:29 +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
830f0b5eb6 refine metadata info 2014-05-14 11:46:17 +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
300f264e92 set metadata time equals to sequence header time. 2014-05-13 15:30:20 +08:00
winlin
91eabda7b8 add comments for source, return for sequence header. 2014-05-13 15:15:25 +08:00
winlin
9ba786d1aa fix bug of mem leak, free the left msgs if send error 2014-05-13 14:32:50 +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
0a1c0afe8d fix bug of NULL ptr for edge kbps object 2014-05-13 11:34:44 +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
9006194cd7 refine framework to calc the kbps 2014-05-12 17:27:50 +08:00
winlin
3f33dffdb3 refine the quit and destroy, quit when normal, destroy only for gmc 2014-05-12 13:14:36 +08:00
winlin
900406cc70 refine api, now to now_ms 2014-05-08 16:13:33 +08:00
winlin
a1fed15789 add uptime, startup time, load to api 2014-05-08 15:45:51 +08:00
winlin
8388da6325 add miss files. fix bug #60: support aggregate message 2014-05-08 14:33:25 +08:00
winlin
f8e8c81e50 refine log, simplify it. to 0.9.90 2014-05-04 16:29:57 +08:00
winlin
106270c8aa refine log messages. 2014-05-04 11:11:51 +08:00
winlin
a4410a4fa9 update pithy-print to 10s. refine log 2014-05-04 10:45:13 +08:00
winlin
243a2eabf5 explicit exit st-thread, for gmc to analysis mem 2014-05-04 10:01:57 +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
e492180b78 fix mem leak detect bug, destroy server when quit 2014-05-02 14:08:48 +08:00
winlin
b53f83acf1 rename __srs_rtmp_expect_message to srs_rtmp_expect_message 2014-05-02 12:45:42 +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
fc501b050b add atc_auto to disable or enable auto detect atc 2014-04-30 12:08:11 +08:00
winlin
30bb3ff704 add dvr_plan hss to full.conf 2014-04-30 11:56:19 +08:00
winlin
aebff659b6 remove wait interval for signal 2014-04-30 11:29:03 +08:00
winlin
d0dff2d332 fix bug #34: convert signal to io. 0.9.85 2014-04-30 11:26:32 +08:00
winlin
a14220d4fb fix bug of auto bravo atc 2014-04-30 10:31:05 +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
80ddddf823 refine RTMP protocol completed, to 0.9.81 2014-04-29 14:44:07 +08:00
winlin
be4c182d11 refine RTMP protocol stack. 2014-04-29 14:18:10 +08:00
winlin
ebf6203c3b refine rtmp protocol stack, refer to go.rtmp 2014-04-29 13:39:16 +08:00
winlin
fd0efecbc8 refine ingester pithy print 2014-04-29 09:57:59 +08:00
winlin
cb2959ae7d fix bug #53, never use msg when sent it 2014-04-29 09:32:30 +08:00
winlin
23b04e2a57 completed the edge reload, to 0.9.79 2014-04-28 17:57:59 +08:00
winlin
c681098949 fix bug of edge, one fd for one thread 2014-04-28 17:20:35 +08:00
winlin
a363e3d293 support basic edge(play/publish) RTMP server. 0.9.78 2014-04-27 15:10:25 +08:00
winlin
bc7648724d use directly send publish edge mode. 2014-04-27 14:57:28 +08:00
winlin
2295ebb346 remove the edge message flag, use directly send mode 2014-04-27 14:23:21 +08:00
winlin
5ddc71685b pre change publish edge to directly send mode 2014-04-27 14:21:19 +08:00
winlin
16319d73fd implements basic edge(play and publish), with bug 2014-04-27 12:28:45 +08:00
winlin
79c9c6dcb7 implements the proxy for edge publish mode 2014-04-27 11:11:15 +08:00
winlin
ec96072472 add publish edge framework 2014-04-27 09:29:37 +08:00
winlin
270b1270af fix bug of edge, refine state to user state. 2014-04-26 22:51:01 +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
acba4cfdc6 add edge framework 2014-04-26 18:08:21 +08:00
winlin
b0951d36d3 refine source, rename req to _req 2014-04-26 17:16:18 +08:00
winlin
a2f317a113 add chad.wang to authors for srs-librtmp on windows build project 2014-04-26 14:47:38 +08:00
winlin
a63a3812e3 add srs app edge 2014-04-25 16:35:03 +08:00
winlin
d6948d613f add author byteman for h264 to flv. 2014-04-25 15:27:50 +08:00
winlin
3ed59f190b refine srs live flashP2P(integrated by chnvideo) 2014-04-24 17:38:57 +08:00
winlin
67e1988b81 support live flashP2P(integrated by chnvideo VDN). 0.9.75 2014-04-24 16:32:19 +08:00
winlin
b276714573 support chnvideo hss streaming 2014-04-24 14:26:24 +08:00
winlin
35f3a93239 support dvr to hss. change to 0.9.74 2014-04-24 12:22:36 +08:00
winlin
e271cb607f refine plan, add stream start time for atc 2014-04-23 17:53:14 +08:00
winlin
0c0010d529 update dvr, extract flv segment 2014-04-23 16:33:42 +08:00
winlin
7ff8df4d97 refine code, notice api when segment close 2014-04-23 16:25:18 +08:00
winlin
435e02db5d dvr use .tmp and rename to .flv when finished. 2014-04-22 17:50:22 +08:00
winlin
733ca2475d call http api when dvr got keyframe 2014-04-22 17:32:45 +08:00
winlin
36d8fdfc1a move the ts buffer to http message 2014-04-22 12:20:58 +08:00
winlin
a73bf8d4aa optimizm the http server for send ts file 2014-04-22 12:15:13 +08:00
winlin
a5f4f6bd14 add meminfo 2014-04-20 00:15:26 +08:00
winlin
15aea4d9b3 add cpuinfo 2014-04-19 23:18:00 +08:00
winlin
951a93ab86 get self proc and system proc stat 2014-04-19 21:43:13 +08:00
winlin
117fd67950 add cpu stat 2014-04-19 21:23:34 +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
ab9a2ddd6c dvr support segment plan 2014-04-17 18:13:59 +08:00
winlin
2d1c28cff9 update dvr, support segment plan 2014-04-17 17:35:21 +08:00
winlin
6f19a83114 dvr support plan and default session plan 2014-04-17 16:57:04 +08:00
winlin
4b82a4f510 support reload dvr 2014-04-17 16:22:21 +08:00
winlin
9861fc4fe3 refine dvr, add comments 2014-04-17 16:16:17 +08:00
winlin
56ff70cdf8 remove lseek and size of fs stream 2014-04-17 16:10:05 +08:00
winlin
271b969d0b set audio/video flag to 0 in flv header. 2014-04-17 16:08:56 +08:00
winlin
73459547e1 support dvr. change to 0.9.69 2014-04-17 16:06:49 +08:00
winlin
996d042a33 add comments for file stream 2014-04-17 12:59:35 +08:00
winlin
f5ff9c7241 update dvr comments 2014-04-16 17:54:41 +08:00
winlin
fdd0678bcb add thread cid to log 2014-04-16 16:58:54 +08:00
winlin
ae3f7d9cb8 change meeting hls to an 2014-04-16 16:18:02 +08:00
winlin
0c91fa6bed fix dvr mem leak, free msg when not use it. 2014-04-16 15:58:06 +08:00
winlin
005502a07e update comments for HLS on_hls_start 2014-04-16 11:11:53 +08:00
winlin
fd0002e499 add dvr framework 2014-04-16 09:28:02 +08:00
winlin
96115ac4f7 fix bug of config params. x86/x64/pi never use static 2014-04-15 16:07:25 +08:00
winlin
90dee0924d fix bug of build script 2014-04-15 14:24:03 +08:00
winlin
23a1b29935 add dvr option. refine macros of auto headers 2014-04-15 14:01:57 +08:00
winlin
1ae9178605 add favicon.ico, change to 0.9.65 2014-04-15 11:19:15 +08:00
winlin
b86c83b0e0 refine the info for log to file. 2014-04-14 12:14:01 +08:00
winlin
ce64dafc3c use stream time for live duration. change to 0.9.64 2014-04-14 10:55:46 +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
73c310cd2e refine the macro. 2014-04-14 09:10:36 +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
04a526b340 change SRS_TRANSCODE macro to SRS_RTMP_TRANSCODE 2014-04-13 17:14:33 +08:00
winlin
a0472f256d support test config file. change to 0.9.61 2014-04-13 16:55:42 +08:00
winlin
f980340e89 refine config option 2014-04-13 13:57:39 +08:00
winlin
aa784377fd refine reload, ignore if parse config file failed. 2014-04-13 13:50:58 +08:00
winlin
cfee761899 support full reload. change to 0.9.60 2014-04-13 13:35:03 +08:00
winlin
bb87272c39 refine reload, rename some vhost specified to add vhost prefix 2014-04-13 13:31:59 +08:00
winlin
dc3c3cff8e support reload http_stream 2014-04-13 13:27:51 +08:00
winlin
c33ff4fdb8 support reload http_api 2014-04-13 13:08:10 +08:00
winlin
17ac29d160 refine code for reload http api/stream 2014-04-12 22:16:39 +08:00
winlin
821b58af03 support reload atc 2014-04-12 22:00:27 +08:00
winlin
eda1ddc03d support reload log level/logfile/tank 2014-04-12 21:35:26 +08:00
winlin
f652c28485 support reload pid. 2014-04-12 20:46:32 +08:00
winlin
0a016e58bf add comments for main 2014-04-12 20:37:16 +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
15f651bccd update demo, support acodec 2014-04-11 14:13:14 +08:00
winlin
3a26b23fba change ffmpeg log to ./objs 2014-04-10 17:19:49 +08:00
winlin
ccba9ba9ba move log level parse to app utility 2014-04-10 14:20:02 +08:00
winlin
f2f30dcc52 add utility, change log to trace 2014-04-10 14:12:22 +08:00
winlin
94874e77af refine reload config 2014-04-10 14:06:23 +08:00
winlin
6c5d8b4851 refine reload config 2014-04-10 14:05:01 +08:00
winlin
bc61b1de18 fix bug of reload ingest 2014-04-10 11:47:38 +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
9ed3421586 rename from get_ingest to get_ingest_by_id of config 2014-04-10 11:24:27 +08:00
winlin
e432fe931f support reload ingesters(added/removed/updated). change to 0.9.57. 2014-04-10 11:21:47 +08:00
winlin
e6d8bc1e5c ingest reload: support disable vhost 2014-04-10 10:35:02 +08:00
winlin
5e504944dc add comments for http conn 2014-04-10 10:22:22 +08:00
winlin
dc71eef394 support ingest reload: add new vhost with ingester 2014-04-10 10:09:30 +08:00
winlin
e5646e3bb5 refine ingester, add vhost/id info to ingester 2014-04-10 09:20:23 +08:00
winlin
9372a7065a refine the ingest log 2014-04-08 18:01:14 +08:00
winlin
ccf0a423be change sleep time from 3s to 0.6s for ingester. 2014-04-08 15:43:47 +08:00
winlin
509504f27d change sleep time from 3s to 0.6s 2014-04-08 15:43:18 +08:00
winlin
eba35e2ac0 refine the macro SRS_FFMPEG to SRS_FFMPEG_STUB, SRS_FFMPEG_TOOL to build ffmpeg tool 2014-04-08 15:28:34 +08:00
winlin
70e73bc281 add comments for bug #39 2014-04-08 13:56:45 +08:00
winlin
d124772d6a add http server/api to srs.conf. add comments for bug #6. 2014-04-08 13:54:16 +08:00
winlin
c11e266d5c update readme 2014-04-07 15:04:31 +08:00
winlin
4f445f2f60 support ingest stream 2014-04-07 14:28:06 +08:00
winlin
e89ab84e4e implements ingest, change to 0.9.53 2014-04-07 14:20:03 +08:00
winlin
2742679354 implements the ingest framework 2014-04-07 13:32:00 +08:00
winlin
92281548b6 add ingest config 2014-04-07 13:13:57 +08:00
winlin
9107831b0e add config to read ingesters 2014-04-07 11:57:24 +08:00
winlin
f5c4f492da add comments for ffmpeg 2014-04-07 11:49:20 +08:00