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

557 commits

Author SHA1 Message Date
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