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

1235 commits

Author SHA1 Message Date
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
7c64a893f5 add demo.m3u8 and demo.html 2014-04-11 15:26:37 +08:00
winlin
9eb76cb1eb update demo.conf 2014-04-11 14:40:38 +08:00
winlin
189da7e12e fix bug of demo.conf 2014-04-11 14:23:19 +08:00
winlin
15f651bccd update demo, support acodec 2014-04-11 14:13:14 +08:00
winlin
acdd5a827e update api server, support servers 2014-04-11 11:29:17 +08:00
winlin
ff90278048 add speex1.2 to transcode flash encoder stream. change to 0.9.58 2014-04-11 10:40:21 +08:00
winlin
64727ce616 add bandwidth test conf 2014-04-10 17:41:55 +08:00
winlin
3a26b23fba change ffmpeg log to ./objs 2014-04-10 17:19:49 +08:00
winlin
ca02cfe1bf update server.py 2014-04-10 16:33:45 +08:00
winlin
c3c2767363 update api server, add servers 2014-04-10 15:06:18 +08:00
winlin
8295169e0e refine code, unify the coding style 2014-04-10 14:22:09 +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
017b96f9b5 fix the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt 2014-04-09 11:51:05 +08:00
winlin
056895a978 add comments for the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt 2014-04-09 11:06:53 +08:00
winlin
9372a7065a refine the ingest log 2014-04-08 18:01:14 +08:00
winlin
4af7b6e383 update conf file, add id for ingest. 2014-04-08 15:51:43 +08:00
winlin
5a3b59d3c8 update conf file, add id for ingest. 2014-04-08 15:47:52 +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
5aded78272 change to 0.9.56, for macro changed 2014-04-08 15:32:13 +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
3b59a6c687 fix bug of package for arm 2014-04-07 17:03:56 +08:00
winlin
667191913b fix bug of package for arm 2014-04-07 17:01:48 +08:00
winlin
5c9941989e fix bug of package for arm 2014-04-07 16:57:05 +08:00
winlin
503fb93d4e fix bug of package for arm 2014-04-07 16:56:45 +08:00
winlin
5fd582cd26 fix bug of package for arm 2014-04-07 16:52:38 +08:00
winlin
a8c5db3fc7 fix bug of package for arm 2014-04-07 16:51:39 +08:00
winlin
6e88634c5c add transcode to package 2014-04-07 16:35:24 +08:00
winlin
9a8eeb685d update package, add http server and api. 2014-04-07 16:33:31 +08:00
winlin
98809862f7 change to 0.9.55, for 1.0 mainline 2014-04-07 16:05:18 +08:00
winlin
12ba02238d update readme, add ingest 2014-04-07 15:56:19 +08:00
winlin
05e22e9530 fix script run/build/stop bug 2014-04-07 15:26:21 +08:00
winlin
c11e266d5c update readme 2014-04-07 15:04:31 +08:00
winlin
3d073f9ef6 update demo script, remove ffmpeg publish. use ingest instead 2014-04-07 14:33:27 +08:00
winlin
4f445f2f60 support ingest stream 2014-04-07 14:28:06 +08:00
winlin
45d8f4346f implements ingest, change to 0.9.53 2014-04-07 14:20:26 +08:00
winlin
e89ab84e4e implements ingest, change to 0.9.53 2014-04-07 14:20:03 +08:00
winlin
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
winlin
c759a7c6b5 refine log of ffmpeg 2014-04-07 11:20:03 +08:00
winlin
4f7cfeed37 change to 0.9.52, refine encoder and ffmpeg 2014-04-07 10:15:44 +08:00
winlin
72c330d47c refine ffmepg and encoder, extract ffmpeg. 2014-04-07 09:34:36 +08:00
winlin
095364a72b refine ingest, start/stop ingest in server 2014-04-07 09:27:30 +08:00
winlin
eea2310b07 refine consts 2014-04-07 09:07:12 +08:00
winlin
4a7378b77a ingest stream when server cycle 2014-04-07 08:41:32 +08:00
winlin
adfbbbfd68 add ingest files 2014-04-07 08:32:28 +08:00
winlin
7384ad0caa add ingest config section of full.conf 2014-04-06 21:26:57 +08:00
winlin
5e6c490ba0 add ingest compile feature 2014-04-06 21:05:18 +08:00
winlin
e80abac4f0 add ingest feature to readme 2014-04-06 20:59:58 +08:00
winlin
983fe46ce2 use --with-ffmpeg to compile FFMPEG tool only, use --with-transcode for transcoding 2014-04-06 20:30:51 +08:00
winlin
5ff1d589f7 change warn to trace for nginx disabled 2014-04-06 19:19:13 +08:00
winlin
d546f815df update build/run/stop script 2014-04-06 19:13:29 +08:00
winlin
c4524484e6 add comments for aac encoder 2014-04-06 18:48:39 +08:00
winlin
7916cab50e donot check the aac encoder, ensure aac is ok 2014-04-05 15:01:41 +08:00
winlin
7de8bd7595 allow pi to use ffmpeg 2014-04-05 14:38:19 +08:00
winlin
2949c751f6 update install, create http root 2014-04-05 14:17:49 +08:00
winlin
43979f7505 add htt.hls sample 2014-04-05 13:56:14 +08:00
winlin
30e3323fe4 update readme, add SampleHTTP link 2014-04-05 13:38:05 +08:00
winlin
4e3fe36ae2 refine http server pages. change to 0.9.51 2014-04-05 13:14:59 +08:00
winlin
1c02f4551c always use 64bits for lseek 2014-04-04 23:28:31 +08:00
winlin
ced050829e fix bug of http, change to 0.9.50 2014-04-04 23:25:32 +08:00
winlin
c5d3b11a6e update http stream. change to 0.9.49 2014-04-04 23:16:31 +08:00
winlin
3c63cf0a86 update demo page, change http port to 8080 2014-04-04 23:09:58 +08:00
winlin
17ce21348d implements the http stream module. change to 0.9.49 2014-04-04 23:06:46 +08:00
winlin
ef26e77560 implements the http stream module. 2014-04-04 23:06:27 +08:00
winlin
00eda0d7b2 implements the http stream module. 2014-04-04 23:04:38 +08:00
winlin
83f35d10b1 add http delivery framework 2014-04-04 18:55:21 +08:00
winlin
8d7877ebd1 refine config, group by sections. 2014-04-04 17:01:34 +08:00
winlin
b7093246e4 fix forward conf file bug, change pid file. change to 0.9.48 2014-04-04 15:35:17 +08:00
winlin
28b0c3a27f refine log and thread function name. change to 0.9.47. 2014-04-04 12:18:26 +08:00
winlin
6d32ad1828 refine log and thread function name 2014-04-04 12:18:05 +08:00
winlin
1117f78587 support arm build for http api and server 2014-04-04 11:36:22 +08:00
winlin
f089eafd9f fix bug #38, remove app slash of jwplayer, change to 0.9.46 2014-04-04 10:12:34 +08:00
winlin
3f13726544 add log level in conf. change to 0.9.45 2014-04-03 18:32:51 +08:00
winlin
4984631cd6 refine the http crossdomain, send it only required 2014-04-03 16:39:55 +08:00
winlin
133a6f0dbf add crossdomain support for http error 2014-04-03 15:55:48 +08:00
winlin
b71eb0d49a support more splash in http url. remove the strip of SrsRequest, use srs_string_remove instead, change to 0.9.44 2014-04-03 15:53:56 +08:00
winlin
f2216691f9 remove the duplicated http status line when error 2014-04-03 15:20:24 +08:00
winlin
818c1f1520 support http error code, check url 2014-04-03 15:17:02 +08:00
winlin
0ae23d7556 rename version to versions 2014-04-03 14:17:00 +08:00
winlin
4a40075f68 add contributors to api/v1/authors 2014-04-03 13:48:52 +08:00
winlin
5c019c7938 implements api/v1/version, change to 0.9.43 2014-04-03 12:08:22 +08:00
winlin
9c3ba680d8 fix http hooks json encode bug, remove the JFIELD_CONT for the last field 2014-04-03 11:52:06 +08:00
winlin
a14267d2b4 refine the http url handler match. refine json encode 2014-04-03 11:49:14 +08:00
winlin
bfa07465f0 implements basic http response framework 2014-04-02 19:10:22 +08:00
winlin
341b5151d9 create http handler framework 2014-04-02 18:07:34 +08:00
winlin
eae9b94153 add api framework code 2014-04-02 12:55:10 +08:00
winlin
0ba0c14fb8 refine code, donot listen if not enabled http 2014-04-02 12:12:27 +08:00
winlin
ec6d696565 refine http framework, use http message 2014-04-02 12:03:49 +08:00
winlin
e70609cea3 refine code, extract http hooks. 2014-04-01 18:40:24 +08:00
winlin
5bbb76a59d remove the namespace srs, use http prefix 2014-04-01 17:30:55 +08:00
winlin
1922d62ff7 add --with-http-api option 2014-04-01 16:06:32 +08:00
winlin
52263457bf fix bug of no http-server feature 2014-04-01 15:42:27 +08:00
winlin
d28458d5fa fix script build bug 2014-04-01 15:33:09 +08:00
winlin
6ca9b774c1 support http methods, support js crossdomain request 2014-04-01 14:28:19 +08:00
winlin
51c1615173 change to 0.9.42, add http parse framework 2014-04-01 12:36:56 +08:00
winlin
5aa0043934 add rfc822 for http1.1 2014-03-31 13:14:10 +08:00
winlin
b0d77c4697 move wiki images to srs.release 2014-03-31 11:35:22 +08:00
winlin
c7a4dd8863 move wiki images to srs.release 2014-03-31 11:35:00 +08:00
winlin
27029679e9 donot ensure transaction-id===1 for connect req/res, change to 0.9.41 2014-03-31 10:22:00 +08:00
winlin
e3254377ce update depends, allow pi/dev to enable gprof/gperf 2014-03-31 10:08:00 +08:00
winlin
64a8dfb09a refine rtmp send protocol, use the same cache for header 2014-03-31 10:04:44 +08:00
winlin
4dfbbcdff4 force st to use epoll, change to 0.9.39 2014-03-30 23:42:29 +08:00
winlin
234ce08ed3 force st to use epoll 2014-03-30 23:42:05 +08:00
winlin
b8f6ef59c5 update readme, refine the chinese summary 2014-03-30 19:09:04 +08:00
winlin
b95e1cab30 update readme, refine the title 2014-03-30 18:58:17 +08:00
winlin
17739e459b update readme, add csdn mirror 2014-03-30 18:47:49 +08:00
winlin
104c143dbe add csdn auto sync script 2014-03-30 18:41:46 +08:00
winlin
c6cdc4ad54 refine package for raspberry. 2014-03-30 12:33:47 +08:00
winlin
be8aa92ab0 refine package for raspberry. 2014-03-30 12:31:50 +08:00
winlin
37fe08a302 support debian and raspbian 2014-03-30 11:14:57 +08:00
winlin
3932cf1334 update build, always patch st, for we need to build in raspberrypi directly 2014-03-29 14:25:47 +08:00
winlin
917f1ea9e1 fix bug of typo of readme. update package to support --help and options 2014-03-29 13:39:57 +08:00
winlin
41f5217360 refine http code, define CRLF consts for http 2014-03-27 17:13:26 +08:00
winlin
6913efe127 implements the http api/stream framework 2014-03-27 13:25:08 +08:00
winlin
ab3c6c92a0 rename srs-client to srs-rtmp-conn 2014-03-27 12:27:47 +08:00
winlin
aa89f9f51e change to 0.9.37, for http api/stream 2014-03-27 12:14:04 +08:00
winlin
041a07dfda add http config in srs conf 2014-03-26 23:19:50 +08:00
winlin
4c8d6d2eb1 fix bug of hls and rename demo player stream to live/demo. change to 0.9.36 2014-03-26 18:13:33 +08:00
winlin
ea3561de08 change script log dir to objs 2014-03-26 17:18:28 +08:00
winlin
97435c6bb4 fix demo.conf bug, remove the log_dir, because it's renamed to ff_log_dir 2014-03-26 16:57:20 +08:00
winlin
0858bd8b6f Support RTMP ATC for HLS/HDS to support backup(failover). change to 0.9.35 2014-03-26 16:25:02 +08:00
winlin
ebf1139582 fix the forward loop detect bug. change to 0.9.34 2014-03-26 12:34:35 +08:00
winlin
e02293d94d fix bug of handshake with nginx-rtmp for forward, change to 0.9.33 2014-03-26 11:39:10 +08:00
winlin
1386e7a8ab fix bug of handshake with nginx, simple hs 2014-03-26 11:12:34 +08:00
winlin
e56c52ceba change to 0.9.32 2014-03-26 10:05:34 +08:00
winlin
7b3bc8f741 fix bug of bwtc 2014-03-26 10:05:07 +08:00
winlin
644dfa1a6d fix bug of librtmp 2014-03-26 09:03:57 +08:00
winlin
a9d11df3a3 update arm tool chain 2014-03-25 14:36:30 +08:00
winlin
a6d9da5e43 fix bug of script, support both abs and relative path 2014-03-25 11:04:36 +08:00
winlin
c3e750e90f add version to log 2014-03-24 18:07:32 +08:00
winlin
bcb54e6587 fix bug of package arm 2014-03-24 13:15:22 +08:00
winlin
4992a9979a add package arm 2014-03-24 13:13:52 +08:00
winlin
7431c110fe package support arm package 2014-03-24 10:51:37 +08:00
winlin
0e54967fb8 fix bug of package, use uname hardware platform 2014-03-24 09:15:26 +08:00
winlin
3035e2b46a refine package, add os machine 2014-03-24 09:03:27 +08:00
winlin
494894a846 remove dev.sh 2014-03-23 22:55:53 +08:00
winlin
ade3630fa6 add package and install script 2014-03-23 22:52:08 +08:00
winlin
34efa15118 change to 0.9.30, first release for srs1 2014-03-23 21:15:52 +08:00
winlin
9055d8eecf update readme. 2014-03-23 18:03:24 +08:00
winlin
cb1499fcb6 change log strategy, write log to file. change to 0.9.29 2014-03-23 14:53:31 +08:00
winlin
ed20bd7078 default write log to file. 2014-03-23 14:51:35 +08:00
winlin
76290a5a12 fix bug of get daemon 2014-03-23 14:47:09 +08:00
winlin
7930add7f9 add log tank config, default to console. 2014-03-23 14:40:55 +08:00
winlin
b290a00de7 refine log 2014-03-23 13:53:07 +08:00
winlin
d9104f3b5e fix bug of make file 2014-03-23 12:45:24 +08:00
winlin
f1477dc4fe support daemon, default start in daemon. change to 0.9.28 2014-03-23 12:42:42 +08:00
winlin
3ec3c1f532 support daemon 2014-03-23 12:42:05 +08:00
winlin
2c1354b9b9 fix bug of log message 2014-03-23 12:23:23 +08:00
winlin
56679b3c82 add srs_log_file to write log to file. change to 0.9.27 2014-03-23 12:22:01 +08:00
winlin
d94b9f44b3 add srs_log_file to write log to file. change to 0.9.27 2014-03-23 12:21:36 +08:00
winlin
4ddb5256ac fix bug of init.d script 2014-03-23 11:25:42 +08:00
winlin
2e1aed5403 rename init.d script to srs and srs-api 2014-03-23 10:25:14 +08:00
winlin
29fe53e21b fix bug of build cherrypy 2014-03-22 23:10:02 +08:00
winlin
73f1762122 fix bug of build cherrypy 2014-03-22 22:55:18 +08:00
winlin
f3e4c16a2f copy ffmpeg when install-demo 2014-03-22 22:53:02 +08:00
winlin
22603b7465 add api-server init.d script 2014-03-22 22:48:08 +08:00
winlin
d63cbb3c46 add reload support. add make install and uninstall, change to 0.9.26 2014-03-22 22:07:49 +08:00
winlin
62762cf1ad add reload support. add make install and uninstall 2014-03-22 22:07:14 +08:00
winlin
3c5878c980 rename ./etc/init.d/srs to ./etc/init.d/simple-rtmp-server 2014-03-22 21:07:34 +08:00
winlin
3c920b933c add ./etc/init.d/srs, refine configure to support make clean then make. 2014-03-22 20:53:29 +08:00
winlin
fdad7c25f0 fix isse #35: the gettimeofday jitter, log warn message 2014-03-21 17:56:27 +08:00
winlin
4f284b20f0 drop ts segment when duration is too small 2014-03-21 17:35:27 +08:00
winlin
5758551508 support hls republish 2014-03-21 17:10:24 +08:00
winlin
f25c6558a5 write pid to ./objs/srs.pid. 2014-03-21 15:45:34 +08:00
winlin
0686b8fa5a update readme, add product wiki link 2014-03-21 14:02:14 +08:00
winlin
a0c0c94cf0 refine conf, add comments for other listen type 2014-03-21 14:00:26 +08:00
winlin
2cebaff9d8 refine hls, ts temp file use ext .tmp 2014-03-21 13:10:47 +08:00
winlin
dbf642723f update readme, add hls(audio-only) support to readme. update sample flv from h264+mp3 to h264+aac 2014-03-21 11:38:02 +08:00
winlin
8600c0ebe9 Merge branch 'master' of github.com:winlinvip/simple-rtmp-server 2014-03-20 18:56:48 +08:00
winlin
e0fb1029c9 support pure audio hls. change to 0.9.24 2014-03-20 18:55:45 +08:00
winlin
b708f588fc refine the hls module, clear logic dead code, rename TSCache to HlsCache, M3u8Muxer to HlsMuxer. that is, make it to more readable. 2014-03-20 18:19:08 +08:00
winlin
2036cef43b Merge branch 'master' of github.com:winlinvip/simple-rtmp-server 2014-03-20 15:16:28 +08:00
winlin
ef7853d7f7 fix demo bug, remove the api server static-dir when link to nginx 2014-03-20 15:15:46 +08:00
winlin
6bc18f2e44 fix script generate auto header bug, always create file 2014-03-20 14:23:36 +08:00
winlin
8239174e97 update configure, change to 0.9.23 2014-03-20 14:11:36 +08:00
winlin
238349b0c0 update configure, change to 0.9.23 2014-03-20 14:08:53 +08:00
winlin
6374fa1383 simple default configure, only enalbe ssl+hls, disable ffmpeg/nginx/utest/gperf/gprof 2014-03-20 13:30:06 +08:00
winlin
c63ad48893 Merge branch 'master' of github.com:winlinvip/simple-rtmp-server 2014-03-20 09:41:13 +08:00
winlin
822143b500 fix bug of build script 2014-03-20 09:26:48 +08:00
winlin
a2c5075002 update comments for handshake. 2014-03-19 23:40:49 +08:00
winlin
a470330383 finish utest for handshake. 2014-03-19 23:34:50 +08:00
winlin
6b84a5e14c change to 0.9.22 2014-03-19 22:51:04 +08:00
winlin
b7d40b5aba support vn/an to disable video/audio, for radio streaming 2014-03-19 22:45:58 +08:00
winlin
747bbd988e change to 0.9.21, refine complex handshake, client/server support complex handshake. 2014-03-19 17:15:52 +08:00
winlin
da93b6fe99 add complex handshake utest 2014-03-19 17:14:42 +08:00
winlin
491ea4b630 support client complex handshake with server 2014-03-19 16:30:43 +08:00
winlin
841f0f8899 change to 0.9.19, verify the s1/s2/c2, refine the handshake. 2014-03-19 14:58:29 +08:00
winlin
152d3539d8 add s1 validation for client/server 2014-03-19 13:10:25 +08:00
winlin
12445174e7 add option --static, to static link for arm 2014-03-19 12:39:09 +08:00
winlin
efa22074be always use static link, for manually build arm, and x86/64 use static link is ok. 2014-03-19 12:18:48 +08:00
winlin
e0e451b680 add utest support for arm 2014-03-19 11:24:25 +08:00
winlin
d89d16ca1e print the system info when startup main 2014-03-19 10:51:33 +08:00
winlin
2eeb289c2f assert system is little-endian 2014-03-19 10:38:02 +08:00
winlin
b58ab508f9 add rtmp handshake utest, for arm to finger out the bug 2014-03-19 00:47:10 +08:00
winlin
1c055e7424 add log for ssl disabled. 2014-03-18 17:44:43 +08:00
winlin
1ffbdbc098 refine log, donot show error when client gracefully close it 2014-03-18 16:17:52 +08:00
winlin
b52a051d80 refine readme, confs 2014-03-18 15:38:34 +08:00
winlin
a0b747621e update srs.conf, add comments to see full.conf 2014-03-18 15:29:27 +08:00
winlin
b36338853a refine the conf files, rename srs.conf to demo.conf 2014-03-18 15:13:25 +08:00
winlin
d67edf631b update readme, add ubuntu12 to test list 2014-03-18 13:04:06 +08:00
winlin
c85dde7f3f substitute all TAB with 4spaces. 2014-03-18 11:32:58 +08:00
winlin
e5770b10b1 refine the colorful log for srs. remove the log when client close. 2014-03-18 11:28:22 +08:00
winlin
8029b7464a Merge pull request #28 from wenjiegit/master 
merge from wenjie.zhao for colorful log.
 2014-03-18 11:00:00 +08:00
