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

451 commits

Author SHA1 Message Date
winlin
47927ab460 refine options, change to 0.9.66 2014-04-16 13:24:00 +08:00
winlin
1ae9178605 add favicon.ico, change to 0.9.65 2014-04-15 11:19:15 +08:00
winlin
2c6b6c6846 fix bug #47: use stream time to stop for duration of rtmpdump 2014-04-14 10:51:31 +08:00
winlin
bc756d6ad9 fix simple handshake bug #46, copy c1 to s2. change to 0.9.63 2014-04-13 21:55:01 +08:00
winlin
9a036958d7 fix bug #45, support duration for live. change to 0.9.62 2014-04-13 21:37:26 +08:00
winlin
a0472f256d support test config file. change to 0.9.61 2014-04-13 16:55:42 +08:00
winlin
cfee761899 support full reload. change to 0.9.60 2014-04-13 13:35:03 +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
ff90278048 add speex1.2 to transcode flash encoder stream. change to 0.9.58 2014-04-11 10:40:21 +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
5aded78272 change to 0.9.56, for macro changed 2014-04-08 15:32:13 +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
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
4f7cfeed37 change to 0.9.52, refine encoder and ffmpeg 2014-04-07 10:15:44 +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
00eda0d7b2 implements the http stream module. 2014-04-04 23:04:38 +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
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
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
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
51c1615173 change to 0.9.42, add http parse framework 2014-04-01 12:36:56 +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
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
3932cf1334 update build, always patch st, for we need to build in raspberrypi directly 2014-03-29 14:25:47 +08:00
winlin
aa89f9f51e change to 0.9.37, for http api/stream 2014-03-27 12:14:04 +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
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
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
34efa15118 change to 0.9.30, first release for srs1 2014-03-23 21:15:52 +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
f1477dc4fe support daemon, default start in daemon. change to 0.9.28 2014-03-23 12:42:42 +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
d63cbb3c46 add reload support. add make install and uninstall, change to 0.9.26 2014-03-22 22:07:49 +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
5758551508 support hls republish 2014-03-21 17:10:24 +08:00
winlin
e0fb1029c9 support pure audio hls. change to 0.9.24 2014-03-20 18:55:45 +08:00
winlin
238349b0c0 update configure, change to 0.9.23 2014-03-20 14:08:53 +08:00
winlin
6b84a5e14c change to 0.9.22 2014-03-19 22:51:04 +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
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
2eeb289c2f assert system is little-endian 2014-03-19 10:38:02 +08:00
winlin
c85dde7f3f substitute all TAB with 4spaces. 2014-03-18 11:32:58 +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
a9da5903f6 arm support ssl/hls, change to 0.9.17 2014-03-16 20:16:42 +08:00
winlin
7744053d28 add arm research files, change to 0.9.16 2014-03-16 18:05:07 +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
f4aa2f30c1 amf0 utest: change version to 0.9.13 2014-03-08 16:57:13 +08:00
winlin
48343e4f3a refien build script, regenereate all options. change to 0.9.12 2014-03-08 11:25:02 +08:00
winlin
9d08b42c82 change version to 0.9.11 2014-03-05 10:41:23 +08:00
winlin
d622da3b44 update readme, finish modularity and wiki, change to 0.9.10 2014-03-02 21:57:36 +08:00
winlin
db22af07a0 change to 0.9.9 2014-03-02 00:06:24 +08:00
winlin
713b05541b add librtmp demo srs_publish 2014-03-01 23:24:53 +08:00
winlin
7d570fb4f3 use fast log 2014-03-01 18:06:20 +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
0296c8eff4 change to 0.9.6 2014-03-01 13:39:52 +08:00
winlin
4a8bc3b277 change version to 0.9.5 2014-03-01 12:46:05 +08:00
winlin
fddd60b962 change to 0.9.4, extract kernel module 2014-03-01 11:06:01 +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
91d57ae7f9 refine build script, add comments for app.sh. change version to 0.9.3 2014-03-01 09:35:41 +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
1d3621dc23 fix warning on 32bits centos6. 2014-01-19 10:49:40 +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
63388e8ac3 merge from wenjie, fix the flower player play bug, play(reset=amf0-number) 2014-01-02 19:09:25 +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
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
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
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
20d1732ced merge from wenjie, the bandwidth test feature. 2013-12-27 17:03:12 +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
c7cd726f1b merge upstream 2013-12-24 10:59:38 +08:00
wenjiegit
00fb37a831 merge upstream 2013-12-24 10:49:17 +08:00
wenjiegit
3753e8c5f1 merge upstream 2013-12-24 10:38:38 +08:00
winlin
593d16446e add bandwidth workflow 2013-12-22 17:45:08 +08:00
winlin
908f0d87e9 add bandwidth workflow 2013-12-22 17:41:28 +08:00
winlin
084ad79534 refine the bandwidth test 2013-12-22 17:38:51 +08:00
winlin
9455181790 merge from wenjie, support banwidth test. 2013-12-22 17:28:29 +08:00
winlin
bad6f0d3a8 revert the copyrigh, only when commit feature, add the copyright field 2013-12-22 12:40:46 +08:00
winlin
dfb3e117f8 add contributor to core.hpp 2013-12-22 12:35:41 +08:00
winlin
725ff8e5a5 merge from wenjie: support set chunk size at vhost level 2013-12-22 12:23:20 +08:00
winlin
4b74435e89 fix bug of resolve vhost, must strip then get from config. 2013-12-22 00:33:38 +08:00
winlin
632255f08f update the signature, when connect to server, parse the response. 2013-12-21 21:13:55 +08:00
wenjiegit
9a70ce7865 add bandcheck code and modified srs code for merge 2013-12-21 16:19:16 +08:00
winlin
9080c2e559 ensure the HLS(ts) is continous when republish stream. 2013-12-15 20:36:59 +08:00
winlin
e262147e81 fix the hls reload bug, feed it the sequence header. 2013-12-15 20:29:18 +08:00
winlin
27255a3e7a refine protocol, use int64_t timestamp for ts and jitter. 2013-12-15 19:59:32 +08:00
winlin
ce4928cef6 support set the live queue length(in seconds), drop when full. 2013-12-15 19:38:39 +08:00
winlin
5836ffd2d4 refine the forwarder, use srs message queue 2013-12-15 19:24:29 +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
d911c85a12 add todo for the reload 2013-12-15 13:27:08 +08:00
winlin
b3ef28f831 fix bug of get hls enabled config 2013-12-15 13:23:03 +08:00
winlin
fb67f91167 support reload the hls/forwarder/transcoder 2013-12-15 13:07:39 +08:00
winlin
b90b64954e support reload the forwarder 2013-12-15 12:34:22 +08:00
winlin
7622878979 support reload the gop_cache 2013-12-15 12:08:01 +08:00
winlin
2f397d0460 support reload the gop_cache 2013-12-15 12:04:28 +08:00
winlin
e2bb38c483 support reload the removed vhost 2013-12-14 22:54:10 +08:00
winlin
f016914ac1 rename SrsReloadHandler to ISrsReloadHandler 2013-12-14 21:34:54 +08:00
winlin
010b7a7595 refine config. 2013-12-14 21:19:47 +08:00
winlin
5b29d0ec42 refine the config 2013-12-14 16:44:27 +08:00
winlin
3dd7156f0d refine the config buffer. 2013-12-14 15:56:20 +08:00
winlin
ac5ccbc77e refine the thread model for the retry threads 2013-12-14 14:06:32 +08:00
wenjiegit
c87e55a2cc merged master 2013-12-13 02:41:31 +08:00
wenjiegit
25caf5db36 for merge 2013-12-13 02:07:50 +08:00
wenjie
6e9f375606 +server support band check +every vhost can have it's own chunk size 2013-12-12 20:56:19 +08:00
winlin
6329284b39 add todo for the bug of forwarder 2013-12-12 16:18:32 +08:00
winlin
7baa53a8d6 add todo for memory increase when forwarder server failed. 2013-12-12 12:42:53 +08:00
winlin
ff9c434eb9 add todo for memory increase when forwarder server failed. 2013-12-12 10:41:27 +08:00
winlin
66048cebbb add todo for source 2013-12-10 14:49:35 +08:00
winlin
8887754b17 change version to 0.9 dev 2013-12-08 14:28:04 +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
2887cda176 support multiple http hooks for a event. 2013-12-08 10:46:33 +08:00
winlin
30099dfa09 support multiple http hooks for a event. 2013-12-08 10:46:15 +08:00