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

554 commits

Author SHA1 Message Date
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
winlin
836bc413f9 fix the bug of publish, server close the connection when timeout. 2013-12-25 14:39:54 +08:00
winlin
ffda615124 auto play, donot scale audio volume 2013-12-25 13:40:30 +08:00
winlin
f308cc39ef change volume to 2.0 2013-12-25 13:16:41 +08:00
winlin
4b12724abc change ui version to 1.11 2013-12-25 12:58:15 +08:00
winlin
b36d31b84c extract the components of js 2013-12-25 12:57:30 +08:00
winlin
e64a11943b extract the components of js 2013-12-25 12:57:20 +08:00
winlin
cb0c7dcf2e fix the bitrate bug(in Bps), use enhanced microphone. 2013-12-25 12:48:17 +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
5636fc7ca2 update ui, remove the collaps of local video. 2013-12-24 10:29:51 +08:00
winlin
47e173bf24 refine the build result. 2013-12-23 13:38:31 +08:00
winlin
2cefe1a9bb refine the script, add build/run/stop 2013-12-23 13:16:31 +08:00
winlin
1783e1f764 refine js, move the consts to the head of srs.js 2013-12-23 11:06:45 +08:00
winlin
46eb1ebd6b refine the srs js player and publisher, add private object 2013-12-23 11:05:34 +08:00
winlin
116129d1c6 refine the pages, use this(means the player object) in the callback 2013-12-23 11:01:33 +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
0846f05e6a add scripts 2013-12-23 10:40:11 +08:00
winlin
8e95227ada update ui version 2013-12-23 01:38:48 +08:00
winlin
12586f793c update reame 2013-12-23 01:37:53 +08:00
winlin
6875b6f5f2 support chat room, meeting. 2013-12-23 01:22:10 +08:00
winlin
e9a88e6b43 remove the wizard control, too complex 2013-12-22 19:51:07 +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
309322fd5c update the bootstrap wizard, use v2 2013-12-22 11:58:30 +08:00
winlin
2bc4bd8913 update the publisher, to auto prompt the dialog to get the publisher. 2013-12-22 10:57:50 +08:00
winlin
b628b5e7a4 fix bug of dar and fs size. 2013-12-22 01:20:03 +08:00
winlin
4c325261f7 add low latecy player 2013-12-22 01:11:09 +08:00
winlin
dd5aa36ba6 add low latecy player 2013-12-22 01:04:01 +08:00
winlin
01a02d2eff refine the tips of ui 2013-12-22 00:44:30 +08:00
winlin
4b74435e89 fix bug of resolve vhost, must strip then get from config. 2013-12-22 00:33:38 +08:00
winlin
96f9a40ca3 update version of ui 2013-12-22 00:19:02 +08:00
winlin
f70d9b101f update version of ui 2013-12-22 00:11:58 +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
632255f08f update the signature, when connect to server, parse the response. 2013-12-21 21:13:55 +08:00
winlin
cb55f23363 update the publish link 2013-12-21 20:27:23 +08:00
winlin
ec29cc0925 refine the publish url. 2013-12-21 20:13:14 +08:00
winlin
825215f7e5 add primary button, refine readme. 2013-12-21 20:04:37 +08:00
winlin
a744308e97 use version to anti swf cache. 2013-12-21 19:59:50 +08:00
winlin
0967ec5e2f use version to anti swf cache. 2013-12-21 19:39:12 +08:00
winlin
4a31ac3e25 filter the first non-virtual camera 2013-12-21 19:35:42 +08:00
winlin
e9ec22e66e use timestamp to stream 2013-12-21 19:30:39 +08:00
winlin
a6e2f19a0f support publish 2013-12-21 19:25:43 +08:00
wenjiegit
9a70ce7865 add bandcheck code and modified srs code for merge 2013-12-21 16:19:16 +08:00
wenjiegit
adb169eaf1 add bandcheck code and modified srs code for merge 2013-12-21 16:18:46 +08:00
winlin
85515f05d3 rename the title 2013-12-21 14:19:05 +08:00
winlin
7a21427b10 override the default nginx page. jump to players page. 2013-12-21 14:12:37 +08:00
winlin
66ea34c514 refine the ui buffer effect 2013-12-21 13:10:02 +08:00
winlin
821e7e01df refine the ui buffer effect 2013-12-21 12:53:02 +08:00
winlin
65a5f4d460 refine ui, unify the player size 2013-12-21 11:37:46 +08:00
winlin
21c6001210 add buffer time and play time display 2013-12-21 10:06:51 +08:00
winlin
065cbbe4aa add fullscreen event and rescale 2013-12-21 01:04:29 +08:00
winlin
02f46d6fcc update the srs player, set the DAR. 2013-12-20 19:14:21 +08:00
winlin
190540683a update the srs player, set the DAR. 2013-12-20 19:02:17 +08:00
winlin
11cd5c640f update the srs player, set the DAR. 2013-12-20 18:53:13 +08:00
winlin
b5c17e2338 update the srs player, set the DAR. 2013-12-20 18:49:45 +08:00
winlin
42ec5f19fc update the srs player, set the DAR. 2013-12-20 18:46:56 +08:00
winlin
5bfb561f89 add srs player 2013-12-20 00:26:34 +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
609a8fa472 update depends script 2013-12-18 15:05:49 +08:00
winlin
764aa9b40a refine the build script 2013-12-18 14:32:47 +08:00
winlin
f019eb303c add crossdomain.xml 2013-12-18 14:30:48 +08:00
winlin
0c08942fec update the ui, add hls player 2013-12-18 14:29:55 +08:00
winlin
6e4795ee5c extract the srs.js 2013-12-18 13:48:59 +08:00
winlin
ff4b28f4d4 extract the srs.js 2013-12-18 13:44:18 +08:00
winlin
4400fc8d0b add srs_publisher 2013-12-18 13:08:50 +08:00
winlin
1c04e35924 refine the ui, add osmf/jwplayer 2013-12-18 12:37:46 +08:00
winlin
5e9915bd15 add players to nginx 2013-12-17 11:37:15 +08:00
winlin
c4477cd64f add players to nginx 2013-12-17 11:30:00 +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