winlin
618f6f52ae fix bug of librtmp sample on x86/x64 platform 2014-03-17 12:06:58 +08:00
winlin
1a3142d23b fix bug of librtmp sample build for arm, use static link 2014-03-17 12:00:21 +08:00
winlin
618579e484 refine srs build for arm, support librtmp sample 2014-03-17 11:52:23 +08:00
winlin
a29bd05c0f refine build script 2014-03-17 11:32:16 +08:00
winlin
71adff776b fix build script, remove unused build tool defines 2014-03-17 11:10:57 +08:00
winlin
77e652fcbe refine buils nginx script 2014-03-17 10:52:49 +08:00
winlin
421fbd4c3e fix bug of arm build script__SRS_BUILD_NGINX=NO 2014-03-17 10:48:44 +08:00
winlin
3721e72e99 arm: change to 0.9.18 2014-03-16 20:59:56 +08:00
winlin
5a4373d483 Support arm (ubuntu12 dev env)(debian armhf, v7cpu) with ssl/hls/librtmp. 2014-03-16 20:58:04 +08:00
winlin
ad05eec7a2 arm support librtmp 2014-03-16 20:20:29 +08:00
winlin
a9da5903f6 arm support ssl/hls, change to 0.9.17 2014-03-16 20:16:42 +08:00
winlin
75340e3ac0 add refer for arm research code 2014-03-16 18:06:30 +08:00
winlin
7744053d28 add arm research files, change to 0.9.16 2014-03-16 18:05:07 +08:00
winlin
a90cb9dd84 fix ubuntu build warning, the config unused setter 2014-03-15 19:50:40 +08:00
winlin
010b5c0d7a fix ubuntu build warning, the config unused setter 2014-03-15 19:48:11 +08:00
winlin
04cc29f4e1 support ubuntu make colorful display 2014-03-15 19:44:06 +08:00
wenjie.zhao
109ce07c1b color text of error msg supported. 
strerror msg supported.
 2014-03-15 04:55:30 +08:00
