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

1418 commits

Author SHA1 Message Date
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
fd8c4989f5 add todo fixme for log verbose and info 2014-07-23 11:24:32 +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
b56e7ef7ab complete main utest for config 2014-07-22 11:14:51 +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
21f49a9875 add basic utest for config service 2014-07-20 17:44:20 +08:00
winlin
6e8c4df4b1 refine error codes. 2014-07-20 17:32:34 +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
9b6c22644d add basic utest for config directive 2014-07-20 15:27:05 +08:00
winlin
6f743a2fe8 pass all utest 2014-07-20 13:48:24 +08:00
winlin
e47c0ae202 refine all consts 2014-07-20 13:46:36 +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
24a041266c refine config 2014-07-20 12:22:24 +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
f3e85a0063 refine the usage of csr. 2014-07-17 11:06:37 +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
9860e390a3 refine code, for cubieboard to build ok. 2014-07-14 17:45:27 +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
5c4398f4a9 refine bandwidth check/test, flash publish test is ok. 2014-07-13 20:25:36 +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
8984ba9d56 refine the usage of bwtc. 2014-07-13 19:28:09 +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
cf7a48e3da refine options.sh in auto 2014-07-13 13:50:58 +08:00
winlin
f24a60819f add demo config test 2014-07-13 13:48:53 +08:00
winlin
5b714ba970 fix utest bug, when ssl disable, ignore complex handshake utest. 2014-07-13 13:47:46 +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
e53655ee83 refine the build script 2014-07-13 13:31:24 +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
019b25ea30 add MIT license to bandwidth check/test as/js library. 2014-07-13 10:05:30 +08:00
winlin
3a1b3dd142 fix bandwidth bug, config item interval to float. 2014-07-12 22:22:56 +08:00
winlin
d8ed7cc968 refine the js library for bandwidth test. 2014-07-12 21:03:26 +08:00
winlin
0707c24b54 refine the js library for bandwidth test. 2014-07-12 20:56:44 +08:00
winlin
2ff88b9bcd move js to srs_bwt. 2014-07-12 20:51:57 +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
e2d273f493 do performance test, support 1.8k, improve 22% 2014-07-12 10:26:09 +08:00
winlin
047fb74889 refine rtmp client/server, add comments. 2014-07-12 09:01:34 +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
f7922e3823 refine protocol send. add utest for server auto response message 2014-07-12 07:41:52 +08:00
winlin
9556790a5e finish utest of protocol stack. 0.9.156 2014-07-11 18:08:34 +08:00
winlin
8e27df4cf7 refine the protocol, add comments, add utest for empty packet 2014-07-11 14:57:20 +08:00
winlin
c4aec5705b fix chunk header parse bug, add utest for basic/message header 2014-07-10 18:56:13 +08:00
winlin
c957fadcb1 refine recv message header, add comments, remove the fresh_packet variable which duplicated with first_chunk 2014-07-10 15:52:50 +08:00
winlin
d86e07b745 finish basic protocol utest, fix the bug of fmt11 length error. 2014-07-10 14:46:58 +08:00
winlin
54fda96f37 add utest for bug #98 2014-07-09 14:14:47 +08:00
winlin
2c3cb73ad6 update utest 2014-07-09 12:51:21 +08:00
winlin
7027a125f0 refine protocol, add comments. add utest for protocol bytes and timeout. 2014-07-09 12:04:40 +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
59dff7d268 add comments for RTMP protocol stack 2014-07-06 20:43:05 +08:00
winlin
2516e3c596 complete the comments of RTMP protocol. 2014-07-06 20:34:11 +08:00
winlin
c457eea692 add comments for all RTMP packets. 2014-07-06 20:26:05 +08:00
winlin
8c493e9896 fix #49, open the sample access by default. 2014-07-06 20:17:47 +08:00
winlin
2554836940 add comments for RTMP packets. 2014-07-06 20:17:02 +08:00
winlin
51f924c553 refine RTMP protocol stack, refine the packet encode/decode, remove class_name 2014-07-06 19:06:25 +08:00
winlin
b551056330 add comments of io interfaces. 2014-07-06 18:44:44 +08:00
winlin
09afaa250a add comments of message array, add utest. 2014-07-06 18:37:48 +08:00
winlin
6a4b177475 refine shared ptr message, rename initialize to create 2014-07-06 18:23:14 +08:00
winlin
891bc3fe65 refine utility of protocol, add comments 2014-07-06 17:43:08 +08:00
winlin
96e0273e99 refine hls, extract the flv/aac sample rates 2014-07-06 17:32:48 +08:00
winlin
e5e2729967 refine amf0 and handshake code, add comments to utest. 2014-07-06 17:25:25 +08:00
winlin
574cd15efb refine amf0, rename internal classes 2014-07-06 17:12:26 +08:00
winlin
c31c607ad3 refine amf0, move declarations from cpp to hpp, use namespace _srs_internal 2014-07-06 17:04:59 +08:00
winlin
d22e7cab0a add comments to amf0 2014-07-06 16:51:07 +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
7805f7b12a add prefix Protocol to AMF0 and Handshake utest 2014-07-05 21:30:11 +08:00
winlin
5a41b1b538 finish kernel utest. to 0.9.149 2014-07-05 21:22:20 +08:00
winlin
ad920915a2 merge handshake to protocol 2014-07-05 17:56:18 +08:00
winlin
b13fd5112b merge buffer to kernel utest 2014-07-05 17:50:36 +08:00
winlin
1e395e7c10 add assert to flv. 2014-07-05 17:30:13 +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
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
0bd7d268e8 add mock for file reader/writer 2014-06-29 21:25:16 +08:00
winlin
a888e52df1 donot mix the read and write for librtmp 2014-06-29 17:17:50 +08:00
winlin
1eee4d25cf refine the librtmp, open writer then reader. 2014-06-29 17:12:10 +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
ed3f9f0a40 add core utest 2014-06-29 16:04:28 +08:00
winlin
f5f54e6008 add utest for kernel codec 2014-06-29 15:43:32 +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
6a2f0a3dc9 add configure preset --demo 2014-06-29 10:50:58 +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
cb2967c967 refine forward, use utility to generate the tcUrl 2014-06-29 10:32:52 +08:00
winlin
4d45b3305b srs demo requires ffmpeg to transcode. 2014-06-29 10:07:57 +08:00
winlin
18534ecdb2 donot start nginx for demo, use cherrypy to delivery HLS. 2014-06-29 10:06:28 +08:00
winlin
ee07210105 fix demo script, start nginx. fix warning of utest on ubuntu14 2014-06-29 10:03:29 +08:00
winlin
e6f524281c support build on ubuntu14, 0.9.138 2014-06-29 09:11:28 +08:00
winlin
aad42d7941 fix ubuntu14 build warnings 2014-06-29 00:09:55 +08:00
winlin
594c1d8bf7 fix ssl make install on ubuntu 14, change to make install_sw 2014-06-28 23:16:14 +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
6ae6f6e60d add freetype2 to pkg-config path. 2014-06-26 17:14:52 +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
e9c96af91a add wiki and conf for token traverse auth 2014-06-21 12:58:33 +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
6ff193c989 donot need to yum install pkg-config, for centos always installed it 2014-06-20 10:40:06 +08:00
winlin
94e5e7070d fix bug of freetype2 build for ffmpeg, depends on pkg-config 2014-06-20 10:25:52 +08:00
winlin
094d82bd06 add connections count to api summaries. 0.9.127 2014-06-19 18:49:05 +08:00
winlin
603b3bcdcc add libfreetype2 for ffmpeg, remove the depends of freetype of build_ffmpeg. 2014-06-19 16:15:49 +08:00
winlin
6ee2ba049b add srs bytes and kbps to api summaries. 0.9.126 2014-06-19 15:28:05 +08:00
winlin
8fabd5d987 refine cubieboard configure, use ubuntu prepare to install tools 2014-06-19 13:32:19 +08:00
winlin
46611ac062 refine configure, add cubieboard. use IProtocolStatistic in kbps. 2014-06-19 11:22:24 +08:00
winlin
46c1367fe8 refine the protocol io reader writer arch. 2014-06-19 10:34:10 +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
f893711499 fix #98: workaround for librtmp ping(fmt=1,cid=2 fresh stream). 2014-06-14 20:44:38 +08:00
winlin
3f9c23d834 fix #101: for ubuntu14 build error. 2014-06-14 16:24:15 +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
17cb8c4550 finish the research for python-subprocess 2014-06-11 11:14:43 +08:00
winlin
b7d8be46a1 add research for usage for subprocess 2014-06-11 11:03:22 +08:00
winlin
cccc483ab3 add bytes statistic for librtmp 2014-06-10 17:39:12 +08:00
winlin
a639eb0596 fix bug of buffer assert, erase can accept any value 2014-06-10 16:06:18 +08:00
winlin
d48d739fa7 fix bug of detect rtmp, add error code 2014-06-10 11:57:46 +08:00
winlin
4d9ed6f7fe refine the code, add comments to result to self interpret 2014-06-10 11:44:02 +08:00
winlin
8817823462 add rtmp detecter 2014-06-10 11:34:35 +08:00
winlin
ef6efb821c add rtmp detecter 2014-06-10 10:40:31 +08:00
winlin
0327c85f85 refine kernel codec, remove unused stream 2014-06-09 10:33:35 +08:00
winlin
6286759eaa refine codec, extract avc aac codec to app. 2014-06-08 22:36:17 +08:00
winlin
3dbe8ba9de update configure script 2014-06-08 13:18:34 +08:00
winlin
31b568b013 refine core, move specified functions to kernel utility. 2014-06-08 13:03:03 +08:00
winlin
7c7920698d refine utest, move the mock io to handshake where actually use it. 2014-06-08 12:29:05 +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
e6c03c6d6d complete the amf0 strict array utest 2014-06-07 20:40:02 +08:00
winlin
5a06909d75 update amf0 strict array test, fix bug of count zero init 2014-06-07 20:01:11 +08:00
winlin
373f92551d refine librtmp, remove the ssl functoins, refine the type2string memory alloc to static 2014-06-07 13:44:46 +08:00
winlin
48adeeb1a5 fix the demo player html text 2014-06-06 15:35:47 +08:00
winlin
e227bd3a0e remove the srs community 2014-05-31 17:47:02 +08:00
winlin
7022f48a86 add rtmfp rfc doc 2014-05-30 15:47:27 +08:00
winlin
52971f3f81 update readme, add rtmfp 2014-05-30 10:28:16 +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