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

371 commits

Author SHA1 Message Date
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
f387b2b569 update master 2014-01-02 18:03:49 +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
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
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
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
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
winlin
a478452f57 support http callback hooks: on_connect 2013-12-07 23:23:19 +08:00
winlin
65fde21e6c add http client 2013-12-07 22:06:53 +08:00
winlin
bb22c3b5cd add http library, support in build script 2013-12-07 20:51:27 +08:00
winlin
3600be9796 add http callback in config 2013-12-07 20:38:14 +08:00
winlin
4b9eabdf01 udpate files. 2013-12-07 19:28:11 +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
2d592d177d refine the signals of ffmpeg. 2013-12-06 14:12:01 +08:00
winlin
71895a4da6 fix the ffmpeg kill bug, wait until ffmpeg quit. 2013-12-06 14:07:37 +08:00
winlin
cab88dfe70 hls support multiple publish/unpublish. disable hls when not support 2013-12-06 14:02:10 +08:00
winlin
679e851f07 support max_connections, drop if exceed. 2013-12-06 11:00:37 +08:00
winlin
86b1f3349a fix bug of forward, erase msgs when error 2013-12-06 10:23:28 +08:00
winlin
89c0170850 fix bug of forward, earse the forwarded msgs. 2013-12-06 10:16:24 +08:00
winlin
8c5661b9ff fix bug of hls muxer, support close/open/flush even muxer is closed. 2013-12-06 09:44:23 +08:00
winlin
6207a2f19e fix the rewind bug, support republish by restart the ffmpeg encoder. 2013-12-05 23:54:30 +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
b5bba29768 refine hls, extract ts cache for ts cache audio and flush once 2013-12-02 22:09:10 +08:00
winlin
1c2f5052dd refine the hls muxer module 2013-12-02 15:55:10 +08:00
winlin
b4eb38c86b refine hls code, reorder classes. 2013-12-02 14:24:09 +08:00
winlin
d6897205c7 add todo for protocol 2013-12-02 12:56:52 +08:00
winlin
a2e6e6718e fix the m3u8 crash bug, simplify it 2013-12-02 11:46:39 +08:00
winlin
2b0bef18ed add todo for forward 2013-12-01 20:03:07 +08:00
winlin
09f9811a97 fix the hls crash bug 2013-12-01 19:54:52 +08:00
winlin
6f0bba9856 add todo: cycle all process, reap the exited 2013-12-01 18:53:24 +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
35676920be convert to unix format 2013-12-01 13:05:43 +08:00
winlin
18028ad4cb update readme 2013-12-01 13:04:09 +08:00
winlin
9a0d8855d8 support ffmpeg filter 2013-12-01 10:54:41 +08:00
winlin
f85b70966c rename global username and email 2013-11-30 23:26:40 +08:00
winlin
951cd08f1f refine the params 2013-11-30 23:21:14 +08:00
winlin
407801b8a6 add ffempty 2013-11-30 23:20:46 +08:00
winlin
b88596b6dc update readme 2013-11-30 23:15:25 +08:00
winlin
601a69aa70 update readme 2013-11-30 23:15:13 +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
ce15f4bce3 update encoder framework 2013-11-30 19:14:19 +08:00
winlin
8d91561ca0 add ffmpeg transcoding framework 2013-11-30 18:31:07 +08:00
winlin
a086e2bbfa add transcoding params to config 2013-11-30 16:23:01 +08:00
winlin
57064237d0 rename author to contributor 2013-11-30 14:35:59 +08:00
winlin
790294f437 add authors 2013-11-29 23:08:50 +08:00
winlin
28572b009a remove the clock msg from log 2013-11-29 22:39:50 +08:00
winlin
5d69236bff convert to unix format 2013-11-29 22:21:31 +08:00
winlin
db405b7e0e support forward stream to origin/edge 2013-11-29 22:20:51 +08:00
winlin
f656087d74 add forward framework 2013-11-29 16:52:24 +08:00
winlin
2fa7610f9c add rtmp client 2013-11-29 15:07:05 +08:00
winlin
844718c99b refine the forwarder 2013-11-28 23:43:52 +08:00
winlin
1f8bb0e935 add forward st thread 2013-11-28 23:18:05 +08:00
winlin
f09d457644 add forward framework 2013-11-28 22:59:00 +08:00
winlin
3515af9dff add tools 2013-11-28 22:32:50 +08:00
winlin
de95bf74b1 refine source, extract gop cache, add srs forwarder. 2013-11-28 22:28:34 +08:00
winlin
ecebedfed2 refine code 2013-11-28 15:12:08 +08:00
winlin
af5e7f002f fix the memory leak error 2013-11-28 14:53:46 +08:00
winlin
005f821441 fix bug of hls conf detect 2013-11-28 09:14:56 +08:00
winlin
3877ab0ff2 fix bug of hls conf detect 2013-11-28 09:14:31 +08:00
winlin
1653e444dd add comments for auto ptr message 2013-11-27 23:02:37 +08:00
winlin
90af450d63 add todo for response client detail error 2013-11-27 22:54:43 +08:00
winlin
62a2384a35 check publish streaming available 2013-11-27 22:53:08 +08:00
winlin
ec5cb39b96 add options --with/without -hls/ssl 2013-11-27 22:41:58 +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
c78baedf4e fix bug of 0.5 release. 2013-11-26 18:20:04 +08:00
winlin
94623c0cee fix bug of shared ptr, must copy the payload for it free it. 2013-11-26 18:11:45 +08:00
winlin
758dff0e97 fix bug of hls, close the muxer when segment finished 2013-11-26 17:56:55 +08:00
winlin
00ec634d56 support hls_fragment and hls_window 2013-11-26 17:48:35 +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
0c72c56f74 support HLS(m3u8) 2013-11-26 16:06:58 +08:00
winlin
749b7bdb2a refine hls, support time jitter detect and correct 2013-11-26 11:48:18 +08:00
winlin
326713fbed refine code, extract the rtmp jitter for hls 2013-11-26 11:15:44 +08:00
winlin
501b182dc9 refine code, write audio immediatly 2013-11-26 10:56:29 +08:00
winlin
dbdfb29de1 refine code, remove the base dts, donot drop start BP frames 2013-11-26 10:48:37 +08:00
winlin
b4235582dc refine code, remove the base dts, donot drop start BP frames 2013-11-26 10:47:05 +08:00
winlin
9e5b3afcbe update readme 2013-11-26 00:03:07 +08:00
winlin
7ed20cc670 support write ts file 2013-11-25 23:54:01 +08:00
winlin
164392f6aa fix bug of ts_info 2013-11-25 10:59:21 +08:00
winlin
d5b84b5e20 refine ts code 2013-11-25 00:46:08 +08:00
winlin
38e66be490 fix ts audio bug, aac adts header and PES_packet_length fixed 2013-11-25 00:02:01 +08:00
winlin
4fca914694 support write ts file 2013-11-24 23:13:14 +08:00
winlin
ca6720aab2 add time to write ts file 2013-11-24 18:55:39 +08:00
winlin
385394315d add ts mux framework 2013-11-24 17:53:36 +08:00