wenjie.zhao
e0e3504e1d color text of error msg supported. 
strerror msg supported.
 2014-03-15 04:53:46 +08:00
winlin
98c9002b41 remove the patch for st for arm 2014-03-12 16:01:50 +08:00
winlin
24be5fb386 add http 1.0 and 1.1 specification 2014-03-12 15:42:30 +08:00
winlin
7112c6ac73 add http 1.0 and 1.1 specification 2014-03-12 15:42:03 +08:00
winlin
b9613fd0d1 update readme, add wiki sample:transcode2hls 2014-03-12 12:07:16 +08:00
winlin
e6e32f963c add wiki Usage: Forward and Realtime 2014-03-11 00:01:24 +08:00
winlin
3066a03fb7 rename SRS_HTTP to SRS_HTTP_CALLBACK 2014-03-10 23:13:09 +08:00
winlin
c1149607c9 simplify usage 2014-03-10 19:44:04 +08:00
winlin
4a8ee0f6e9 fix bug of stop script 2014-03-10 19:26:44 +08:00
winlin
2fa0d60186 simplify usage 2014-03-10 19:13:18 +08:00
winlin
13d9b44c73 simplify usage 2014-03-10 18:59:11 +08:00
winlin
431b0fb31d add FMLE snapshot 2014-03-10 16:09:19 +08:00
winlin
91c1a2cd28 fix ubuntu build bug, add --force-yes to install 2014-03-10 13:33:13 +08:00
winlin
f6126c5ad2 fix ubuntu build bug, add --force-yes to install 2014-03-10 13:09:45 +08:00
winlin
387be8fa3b change to 0.9.15, finish amf0 utest 2014-03-09 20:37:20 +08:00
winlin
9521fbfaaa change version to 0.9.14, finish amf0 basic utest 2014-03-08 23:10:54 +08:00
winlin
95c2e7fd63 amf0 utest: finish basic utest for amf0 2014-03-08 23:09:24 +08:00
winlin
044138c39e refine summary for amf0 hpp 2014-03-08 23:02:27 +08:00
winlin
9fd48d84c1 refine amf0 object size to total_size, elem count to count 2014-03-08 22:59:30 +08:00
winlin
59db1dd260 utest for amf0 object, refine the count of elem 2014-03-08 22:51:13 +08:00
winlin
8ed9ae6242 amf0 utest: remove the object read/write function, directly use object to read or write. 2014-03-08 22:25:56 +08:00
winlin
a3ae871360 refine code, array to ecma_array. 2014-03-08 22:07:40 +08:00
winlin
3129c738cb amf0 utest: refine interface of amf0, only export required objects 2014-03-08 21:56:14 +08:00
winlin
b55efef2ee amf0 utest: finish amf0 any read/write utest 2014-03-08 21:12:13 +08:00
winlin
609114a5fe amf0 utest: remove the old amf0 read any, discovery object ant use object to read itself. 2014-03-08 21:06:20 +08:00
winlin
3691c106fa amf0 utest: add usage for amf0 2014-03-08 17:18:44 +08:00
winlin
34f94a1be3 amf0 utest: add object and ecma array create function. 2014-03-08 17:04:21 +08:00
winlin
f4aa2f30c1 amf0 utest: change version to 0.9.13 2014-03-08 16:57:13 +08:00
winlin
4306db099d amf0 utest: elem read/write refined 2014-03-08 16:56:35 +08:00
winlin
bfe771bbba amf0 utest: null,undefined,object-eof to any 2014-03-08 14:38:19 +08:00
winlin
e40be6e89d amf0 utest: boolean to any 2014-03-08 14:13:31 +08:00
winlin
4a0023ae63 amf0 utest: finish utest for string to any 2014-03-08 14:05:45 +08:00
winlin
cae8228b09 amf0 utest: remove class SrsAmf0String, use SrsAmf0Any instead 2014-03-08 13:57:08 +08:00
winlin
57ce04ae12 amf0 utest: remove struct use class instead, move class together 2014-03-08 13:41:15 +08:00
winlin
404207db4f amf0 utest: refine amf0 size and finish utest. 2014-03-08 13:35:22 +08:00
winlin
db7a113441 amf0 utest: refine amf0 size and finish utest. 2014-03-08 13:35:04 +08:00
winlin
3083759273 amf0 utest, refine amf0 size and object/array read/write 2014-03-08 13:11:26 +08:00
winlin
48343e4f3a refien build script, regenereate all options. change to 0.9.12 2014-03-08 11:25:02 +08:00
winlin
1892245db6 add option bwtc, to enable or disable the bandwidth test tool 2014-03-07 19:07:38 +08:00
winlin
0a2b8b797d support disable the librtmp 2014-03-07 18:55:15 +08:00
winlin
179e2a2bba use zip format 2014-03-07 17:50:21 +08:00
winlin
59a2d5e7e0 add --with-gprof support 2014-03-07 17:18:31 +08:00
winlin
42ad264182 add gprof files and dot files 2014-03-07 16:09:35 +08:00
winlin
6e0bebdacf full support gperf gmc/gmp/gcp 2014-03-07 15:40:55 +08:00
winlin
8cd1c11add change forward schema 2014-03-07 14:27:32 +08:00
winlin
bef7e20ed9 fix rtmp protocol bug, use 31bits timestamp 2014-03-07 13:35:03 +08:00
winlin
c89aea8af7 fix rtmp protocol bug, use 31bits timestamp 2014-03-07 13:34:23 +08:00
winlin
741d6f97f6 support gperf memory check(gmc). 2014-03-07 12:24:47 +08:00
winlin
489a492e47 add url for gperftools 2014-03-07 09:52:59 +08:00
winlin
10852acb25 refine gperf build script 2014-03-06 18:14:46 +08:00
winlin
dcd568a0d7 add gperf to heap check, use reload signal to terminate program normally 2014-03-06 18:12:19 +08:00
winlin
03a14e2e1a add gperftools for mem leak detect, mem/cpu profile. 2014-03-06 16:52:51 +08:00
winlin
ee7fafe465 add gperftools demo: heap check and profile, cpu profile 2014-03-06 16:48:39 +08:00
winlin
9896842b05 add cpu profile 2014-03-06 16:46:59 +08:00
winlin
4061f0db58 refine the profiler 2014-03-06 16:31:40 +08:00
winlin
7239963780 add heap checker and profiler demo 2014-03-06 16:23:35 +08:00
winlin
0b17b2a481 build gperftools 2014-03-06 14:10:45 +08:00
winlin
34e913c58f add gperftools for mem leak detect, mem/cpu profile. 2014-03-06 12:50:23 +08:00
winlin
9d08b42c82 change version to 0.9.11 2014-03-05 10:41:23 +08:00
winlin
8bdf98afa5 refine the multiple processes architecture, remove the isolate bandwidth test process 2014-03-05 10:34:17 +08:00
winlin
a488ef8317 fix bug#25: fmle republish bug, srs return special error code and wait for client to republish. 2014-03-05 10:21:31 +08:00
winlin
1ccddf4cfc add gest framework for utest, build success. 2014-03-04 18:46:00 +08:00
winlin
338e129a29 add utest build project, no testcase. 2014-03-04 16:13:12 +08:00
winlin
fe5811304b add utest script to generate the utest Makefile 2014-03-04 14:01:43 +08:00
winlin
02326cd844 support build with jobs 2014-03-04 13:03:20 +08:00
winlin
52b6ab3f2f support build with jobs 2014-03-04 12:45:41 +08:00
winlin
128783ded3 add build summary colorful display for each feature. 2014-03-04 11:09:41 +08:00
winlin
47aee8dce0 add utest framework gtest 2014-03-03 18:28:50 +08:00
winlin
722e79003b merge from xiangcheng.liu, memory leak in amf0 2014-03-03 09:49:59 +08:00
winlin
d622da3b44 update readme, finish modularity and wiki, change to 0.9.10 2014-03-02 21:57:36 +08:00
winlin
880f4f5dc2 final the modularity, rename the app module. 2014-03-02 21:49:09 +08:00
winlin
c1086f8a9d srs-librtmp: finish the simple publish and play sample. 2014-03-02 18:33:32 +08:00
winlin
efa09102cf srs-librtmp: implements the read packet. 2014-03-02 17:47:53 +08:00
winlin
c338eb3666 srs-librtmp: implements the publish and play. 2014-03-02 14:51:19 +08:00
winlin
fce26d6690 srs-librtmp: implements play stream. 2014-03-02 14:07:48 +08:00
winlin
6b213b73eb refine code, rename SrsRtmp to SrsRtmpServer. 2014-03-02 14:07:10 +08:00
winlin
8aedc51a2f refine code, rename SrsRtmp to SrsRtmpServer. 2014-03-02 13:54:40 +08:00
winlin
4f91cae377 srs-librtmp: add complex handshake. 2014-03-02 13:07:32 +08:00
winlin
76f37baafe srs-librtmp: implements the simple socket stream. 2014-03-02 13:06:21 +08:00
winlin
86267f854c srs-librtmp: implements handshake. 2014-03-02 12:35:15 +08:00
winlin
f24f27deb9 srs-librtmp: add make ssl/nossl support for sample 2014-03-02 11:31:31 +08:00
winlin
b7a62ba131 use goto to free resource 2014-03-02 09:48:30 +08:00
winlin
feaf0c5e89 librtmp: create socket 2014-03-02 09:28:44 +08:00
winlin
f8335e2c1f extract simple socket to lib 2014-03-02 09:22:09 +08:00
winlin
5e4b7d3ae9 add colorful display for make. 2014-03-02 09:02:53 +08:00
winlin
e14d3bb5df add colorful display for make. 2014-03-02 09:00:49 +08:00
winlin
40a5edb37f update readme. 2014-03-02 00:15:09 +08:00
winlin
db22af07a0 change to 0.9.9 2014-03-02 00:06:24 +08:00
winlin
fc9e3fd890 srs-librtmp define interfaces 2014-03-02 00:05:59 +08:00
winlin
44375b9e6b add srs publish/play demo use srs-librtmp 2014-03-01 23:31:52 +08:00
winlin
713b05541b add librtmp demo srs_publish 2014-03-01 23:24:53 +08:00
winlin
aa5d28ed85 add library 2014-03-01 19:15:36 +08:00
winlin
d5a02a55ee unify code style 2014-03-01 18:27:55 +08:00
winlin
7d570fb4f3 use fast log 2014-03-01 18:06:20 +08:00
winlin
382fd127e4 rename config and pithy-print to app module. 2014-03-01 16:02:59 +08:00
winlin
b407021d45 move config to app, for its application level features 2014-03-01 15:59:55 +08:00
winlin
517d346a52 change macro for all rtmp protocol files. 2014-03-01 14:09:22 +08:00
winlin
4c498b67da rename pro to rtmp protocol. 2014-03-01 14:05:58 +08:00
winlin
8d5806154b add todo, to rename to the right name SrsRtmpServer 2014-03-01 14:03:41 +08:00
winlin
2074b50d87 move handshake and rtmp to protocol module 2014-03-01 14:03:02 +08:00
winlin
0296c8eff4 change to 0.9.6 2014-03-01 13:39:52 +08:00
winlin
4e3f7843fe rename protocol dir to pro. move rtmp stack to protocol module 2014-03-01 13:39:27 +08:00
winlin
4a8bc3b277 change version to 0.9.5 2014-03-01 12:46:05 +08:00
winlin
7dfc902b87 extract protocol io interface to prepare to extract the protocol from underlayer socket. 2014-03-01 12:43:04 +08:00
winlin
a73dec4c41 refine code, rename ISrsReader to ISrsBufferReader 2014-03-01 11:27:06 +08:00
winlin
85cd1e1a41 extract protocol module, move amf0 to protocol module 2014-03-01 11:24:40 +08:00
winlin
7e14e7fa57 move pithy print to kernel 2014-03-01 11:11:02 +08:00
winlin
fddd60b962 change to 0.9.4, extract kernel module 2014-03-01 11:06:01 +08:00
winlin
c0dbee0854 move buffer to kernel. extract ISrsReader for buffer 2014-03-01 11:04:03 +08:00
winlin
8fea433450 move stream to kernel module 2014-03-01 10:58:13 +08:00
winlin
cb99de4462 move config to kernel module 2014-03-01 10:55:43 +08:00
winlin
5e14aa9c13 fix the macro bug 2014-03-01 10:53:28 +08:00
winlin
b0d20f57e1 move reload to kernel module 2014-03-01 10:51:45 +08:00
winlin
39d3425691 extract log context, move log to kernel module. 2014-03-01 10:42:55 +08:00
winlin
dea66a322d extract kernel module, depends on core and provides kernel service(no stream) 2014-03-01 10:30:16 +08:00
winlin
bcbea86202 extract auto_free to core module 2014-03-01 10:19:11 +08:00
winlin
4e91a3d5aa extract core and app module. 2014-03-01 10:14:25 +08:00
winlin
62fbe9e760 refine modules, extract core module 2014-03-01 10:05:14 +08:00
winlin
c2ccb83912 rename core to app 2014-03-01 09:56:48 +08:00
winlin
6616dfecfc refine configure. 2014-03-01 09:52:41 +08:00
winlin
91d57ae7f9 refine build script, add comments for app.sh. change version to 0.9.3 2014-03-01 09:35:41 +08:00
winlin
ac3be10435 patch st and srs for arm build, allow user to specifies the gcc/g++ 2014-03-01 00:17:41 +08:00
winlin
7fa031e7fb fix bug of openssl, use objs/openssl/include 2014-02-28 22:50:18 +08:00
winlin
a6f4815994 use local openssl and link libssl.a 2014-02-28 22:42:25 +08:00
winlin
bcb719bf18 create log dir 2014-02-28 21:07:46 +08:00
winlin
985034860c add comments for depends 2014-02-28 20:52:26 +08:00
winlin
7e0cf2b9fc add comments for configure 2014-02-28 15:42:35 +08:00
winlin
979ee7d39c update config, remove the script to create logs dir. 2014-02-28 15:10:28 +08:00
winlin
72d477f466 support use other g++ when configure. 2014-02-28 14:38:27 +08:00
winlin
cd7e6cc321 refine the configure, add comments 2014-02-28 13:17:31 +08:00
winlin
b730fda176 add rtsp protocol 2014-02-28 09:26:17 +08:00
winlin
4aeed8df1d fix bug of SrsFMLEStartPacket command name, set_recv_timeout(SRS_PAUSED_RECV_TIMEOUT_US) 2014-02-24 09:12:57 +08:00
winlin
797d548766 fix bug of comment, change version to 0.9.2 2014-02-19 15:31:29 +08:00
winlin
980b53dfbe change version to 0.9.1 2014-02-19 15:15:32 +08:00
winlin
745797365e change version to 0.9.1 2014-02-19 15:14:46 +08:00
winlin
39f15ba3da refine the comments, fix bug of parse message 2014-02-19 14:54:04 +08:00
winlin
73b298cab5 fix bug of connect app response data 2014-02-19 09:38:49 +08:00
winlin
11c5b2cf14 refine code, use RTMP_FMT_TYPE0 instead 2014-02-16 10:23:23 +08:00
winlin
7a91826732 refine code, use RTMP_FMT_TYPE0 instead 2014-02-16 10:22:52 +08:00
winlin
8697adacd9 fix compile warning on 64bit centos 2014-02-11 13:54:05 +08:00
liuxc0116
490033f601 forget delete memset 
at last modify,forget delete memset(payload, 0, size);
 2014-01-27 11:34:50 +08:00
