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

550 commits

Author SHA1 Message Date
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
9055d8eecf update readme. 2014-03-23 18:03:24 +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
3ec3c1f532 support daemon 2014-03-23 12:42:05 +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
3c920b933c add ./etc/init.d/srs, refine configure to support make clean then make. 2014-03-22 20:53:29 +08:00
winlin
f25c6558a5 write pid to ./objs/srs.pid. 2014-03-21 15:45:34 +08:00
winlin
a0c0c94cf0 refine conf, add comments for other listen type 2014-03-21 14:00:26 +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
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
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
2fa0d60186 simplify usage 2014-03-10 19:13:18 +08:00
winlin
13d9b44c73 simplify usage 2014-03-10 18:59:11 +08:00
winlin
8cd1c11add change forward schema 2014-03-07 14:27:32 +08:00
winlin
bcb719bf18 create log dir 2014-02-28 21:07:46 +08:00
winlin
527abe2157 update readme 2014-01-19 11:37:55 +08:00
winlin
5a9a15f796 Update srs.conf 2014-01-12 15:58:15 +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
20d1732ced merge from wenjie, the bandwidth test feature. 2013-12-27 17:03:12 +08:00
winlin
6b99a749ea refine the chat, use players_pub_rtmp without hls and gopcache, low latecy 2013-12-23 10:58:41 +08:00
winlin
bad6f0d3a8 revert the copyrigh, only when commit feature, add the copyright field 2013-12-22 12:40:46 +08:00
winlin
725ff8e5a5 merge from wenjie: support set chunk size at vhost level 2013-12-22 12:23:20 +08:00
winlin
309322fd5c update the bootstrap wizard, use v2 2013-12-22 11:58:30 +08:00
winlin
ee79f4a52f update the conf, add demo.srs.com, add players and players_pub, add __defaultVhost__ for rtmp 2013-12-22 00:08:17 +08:00
winlin
40c1298476 add srs player 2013-12-20 00:12:17 +08:00
winlin
6beff7cf54 fix build script bug, create nginx/html/live dir 2013-12-18 15:22:14 +08:00
winlin
1c04e35924 refine the ui, add osmf/jwplayer 2013-12-18 12:37:46 +08:00
winlin
e262147e81 fix the hls reload bug, feed it the sequence header. 2013-12-15 20:29:18 +08:00
winlin
ce4928cef6 support set the live queue length(in seconds), drop when full. 2013-12-15 19:38:39 +08:00
winlin
c47f07c69a refine the consumer, use srs message queue to shrink message when overflow. 2013-12-15 19:11:57 +08:00
winlin
b4093bfbe4 support set live queue length 2013-12-15 18:25:55 +08:00
winlin
270041b225 fix the forwarder reconnect bug, feed it the sequence header. 2013-12-15 17:09:25 +08:00
winlin
63cec6f967 update readme 2013-12-15 13:41:17 +08:00
winlin
b3ef28f831 fix bug of get hls enabled config 2013-12-15 13:23:03 +08:00
winlin
aaba290c1d add reload readme. 2013-12-15 12:44:09 +08:00
winlin
b90b64954e support reload the forwarder 2013-12-15 12:34:22 +08:00
winlin
e2bb38c483 support reload the removed vhost 2013-12-14 22:54:10 +08:00
winlin
010b7a7595 refine config. 2013-12-14 21:19:47 +08:00
winlin
ac5ccbc77e refine the thread model for the retry threads 2013-12-14 14:06:32 +08:00
winlin
bb90881489 auto install depends software for ubuntu or centos. 2013-12-10 10:09:29 +08:00
winlin
c618229487 regression test ok 2013-12-08 13:17:39 +08:00
winlin
3fd3ac5a11 support http hooks: on_connect/close/publish/unpublish/play/stop. 2013-12-08 12:48:03 +08:00
winlin
889ad9238b support http hooks: on_connect/close/publish/unpublish/play/stop. 2013-12-08 12:45:12 +08:00
winlin
30099dfa09 support multiple http hooks for a event. 2013-12-08 10:46:15 +08:00
winlin
65fde21e6c add http client 2013-12-07 22:06:53 +08:00
winlin
d3cee00b3b add cherrypy api server 2013-12-07 20:34:42 +08:00
winlin
263213d8b6 update version, add build date 2013-12-07 19:27:31 +08:00
winlin
3b09f9bea9 support audio transcode only, speex/mp3 to aac 2013-12-06 14:35:03 +08:00
winlin
679e851f07 support max_connections, drop if exceed. 2013-12-06 11:00:37 +08:00
winlin
b9440df745 add encoder/hls pithy print 2013-12-05 23:34:26 +08:00
winlin
464d78b762 add todo for ffmpeg 2013-12-03 00:26:40 +08:00
winlin
113731dd6b reap the transcode process 2013-12-02 23:51:51 +08:00
winlin
a2e6e6718e fix the m3u8 crash bug, simplify it 2013-12-02 11:46:39 +08:00
winlin
2695e4d0c6 fix bug of core 2013-12-01 17:42:09 +08:00
winlin
6af0794bab support dead-loop detect for forwarder and transcoder. 2013-12-01 17:32:06 +08:00
winlin
e4ea965a3a update conf 2013-12-01 14:28:07 +08:00
winlin
9d65cd1c9f change server name to demo, dev used for development vhost 2013-12-01 14:08:28 +08:00
winlin
bf18a3ac96 change demo video to 200kbps 2013-12-01 12:41:52 +08:00
winlin
bbf7b9bb01 disable the forward for bug. update the steps 2013-12-01 12:31:23 +08:00
winlin
5502344e85 add forward sample 2013-12-01 12:16:57 +08:00
winlin
5cc1ad6da8 add drawtext filter sample 2013-12-01 12:04:00 +08:00
winlin
1da09e5ffb add sample video 2013-12-01 11:24:26 +08:00
winlin
a7c83b1aee support ffmpeg filter 2013-12-01 10:55:06 +08:00
winlin
9a0d8855d8 support ffmpeg filter 2013-12-01 10:54:41 +08:00
winlin
52e6115f9a update readme 2013-11-30 23:12:47 +08:00
winlin
525af4599f support live stream transcoding by ffmpeg. 2013-11-30 23:04:47 +08:00
winlin
06278176dd add research empty ffmpeg 2013-11-30 21:53:28 +08:00
winlin
80a81b1661 parse ffmpeg params 2013-11-30 21:02:21 +08:00
winlin
8d91561ca0 add ffmpeg transcoding framework 2013-11-30 18:31:07 +08:00
winlin
b1466c8883 fix build ffmpeg bug, add -ldl compile option 2013-11-30 16:45:47 +08:00
winlin
a086e2bbfa add transcoding params to config 2013-11-30 16:23:01 +08:00
winlin
db405b7e0e support forward stream to origin/edge 2013-11-29 22:20:51 +08:00
winlin
2fa7610f9c add rtmp client 2013-11-29 15:07:05 +08:00
winlin
023e23bc82 add performance test 2013-11-28 19:25:56 +08:00
winlin
af5e7f002f fix the memory leak error 2013-11-28 14:53:46 +08:00
winlin
a26c28334e update readme 2013-11-27 23:27:55 +08:00
winlin
f8855cfcbb fix the aac jump bug on iphone, correct the audio pts, use audio buffer and flush audio 2013-11-27 17:30:16 +08:00
winlin
04cfe20279 support HLS, refine the dir use app 2013-11-26 17:21:49 +08:00
winlin
57ea56970d add nginx and used as http server 2013-11-26 16:45:50 +08:00
winlin
200a6a6975 add hls config 2013-11-23 19:15:11 +08:00
winlin
e3e0db9bb1 fix the format to unix without x 2013-11-23 18:20:02 +08:00
winlin
a47a53f271 update the ts_info parse the PMT and PES header 2013-11-18 23:49:18 +08:00
winlin
ff565c4d9b fix bug of amf0 decode 2013-11-16 12:54:48 +08:00
winlin
3669419e4c support config and reload the pithy print. 2013-11-10 11:52:19 +08:00
winlin
0813104c6e support reload config(vhost and its detail). 2013-11-09 22:47:27 +08:00
winlin
aef2fe9db5 support reload config(vhost and its detail). 2013-11-09 22:46:50 +08:00
winlin
68ccd7eb64 support reload config(listen and chunk_size) by SIGHUP(1). 2013-11-09 22:41:44 +08:00
winlin
ed3525056c support config the chunk_size. 2013-11-09 20:56:35 +08:00
winlin
751323fac8 release v0.3, 11773 lines 2013-11-04 22:55:19 +08:00
winlin
58d9677ddd support vhosts specified config. 2013-11-04 22:42:03 +08:00
winlin
c0b6982e0d support listen multiple ports. 2013-11-02 19:32:52 +08:00
winlin
2aa15a1134 support nginx-style config file 2013-11-02 17:55:59 +08:00