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

953 commits

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