liuxc0116
81e085dd1b memory will leaks 
the payload pointor assigned two memory,will lead to memory leaks
 2014-01-23 18:05:55 +08:00
winlin
527abe2157 update readme 2014-01-19 11:37:55 +08:00
winlin
1d3621dc23 fix warning on 32bits centos6. 2014-01-19 10:49:40 +08:00
winlin
5a9a15f796 Update srs.conf 2014-01-12 15:58:15 +08:00
winlin
574536d9ed merge wenjie. fix jw/flower player pause bug, which send closeStream actually. 2014-01-11 19:55:55 +08:00
winlin
29a97152fa fix bug of compile ts_info on old gcc, add LL to large number. 2014-01-05 16:54:50 +08:00
winlin
b54aefe897 update script 2014-01-05 16:48:10 +08:00
winlin
47dfdd3ae2 update readme 2014-01-05 15:58:17 +08:00
winlin
63388e8ac3 merge from wenjie, fix the flower player play bug, play(reset=amf0-number) 2014-01-02 19:09:25 +08:00
wenjiegit
a91ffb1e11 update master 2014-01-02 18:23:27 +08:00
wenjiegit
6d2e1c95da update master 2014-01-02 18:21:29 +08:00
wenjiegit
8d808d8868 update master 2014-01-02 18:19:36 +08:00
wenjiegit
54bd613cf5 update master 2014-01-02 18:17:39 +08:00
wenjiegit
d05f69b247 update master 2014-01-02 18:04:35 +08:00
wenjiegit
f387b2b569 update master 2014-01-02 18:03:49 +08:00
wenjiegit
a0fc4e5f25 update master 2014-01-02 18:01:41 +08:00
wenjiegit
e981cde90c update master 2014-01-02 17:38:44 +08:00
wenjiegit
f8a7db51f2 fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number] 2014-01-02 14:16:26 +08:00
wenjiegit
276b60200f fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number] 2014-01-02 14:05:09 +08:00
wenjiegit
bfef0eebfe fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number] 2014-01-02 14:00:00 +08:00
wenjiegit
e959bb6c5c fixbug[play packet decode bug: srs only read bool type play reset value, actually this value can be bool or number] 2014-01-02 13:26:25 +08:00
winlin
993c5daec7 chunk size default to 60000, high performance. set chunk size when forward 2014-01-01 21:39:06 +08:00
winlin
4d631d749f fix ts_info centos5 build bug 2014-01-01 21:07:01 +08:00
winlin
4955425be9 fix the listen backlog bug, change from 10 to 512 2014-01-01 20:14:46 +08:00
winlin
3dbb2132d3 change server timeout longer, recv timeout from 5s to 30s 2014-01-01 19:58:33 +08:00
winlin
99b9fa0c25 fix the forwarder dead when st_thread interrupt at st_usleep, check thread->can_loop(). 2014-01-01 16:27:45 +08:00
winlin
fabdf9507e fix bug of play stream of nginx, remove the start slash of streamName. 2014-01-01 13:58:58 +08:00
winlin
273bdb2242 update flash client. 2014-01-01 11:38:48 +08:00
winlin
dba7329682 refine readme. 2014-01-01 11:28:43 +08:00
winlin
0b7c7240e6 refine the authors and license 2014-01-01 11:21:52 +08:00
winlin
bb3c88fef7 change copyright from 2013 to 2013-2014. 2014-01-01 10:37:12 +08:00
winlin
649419c1aa refine the utility of js. 2014-01-01 09:49:54 +08:00
winlin
c221eb61c4 fix bug of bandwidth test, donot use vhost in query 2013-12-27 18:57:36 +08:00
winlin
5537f9b066 fix bug of bandwidth test, donot use vhost in query 2013-12-27 18:55:47 +08:00
winlin
df349da7d9 fix bug of bandwidth test, donot use vhost in query 2013-12-27 18:55:10 +08:00
winlin
89ac091c35 fix bug of bandwidth test, donot use vhost in query 2013-12-27 18:54:34 +08:00
winlin
62f1f23991 fix bug of bandwidth test, donot use vhost in query 2013-12-27 18:52:09 +08:00
winlin
7901b481e4 change ui version to 1.19 2013-12-27 18:50:43 +08:00
winlin
19f9342034 refine bandwidth test 2013-12-27 18:49:34 +08:00
winlin
20d1732ced merge from wenjie, the bandwidth test feature. 2013-12-27 17:03:12 +08:00
winlin
6bba081485 update the stop/start script 2013-12-27 10:11:29 +08:00
winlin
51686b91d2 change ui version to 1.17 2013-12-26 15:41:54 +08:00
winlin
2e58de393a refine the ui of chat, to 5x3+1 2013-12-26 15:41:04 +08:00
winlin
5cec967931 refine the index. refine the parse_query_string, add user_query object to result 2013-12-26 13:31:52 +08:00
winlin
c51842aa9a jump nginx index to api-server, for ie crossdomain. 2013-12-26 10:05:24 +08:00
winlin
b6280f3804 jump nginx index to api-server, for ie crossdomain. 2013-12-26 09:50:10 +08:00
winlin
c23b133fdc support query in index.html 2013-12-26 09:18:03 +08:00
winlin
702ad69817 support query in index.html 2013-12-26 09:13:27 +08:00
winlin
7094b6f437 set default to chat. 2013-12-26 09:02:16 +08:00
winlin
531fa6fb76 change ui version to 1.15, fix the publiser bug, support chrome/firefox/safari/ie browsers. 2013-12-26 08:56:13 +08:00
wenjiegit
3af83fb02a add linux version of band check app; add web version of band check app 2013-12-26 07:24:19 +08:00
wenjiegit
237fb13e1b add linux version of band check app; add web version of band check app 2013-12-26 06:06:16 +08:00
wenjiegit
7b5ac6367f add linux version of band check app; add web version of band check app 2013-12-26 05:50:43 +08:00
winlin
4b4f317e09 refine the ui, link the players to the api server static dir 2013-12-25 23:42:23 +08:00
winlin
7b2f9d59a2 fix bug of identify the truevision camera 2013-12-25 22:18:05 +08:00
winlin
ec5e33f3bc refine the filter of camera and microphone 2013-12-25 22:01:59 +08:00
winlin
b1fe298def change ui version to 1.13 2013-12-25 18:17:44 +08:00
winlin
962deefb92 refine the ui of chat. 2013-12-25 17:41:41 +08:00
winlin
70dc3dbb53 layout the chat in 2x8 table 2013-12-25 17:26:50 +08:00
winlin
3ab867d907 fix bug of player dar. 2013-12-25 14:59:19 +08:00